Skip to contentSkip to conversation

net/sched: act_tunnel_key: add support for TUNNEL_DONT_FRAGMENT

PATCH Superseded Davide Caratti 3 participants 9 messages Mar 28, 2023

Subsystems (5)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover net/sched: act_tunnel_key: add support for TUNNEL_DONT_FRAGMENT

- patch 1 extends TC tunnel_key action to add support for TUNNEL_DONT_FRAGMENT
- patch 2 extends tdc to skip tests when iproute2 support is missing
- patch 3 adds a tdc test case to verify functionality of the control plane
- patch 4 adds a net/forwarding test case to verify functionality of the data plane

v2->v3:
- introduce new "dependsOn" property instead of extending "skip" (suggested by Pedro Tammela)
- fix wrong indentation (thanks to Jakub Kicinski)

v1->v2:
- split patchset to have test cases in separate patches (thanks to Pedro Tammela)
- change TCA_TUNNEL_KEY_NO_FRAG attribute, so that it is a flag istead of u8 (thanks to Jakub Kicinski)
- add missing TEST_PROGS assignment (thanks to Jakub Kicinski)

Davide Caratti (4):
net/sched: act_tunnel_key: add support for "don't fragment"
selftests: tc-testing: add "depends_on" property to skip tests
selftests: tc-testing: add tunnel_key "nofrag" test case
selftests: forwarding: add tunnel_key "nofrag" test case

 include/uapi/linux/tc_act/tc_tunnel_key.h     |   1 +
 net/sched/act_tunnel_key.c                    |   5 +
 .../testing/selftests/net/forwarding/Makefile |   1 +
 .../selftests/net/forwarding/tc_tunnel_key.sh | 161 ++++++++++++++++++
 .../creating-testcases/AddingTestCases.txt    |   2 +
 .../tc-tests/actions/tunnel_key.json          |  25 +++
 tools/testing/selftests/tc-testing/tdc.py     |  13 ++
 7 files changed, 208 insertions(+)
 create mode 100755 tools/testing/selftests/net/forwarding/tc_tunnel_key.sh
Signature · 1 line
2.39.2
#1 lore raw

PATCH v3 1/4 net/sched: act_tunnel_key: add support for "don't fragment"

extend "act_tunnel_key" to allow specifying TUNNEL_DONT_FRAGMENT.

---
 include/uapi/linux/tc_act/tc_tunnel_key.h | 1 +
 net/sched/act_tunnel_key.c                | 5 +++++
 2 files changed, 6 insertions(+)
include/uapi/linux/tc_act/tc_tunnel_key.h +1 -0
index 49ad4033951b..37c6f612f161 100644
@@ -34,6 +34,7 @@ enum {
 					 */
 	TCA_TUNNEL_KEY_ENC_TOS,		/* u8 */
 	TCA_TUNNEL_KEY_ENC_TTL,		/* u8 */
+	TCA_TUNNEL_KEY_NO_FRAG,		/* flag */
 	__TCA_TUNNEL_KEY_MAX,
 };
 
net/sched/act_tunnel_key.c +5 -0
index 2d12d2626415..0c8aa7e686ea 100644
@@ -420,6 +420,9 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla,
 		    nla_get_u8(tb[TCA_TUNNEL_KEY_NO_CSUM]))
 			flags &= ~TUNNEL_CSUM;
 
+		if (nla_get_flag(tb[TCA_TUNNEL_KEY_NO_FRAG]))
+			flags |= TUNNEL_DONT_FRAGMENT;
+
 		if (tb[TCA_TUNNEL_KEY_ENC_DST_PORT])
 			dst_port = nla_get_be16(tb[TCA_TUNNEL_KEY_ENC_DST_PORT]);
 
@@ -747,6 +750,8 @@ static int tunnel_key_dump(struct sk_buff *skb, struct tc_action *a,
 				   key->tp_dst)) ||
 		    nla_put_u8(skb, TCA_TUNNEL_KEY_NO_CSUM,
 			       !(key->tun_flags & TUNNEL_CSUM)) ||
+		    ((key->tun_flags & TUNNEL_DONT_FRAGMENT) &&
+		     nla_put_flag(skb, TCA_TUNNEL_KEY_NO_FRAG)) ||
 		    tunnel_key_opts_dump(skb, info))
 			goto nla_put_failure;
 
Signature · 1 line
2.39.2
#4 lore raw

PATCH v3 2/4 selftests: tc-testing: add "depends_on" property to skip tests

In reply to Davide Caratti

currently, users can skip individual test cases by means of writing

"skip": "yes"

in the scenario file. Extend this functionality, introducing 'dependsOn':
it's optional property like "skip", but the value contains a command (for example, a probe on iproute2 to check if it supports a specific feature). If such property is present, tdc executes that command and skips the test when the return value is non-zero.

---
 .../creating-testcases/AddingTestCases.txt          |  2 ++
 tools/testing/selftests/tc-testing/tdc.py           | 13 +++++++++++++
 2 files changed, 15 insertions(+)
tools/testing/selftests/tc-testing/creating-testcases/AddingTestCases.txt +2 -0
index a28571aff0e1..ff956d8c99c5 100644
@@ -38,6 +38,8 @@ skip:         A completely optional key, if the corresponding value is "yes"
               this test case will still appear in the results output but
               marked as skipped. This key can be placed anywhere inside the
               test case at the top level.
+dependsOn:    Same as 'skip', but the value is executed as a command. The test
+              is skipped when the command returns non-zero.
 category:     A list of single-word descriptions covering what the command
               under test is testing. Example: filter, actions, u32, gact, etc.
 setup:        The list of commands required to ensure the command under test
tools/testing/selftests/tc-testing/tdc.py +13 -0
index 7bd94f8e490a..5fa3fe644bfe 100755
@@ -369,6 +369,19 @@ def run_one_test(pm, args, index, tidx):
             pm.call_post_execute()
             return res
 
+    if 'dependsOn' in tidx:
+        if (args.verbose > 0):
+            print('probe command for test skip')
+        (p, procout) = exec_cmd(args, pm, 'execute', tidx['dependsOn'])
+        if p:
+            if (p.returncode != 0):
+                res = TestResult(tidx['id'], tidx['name'])
+                res.set_result(ResultState.skip)
+                res.set_errormsg('probe command failed: test skipped.')
+                pm.call_pre_case(tidx, test_skip=True)
+                pm.call_post_execute()
+                return res
+
     # populate NAMES with TESTID for this test
     NAMES['TESTID'] = tidx['id']
 
Signature · 1 line
2.39.2
#6 lore raw

PATCH v3 3/4 selftests: tc-testing: add tunnel_key "nofrag" test case

In reply to Davide Caratti
 # ./tdc.py -e 6bda -l
 6bda: (actions, tunnel_key) Add tunnel_key action with nofrag option
---
 .../tc-tests/actions/tunnel_key.json          | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
tools/testing/selftests/tc-testing/tc-tests/actions/tunnel_key.json +25 -0
index b40ee602918a..b5b47fbf6c00 100644
@@ -983,5 +983,30 @@
         "teardown": [
             "$TC actions flush action tunnel_key"
         ]
+    },
+    {
+        "id": "6bda",
+        "name": "Add tunnel_key action with nofrag option",
+        "category": [
+            "actions",
+            "tunnel_key"
+        ],
+        "dependsOn": "$TC actions add action tunnel_key help 2>&1 | grep -q nofrag",
+        "setup": [
+            [
+                "$TC action flush action tunnel_key",
+                0,
+                1,
+                255
+            ]
+        ],
+        "cmdUnderTest": "$TC actions add action tunnel_key set src_ip 10.10.10.1 dst_ip 10.10.10.2 id 1111 nofrag index 222",
+        "expExitCode": "0",
+        "verifyCmd": "$TC actions get action tunnel_key index 222",
+        "matchPattern": "action order [0-9]+: tunnel_key.*src_ip 10.10.10.1.*dst_ip 10.10.10.2.*key_id 1111.*csum.*nofrag pipe.*index 222",
+        "matchCount": "1",
+        "teardown": [
+            "$TC actions flush action tunnel_key"
+        ]
     }
 ]
Signature · 1 line
2.39.2
#8 lore raw

PATCH v3 4/4 selftests: forwarding: add tunnel_key "nofrag" test case

In reply to Davide Caratti

Add a selftest that configures metadata tunnel encapsulation using the TC "tunnel_key" action: it includes a test case for setting "nofrag" flag.

Example output:

# selftests: net/forwarding: tc_tunnel_key.sh
# TEST: tunnel_key nofrag (skip_hw) [ OK ]
# INFO: Could not test offloaded functionality
ok 1 selftests: net/forwarding: tc_tunnel_key.sh

---
 .../testing/selftests/net/forwarding/Makefile |   1 +
 .../selftests/net/forwarding/tc_tunnel_key.sh | 161 ++++++++++++++++++
 2 files changed, 162 insertions(+)
 create mode 100755 tools/testing/selftests/net/forwarding/tc_tunnel_key.sh
tools/testing/selftests/net/forwarding/Makefile +1 -0
index 91201ab3c4fc..236f6b796a52 100644
@@ -85,6 +85,7 @@ TEST_PROGS = bridge_igmp.sh \
 	tc_mpls_l2vpn.sh \
 	tc_police.sh \
 	tc_shblocks.sh \
+	tc_tunnel_key.sh \
 	tc_vlan_modify.sh \
 	vxlan_asymmetric_ipv6.sh \
 	vxlan_asymmetric.sh \
tools/testing/selftests/net/forwarding/tc_tunnel_key.sh new file +161 -0

161 lines not on this page · raw message

Signature · 1 line
2.39.2
Reviewed-by on v3 2/4
#5 lore raw

Re: [PATCH net-next v3 2/4] selftests: tc-testing: add "depends_on" property to skip tests

In reply to Davide Caratti
Quoted 36 lines · Davide Caratti

currently, users can skip individual test cases by means of writing

   "skip": "yes"

in the scenario file. Extend this functionality, introducing 'dependsOn':
it's optional property like "skip", but the value contains a command (for example, a probe on iproute2 to check if it supports a specific feature). If such property is present, tdc executes that command and skips the test when the return value is non-zero.

---
  .../creating-testcases/AddingTestCases.txt          |  2 ++
  tools/testing/selftests/tc-testing/tdc.py           | 13 +++++++++++++
  2 files changed, 15 insertions(+)
tools/testing/selftests/tc-testing/creating-testcases/AddingTestCases.txt +2 -0
index a28571aff0e1..ff956d8c99c5 100644
@@ -38,6 +38,8 @@ skip:         A completely optional key, if the corresponding value is "yes"
                this test case will still appear in the results output but
                marked as skipped. This key can be placed anywhere inside the
                test case at the top level.
+dependsOn:    Same as 'skip', but the value is executed as a command. The test
+              is skipped when the command returns non-zero.
  category:     A list of single-word descriptions covering what the command
                under test is testing. Example: filter, actions, u32, gact, etc.
  setup:        The list of commands required to ensure the command under test
tools/testing/selftests/tc-testing/tdc.py +0 -0
index 7bd94f8e490a..5fa3fe644bfe 100755
@@ -369,6 +369,19 @@ def run_one_test(pm, args, index, tidx):
              pm.call_post_execute()
              return res

tools/testing/selftests/tc-testing/tdc.py def run_one_test(pm, args, index, tidx): · line 380

Quoted 10 lines
tools/testing/selftests/tc-testing/tdc.py +9 -0
 
+    if 'dependsOn' in tidx:
+        if (args.verbose > 0):
+            print('probe command for test skip')
+        (p, procout) = exec_cmd(args, pm, 'execute', tidx['dependsOn'])
+        if p:
+            if (p.returncode != 0):
+                res = TestResult(tidx['id'], tidx['name'])
+                res.set_result(ResultState.skip)
+                res.set_errormsg('probe command failed: test skipped.')

'probe command: test skipped'

tools/testing/selftests/tc-testing/tdc.py def run_one_test(pm, args, index, tidx): · line 387

Quoted 7 lines
tools/testing/selftests/tc-testing/tdc.py +4 -0
+                pm.call_pre_case(tidx, test_skip=True)
+                pm.call_post_execute()
+                return res
+
      # populate NAMES with TESTID for this test
      NAMES['TESTID'] = tidx['id']
 

Other than the above, LGTM.

Reviewed-by on v3 1/4
#2 lore raw

Re: [PATCH net-next v3 1/4] net/sched: act_tunnel_key: add support for "don't fragment"

In reply to Davide Caratti
Quoted 36 lines · Davide Caratti

extend "act_tunnel_key" to allow specifying TUNNEL_DONT_FRAGMENT.

---
  include/uapi/linux/tc_act/tc_tunnel_key.h | 1 +
  net/sched/act_tunnel_key.c                | 5 +++++
  2 files changed, 6 insertions(+)
include/uapi/linux/tc_act/tc_tunnel_key.h +1 -0
index 49ad4033951b..37c6f612f161 100644
@@ -34,6 +34,7 @@ enum {
  					 */
  	TCA_TUNNEL_KEY_ENC_TOS,		/* u8 */
  	TCA_TUNNEL_KEY_ENC_TTL,		/* u8 */
+	TCA_TUNNEL_KEY_NO_FRAG,		/* flag */
  	__TCA_TUNNEL_KEY_MAX,
  };
 
net/sched/act_tunnel_key.c +3 -0
index 2d12d2626415..0c8aa7e686ea 100644
@@ -420,6 +420,9 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla,
  		    nla_get_u8(tb[TCA_TUNNEL_KEY_NO_CSUM]))
  			flags &= ~TUNNEL_CSUM;
 
+		if (nla_get_flag(tb[TCA_TUNNEL_KEY_NO_FRAG]))
+			flags |= TUNNEL_DONT_FRAGMENT;
+
  		if (tb[TCA_TUNNEL_KEY_ENC_DST_PORT])
  			dst_port = nla_get_be16(tb[TCA_TUNNEL_KEY_ENC_DST_PORT]);
 

net/sched/act_tunnel_key.c static int tunnel_key_dump(struct sk_buff *skb, struct tc_action *a, · line 757

Quoted 8 lines
net/sched/act_tunnel_key.c +2 -0
@@ -747,6 +750,8 @@ static int tunnel_key_dump(struct sk_buff *skb, struct tc_action *a,
  				   key->tp_dst)) ||
  		    nla_put_u8(skb, TCA_TUNNEL_KEY_NO_CSUM,
  			       !(key->tun_flags & TUNNEL_CSUM)) ||
+		    ((key->tun_flags & TUNNEL_DONT_FRAGMENT) &&
+		     nla_put_flag(skb, TCA_TUNNEL_KEY_NO_FRAG)) ||
  		    tunnel_key_opts_dump(skb, info))
  			goto nla_put_failure;
 

LGTM,

maintainer Acked-by on v3 1/4
#3 lore raw

Re: [PATCH net-next v3 1/4] net/sched: act_tunnel_key: add support for "don't fragment"

In reply to Davide Caratti

Try 2 (some silly spam filter blocked earlier email)

Quoted 5 lines · Davide Caratti

extend "act_tunnel_key" to allow specifying TUNNEL_DONT_FRAGMENT.

cheers,
jamal

Quoted 44 lines
---
 include/uapi/linux/tc_act/tc_tunnel_key.h | 1 +
 net/sched/act_tunnel_key.c                | 5 +++++
 2 files changed, 6 insertions(+)
include/uapi/linux/tc_act/tc_tunnel_key.h +1 -0
index 49ad4033951b..37c6f612f161 100644
@@ -34,6 +34,7 @@ enum {
                                         */
        TCA_TUNNEL_KEY_ENC_TOS,         /* u8 */
        TCA_TUNNEL_KEY_ENC_TTL,         /* u8 */
+       TCA_TUNNEL_KEY_NO_FRAG,         /* flag */
        __TCA_TUNNEL_KEY_MAX,
 };
 
net/sched/act_tunnel_key.c +5 -1
index 2d12d2626415..0c8aa7e686ea 100644
@@ -420,6 +420,9 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla,
                    nla_get_u8(tb[TCA_TUNNEL_KEY_NO_CSUM]))
                        flags &= ~TUNNEL_CSUM;
 
+               if (nla_get_flag(tb[TCA_TUNNEL_KEY_NO_FRAG]))
+                       flags |= TUNNEL_DONT_FRAGMENT;
+
                if (tb[TCA_TUNNEL_KEY_ENC_DST_PORT])
                        dst_port = nla_get_be16(tb[TCA_TUNNEL_KEY_ENC_DST_PORT]);
 
@@ -747,6 +750,8 @@ static int tunnel_key_dump(struct sk_buff *skb, struct tc_action *a,
                                   key->tp_dst)) ||
                    nla_put_u8(skb, TCA_TUNNEL_KEY_NO_CSUM,
                               !(key->tun_flags & TUNNEL_CSUM)) ||
+                   ((key->tun_flags & TUNNEL_DONT_FRAGMENT) &&
+                    nla_put_flag(skb, TCA_TUNNEL_KEY_NO_FRAG)) ||
                    tunnel_key_opts_dump(skb, info))
                        goto nla_put_failure;
 
--

2.39.2

maintainer Acked-by on v3 3/4
#7 lore raw

Re: [PATCH net-next v3 3/4] selftests: tc-testing: add tunnel_key "nofrag" test case

In reply to Davide Caratti
Quoted 5 lines · Davide Caratti
 # ./tdc.py -e 6bda -l
 6bda: (actions, tunnel_key) Add tunnel_key action with nofrag option

cheers,
jamal

Quoted 42 lines
---
 .../tc-tests/actions/tunnel_key.json          | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
tools/testing/selftests/tc-testing/tc-tests/actions/tunnel_key.json +25 -1
index b40ee602918a..b5b47fbf6c00 100644
@@ -983,5 +983,30 @@
         "teardown": [
             "$TC actions flush action tunnel_key"
         ]
+    },
+    {
+        "id": "6bda",
+        "name": "Add tunnel_key action with nofrag option",
+        "category": [
+            "actions",
+            "tunnel_key"
+        ],
+        "dependsOn": "$TC actions add action tunnel_key help 2>&1 | grep -q nofrag",
+        "setup": [
+            [
+                "$TC action flush action tunnel_key",
+                0,
+                1,
+                255
+            ]
+        ],
+        "cmdUnderTest": "$TC actions add action tunnel_key set src_ip 10.10.10.1 dst_ip 10.10.10.2 id 1111 nofrag index 222",
+        "expExitCode": "0",
+        "verifyCmd": "$TC actions get action tunnel_key index 222",
+        "matchPattern": "action order [0-9]+: tunnel_key.*src_ip 10.10.10.1.*dst_ip 10.10.10.2.*key_id 1111.*csum.*nofrag pipe.*index 222",
+        "matchCount": "1",
+        "teardown": [
+            "$TC actions flush action tunnel_key"
+        ]
     }
 ]
--

2.39.2