use network helpers, part 10
Subsystems (3)
cover use network helpers, part 10
From: Geliang Tang <[email protected]>
This set is part 10 of series "use network helpers" all BPF selftests wide.
Patches 1-3 drop local functions make_client(), make_socket() and inetaddr_len() in sk_lookup.c. Patch 4 drops a useless function __start_server() in network_helpers.c.
Geliang Tang (4):
selftests/bpf: Drop make_client in sk_lookup selftests/bpf: Drop make_socket in sk_lookup selftests/bpf: Drop inetaddr_len in sk_lookup selftests/bpf: Drop __start_server in network_helpers
tools/testing/selftests/bpf/network_helpers.c | 26 ++--- .../selftests/bpf/prog_tests/sk_lookup.c | 110 +++++------------- 2 files changed, 40 insertions(+), 96 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/4 selftests/bpf: Drop make_client in sk_lookup
From: Geliang Tang <[email protected]>
This patch uses the new helper connect_to_addr_str() in sk_lookup.c to create the client socket and connect to the server, instead of using local defined function make_client(). This local function can be dropped then.
--- .../selftests/bpf/prog_tests/sk_lookup.c | 34 ++++--------------- 1 file changed, 7 insertions(+), 27 deletions(-)
tools/testing/selftests/bpf/prog_tests/sk_lookup.c +7 -27
@@ -229,27 +229,6 @@ static int make_server(int sotype, const char *ip, int port,return -1 ; } -static int make_client (int sotype,const char *ip,int port) -{ -struct sockaddr_storage addr = {0 }; -int err, fd; - - fd =make_socket (sotype, ip, port, &addr); -if (fd <0 ) -return -1 ; - - err =connect (fd, (void *)&addr,inetaddr_len (&addr)); -if (CHECK (err,"make_client" ,"connect" )) { -log_err ("failed to connect client socket" ); - goto fail; - } - -return fd; -fail: -close (fd); -return -1 ; -} -static __u64 socket_cookie (int fd) {__u64 cookie;
@@ -646,8 +625,9 @@ static void run_lookup_prog(const struct test *t) goto close; } - client_fd =make_client (t->sotype, t->connect_to.ip, t->connect_to.port); -if (client_fd <0 ) + client_fd =connect_to_addr_str (is_ipv6 (t->connect_to.ip) ?AF_INET6 :AF_INET , + t->sotype, t->connect_to.ip, t->connect_to.port,NULL ); +if (!ASSERT_OK_FD (client_fd,"connect_to_addr_str" )) goto close;if (t->sotype ==SOCK_STREAM )
@@ -1152,8 +1132,8 @@ static void run_sk_assign_connected(struct test_sk_lookup *skel,if (server_fd <0 )return ; - connected_fd =make_client (sotype,EXT_IP4 ,EXT_PORT ); -if (connected_fd <0 ) + connected_fd =connect_to_addr_str (AF_INET , sotype,EXT_IP4 ,EXT_PORT ,NULL ); +if (!ASSERT_OK_FD (connected_fd,"connect_to_addr_str" )) goto out_close_server;/* Put a connected socket in redirect map */
@@ -1166,8 +1146,8 @@ static void run_sk_assign_connected(struct test_sk_lookup *skel, goto out_close_connected;/* Try to redirect TCP SYN / UDP packet to a connected socket */ - client_fd =make_client (sotype,EXT_IP4 ,EXT_PORT ); -if (client_fd <0 ) + client_fd =connect_to_addr_str (AF_INET , sotype,EXT_IP4 ,EXT_PORT ,NULL ); +if (!ASSERT_OK_FD (client_fd,"connect_to_addr_str" )) goto out_unlink_prog;if (sotype ==SOCK_DGRAM ) {send_byte (client_fd);
Signature · 1 line
2.43.0
PATCH 2/4 selftests/bpf: Drop make_socket in sk_lookup
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses the public network helers client_socket() + make_sockaddr() in sk_lookup.c to create the client socket, set the timeout sockopts, and make the connecting address. The local defined function make_socket() can be dropped then.
--- .../selftests/bpf/prog_tests/sk_lookup.c | 61 ++++++------------- 1 file changed, 17 insertions(+), 44 deletions(-)
tools/testing/selftests/bpf/prog_tests/sk_lookup.c +17 -44
@@ -47,8 +47,6 @@#define INT_IP6 "fd00::2"#define INT_PORT 8008 -#define IO_TIMEOUT_SEC 3 -enum server {SERVER_A =0 ,SERVER_B =1 ,
@@ -114,40 +112,6 @@ static socklen_t inetaddr_len(const struct sockaddr_storage *addr) addr->ss_family == AF_INET6 ? sizeof(struct sockaddr_in6) : 0); } -static int make_socket (int sotype,const char *ip,int port, -struct sockaddr_storage *addr) -{ -struct timeval timeo = { .tv_sec =IO_TIMEOUT_SEC }; -int err, family, fd; - - family =is_ipv6 (ip) ?AF_INET6 :AF_INET ; - err =make_sockaddr (family, ip, port, addr,NULL ); -if (CHECK (err,"make_address" ,"failed\n" )) -return -1 ; - - fd =socket (addr->ss_family, sotype,0 ); -if (CHECK (fd <0 ,"socket" ,"failed\n" )) { -log_err ("failed to make socket" ); -return -1 ; - } - - err =setsockopt (fd,SOL_SOCKET ,SO_SNDTIMEO , &timeo,sizeof (timeo)); -if (CHECK (err,"setsockopt(SO_SNDTIMEO)" ,"failed\n" )) { -log_err ("failed to set SNDTIMEO" ); -close (fd); -return -1 ; - } - - err =setsockopt (fd,SOL_SOCKET ,SO_RCVTIMEO , &timeo,sizeof (timeo)); -if (CHECK (err,"setsockopt(SO_RCVTIMEO)" ,"failed\n" )) { -log_err ("failed to set RCVTIMEO" ); -close (fd); -return -1 ; - } - -return fd; -} -static int setsockopts (int fd,void *opts) {struct cb_opts *co = (struct cb_opts *)opts;
@@ -842,6 +806,7 @@ static void test_redirect_lookup(struct test_sk_lookup *skel)static void drop_on_lookup (const struct test *t) { +int family =is_ipv6 (t->connect_to.ip) ?AF_INET6 :AF_INET ;struct sockaddr_storage dst = {};int client_fd, server_fd, err;struct bpf_link *lookup_link;
@@ -856,11 +821,13 @@ static void drop_on_lookup(const struct test *t)if (server_fd <0 ) goto detach; - client_fd =make_socket (t->sotype, t->connect_to.ip, - t->connect_to.port, &dst); -if (client_fd <0 ) + client_fd =client_socket (family, t->sotype,NULL ); +if (!ASSERT_OK_FD (client_fd,"client_socket" )) goto close_srv; + err =make_sockaddr (family, t->connect_to.ip, t->connect_to.port, &dst,NULL ); +if (!ASSERT_OK (err,"make_sockaddr" )) + goto close_all; err =connect (client_fd, (void *)&dst,inetaddr_len (&dst));if (t->sotype ==SOCK_DGRAM ) { err =send_byte (client_fd);
@@ -956,6 +923,7 @@ static void test_drop_on_lookup(struct test_sk_lookup *skel)static void drop_on_reuseport (const struct test *t) { +int family =is_ipv6 (t->connect_to.ip) ?AF_INET6 :AF_INET ;struct sockaddr_storage dst = {0 };int client, server1, server2, err;struct bpf_link *lookup_link;
@@ -980,11 +948,13 @@ static void drop_on_reuseport(const struct test *t)if (server2 <0 ) goto close_srv1; - client =make_socket (t->sotype, t->connect_to.ip, - t->connect_to.port, &dst); -if (client <0 ) + client =client_socket (family, t->sotype,NULL ); +if (!ASSERT_OK_FD (client,"client_socket" )) goto close_srv2; + err =make_sockaddr (family, t->connect_to.ip, t->connect_to.port, &dst,NULL ); +if (!ASSERT_OK (err,"make_sockaddr" )) + goto close_all; err =connect (client, (void *)&dst,inetaddr_len (&dst));if (t->sotype ==SOCK_DGRAM ) { err =send_byte (client);
@@ -1228,10 +1198,13 @@ static void run_multi_prog_lookup(const struct test_multi_prog *t)if (err) goto out_close_server; - client_fd =make_socket (SOCK_STREAM ,EXT_IP4 ,EXT_PORT , &dst); -if (client_fd <0 ) + client_fd =client_socket (AF_INET ,SOCK_STREAM ,NULL ); +if (!ASSERT_OK_FD (client_fd,"client_socket" )) goto out_close_server; + err =make_sockaddr (AF_INET ,EXT_IP4 ,EXT_PORT , &dst,NULL ); +if (!ASSERT_OK (err,"make_sockaddr" )) + goto out_close_client; err =connect (client_fd, (void *)&dst,inetaddr_len (&dst));if (CHECK (err && !t->expect_errno,"connect" ,"unexpected error %d\n" , errno))
Signature · 1 line
2.43.0
PATCH 3/4 selftests/bpf: Drop inetaddr_len in sk_lookup
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
No need to use a dedicated helper inetaddr_len() to get the length of the IPv4 or IPv6 address, it can be got by make_sockaddr(), this patch drops it.
--- .../selftests/bpf/prog_tests/sk_lookup.c | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-)
tools/testing/selftests/bpf/prog_tests/sk_lookup.c +9 -12
@@ -106,12 +106,6 @@ static int attach_reuseport(int sock_fd, struct bpf_program *reuseport_prog)return 0 ; } -static socklen_t inetaddr_len (const struct sockaddr_storage *addr) -{ -return (addr->ss_family ==AF_INET ?sizeof (struct sockaddr_in ) : - addr->ss_family ==AF_INET6 ?sizeof (struct sockaddr_in6 ) :0 ); -} -static int setsockopts (int fd,void *opts) {struct cb_opts *co = (struct cb_opts *)opts;
@@ -810,6 +804,7 @@ static void drop_on_lookup(const struct test *t)struct sockaddr_storage dst = {};int client_fd, server_fd, err;struct bpf_link *lookup_link; +socklen_t len;ssize_t n; lookup_link =attach_lookup_prog (t->lookup_prog);
@@ -825,10 +820,10 @@ static void drop_on_lookup(const struct test *t)if (!ASSERT_OK_FD (client_fd,"client_socket" )) goto close_srv; - err =make_sockaddr (family, t->connect_to.ip, t->connect_to.port, &dst,NULL ); + err =make_sockaddr (family, t->connect_to.ip, t->connect_to.port, &dst, &len);if (!ASSERT_OK (err,"make_sockaddr" )) goto close_all; - err =connect (client_fd, (void *)&dst,inetaddr_len (&dst)); + err =connect (client_fd, (void *)&dst, len);if (t->sotype ==SOCK_DGRAM ) { err =send_byte (client_fd);if (err)
@@ -927,6 +922,7 @@ static void drop_on_reuseport(const struct test *t)struct sockaddr_storage dst = {0 };int client, server1, server2, err;struct bpf_link *lookup_link; +socklen_t len;ssize_t n; lookup_link =attach_lookup_prog (t->lookup_prog);
@@ -952,10 +948,10 @@ static void drop_on_reuseport(const struct test *t)if (!ASSERT_OK_FD (client,"client_socket" )) goto close_srv2; - err =make_sockaddr (family, t->connect_to.ip, t->connect_to.port, &dst,NULL ); + err =make_sockaddr (family, t->connect_to.ip, t->connect_to.port, &dst, &len);if (!ASSERT_OK (err,"make_sockaddr" )) goto close_all; - err =connect (client, (void *)&dst,inetaddr_len (&dst)); + err =connect (client, (void *)&dst, len);if (t->sotype ==SOCK_DGRAM ) { err =send_byte (client);if (err)
@@ -1169,6 +1165,7 @@ static void run_multi_prog_lookup(const struct test_multi_prog *t)int map_fd, server_fd, client_fd;struct bpf_link *link1, *link2;int prog_idx, done, err; +socklen_t len; map_fd =bpf_map__fd (t->run_map);
@@ -1202,10 +1199,10 @@ static void run_multi_prog_lookup(const struct test_multi_prog *t)if (!ASSERT_OK_FD (client_fd,"client_socket" )) goto out_close_server; - err =make_sockaddr (AF_INET ,EXT_IP4 ,EXT_PORT , &dst,NULL ); + err =make_sockaddr (AF_INET ,EXT_IP4 ,EXT_PORT , &dst, &len);if (!ASSERT_OK (err,"make_sockaddr" )) goto out_close_client; - err =connect (client_fd, (void *)&dst,inetaddr_len (&dst)); + err =connect (client_fd, (void *)&dst, len);if (CHECK (err && !t->expect_errno,"connect" ,"unexpected error %d\n" , errno)) goto out_close_client;
Signature · 1 line
2.43.0
PATCH 4/4 selftests/bpf: Drop __start_server in network_helpers
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
The helper start_server_addr() is a wrapper of __start_server(), the only difference between them is __start_server() accepts a sockaddr type address parameter, but start_server_addr() accepts a sockaddr_storage one.
This patch drops __start_server(), and updates the callers to invoke start_server_addr() instead.
--- tools/testing/selftests/bpf/network_helpers.c | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +10 -16
@@ -80,12 +80,15 @@ int settimeo(int fd, int timeout_ms)#define save_errno_close (fd) ({ int __save = errno; close(fd); errno = __save; }) -static int __start_server (int type,const struct sockaddr *addr,socklen_t addrlen, -const struct network_helper_opts *opts) +int start_server_addr (int type,const struct sockaddr_storage *addr,socklen_t addrlen, +const struct network_helper_opts *opts) {int fd; - fd =socket (addr->sa_family, type, opts->proto); +if (!opts) + opts = &default_opts; + + fd =socket (addr->ss_family, type, opts->proto);if (fd <0 ) {log_err ("Failed to create server socket" );return -1 ;
@@ -100,7 +103,7 @@ static int __start_server(int type, const struct sockaddr *addr, socklen_t addrl goto error_close; } -if (bind (fd, addr, addrlen) <0 ) { +if (bind (fd, (struct sockaddr *)addr, addrlen) <0 ) {log_err ("Failed to bind socket" ); goto error_close; }
@@ -131,7 +134,7 @@ int start_server_str(int family, int type, const char *addr_str, __u16 port,if (make_sockaddr (family, addr_str, port, &addr, &addrlen))return -1 ; -return __start_server (type, (struct sockaddr *)&addr, addrlen, opts); +return start_server_addr (type, &addr, addrlen, opts); } int start_server(int family, int type, const char *addr_str, __u16 port,
@@ -173,7 +176,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str,if (!fds)return NULL ; - fds[0 ] =__start_server (type, (struct sockaddr *)&addr, addrlen, &opts); + fds[0 ] =start_server_addr (type, &addr, addrlen, &opts);if (fds[0 ] ==-1 ) goto close_fds; nr_fds =1 ;
@@ -182,7 +185,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str, goto close_fds;for (; nr_fds < nr_listens; nr_fds++) { - fds[nr_fds] =__start_server (type, (struct sockaddr *)&addr, addrlen, &opts); + fds[nr_fds] =start_server_addr (type, &addr, addrlen, &opts);if (fds[nr_fds] ==-1 ) goto close_fds; }
@@ -194,15 +197,6 @@ int *start_reuseport_server(int family, int type, const char *addr_str,return NULL ; } -int start_server_addr (int type,const struct sockaddr_storage *addr,socklen_t len, -const struct network_helper_opts *opts) -{ -if (!opts) - opts = &default_opts; - -return __start_server (type, (struct sockaddr *)addr, len, opts); -} -void free_fds (int *fds,unsigned int nr_close_fds) {if (fds) {
Signature · 1 line
2.43.0
CI has tested the following submission:
Dear patch submitter,
CI has tested the following submission:
Status: SUCCESS Name: [bpf-next,0/4] use network helpers, part 10 Patchwork: https://patchwork.kernel.org/project/netdevbpf/list/?series=872683&state=* Matrix: https://github.com/kernel-patches/bpf/actions/runs/10019935133
No further action is necessary on your part.
Please note: this email is coming from an unmonitored mailbox. If you have questions or feedback, please reach out to the Meta Kernel CI team at [email protected].
CI has tested the following submission:
Dear patch submitter,
CI has tested the following submission:
Status: FAILURE Name: [bpf-next,0/4] use network helpers, part 10 Patchwork: https://patchwork.kernel.org/project/netdevbpf/list/?series=872683&state=* Matrix: https://github.com/kernel-patches/bpf/actions/runs/10050705880
Failed jobs:
test_progs_no_alu32-aarch64-gcc: https://github.com/kernel-patches/bpf/actions/runs/10050705880/job/27779265107
test_progs_no_alu32-s390x-gcc: https://github.com/kernel-patches/bpf/actions/runs/10050705880/job/27779401509
test_progs_no_alu32-x86_64-gcc: https://github.com/kernel-patches/bpf/actions/runs/10050705880/job/27779392788
test_progs_no_alu32-x86_64-llvm-17: https://github.com/kernel-patches/bpf/actions/runs/10050705880/job/27779412425
test_progs_no_alu32-x86_64-llvm-18: https://github.com/kernel-patches/bpf/actions/runs/10050705880/job/27779413675
First test_progs failure (test_progs_no_alu32-aarch64-gcc):
#134 libbpf_get_fd_by_id_opts
libbpf: prog 'check_access': BPF program load failed: Invalid argument
libbpf: prog 'check_access': -- BEGIN PROG LOAD LOG --
0: R1=ctx() R10=fp0
; int BPF_PROG(check_access, struct bpf_map *map, fmode_t fmode) @ test_libbpf_get_fd_by_id_opts.c:27
0: (b7) r0 = 0 ; R0_w=0
1: (79) r2 = *(u64 *)(r1 +0)
func 'bpf_lsm_bpf_map' arg0 has btf_id 2072 type STRUCT 'bpf_map'
2: R1=ctx() R2_w=trusted_ptr_bpf_map()
; if (map != (struct bpf_map *)&data_input) @ test_libbpf_get_fd_by_id_opts.c:29
2: (18) r3 = 0xffff0000c28d1a00 ; R3_w=map_ptr(map=data_input,ks=4,vs=4)
4: (5d) if r2 != r3 goto pc+4 ; R2_w=trusted_ptr_bpf_map() R3_w=map_ptr(map=data_input,ks=4,vs=4)
; int BPF_PROG(check_access, struct bpf_map *map, fmode_t fmode) @ test_libbpf_get_fd_by_id_opts.c:27
5: (79) r0 = *(u64 *)(r1 +8) ; R0_w=scalar() R1=ctx()
; if (fmode & FMODE_WRITE) @ test_libbpf_get_fd_by_id_opts.c:32
6: (67) r0 <<= 62 ; R0_w=scalar(smax=0x4000000000000000,umax=0xc000000000000000,smin32=0,smax32=umax32=0,var_off=(0x0; 0xc000000000000000))
7: (c7) r0 s>>= 63 ; R0_w=scalar(smin=smin32=-1,smax=smax32=0)
; @ test_libbpf_get_fd_by_id_opts.c:0
8: (57) r0 &= -13 ; R0_w=scalar(smax=0x7ffffffffffffff3,umax=0xfffffffffffffff3,smax32=0x7ffffff3,umax32=0xfffffff3,var_off=(0x0; 0xfffffffffffffff3))
; int BPF_PROG(check_access, struct bpf_map *map, fmode_t fmode) @ test_libbpf_get_fd_by_id_opts.c:27 9: (95) exit
At program exit the register R0 has smax=9223372036854775795 should have been in [-4095, 0] processed 9 insns (limit 1000000) max_states_per_insn 0 total_states 0 peak_states 0 mark_read 0 -- END PROG LOAD LOG --
libbpf: prog 'check_access': failed to load: -22
libbpf: failed to load object 'test_libbpf_get_fd_by_id_opts'
libbpf: failed to load BPF skeleton 'test_libbpf_get_fd_by_id_opts': -22 test_libbpf_get_fd_by_id_opts:FAIL:test_libbpf_get_fd_by_id_opts__open_and_load unexpected error: -22
Please note: this email is coming from an unmonitored mailbox. If you have questions or feedback, please reach out to the Meta Kernel CI team at [email protected].
CI has tested the following submission:
Dear patch submitter,
CI has tested the following submission:
Status: SUCCESS Name: [bpf-next,0/4] use network helpers, part 10 Patchwork: https://patchwork.kernel.org/project/netdevbpf/list/?series=872683&state=* Matrix: https://github.com/kernel-patches/bpf/actions/runs/10051538319
No further action is necessary on your part.
Please note: this email is coming from an unmonitored mailbox. If you have questions or feedback, please reach out to the Meta Kernel CI team at [email protected].
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Quoted 10 lines · On Sat, 20 Jul 2024 19:40:02 +0800 you wrote:
From: Geliang Tang <[email protected]>
This set is part 10 of series "use network helpers" all BPF selftests wide.
Patches 1-3 drop local functions
make_client(),make_socket()andinetaddr_len()insk_lookup.c. Patch 4 drops a useless function__start_server()innetwork_helpers.c.[...]
Here is the summary with links:
- [bpf-next,1/4] selftests/bpf: Drop make_client in sk_lookup
https://git.kernel.org/bpf/bpf-next/c/a81b34bb2dc7 - [bpf-next,2/4] selftests/bpf: Drop make_socket in sk_lookup https://git.kernel.org/bpf/bpf-next/c/c6b30248c21a - [bpf-next,3/4] selftests/bpf: Drop inetaddr_len in sk_lookup https://git.kernel.org/bpf/bpf-next/c/5849dff3414b - [bpf-next,4/4] selftests/bpf: Drop __start_server in network_helpers https://git.kernel.org/bpf/bpf-next/c/b27a9abd2dc1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html