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 23, 2023 – Mar 27, 2023

Subsystems (5)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 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

v1->v2:
- split patchset to have test cases in separate patches (thanks to Pedro Tammela)
- change TCA_TUNNEL_KEY_NO_FRAG attribute, so the 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: extend the "skip" property
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    |   4 +-
 .../tc-tests/actions/tunnel_key.json          |  25 +++
 tools/testing/selftests/tc-testing/tdc.py     |  21 ++-
 7 files changed, 211 insertions(+), 7 deletions(-)
 create mode 100755 tools/testing/selftests/net/forwarding/tc_tunnel_key.sh
Signature · 1 line
2.39.2
#1 lore raw

PATCH v2 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..5f852631343f 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
maintainer
#2 lore raw

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

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

Quoted 2 lines · On Thu, 23 Mar 2023 14:34:40 +0100 Davide Caratti wrote:
net/sched/act_tunnel_key.c +2 -0
+		    ((key->tun_flags & TUNNEL_DONT_FRAGMENT) &&
+				nla_put_flag(skb, TCA_TUNNEL_KEY_NO_FRAG)) ||

indentation looks off :(

#3 lore raw

PATCH v2 2/4 selftests: tc-testing: extend the "skip" property

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 by allowing the execution of a command, written in the "skip" property for a specific test case. If such property is present, tdc executes that command and skips the test if the return value is non-zero.

---
 .../creating-testcases/AddingTestCases.txt    |  4 +++-
 tools/testing/selftests/tc-testing/tdc.py     | 21 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)
tools/testing/selftests/tc-testing/creating-testcases/AddingTestCases.txt +3 -1
index a28571aff0e1..130c49ef8576 100644
@@ -37,7 +37,9 @@ skip:         A completely optional key, if the corresponding value is "yes"
               then tdc will not execute the test case in question. However,
               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.
+              test case at the top level. It's possible to specify a command
+              in the value of "skip": in this case, the test is skipped when
+              the return value is not 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 +15 -6
index 7bd94f8e490a..cc355ead1ff0 100755
@@ -361,13 +361,22 @@ def run_one_test(pm, args, index, tidx):
     print("Test " + tidx["id"] + ": " + tidx["name"])
 
     if 'skip' in tidx:
+        if (args.verbose > 0):
+            print('probe command for test skip')
         if tidx['skip'] == 'yes':
-            res = TestResult(tidx['id'], tidx['name'])
-            res.set_result(ResultState.skip)
-            res.set_errormsg('Test case designated as skipped.')
-            pm.call_pre_case(tidx, test_skip=True)
-            pm.call_post_execute()
-            return res
+            # 'yes' would block forever: preserve existing skipped test
+            #  replacing 'yes' with 'false'
+            (p, procout) = exec_cmd(args, pm, 'execute', '/bin/false')
+        else:
+            (p, procout) = exec_cmd(args, pm, 'execute', tidx['skip'])
+        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
#4 lore raw

Re: [PATCH net-next v2 2/4] selftests: tc-testing: extend the "skip" property

Quoted 10 lines · Davide Caratti

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

   "skip": "yes"

in the scenario file. Extend this functionality by allowing the execution of a command, written in the "skip" property for a specific test case. If such property is present, tdc executes that command and skips the test if the return value is non-zero.

I saw the use case in patch 3 but I didn't understand how it can happen.
Shouldn't iproute2 at least match the kernel version? I know it's not a hard requirement for 99% of use cases, but when running tdc I would argue it's the minimum expected.

#5 lore raw

Re: [PATCH net-next v2 2/4] selftests: tc-testing: extend the "skip" property

hello Pedro, thanks for looking at this!

Quoted 10 lines · Pedro Tammela
Quoted 9 lines · Davide Caratti

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

   "skip": "yes"

in the scenario file. Extend this functionality by allowing the execution of a command, written in the "skip" property for a specific test case. If such property is present, tdc executes that command and skips the test if the return value is non-zero.

Quoted 7 lines
Quoted 1 line

I saw the use case in patch 3 but I didn't understand how it can happen. Shouldn't iproute2 at least match the kernel version? I know it's not a hard requirement for 99% of use cases, but when running tdc I would argue it's the minimum expected.

sure, but there are distributions where patches are backported: on these ones, the kernel/iproute version is not so meaningful.
Instead of posting kselftest after the iproute2 support code is merged, I think it's preferrable to just skip those kselftests that can't run because they lack userspace bits; and by the way I see we are already taking this approach elsewhere [1] [2].

Signature · 4 lines
davide

[1] https://elixir.bootlin.com/linux/v6.3-rc4/source/tools/testing/selftests/net/srv6_hl2encap_red_l2vpn_test.sh#L789
[2] https://elixir.bootlin.com/linux/v6.3-rc4/source/tools/testing/selftests/net/rtnetlink.sh#L391
#6 lore raw

Re: [PATCH net-next v2 2/4] selftests: tc-testing: extend the "skip" property

Quoted 16 lines · Davide Caratti

hello Pedro, thanks for looking at this!

Quoted 13 lines · Pedro Tammela
Quoted 10 lines · Davide Caratti

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

    "skip": "yes"

in the scenario file. Extend this functionality by allowing the execution of a command, written in the "skip" property for a specific test case. If such property is present, tdc executes that command and skips the test if the return value is non-zero.

Quoted 7 lines
Quoted 4 lines

I saw the use case in patch 3 but I didn't understand how it can happen. Shouldn't iproute2 at least match the kernel version? I know it's not a hard requirement for 99% of use cases, but when running tdc I would argue it's the minimum expected.

sure, but there are distributions where patches are backported: on these ones, the kernel/iproute version is not so meaningful.

Oh, of course!

Quoted 5 lines

Instead of posting kselftest after the iproute2 support code is merged, I think it's preferrable to just skip those kselftests that can't run because they lack userspace bits; and by the way I see we are already taking this approach elsewhere [1] [2].

I see, so it makes distribution lives easier.
Wouldn't it be more clear then to have a separate property called "depends_on" or something similar? If someone adds a new feature that depends on iproute2, then it would be more natural to just add a "depends_on" property.

Pedro

#7 lore raw

PATCH v2 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..1ae51eadc477 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"
+        ],
+        "skip": "$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 v2 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