support session AMBR & MFBR & URR MBQE(measurement before QoS enforcement) #86

chen042531 · 2023-12-08T05:52:49Z

No description provided.

src/gtpu/encap.c

src/genl/genl_qer.c

src/genl/genl_pdr.c

src/genl/genl_qer.c

src/gtpu/trTCM.c

src/gtpu/encap.c

src/proc.c

afcidk · 2024-01-09T03:13:40Z

src/gtpu/encap.c

@@ -774,7 +788,7 @@ static int gtp5g_fwd_skb_encap(struct sk_buff *skb, struct net_device *dev,
            uh->check = 0;

            if (pdr->urr_num != 0) {
-                ret = check_urr(pdr, far, volume, volume_mbqe, true);
+                ret = check_urr(pdr, far, volume, volume_mbqe, true, drop_pkt);
                if (ret < 0) {
                    if (ret == DONT_SEND_UL_PACKET) {
                        GTP5G_ERR(pdr->dev, "Should not foward the first uplink packet");


Why is this GTP5G_ERR?

@chen042531 please reply.

I am unsure why the original author used GTP5G_ERR()
I believe it would be better to use GTP5G_INF() at level 3 instead, as this is not an error.

src/gtpu/encap.c

afcidk · 2024-01-09T03:24:35Z

src/gtpu/encap.c

+
+    if (color == Red){
+        return -1;
+    }
    ret = netif_rx(skb);
    if (ret != NET_RX_SUCCESS) {
        GTP5G_ERR(dev, "Uplink: Packet got dropped\n");


Should we return value other than 0?

@chen042531 please reply.

There are still mixed usages for 0, -1, COLOR_RED_DROP.
I think COLOR_RED_DROP should be value other than 0 (maybe -2?) so that we can distinguish different runtime behaviors (forwarded, dropped due to what failed reason, dropped due to QoS).

By the way, related error codes may need to be updated as well

gtp5g/src/gtpu/encap.c

Lines 143 to 152 in 49fbe75

case 1:

GTP5G_ERR(gtp->dev, "Pass up to the process\n");

break;

case 0:

break;

case -1:

GTP5G_ERR(gtp->dev, "GTP packet has been dropped\n");

kfree_skb(skb);

ret = 0;

break;

I will update these part

As discussed with @chen042531, only 1, 0, -1 should be returned from encap function. The return values will be replaced with macro, and only return value with -1 (dropped) should be freed.

src/gtpu/encap.c

include/pdr.h

include/qer.h

src/genl/genl_pdr.c

src/genl/genl_qer.c

src/gtpu/encap.c

some comments unresolved

afcidk · 2024-02-06T09:43:05Z

src/gtpu/encap.c

+    if (color == Red) {
+        GTP5G_TRC(pdr->dev, "Drop red packet");
+        return PKT_DROPPED;
+    }
    ret = netif_rx(skb);
    if (ret != NET_RX_SUCCESS) {
        GTP5G_ERR(dev, "Uplink: Packet got dropped\n");


Do we need to free the skb when netif_rx fails?

”netif_rx“ will free the skb when netif_rx fails

tim-ywliu · 2024-02-11T17:04:44Z

include/encap.h

@@ -6,6 +6,10 @@
 #include "dev.h"
 #include "pktinfo.h"

+#define PKT_PASS_TO_UPF 1


what are the difference between PKT_PASS_TO_UPF and PKT_SENT? Does it mean to send pkt to APP or not?

"PKT_PASS_TO_UPF" means that gtp5g cannot handle the packet (e.g., not GTPv1, not TPDU, or not an end marker) and passes the packet to a userspace program for handling.

"PKT_SENT" indicates that gtp5g has successfully handled the packet and forwarded it to the N6/N9 interface.

rename to PKT_TO_APP and PKT_FORWARDED

tim-ywliu · 2024-02-15T15:08:33Z

src/gtpu/encap.c

                if (ret < 0) {
                    if (ret == DONT_SEND_UL_PACKET) {
-                        GTP5G_ERR(pdr->dev, "Should not foward the first uplink packet");
+                        GTP5G_INF(pdr->dev, "Should not foward the first uplink packet");
                        return -1;


return PKT_DROPPED;

tim-ywliu · 2024-02-15T15:08:46Z

src/gtpu/encap.c

+            if (color == Red) {
+                GTP5G_TRC(pdr->dev, "Drop red packet");
+                return PKT_DROPPED;
+            }
            if (ip_xmit(skb, pdr->sk, dev) < 0) {
                GTP5G_ERR(dev, "Failed to transmit skb through ip_xmit\n");
                return -1;


return PKT_DROPPED;

tim-ywliu · 2024-02-15T15:10:42Z

src/gtpu/encap.c

-        if (check_urr(pdr, far, volume, volume_mbqe, true) < 0)
-            GTP5G_ERR(pdr->dev, "Fail to send Usage Report");
-    }
-
    return 0;


return PKT_FORWARDED;

chen042531 force-pushed the sessAMBR branch 2 times, most recently from 87849ce to aecd472 Compare December 25, 2023 01:13

tim-ywliu reviewed Jan 8, 2024

View reviewed changes

src/gtpu/encap.c Outdated Show resolved Hide resolved

tim-ywliu reviewed Jan 8, 2024

View reviewed changes

src/genl/genl_qer.c Outdated Show resolved Hide resolved

tim-ywliu reviewed Jan 8, 2024

View reviewed changes

src/genl/genl_qer.c Outdated Show resolved Hide resolved

tim-ywliu reviewed Jan 8, 2024

View reviewed changes

src/genl/genl_qer.c Show resolved Hide resolved

tim-ywliu reviewed Jan 8, 2024

View reviewed changes

src/genl/genl_pdr.c Outdated Show resolved Hide resolved

afcidk reviewed Jan 9, 2024

View reviewed changes

src/genl/genl_qer.c Outdated Show resolved Hide resolved

src/gtpu/trTCM.c Show resolved Hide resolved

src/gtpu/encap.c Outdated Show resolved Hide resolved

src/gtpu/encap.c Outdated Show resolved Hide resolved

afcidk reviewed Jan 9, 2024

View reviewed changes

chen042531 force-pushed the sessAMBR branch 2 times, most recently from d522421 to 4b1954c Compare January 9, 2024 10:09

afcidk reviewed Jan 10, 2024

View reviewed changes

src/gtpu/encap.c Outdated Show resolved Hide resolved

afcidk reviewed Jan 10, 2024

View reviewed changes

src/gtpu/encap.c Outdated Show resolved Hide resolved

chen042531 force-pushed the sessAMBR branch 2 times, most recently from a37e780 to d27cde2 Compare January 12, 2024 01:41

tim-ywliu reviewed Jan 12, 2024

View reviewed changes

include/pdr.h Outdated Show resolved Hide resolved

tim-ywliu reviewed Jan 12, 2024

View reviewed changes

include/qer.h Outdated Show resolved Hide resolved

tim-ywliu reviewed Jan 12, 2024

View reviewed changes

src/genl/genl_pdr.c Outdated Show resolved Hide resolved

tim-ywliu reviewed Jan 12, 2024

View reviewed changes

src/genl/genl_qer.c Outdated Show resolved Hide resolved

tim-ywliu reviewed Jan 12, 2024

View reviewed changes

src/gtpu/encap.c Outdated Show resolved Hide resolved

tim-ywliu reviewed Jan 12, 2024

View reviewed changes

src/gtpu/encap.c Outdated Show resolved Hide resolved

chen042531 force-pushed the sessAMBR branch from 7cabf96 to 776998a Compare January 24, 2024 01:20

ycchen added 7 commits January 24, 2024 01:46

session AMBR v1

bdd2903

qos enable/disable by /proc

1956b81

update trafficPolicer & fine tune bucket size

94e04ac

after header remove

1930b98

update qos enable

f7d4e85

set QoS disable as default value

71a4bae

urr mbqe

60bcb3b

ycchen added 7 commits January 24, 2024 01:46

update pdr/qer structure

4e8fc4c

add rcu protect

7a7184d

update qer/pdr structure

054caa4

remove drop_pkt parameter

2646b2e

update COLOR_RED_DROP return & spinlock init

26b3c2e

update version number to v0.9.0

465ad30

update format

0789242

chen042531 force-pushed the sessAMBR branch from 0a09516 to 0789242 Compare January 24, 2024 01:49

chen042531 changed the title ~~session AMBR v1~~ support session AMBR & MFBR & URR MBQE(measurement before QoS enforcement) Jan 24, 2024

chen042531 force-pushed the sessAMBR branch from a611057 to 0789242 Compare January 24, 2024 03:18

Merge branch 'master' into sessAMBR

c8c29aa

tim-ywliu reviewed Jan 31, 2024

View reviewed changes

src/gtpu/encap.c Outdated Show resolved Hide resolved

tim-ywliu reviewed Jan 31, 2024

View reviewed changes

src/gtpu/encap.c Outdated Show resolved Hide resolved

tim-ywliu reviewed Jan 31, 2024

View reviewed changes

src/gtpu/encap.c Show resolved Hide resolved

remove redundent lines

2d185ca

tim-ywliu previously approved these changes Feb 5, 2024

View reviewed changes

replace return value with macro & update log

0939f97

afcidk reviewed Feb 6, 2024

View reviewed changes

tim-ywliu reviewed Feb 11, 2024

View reviewed changes

tim-ywliu reviewed Feb 15, 2024

View reviewed changes

update macro

2efe608

tim-ywliu approved these changes Feb 16, 2024

View reviewed changes

tim-ywliu merged commit 7768779 into free5gc:master Feb 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

support session AMBR & MFBR & URR MBQE(measurement before QoS enforcement) #86

support session AMBR & MFBR & URR MBQE(measurement before QoS enforcement) #86

chen042531 commented Dec 8, 2023

afcidk Jan 9, 2024

tim-ywliu Feb 5, 2024

chen042531 Feb 6, 2024

afcidk Jan 9, 2024

tim-ywliu Feb 5, 2024

afcidk Feb 6, 2024 •

edited

Loading

chen042531 Feb 6, 2024

afcidk Feb 6, 2024

afcidk Feb 6, 2024

chen042531 Feb 6, 2024

tim-ywliu Feb 11, 2024

chen042531 Feb 15, 2024

tim-ywliu Feb 15, 2024

tim-ywliu Feb 15, 2024

tim-ywliu Feb 15, 2024

tim-ywliu Feb 15, 2024

	case 1:
	GTP5G_ERR(gtp->dev, "Pass up to the process\n");
	break;
	case 0:
	break;
	case -1:
	GTP5G_ERR(gtp->dev, "GTP packet has been dropped\n");
	kfree_skb(skb);
	ret = 0;
	break;

support session AMBR & MFBR & URR MBQE(measurement before QoS enforcement) #86

support session AMBR & MFBR & URR MBQE(measurement before QoS enforcement) #86

Conversation

chen042531 commented Dec 8, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

afcidk Feb 6, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

afcidk Feb 6, 2024 •

edited

Loading