Fix netdevim to correctly mark NAPI IDs
Subsystems (5)
v2 cover Fix netdevim to correctly mark NAPI IDs
Greetings:
Welcome to v2.
This series fixes netdevsim to correctly set the NAPI ID on the skb. This is helpful for writing tests around features that use SO_INCOMING_NAPI_ID.
In addition to the netdevsim fix in patch 1, patches 2-4 do some self test refactoring and add a test for NAPI IDs. The test itself (patch 4) introduces a C helper because apparently python doesn't have socket.SO_INCOMING_NAPI_ID.
Thanks,
Joe
v2:
- No longer an RFC
- Minor whitespace change in patch 1 (no functional change).
- Patches 2-4 new in v2
rfcv1: https://lore.kernel.org/netdev/[email protected]/
Joe Damato (4):
netdevsim: Mark NAPI ID on skb in nsim_rcv
selftests: drv-net: Factor out ksft C helpers
selftests: net: Allow custom net ns paths
selftests: drv-net: Test that NAPI ID is non-zero
drivers/net/netdevsim/netdev.c | 2 + .../testing/selftests/drivers/net/.gitignore | 1 + tools/testing/selftests/drivers/net/Makefile | 6 +- tools/testing/selftests/drivers/net/ksft.h | 56 +++++++++++++ .../testing/selftests/drivers/net/napi_id.py | 24 ++++++ .../selftests/drivers/net/napi_id_helper.c | 83 +++++++++++++++++++ .../selftests/drivers/net/xdp_helper.c | 49 +---------- tools/testing/selftests/net/lib/py/netns.py | 4 +- 8 files changed, 175 insertions(+), 50 deletions(-) create mode 100644 tools/testing/selftests/drivers/net/ksft.h create mode 100755 tools/testing/selftests/drivers/net/napi_id.py create mode 100644 tools/testing/selftests/drivers/net/napi_id_helper.c
base-commit: bbfc077d457272bcea4f14b3a28247ade99b196d
Signature · 1 line
2.43.0
PATCH v2 1/4 netdevsim: Mark NAPI ID on skb in nsim_rcv
Previously, nsim_rcv was not marking the NAPI ID on the skb, leading to applications seeing a napi ID of 0 when using SO_INCOMING_NAPI_ID.
To add to the userland confusion, netlink appears to correctly report the NAPI IDs for netdevsim queues but the resulting file descriptor from a call to accept() was reporting a NAPI ID of 0.
--- drivers/net/netdevsim/netdev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/netdevsim/netdev.c +2 -0
@@ -29,6 +29,7 @@#include <net/pkt_cls.h> #include <net/rtnetlink.h> #include <net/udp_tunnel.h> +#include <net/busy_poll.h> #include "netdevsim.h"
@@ -357,6 +358,7 @@ static int nsim_rcv(struct nsim_rq *rq, int budget)break ; skb =skb_dequeue (&rq->skb_queue); +skb_mark_napi_id (skb, &rq->napi);netif_receive_skb (skb); }
Signature · 1 line
2.43.0
PATCH v2 2/4 selftests: drv-net: Factor out ksft C helpers
In reply to Joe DamatoFactor ksft C helpers to a header so they can be used by other C-based tests.
--- tools/testing/selftests/drivers/net/ksft.h | 56 +++++++++++++++++++ .../selftests/drivers/net/xdp_helper.c | 49 +--------------- 2 files changed, 58 insertions(+), 47 deletions(-) create mode 100644 tools/testing/selftests/drivers/net/ksft.h
tools/testing/selftests/drivers/net/ksft.h new file +56 -0
@@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#if !defined(__KSFT_H__) +#define __KSFT_H__ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + +static void ksft_ready (void ) +{ +const char msg[7 ] ="ready\n" ; +char *env_str; +int fd; + + env_str =getenv ("KSFT_READY_FD" ); +if (env_str) { + fd =atoi (env_str); +if (!fd) { +fprintf (stderr,"invalid KSFT_READY_FD = '%s'\n" , + env_str); +return ; + } + }else { + fd =STDOUT_FILENO ; + } + +write (fd, msg,sizeof (msg)); +if (fd !=STDOUT_FILENO ) +close (fd); +} + +static void ksft_wait (void ) +{ +char *env_str; +char byte; +int fd; + + env_str =getenv ("KSFT_WAIT_FD" ); +if (env_str) { + fd =atoi (env_str); +if (!fd) { +fprintf (stderr,"invalid KSFT_WAIT_FD = '%s'\n" , + env_str); +return ; + } + }else { +/* Not running in KSFT env, wait for input from STDIN instead */ + fd =STDIN_FILENO ; + } + +read (fd, &byte,sizeof (byte)); +if (fd !=STDIN_FILENO ) +close (fd); +} + +#endif
tools/testing/selftests/drivers/net/xdp_helper.c +2 -47
58 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH v2 3/4 selftests: net: Allow custom net ns paths
In reply to Joe DamatoExtend NetNSEnter to allow custom paths in order to support, for example, /proc/self/ns/net.
--- tools/testing/selftests/net/lib/py/netns.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/net/lib/py/netns.py +2 -2
@@ -35,8 +35,8 @@ class NetNS: class NetNSEnter: - def __init__(self, ns_name): - self.ns_path = f"/run/netns/{ns_name}" + def __init__(self, ns_name, ns_path="/run/netns/"): + self.ns_path = f"{ns_path}{ns_name}" def __enter__(self): self.saved = open("/proc/thread-self/ns/net")
Signature · 1 line
2.43.0
PATCH v2 4/4 selftests: drv-net: Test that NAPI ID is non-zero
In reply to Joe DamatoTest that the SO_INCOMING_NAPI_ID of a network file descriptor is non-zero. This ensures that either the core networking stack or, in some cases like netdevsim, the driver correctly sets the NAPI ID.
--- .../testing/selftests/drivers/net/.gitignore | 1 + tools/testing/selftests/drivers/net/Makefile | 6 +- .../testing/selftests/drivers/net/napi_id.py | 24 ++++++ .../selftests/drivers/net/napi_id_helper.c | 83 +++++++++++++++++++ 4 files changed, 113 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/drivers/net/napi_id.py create mode 100644 tools/testing/selftests/drivers/net/napi_id_helper.c
tools/testing/selftests/drivers/net/.gitignore +1 -0
@@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only xdp_helper +napi_id_helper
tools/testing/selftests/drivers/net/Makefile +5 -1
@@ -6,9 +6,13 @@ TEST_INCLUDES := $(wildcard lib/py/*.py) \ ../../net/net_helper.sh \ ../../net/lib.sh \ -TEST_GEN_FILES := xdp_helper +TEST_GEN_FILES := \ + napi_id_helper \ + xdp_helper \ +# end of TEST_GEN_FILES TEST_PROGS := \ + napi_id.py \ netcons_basic.sh \ netcons_fragmented_msg.sh \ netcons_overflow.sh \
tools/testing/selftests/drivers/net/napi_id.py new file +24 -0
@@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +from lib.py import ksft_run, ksft_exit +from lib.py import ksft_eq, NetDrvEpEnv +from lib.py import bkg, cmd, rand_port, NetNSEnter + +def test_napi_id(cfg) -> None: + port = rand_port() + listen_cmd = f'{cfg.test_dir / "napi_id_helper"} {cfg.addr_v['4']} {port}' + + with bkg(listen_cmd, ksft_wait=3) as server: + with NetNSEnter('net', '/proc/self/ns/'): + cmd(f"echo a | socat - TCP:{cfg.addr_v['4']}:{port}", host=cfg.remote, shell=True) + + ksft_eq(0, server.ret) + +def main() -> None: + with NetDrvEpEnv(__file__) as cfg: + ksft_run([test_napi_id], args=(cfg,)) + ksft_exit() + +if __name__ == "__main__": + main()
tools/testing/selftests/drivers/net/napi_id_helper.c new file +83 -0
83 lines not on this page · raw message
Signature · 1 line
2.43.0
Paolo Abeni
maintainerRe: [PATCH net-next v2 4/4] selftests: drv-net: Test that NAPI ID is non-zero
Quoted 6 lines · Joe Damato
tools/testing/selftests/drivers/net/napi_id.py new file +0
-0
tools/testing/selftests/drivers/net/napi_id.py line 10
Quoted 10 lines
tools/testing/selftests/drivers/net/napi_id.py new file +10
-0@@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +from lib.py import ksft_run, ksft_exit +from lib.py import ksft_eq, NetDrvEpEnv +from lib.py import bkg, cmd, rand_port, NetNSEnter + +def test_napi_id(cfg) -> None: + port = rand_port() + listen_cmd = f'{cfg.test_dir / "napi_id_helper"} {cfg.addr_v['4']} {port}'
Not really a full review, but this is apparently causing self-tests failures:
# selftests: drivers/net: napi_id.py
# File
"/home/virtme/testing-17/tools/testing/selftests/drivers/net/./napi_id.py", line 10
# listen_cmd = f'{cfg.test_dir / "napi_id_helper"} {cfg.addr_v['4']}
{port}'
# ^
# SyntaxError: f-string: unmatched '['
not ok 1 selftests: drivers/net: napi_id.py # exit=1
the second "'" char is closing the python format string, truncating the cfg.addr_v['4'] expression.
Please run the self test locally before the next submission, thanks!
/P
Re: [PATCH net-next v2 4/4] selftests: drv-net: Test that NAPI ID is non-zero
Quoted 31 lines · Paolo Abeni
Quoted 6 lines · Joe Damato
tools/testing/selftests/drivers/net/napi_id.py new file +0
-0tools/testing/selftests/drivers/net/napi_id.py line 10
Quoted 10 lines
tools/testing/selftests/drivers/net/napi_id.py new file +10
-0@@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +from lib.py import ksft_run, ksft_exit +from lib.py import ksft_eq, NetDrvEpEnv +from lib.py import bkg, cmd, rand_port, NetNSEnter + +def test_napi_id(cfg) -> None: + port = rand_port() + listen_cmd = f'{cfg.test_dir / "napi_id_helper"} {cfg.addr_v['4']} {port}'Not really a full review, but this is apparently causing self-tests failures:
# selftests:
drivers/net:napi_id.py
# File
"/home/virtme/testing-17/tools/testing/selftests/drivers/net/./napi_id.py", line 10
#listen_cmd= f'{cfg.test_dir / "napi_id_helper"} {cfg.addr_v['4']}
{port}'
# ^
# SyntaxError: f-string: unmatched '['
not ok 1 selftests:drivers/net:napi_id.py# exit=1
Quoted 4 lines
the second "'" char is closing the python format string, truncating the cfg.addr_v['4'] expression.
Please run the self test locally before the next submission, thanks!
I did run it locally, many times, and it works for me:
$ sudo ./tools/testing/selftests/drivers/net/napi_id.py TAP version 13 1..1 ok 1 napi_id.test_napi_id # Totals: pass:1 fail:0 xfail:0 xpass:0 skip:0 error:0
Maybe this has something to do with the Python version on my system vs yours/the test host?
I am using Python 3.13.1 from Ubuntu 24.04.
Please let me know what Python version you are using so I can try to reproduce this locally ?
Re: [PATCH net-next v2 4/4] selftests: drv-net: Test that NAPI ID is non-zero
In reply to Joe DamatoQuoted 1 line · Joe Damato
[...]
Quoted 10 lines
tools/testing/selftests/drivers/net/napi_id.py new file +4
-0@@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +from lib.py import ksft_run, ksft_exit
tools/testing/selftests/drivers/net/napi_id.py line 14
Quoted 10 lines
tools/testing/selftests/drivers/net/napi_id.py new file +10
-0+from lib.py import ksft_eq, NetDrvEpEnv +from lib.py import bkg, cmd, rand_port, NetNSEnter + +def test_napi_id(cfg) -> None: + port = rand_port() + listen_cmd = f'{cfg.test_dir / "napi_id_helper"} {cfg.addr_v['4']} {port}' + + with bkg(listen_cmd, ksft_wait=3) as server: + with NetNSEnter('net', '/proc/self/ns/'): + cmd(f"echo a | socat - TCP:{cfg.addr_v['4']}:{port}", host=cfg.remote, shell=True)
There's no need to reenter /proc/self/ns/net. And I think passing host=cfg.remote should be sufficient to run the command in the other netns.
Jakub Kicinski
maintainerRe: [PATCH net-next v2 4/4] selftests: drv-net: Test that NAPI ID is non-zero
In reply to Joe DamatoQuoted 19 lines · On Thu, 17 Apr 2025 01:32:42 +0000 Joe Damato wrote:
Test that the
SO_INCOMING_NAPI_IDof a network file descriptor is non-zero. This ensures that either the core networking stack or, in some cases like netdevsim, the driver correctly sets the NAPI ID.Signed-off-by Joe Damato <[email protected]>--- .../testing/selftests/drivers/net/.gitignore | 1 + tools/testing/selftests/drivers/net/Makefile | 6 +- .../testing/selftests/drivers/net/napi_id.py | 24 ++++++ .../selftests/drivers/net/napi_id_helper.c | 83 +++++++++++++++++++ 4 files changed, 113 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/drivers/net/napi_id.py create mode 100644 tools/testing/selftests/drivers/net/napi_id_helper.ctools/testing/selftests/drivers/net/.gitignore +0
-0
tools/testing/selftests/drivers/net/.gitignore line 3
Quoted 3 lines
tools/testing/selftests/drivers/net/.gitignore +1
-0@@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only xdp_helper +napi_id_helper
sort alphabetically, pls
tools/testing/selftests/drivers/net/Makefile TEST_INCLUDES := $(wildcard lib/py/*.py) \ · line 11
Quoted 12 lines
tools/testing/selftests/drivers/net/Makefile +3
-1@@ -6,9 +6,13 @@ TEST_INCLUDES := $(wildcard lib/py/*.py) \ ../../net/net_helper.sh \ ../../net/lib.sh \ -TEST_GEN_FILES := xdp_helper +TEST_GEN_FILES := \ + napi_id_helper \ + xdp_helper \
like you did here
Quoted 13 lines
tools/testing/selftests/drivers/net/Makefile +2
-0+# end of TEST_GEN_FILES TEST_PROGS := \ + napi_id.py \ netcons_basic.sh \ netcons_fragmented_msg.sh \ netcons_overflow.sh \tools/testing/selftests/drivers/net/napi_id.py new file +0
-0
tools/testing/selftests/drivers/net/napi_id.py line 10
Quoted 10 lines
tools/testing/selftests/drivers/net/napi_id.py new file +10
-0@@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +from lib.py import ksft_run, ksft_exit +from lib.py import ksft_eq, NetDrvEpEnv +from lib.py import bkg, cmd, rand_port, NetNSEnter + +def test_napi_id(cfg) -> None: + port = rand_port() + listen_cmd = f'{cfg.test_dir / "napi_id_helper"} {cfg.addr_v['4']} {port}'
you need to deploy, in case test is running with a real remote machine and the binary has to be copied over:
bin_remote = cfg.remote.deploy(cfg.test_dir / "napi_id_helper")
listen_cmd = f'{bin_remote} {cfg.addr_v['4']} {port}' tools/testing/selftests/drivers/net/napi_id.py line 14
Quoted 3 lines
tools/testing/selftests/drivers/net/napi_id.py new file +3
-0+ with bkg(listen_cmd, ksft_wait=3) as server: + with NetNSEnter('net', '/proc/self/ns/'): + cmd(f"echo a | socat - TCP:{cfg.addr_v['4']}:{port}", host=cfg.remote, shell=True)
Like Xiao Liang said, just host=cfg.remote should work.
Quoted 2 lines
tools/testing/selftests/drivers/net/napi_id.py new file +2
-0+ ksft_eq(0, server.ret) +
Re: [PATCH net-next v2 4/4] selftests: drv-net: Test that NAPI ID is non-zero
Quoted 15 lines · Jakub Kicinski
Quoted 14 lines · On Thu, 17 Apr 2025 01:32:42 +0000 Joe Damato wrote:
Test that the
SO_INCOMING_NAPI_IDof a network file descriptor is non-zero. This ensures that either the core networking stack or, in some cases like netdevsim, the driver correctly sets the NAPI ID.Signed-off-by Joe Damato <[email protected]>--- .../testing/selftests/drivers/net/.gitignore | 1 + tools/testing/selftests/drivers/net/Makefile | 6 +- .../testing/selftests/drivers/net/napi_id.py | 24 ++++++ .../selftests/drivers/net/napi_id_helper.c | 83 +++++++++++++++++++ 4 files changed, 113 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/drivers/net/napi_id.py create mode 100644 tools/testing/selftests/drivers/net/napi_id_helper.c
Quoted 10 lines
tools/testing/selftests/drivers/net/.gitignore line 3
Quoted 8 lines
tools/testing/selftests/drivers/net/.gitignore +1
-0@@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only xdp_helper +napi_id_helpersort alphabetically, pls
Thanks, fixed.
Quoted 20 lines
Quoted 6 lines
tools/testing/selftests/drivers/net/napi_id.py new file +0
-0tools/testing/selftests/drivers/net/napi_id.py line 10
Quoted 10 lines
tools/testing/selftests/drivers/net/napi_id.py new file +10
-0@@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +from lib.py import ksft_run, ksft_exit +from lib.py import ksft_eq, NetDrvEpEnv +from lib.py import bkg, cmd, rand_port, NetNSEnter + +def test_napi_id(cfg) -> None: + port = rand_port() + listen_cmd = f'{cfg.test_dir / "napi_id_helper"} {cfg.addr_v['4']} {port}'you need to deploy, in case test is running with a real remote machine and the binary has to be copied over:
Quoted 2 lines
bin_remote = cfg.remote.deploy(cfg.test_dir / "napi_id_helper")
listen_cmd = f'{bin_remote} {cfg.addr_v['4']} {port}' Thanks, fixed.
Quoted 5 lines
tools/testing/selftests/drivers/net/napi_id.py line 14
Quoted 3 lines
tools/testing/selftests/drivers/net/napi_id.py new file +3
-0+ with bkg(listen_cmd, ksft_wait=3) as server: + with NetNSEnter('net', '/proc/self/ns/'): + cmd(f"echo a | socat - TCP:{cfg.addr_v['4']}:{port}", host=cfg.remote, shell=True)Like Xiao Liang said, just host=cfg.remote should work.
You are both correct; sorry about the noise. I thought I tried this last night and it was failing, but clearly I was wrong/something else was broken.
I've fixed this locally and dropped patch 3 which is now unnecessary.
I think the main outstanding thing is Paolo's feedback which maybe (?) is due to a Python version difference? If you have any guidance on how to proceed on that, I'd appreciate it [1].
My guess is that I could rewrite that line to concat the strings instead of interpolate and it would work both on Paolo's system and mine. Would that be the right way to go?
[1]: https://lore.kernel.org/netdev/aAEtSppgCFNd8vr4@LQ3V64L9R2/
Jakub Kicinski
maintainerRe: [PATCH net-next v2 4/4] selftests: drv-net: Test that NAPI ID is non-zero
Quoted 3 lines · On Thu, 17 Apr 2025 09:43:23 -0700 Joe Damato wrote:
I think the main outstanding thing is Paolo's feedback which maybe (?) is due to a Python version difference? If you have any guidance on how to proceed on that, I'd appreciate it [1].
yes, it's a Python version, I made the same mistake in the past. Older Pythons terminate an fstring too early.
Just switch from ' to " inside the fstring, like you would in bash if you wanted to quote a quote character. The two are functionally equivalent.
Re: [PATCH net-next v2 4/4] selftests: drv-net: Test that NAPI ID is non-zero
Quoted 10 lines · Jakub Kicinski
Quoted 3 lines · On Thu, 17 Apr 2025 09:43:23 -0700 Joe Damato wrote:
I think the main outstanding thing is Paolo's feedback which maybe (?) is due to a Python version difference? If you have any guidance on how to proceed on that, I'd appreciate it [1].
yes, it's a Python version, I made the same mistake in the past. Older Pythons terminate an fstring too early.
Just switch from ' to " inside the fstring, like you would in bash if you wanted to quote a quote character. The two are functionally equivalent.
OK thanks for the details. Sorry that I am learning Python via netdev ;)
I did this so it matches the style of the other fstring a few lines below:
- listen_cmd = f'{bin_remote} {cfg.addr_v['4']} {port}'
+ listen_cmd = f"{bin_remote} {cfg.addr_v['4']} {port}"
Test works and passes for me on my system, so I'll send the v3 tonight when I've hit 24 hrs.
Thanks!