Skip to contentSkip to conversation

Fix netdevim to correctly mark NAPI IDs

PATCH In review Joe Damato 3 participants 7 messages Apr 24, 2025 – Apr 25, 2025

Subsystems (5)
lore
Share & tools
lore

Joe Damato

author
#0 lore raw

v4 cover Fix netdevim to correctly mark NAPI IDs

Greetings:

Welcome to v4.

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 & 3 do some self test refactoring and add a test for NAPI IDs. The test itself (patch 3) introduces a C helper because apparently python doesn't have socket.SO_INCOMING_NAPI_ID.

Thanks,
Joe

v4:
- Updated the macro guard in patch 2
- Removed the remote deploy from patch 3

v3: https://lore.kernel.org/netdev/[email protected]/
- Dropped patch 3 from v2 as it is no longer necessary.
- Patch 3 from this series (which was patch 4 in the v2)
- Sorted .gitignore alphabetically
- added cfg.remote_deploy so the test supports real remote machines
- Dropped the NetNSEnter as it is unnecessary
- Fixed a string interpolation issue that Paolo hit with his Python version

v2: https://lore.kernel.org/netdev/[email protected]/
- 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 (3):
netdevsim: Mark NAPI ID on skb in nsim_rcv
selftests: drv-net: Factor out ksft C helpers
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  | 23 +++++
 .../selftests/drivers/net/napi_id_helper.c    | 83 +++++++++++++++++++
 .../selftests/drivers/net/xdp_helper.c        | 49 +----------
 7 files changed, 172 insertions(+), 48 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: cd7276ecac9c64c80433fbcff2e35aceaea6f477

Signature · 1 line
2.43.0
author
#1 lore raw

PATCH v4 1/3 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
index 0e0321a7ddd7..2aa999345fe1 100644
@@ -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
author
#2 lore raw

PATCH v4 2/3 selftests: drv-net: Factor out ksft C helpers

In reply to Joe Damato

Factor 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
new file mode 100644
index 000000000000..c30a02da903f
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#if !defined(__NET_KSFT_H__)
+#define __NET_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
maintainer
#3 lore raw

Re: [PATCH net-next v4 2/3] selftests: drv-net: Factor out ksft C helpers

tools/testing/selftests/drivers/net/ksft.h line 32

Quoted 4 lines · On Thu, 24 Apr 2025 00:27:32 +0000 Joe Damato wrote:

+++ b/tools/testing/selftests/drivers/net/ksft.h

tools/testing/selftests/drivers/net/ksft.h new file +2 -0
+static void ksft_ready(void)
 
+static void ksft_wait(void)

These need to be static inlines.
I'll fix when applying cause I think this series may conflict with Bui Quang Minh's

author
#4 lore raw

Re: [PATCH net-next v4 2/3] selftests: drv-net: Factor out ksft C helpers

Quoted 9 lines · Jakub Kicinski

tools/testing/selftests/drivers/net/ksft.h line 32

Quoted 4 lines · On Thu, 24 Apr 2025 00:27:32 +0000 Joe Damato wrote:

+++ b/tools/testing/selftests/drivers/net/ksft.h

tools/testing/selftests/drivers/net/ksft.h new file +2 -0
+static void ksft_ready(void)
 
+static void ksft_wait(void)

These need to be static inlines.
I'll fix when applying cause I think this series may conflict with Bui Quang Minh's

OK -- if you change your mind and prefer that I respin to save you some cycles or something, I am happy to do so.

Thanks.

author
#5 lore raw

PATCH v4 3/3 selftests: drv-net: Test that NAPI ID is non-zero

In reply to Joe Damato

Test 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  | 23 +++++
 .../selftests/drivers/net/napi_id_helper.c    | 83 +++++++++++++++++++
 4 files changed, 112 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
index ec746f374e85..72d2124fd513 100644
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
+napi_id_helper
 xdp_helper
tools/testing/selftests/drivers/net/Makefile +5 -1
index 0c95bd944d56..47247c2ef948 100644
@@ -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 +23 -0
new file mode 100755
index 000000000000..356bac46ba04
@@ -0,0 +1,23 @@
+#!/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:
+        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
#6 lore raw
In reply to Joe Damato
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 9 lines · On Thu, 24 Apr 2025 00:27:30 +0000 you wrote:

Greetings:

Welcome to v4.

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.

[...]

Here is the summary with links:
- [net-next,v4,1/3] netdevsim: Mark NAPI ID on skb in nsim_rcv

    https://git.kernel.org/netdev/net-next/c/f71c549b26a3
  - [net-next,v4,2/3] selftests: drv-net: Factor out ksft C helpers
    (no matching commit)
  - [net-next,v4,3/3] selftests: drv-net: Test that NAPI ID is non-zero
    https://git.kernel.org/netdev/net-next/c/2593a0a1446a

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html