selftests/drivers/net: Support ipv6 for napi_id test
Subsystems (3)
PATCH v2 1/1 selftests/drivers/net: Support ipv6 for napi_id test
Add support for IPv6 environment for napi_id test.
Test Plan:
./run_kselftest.sh -t drivers/net:napi_id.py TAP version 13
1..1
# timeout set to 45
# 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 ok 1 selftests: drivers/net: napi_id.py
---
Changelog:
v2:
- Use cfg.addr instead of if statement in napi_id.py
v1: https://lore.kernel.org/all/[email protected]/
.../testing/selftests/drivers/net/napi_id.py | 4 +-- .../selftests/drivers/net/napi_id_helper.c | 35 ++++++++++++++----- 2 files changed, 28 insertions(+), 11 deletions(-)
tools/testing/selftests/drivers/net/napi_id.py +2 -2
@@ -7,10 +7,10 @@ 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}" + listen_cmd = f"{cfg.test_dir}/napi_id_helper {cfg.addr} {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) + cmd(f"echo a | socat - TCP:{cfg.baddr}:{port}", host=cfg.remote, shell=True) ksft_eq(0, server.ret)
tools/testing/selftests/drivers/net/napi_id_helper.c +26 -9
@@ -7,41 +7,58 @@#include <unistd.h> #include <arpa/inet.h> #include <sys/socket.h> +#include <netdb.h> #include "../../net/lib/ksft.h" int main (int argc,char *argv[]) { -struct sockaddr_in address; +struct sockaddr_storage address; +struct addrinfo *result; +struct addrinfo hints;unsigned int napi_id; -unsigned int port; +socklen_t addr_len;socklen_t optlen;char buf[1024 ];int opt =1 ; +int family;int server;int client;int ret; - server =socket (AF_INET ,SOCK_STREAM ,IPPROTO_TCP ); +memset (&hints,0 ,sizeof (hints)); + hints.ai_family =AF_UNSPEC ; + hints.ai_socktype =SOCK_STREAM ; + hints.ai_flags =AI_PASSIVE ; + + ret =getaddrinfo (argv[1 ], argv[2 ], &hints, &result); +if (ret !=0 ) { +fprintf (stderr,"getaddrinfo: %s\n" ,gai_strerror (ret)); +return 1 ; + } + + family = result->ai_family; + addr_len = result->ai_addrlen; + + server =socket (family,SOCK_STREAM ,IPPROTO_TCP );if (server <0 ) {perror ("socket creation failed" ); +freeaddrinfo (result);if (errno ==EAFNOSUPPORT )return -1 ;return 1 ; } - port =atoi (argv[2 ]); -if (setsockopt (server,SOL_SOCKET ,SO_REUSEADDR , &opt,sizeof (opt))) {perror ("setsockopt" ); +freeaddrinfo (result);return 1 ; } - address.sin_family =AF_INET ; -inet_pton (AF_INET , argv[1 ], &address.sin_addr); - address.sin_port =htons (port); +memcpy (&address, result->ai_addr, result->ai_addrlen); +freeaddrinfo (result); -if (bind (server, (struct sockaddr *)&address,sizeof (address)) <0 ) { +if (bind (server, (struct sockaddr *)&address, addr_len) <0 ) {perror ("bind failed" );return 1 ; }
--
2.47.1
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 15 lines · On Wed, 16 Jul 2025 18:19:13 -0700 you wrote:
Add support for IPv6 environment for
napi_idtest.Test Plan:
./run_kselftest.sh -t drivers/net:napi_id.py TAP version 13
1..1
# timeout set to 45
# 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 ok 1 selftests:drivers/net:napi_id.py
Quoted 1 line
[...]
Here is the summary with links:
- [net-next,v2] selftests/drivers/net: Support ipv6 for napi_id test
https://git.kernel.org/netdev/net-next/c/b6645645d0d0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html