Skip to contentSkip to conversation

netdevsim: support ETS offload

PATCH Superseded Davide Caratti 4 participants 10 messages Mar 13 – Mar 14

Subsystems (5)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover netdevsim: support ETS offload

- patch 1 moves netdevsim tc offloads to a dedicated file
- patch 2 enables ETS offload on netdevsim
- patch 3 is a tdc test for ets offload on netdevsim

v2: don't use x-macro (Jakub Kicinski)

Davide Caratti (3):
netdevsim: move TC offload code to a dedicated file
netdevsim: support tc-ets offload
tc-testing: add a test case for ETS offload

 drivers/net/netdevsim/Makefile                |  2 +-
 drivers/net/netdevsim/netdev.c                | 51 ------------
 drivers/net/netdevsim/netdevsim.h             |  3 +
 drivers/net/netdevsim/tc.c                    | 79 +++++++++++++++++++
 .../tc-testing/tc-tests/qdiscs/ets.json       | 23 ++++++
 5 files changed, 106 insertions(+), 52 deletions(-)
 create mode 100644 drivers/net/netdevsim/tc.c
Signature · 1 line
2.52.0
#1 lore raw

PATCH v2 1/3 netdevsim: move TC offload code to a dedicated file

This commit has no functional change.

---
 drivers/net/netdevsim/Makefile    |  2 +-
 drivers/net/netdevsim/netdev.c    | 51 ---------------------------
 drivers/net/netdevsim/netdevsim.h |  3 ++
 drivers/net/netdevsim/tc.c        | 57 +++++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 52 deletions(-)
 create mode 100644 drivers/net/netdevsim/tc.c
drivers/net/netdevsim/Makefile +1 -1
index 14a553e000ec..87718204fb4d 100644
@@ -3,7 +3,7 @@
 obj-$(CONFIG_NETDEVSIM) += netdevsim.o
 
 netdevsim-objs := \
-	netdev.o dev.o ethtool.o fib.o bus.o health.o hwstats.o udp_tunnels.o
+	netdev.o dev.o ethtool.o fib.o bus.o health.o hwstats.o udp_tunnels.o tc.o
 
 ifeq ($(CONFIG_BPF_SYSCALL),y)
 netdevsim-objs += \
drivers/net/netdevsim/netdev.c +0 -51

63 lines not on this page · raw message

drivers/net/netdevsim/netdevsim.h +3 -0
index f767fc8a7505..fdd35ab29d98 100644
@@ -470,3 +470,6 @@ struct nsim_bus_dev {
 
 int nsim_bus_init(void);
 void nsim_bus_exit(void);
+
+int nsim_setup_tc(struct net_device *dev, enum tc_setup_type type,
+		  void *type_data);
drivers/net/netdevsim/tc.c new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
2.52.0
#3 lore raw

PATCH v2 2/3 netdevsim: support tc-ets offload

In reply to Davide Caratti

Extend netdevsim to accept ndo_setup_tc(TC_SETUP_QDISC_ETS) calls, so that it's possible to run tdc on ETS offload code path.

---
 drivers/net/netdevsim/tc.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
drivers/net/netdevsim/tc.c +22 -0
index 8a1960f5f99e..8f013a5895a2 100644
@@ -2,6 +2,7 @@
 
 #include <linux/netdevice.h>
 #include <net/pkt_sched.h>
+#include <net/pkt_cls.h>
 
 #include "netdevsim.h"
 
@@ -36,6 +37,25 @@ static int nsim_setup_tc_taprio(struct net_device *dev,
 	return err;
 }
 
+static int nsim_setup_tc_ets(struct net_device *dev,
+			     struct tc_ets_qopt_offload *offload)
+{
+	int err = 0;
+
+	switch (offload->command) {
+	case TC_ETS_REPLACE:
+	case TC_ETS_DESTROY:
+		break;
+	case TC_ETS_STATS:
+		_bstats_update(offload->stats.bstats, 0, 0);
+		break;
+	default:
+		err = -EOPNOTSUPP;
+	}
+
+	return err;
+}
+
 static LIST_HEAD(nsim_block_cb_list);
 
 int
@@ -46,6 +66,8 @@ nsim_setup_tc(struct net_device *dev, enum tc_setup_type type, void *type_data)
 	switch (type) {
 	case TC_SETUP_QDISC_TAPRIO:
 		return nsim_setup_tc_taprio(dev, type_data);
+	case TC_SETUP_QDISC_ETS:
+		return nsim_setup_tc_ets(dev, type_data);
 	case TC_SETUP_BLOCK:
 		return flow_block_cb_setup_simple(type_data,
 						  &nsim_block_cb_list,
Signature · 1 line
2.52.0
#4 lore raw

PATCH v2 3/3 tc-testing: add a test case for ETS offload

In reply to Davide Caratti

While reviewing the fix for unintentional u32 overflows in ets offload code, Jamal said:

[...]

Quoted 2 lines

otherwise a tdc test should cover it fine (when you get to the netdevsim change perhaps)

Add a test case to reproduce the division by zero fixed in [1].

[1] https://lore.kernel.org/all/CAM0EoMm17wsYZmdFLshH3_-GrZtzd=i0xnoO2yiVB=-N4761mw@mail.gmail.com/

---
 .../tc-testing/tc-tests/qdiscs/ets.json       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
tools/testing/selftests/tc-testing/tc-tests/qdiscs/ets.json +23 -0
index a5d94cdec605..479b866031bb 100644
@@ -984,5 +984,28 @@
         "matchCount": "1",
         "teardown": [
         ]
+    },
+    {
+        "id": "41f5",
+        "name": "ETS offload where the sum of quanta wraps u32",
+        "category": [
+            "qdisc",
+            "ets"
+        ],
+        "plugins": {
+            "requires": "nsPlugin"
+        },
+        "setup": [
+            "echo \"1 1 4\" > /sys/bus/netdevsim/new_device",
+            "ethtool -K $ETH hw-tc-offload on"
+        ],
+        "cmdUnderTest": "$TC qdisc add dev $ETH root ets quanta 4294967294 1 1",
+        "expExitCode": "0",
+        "verifyCmd": "$TC qdisc show dev $ETH",
+        "matchPattern": "qdisc ets .*bands 3 quanta 4294967294 1 1",
+        "matchCount": "1",
+        "teardown": [
+            "echo \"1\" > /sys/bus/netdevsim/del_device"
+        ]
     }
 ]
Signature · 1 line
2.52.0
maintainer Reviewed-by on the v2 series
#6 lore raw
In reply to Davide Caratti
Quoted 12 lines · Davide Caratti

- patch 1 moves netdevsim tc offloads to a dedicated file
- patch 2 enables ETS offload on netdevsim
- patch 3 is a tdc test for ets offload on netdevsim

v2: don't use x-macro (Jakub Kicinski)

Davide Caratti (3):
netdevsim: move TC offload code to a dedicated file
netdevsim: support tc-ets offload
tc-testing: add a test case for ETS offload

Quoted 8 lines
 drivers/net/netdevsim/Makefile                |  2 +-
 drivers/net/netdevsim/netdev.c                | 51 ------------
 drivers/net/netdevsim/netdevsim.h             |  3 +
 drivers/net/netdevsim/tc.c                    | 79 +++++++++++++++++++
 .../tc-testing/tc-tests/qdiscs/ets.json       | 23 ++++++
 5 files changed, 106 insertions(+), 52 deletions(-)
 create mode 100644 drivers/net/netdevsim/tc.c

To the patchset:

cheers,
jamal

Quoted 3 lines

--
2.52.0

maintainer
#7 lore raw
In reply to Davide Caratti
Quoted 3 lines · On Fri, 13 Mar 2026 18:23:55 +0100 Davide Caratti wrote:

- patch 1 moves netdevsim tc offloads to a dedicated file
- patch 2 enables ETS offload on netdevsim
- patch 3 is a tdc test for ets offload on netdevsim

Looks like this is failing in TC CI
Is it possible that the system / container doesn't have ethtool installed? Adding Victor

I'll drop this from PW for now LMK if it's a TDC thing I'll restore it once fixed.

# -- ns/SubPlugin.__init__
# -- scapy/SubPlugin.__init__
# Executing 1174 tests in parallel and 88 in serial # Using 38 batches and 4 workers
# WARNING: No route found (no default route?) # WARNING: No route found (no default route?) # .WARNING: more No route found (no default route?)

# ...................
# -----> prepare stage *** Could not execute: "ethtool -K $ETH hw-tc-offload on"
# 
# -----> prepare stage *** Error message: "exec of "ethtool" failed: No such file or directory
# "
# 
# -----> prepare stage *** Aborting test run.
# 
# 
# <_io.BufferedReader name=6> *** stdout ***
# 
# 
# <_io.BufferedReader name=17> *** stderr ***
#   File "/nipa-data/kernel/tools/testing/selftests/tc-testing/./tdc.py", line 535, in test_runner
#     res = run_one_test(pm, args, index, tidx)
#           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
#   File "/nipa-data/kernel/tools/testing/selftests/tc-testing/./tdc.py", line 419, in run_one_test
#     prepare_env(tidx, args, pm, 'setup', "-----> prepare stage", tidx["setup"])
#   File "/nipa-data/kernel/tools/testing/selftests/tc-testing/./tdc.py", line 267, in prepare_env
#     raise PluginMgrTestFail(
# ..........Test b438: Add basic filter with canid ematch and a combination of SFF/EFF with masks
# Test 0811: Add multiple basic filter with cmp ematch u8/link layer and default action and dump them
#8 lore raw
Quoted 6 lines · Jakub Kicinski
Quoted 3 lines · On Fri, 13 Mar 2026 18:23:55 +0100 Davide Caratti wrote:

- patch 1 moves netdevsim tc offloads to a dedicated file
- patch 2 enables ETS offload on netdevsim
- patch 3 is a tdc test for ets offload on netdevsim

Quoted 6 lines

Looks like this is failing in TC CI
Is it possible that the system / container doesn't have ethtool installed? Adding Victor

I'll drop this from PW for now LMK if it's a TDC thing I'll restore it once fixed.

Yes, sorry - I sent an email earlier, but just realised I forgot to cc the list. It seems to be a TDC issue, not just the lack of ethtool, but possibly other problems as well. I will ping you once this is resolved.

cheers,
Victor

#9 lore raw
Quoted 12 lines · Victor Nogueira
Quoted 10 lines · Jakub Kicinski
Quoted 3 lines · On Fri, 13 Mar 2026 18:23:55 +0100 Davide Caratti wrote:

- patch 1 moves netdevsim tc offloads to a dedicated file
- patch 2 enables ETS offload on netdevsim
- patch 3 is a tdc test for ets offload on netdevsim

Looks like this is failing in TC CI
Is it possible that the system / container doesn't have ethtool installed? Adding Victor

Quoted 5 lines
Quoted 2 lines

I'll drop this from PW for now LMK if it's a TDC thing I'll restore it once fixed.

It seems to be a TDC issue [...]
I will ping you once this is resolved

Should be safe to restore the patch now.

cheers,
Victor

Reviewed-by on v2 3/3
#5 lore raw

Re: [PATCH net-next v2 3/3] tc-testing: add a test case for ETS offload

In reply to Davide Caratti
Quoted 8 lines · Davide Caratti

While reviewing the fix for unintentional u32 overflows in ets offload code, Jamal said:

[...]

Quoted 2 lines

otherwise a tdc test should cover it fine (when you get to the netdevsim change perhaps)

Quoted 6 lines

Add a test case to reproduce the division by zero fixed in [1].

[1] https://lore.kernel.org/all/CAM0EoMm17wsYZmdFLshH3_-GrZtzd=i0xnoO2yiVB=-N4761mw@mail.gmail.com/

maintainer
#2 lore raw

Re: [PATCH net-next v2 1/3] netdevsim: move TC offload code to a dedicated file

In reply to Davide Caratti

drivers/net/netdevsim/netdevsim.h struct nsim_bus_dev { · line 475

Quoted 11 lines · On Fri, 13 Mar 2026 18:23:56 +0100 Davide Caratti wrote:
drivers/net/netdevsim/netdevsim.h +3 -0
index f767fc8a7505..fdd35ab29d98 100644
@@ -470,3 +470,6 @@ struct nsim_bus_dev {
 
 int nsim_bus_init(void);
 void nsim_bus_exit(void);
+
+int nsim_setup_tc(struct net_device *dev, enum tc_setup_type type,
+		  void *type_data);

Put this above struct nsim_bus_dev please