use network helpers, part 2
Subsystems (4)
v2 cover use network helpers, part 2
From: Geliang Tang <[email protected]>
This patchset uses more network helpers in test_sock_addr.c, but first of all, patch 2 is needed to make network_helpers.c independent of test_progs.c. Then network_helpers.h can be included into test_sock_addr.c without compile errors.
Patch 1 and patch 2 address Martin's comments for the previous series too.
v2:
- Only a few minor cleanups to patch 5.
Geliang Tang (5):
selftests/bpf: Fix a fd leak in error paths in open_netns selftests/bpf: Use log_err in open_netns/close_netns selftests/bpf: Use start_server_addr in test_sock_addr selftests/bpf: Use connect_to_addr in test_sock_addr selftests/bpf: Use make_sockaddr in test_sock_addr
tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/network_helpers.c | 20 ++- tools/testing/selftests/bpf/network_helpers.h | 1 + .../selftests/bpf/prog_tests/empty_skb.c | 2 + .../bpf/prog_tests/ip_check_defrag.c | 2 + .../selftests/bpf/prog_tests/tc_redirect.c | 2 +- .../selftests/bpf/prog_tests/test_tunnel.c | 4 + .../selftests/bpf/prog_tests/xdp_metadata.c | 16 ++ tools/testing/selftests/bpf/test_sock_addr.c | 138 +++--------------- 9 files changed, 63 insertions(+), 125 deletions(-)
Signature · 1 line
2.40.1
PATCH v2 1/5 selftests/bpf: Fix a fd leak in error paths in open_netns
From: Geliang Tang <[email protected]>
As Martin mentioned in review comment, there is an existing bug that orig_netns_fd will be leaked in the later "goto fail;" case after open("/proc/self/ns/net") in open_netns() in network_helpers.c. This patch adds "close(token->orig_netns_fd);" before "free(token);" to fix it.
--- tools/testing/selftests/bpf/network_helpers.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/bpf/network_helpers.c +1 -0
@@ -478,6 +478,7 @@ struct nstoken *open_netns(const char *name)return token; fail: +close (token->orig_netns_fd);free (token);return NULL ; }
Signature · 1 line
2.40.1
PATCH v2 2/5 selftests/bpf: Use log_err in open_netns/close_netns
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
ASSERT helpers defined in test_progs.h shouldn't be used in public functions like open_netns() and close_netns(). Since they depend on test__fail() which defined in test_progs.c. Public functions may be used not only in test_progs.c, but in other tests like test_sock_addr.c in the next commit.
This patch uses log_err() to replace ASSERT helpers in open_netns() and close_netns() in network_helpers.c to decouple dependencies, then uses ASSERT_OK_PTR() to check the return values of all open_netns().
--- tools/testing/selftests/bpf/network_helpers.c | 19 ++++++++++++++----- .../selftests/bpf/prog_tests/empty_skb.c | 2 ++ .../bpf/prog_tests/ip_check_defrag.c | 2 ++ .../selftests/bpf/prog_tests/tc_redirect.c | 2 +- .../selftests/bpf/prog_tests/test_tunnel.c | 4 ++++ .../selftests/bpf/prog_tests/xdp_metadata.c | 16 ++++++++++++++++ 6 files changed, 39 insertions(+), 6 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +14 -5
@@ -459,22 +459,30 @@ struct nstoken *open_netns(const char *name)struct nstoken *token; token =calloc (1 ,sizeof (struct nstoken )); -if (!ASSERT_OK_PTR (token,"malloc token" )) +if (!token) { +log_err ("Failed to malloc token" );return NULL ; + } token->orig_netns_fd =open ("/proc/self/ns/net" ,O_RDONLY ); -if (!ASSERT_GE (token->orig_netns_fd,0 ,"open /proc/self/ns/net" )) +if (token->orig_netns_fd ==-1 ) { +log_err ("Failed to open /proc/self/ns/net" ); goto fail; + }snprintf (nspath,sizeof (nspath),"%s/%s" ,"/var/run/netns" , name); nsfd =open (nspath,O_RDONLY |O_CLOEXEC ); -if (!ASSERT_GE (nsfd,0 ,"open netns fd" )) +if (nsfd ==-1 ) { +log_err ("Failed to open netns fd" ); goto fail; + } err =setns (nsfd,CLONE_NEWNET );close (nsfd); -if (!ASSERT_OK (err,"setns" )) +if (err) { +log_err ("Failed to setns" ); goto fail; + }return token; fail:
@@ -488,7 +496,8 @@ void close_netns(struct nstoken *token)if (!token)return ; -ASSERT_OK (setns (token->orig_netns_fd,CLONE_NEWNET ),"setns" ); +if (setns (token->orig_netns_fd,CLONE_NEWNET )) +log_err ("Failed to setns" );close (token->orig_netns_fd);free (token); }
tools/testing/selftests/bpf/prog_tests/empty_skb.c +2 -0
@@ -94,6 +94,8 @@ void test_empty_skb(void)SYS (out,"ip netns add empty_skb" ); tok =open_netns ("empty_skb" ); +if (!ASSERT_OK_PTR (tok,"setns" )) + goto out;SYS (out,"ip link add veth0 type veth peer veth1" );SYS (out,"ip link set dev veth0 up" );SYS (out,"ip link set dev veth1 up" );
tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c +2 -0
@@ -88,6 +88,8 @@ static int attach(struct ip_check_defrag *skel, bool ipv6)int err =-1 ; nstoken =open_netns (NS1 ); +if (!ASSERT_OK_PTR (nstoken,"setns" )) + goto out; skel->links.defrag =bpf_program__attach_netfilter (skel->progs.defrag, &opts);if (!ASSERT_OK_PTR (skel->links.defrag,"program attach" ))
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1 -1
@@ -530,7 +530,7 @@ static int wait_netstamp_needed_key(void)__u64 tstamp =0 ; nstoken =open_netns (NS_DST ); -if (!nstoken) +if (!ASSERT_OK_PTR (nstoken,"setns dst" ))return -1 ; srv_fd =start_server (AF_INET6 ,SOCK_DGRAM ,"::1" ,0 ,0 );
tools/testing/selftests/bpf/prog_tests/test_tunnel.c +4 -0
@@ -612,6 +612,8 @@ static void test_ipip_tunnel(enum ipip_encap encap)/* ping from at_ns0 namespace test */ nstoken =open_netns ("at_ns0" ); +if (!ASSERT_OK_PTR (nstoken,"setns" )) + goto done; err =test_ping (AF_INET ,IP4_ADDR_TUNL_DEV1 );if (!ASSERT_OK (err,"test_ping" )) goto done;
@@ -666,6 +668,8 @@ static void test_xfrm_tunnel(void)/* ping from at_ns0 namespace test */ nstoken =open_netns ("at_ns0" ); +if (!ASSERT_OK_PTR (nstoken,"setns" )) + goto done; err =test_ping (AF_INET ,IP4_ADDR_TUNL_DEV1 );close_netns (nstoken);if (!ASSERT_OK (err,"test_ping" ))
tools/testing/selftests/bpf/prog_tests/xdp_metadata.c +16 -0
@@ -384,6 +384,8 @@ void test_xdp_metadata(void)SYS (out,"ip netns add " RX_NETNS_NAME ); tok =open_netns (TX_NETNS_NAME ); +if (!ASSERT_OK_PTR (tok,"setns" )) + goto out;SYS (out,"ip link add numtxqueues 1 numrxqueues 1 " TX_NAME " type veth peer " RX_NAME " numtxqueues 1 numrxqueues 1" );SYS (out,"ip link set " RX_NAME " netns " RX_NETNS_NAME );
@@ -400,6 +402,8 @@ void test_xdp_metadata(void)SYS (out,"ip -4 neigh add " RX_ADDR " lladdr " RX_MAC " dev " TX_NAME_VLAN );switch_ns_to_rx (&tok); +if (!ASSERT_OK_PTR (tok,"setns rx" )) + goto out;SYS (out,"ip link set dev " RX_NAME " address " RX_MAC );SYS (out,"ip link set dev " RX_NAME " up" );
@@ -449,6 +453,8 @@ void test_xdp_metadata(void) goto out;switch_ns_to_tx (&tok); +if (!ASSERT_OK_PTR (tok,"setns tx" )) + goto out;/* Setup separate AF_XDP for TX interface nad send packet to the RX socket. */ tx_ifindex =if_nametoindex (TX_NAME );
@@ -461,6 +467,8 @@ void test_xdp_metadata(void) goto out;switch_ns_to_rx (&tok); +if (!ASSERT_OK_PTR (tok,"setns rx" )) + goto out;/* Verify packet sent from AF_XDP has proper metadata. */ if (!ASSERT_GE(verify_xsk_metadata(&rx_xsk, true), 0,
@@ -468,6 +476,8 @@ void test_xdp_metadata(void) goto out;switch_ns_to_tx (&tok); +if (!ASSERT_OK_PTR (tok,"setns tx" )) + goto out;complete_tx (&tx_xsk);/* Now check metadata of packet, generated with network stack */
@@ -475,6 +485,8 @@ void test_xdp_metadata(void) goto out;switch_ns_to_rx (&tok); +if (!ASSERT_OK_PTR (tok,"setns rx" )) + goto out;if (!ASSERT_GE (verify_xsk_metadata (&rx_xsk, false),0 ,"verify_xsk_metadata" ))
@@ -498,6 +510,8 @@ void test_xdp_metadata(void) goto out;switch_ns_to_tx (&tok); +if (!ASSERT_OK_PTR (tok,"setns tx" )) + goto out;/* Send packet to trigger . */ if (!ASSERT_GE(generate_packet(&tx_xsk, AF_XDP_CONSUMER_PORT), 0,
@@ -505,6 +519,8 @@ void test_xdp_metadata(void) goto out;switch_ns_to_rx (&tok); +if (!ASSERT_OK_PTR (tok,"setns rx" )) + goto out;while (!retries--) {if (bpf_obj2->bss->called)
Signature · 1 line
2.40.1
PATCH v2 3/5 selftests/bpf: Use start_server_addr in test_sock_addr
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Include network_helpers.h in test_sock_addr.c, use the newly added public helper start_server_addr() instead of the local defined function start_server(). This can avoid duplicate code.
In order to use functions defined in network_helpers.c in test_sock_addr.c, Makefile needs to be updated and <Linux/err.h> needs to be included in network_helpers.h to avoid compilation errors.
--- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/network_helpers.h | 1 + tools/testing/selftests/bpf/test_sock_addr.c | 38 ++----------------- 3 files changed, 7 insertions(+), 35 deletions(-)
tools/testing/selftests/bpf/Makefile +2 -1
@@ -278,11 +278,12 @@ UNPRIV_HELPERS := $(OUTPUT)/unpriv_helpers.o TRACE_HELPERS := $(OUTPUT)/trace_helpers.o JSON_WRITER := $(OUTPUT)/json_writer.o CAP_HELPERS := $(OUTPUT)/cap_helpers.o +NETWORK_HELPERS := $(OUTPUT)/network_helpers.o $(OUTPUT)/test_dev_cgroup: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_skb_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_sock: $(CGROUP_HELPERS) $(TESTING_HELPERS) -$(OUTPUT)/test_sock_addr: $(CGROUP_HELPERS) $(TESTING_HELPERS) +$(OUTPUT)/test_sock_addr: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(NETWORK_HELPERS) $(OUTPUT)/test_sockmap: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(TRACE_HELPERS) $(OUTPUT)/get_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS)
tools/testing/selftests/bpf/network_helpers.h +1 -0
@@ -11,6 +11,7 @@ typedef __u16 __sum16;#include <linux/ipv6.h> #include <linux/ethtool.h> #include <linux/sockios.h> +#include <linux/err.h> #include <netinet/tcp.h> #include <bpf/bpf_endian.h> #include <net/if.h>
tools/testing/selftests/bpf/test_sock_addr.c +4 -34
@@ -19,6 +19,7 @@#include <bpf/libbpf.h> #include "cgroup_helpers.h" +#include "network_helpers.h" #include "testing_helpers.h" #include "bpf_util.h"
@@ -939,37 +940,6 @@ static int cmp_peer_addr(int sock1, const struct sockaddr_storage *addr2)return cmp_sock_addr (getpeername, sock1, addr2,/*cmp_port*/ 1 ); } -static int start_server (int type,const struct sockaddr_storage *addr, -socklen_t addr_len) -{ -int fd; - - fd =socket (addr->ss_family, type,0 ); -if (fd ==-1 ) { -log_err ("Failed to create server socket" ); - goto out; - } - -if (bind (fd, (const struct sockaddr *)addr, addr_len) ==-1 ) { -log_err ("Failed to bind server socket" ); - goto close_out; - } - -if (type ==SOCK_STREAM ) { -if (listen (fd,128 ) ==-1 ) { -log_err ("Failed to listen on server socket" ); - goto close_out; - } - } - - goto out; -close_out: -close (fd); - fd =-1 ; -out: -return fd; -} -static int connect_to_server (int type,const struct sockaddr_storage *addr,socklen_t addr_len) {
@@ -1178,7 +1148,7 @@ static int run_bind_test_case(const struct sock_addr_test *test)if (init_addrs (test, &requested_addr, &expected_addr,NULL )) goto err; - servfd =start_server (test->type, &requested_addr, addr_len); + servfd =start_server_addr (test->type, &requested_addr, addr_len,NULL );if (servfd ==-1 ) goto err;
@@ -1214,7 +1184,7 @@ static int run_connect_test_case(const struct sock_addr_test *test) goto err;/* Prepare server to connect to */ - servfd =start_server (test->type, &expected_addr, addr_len); + servfd =start_server_addr (test->type, &expected_addr, addr_len,NULL );if (servfd ==-1 ) goto err;
@@ -1271,7 +1241,7 @@ static int run_xmsg_test_case(const struct sock_addr_test *test, int max_cmsg) goto err;/* Prepare server to sendmsg to */ - servfd =start_server (test->type, &server_addr, addr_len); + servfd =start_server_addr (test->type, &server_addr, addr_len,NULL );if (servfd ==-1 ) goto err;
Signature · 1 line
2.40.1
PATCH v2 4/5 selftests/bpf: Use connect_to_addr in test_sock_addr
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses public network helper connect_to_addr() exported in network_helpers.h instead of the local defined function connect_to_server() in test_sock_addr.c. This can avoid duplicate code.
--- tools/testing/selftests/bpf/test_sock_addr.c | 36 ++------------------ 1 file changed, 2 insertions(+), 34 deletions(-)
tools/testing/selftests/bpf/test_sock_addr.c +2 -34
@@ -940,38 +940,6 @@ static int cmp_peer_addr(int sock1, const struct sockaddr_storage *addr2)return cmp_sock_addr (getpeername, sock1, addr2,/*cmp_port*/ 1 ); } -static int connect_to_server (int type,const struct sockaddr_storage *addr, -socklen_t addr_len) -{ -int domain; -int fd =-1 ; - - domain = addr->ss_family; - -if (domain !=AF_INET && domain !=AF_INET6 ) { -log_err ("Unsupported address family" ); - goto err; - } - - fd =socket (domain, type,0 ); -if (fd ==-1 ) { -log_err ("Failed to create client socket" ); - goto err; - } - -if (connect (fd, (const struct sockaddr *)addr, addr_len) ==-1 ) { -log_err ("Fail to connect to server" ); - goto err; - } - - goto out; -err: -close (fd); - fd =-1 ; -out: -return fd; -} -int init_pktinfo (int domain,struct cmsghdr *cmsg) {struct in6_pktinfo *pktinfo6;
@@ -1156,7 +1124,7 @@ static int run_bind_test_case(const struct sock_addr_test *test) goto err;/* Try to connect to server just in case */ - clientfd =connect_to_server (test->type, &expected_addr, addr_len); + clientfd =connect_to_addr (test->type, &expected_addr, addr_len,NULL );if (clientfd ==-1 ) goto err;
@@ -1188,7 +1156,7 @@ static int run_connect_test_case(const struct sock_addr_test *test)if (servfd ==-1 ) goto err; - clientfd =connect_to_server (test->type, &requested_addr, addr_len); + clientfd =connect_to_addr (test->type, &requested_addr, addr_len,NULL );if (clientfd ==-1 ) goto err;
Signature · 1 line
2.40.1
PATCH v2 5/5 selftests/bpf: Use make_sockaddr in test_sock_addr
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses public helper make_sockaddr() exported in network_helpers.h instead of the local defined function mk_sockaddr() in test_sock_addr.c. This can avoid duplicate code.
--- tools/testing/selftests/bpf/test_sock_addr.c | 64 +++++--------------- 1 file changed, 14 insertions(+), 50 deletions(-)
tools/testing/selftests/bpf/test_sock_addr.c +14 -50
@@ -605,44 +605,6 @@ static struct sock_addr_test tests[] = { }, }; -static int mk_sockaddr (int domain,const char *ip,unsigned short port, -struct sockaddr *addr,socklen_t addr_len) -{ -struct sockaddr_in6 *addr6; -struct sockaddr_in *addr4; - -if (domain !=AF_INET && domain !=AF_INET6 ) { -log_err ("Unsupported address family" ); -return -1 ; - } - -memset (addr,0 , addr_len); - -if (domain ==AF_INET ) { -if (addr_len <sizeof (struct sockaddr_in )) -return -1 ; - addr4 = (struct sockaddr_in *)addr; - addr4->sin_family = domain; - addr4->sin_port =htons (port); -if (inet_pton (domain, ip, (void *)&addr4->sin_addr) !=1 ) { -log_err ("Invalid IPv4: %s" , ip); -return -1 ; - } - }else if (domain ==AF_INET6 ) { -if (addr_len <sizeof (struct sockaddr_in6 )) -return -1 ; - addr6 = (struct sockaddr_in6 *)addr; - addr6->sin6_family = domain; - addr6->sin6_port =htons (port); -if (inet_pton (domain, ip, (void *)&addr6->sin6_addr) !=1 ) { -log_err ("Invalid IPv6: %s" , ip); -return -1 ; - } - } - -return 0 ; -} -static int load_insns (const struct sock_addr_test *test,const struct bpf_insn *insns,size_t insns_cnt) {
@@ -749,6 +711,7 @@ static int recvmsg_deny_prog_load(const struct sock_addr_test *test)static int sendmsg4_rw_asm_prog_load (const struct sock_addr_test *test) { +socklen_t addr_len =sizeof (struct sockaddr_storage );struct sockaddr_in dst4_rw_addr;struct in_addr src4_rw_ip;
@@ -757,9 +720,9 @@ static int sendmsg4_rw_asm_prog_load(const struct sock_addr_test *test)return -1 ; } -if (mk_sockaddr (AF_INET ,SERV4_REWRITE_IP ,SERV4_REWRITE_PORT , - (struct sockaddr *)&dst4_rw_addr, -sizeof (dst4_rw_addr)) ==-1 ) +if (make_sockaddr (AF_INET ,SERV4_REWRITE_IP ,SERV4_REWRITE_PORT , + (struct sockaddr_storage *)&dst4_rw_addr, + &addr_len) ==-1 )return -1 ;struct bpf_insn insns[] = {
@@ -812,6 +775,7 @@ static int sendmsg4_rw_c_prog_load(const struct sock_addr_test *test)static int sendmsg6_rw_dst_asm_prog_load (const struct sock_addr_test *test,const char *rw_dst_ip) { +socklen_t addr_len =sizeof (struct sockaddr_storage );struct sockaddr_in6 dst6_rw_addr;struct in6_addr src6_rw_ip;
@@ -820,9 +784,9 @@ static int sendmsg6_rw_dst_asm_prog_load(const struct sock_addr_test *test,return -1 ; } -if (mk_sockaddr (AF_INET6 , rw_dst_ip,SERV6_REWRITE_PORT , - (struct sockaddr *)&dst6_rw_addr, -sizeof (dst6_rw_addr)) ==-1 ) +if (make_sockaddr (AF_INET6 , rw_dst_ip,SERV6_REWRITE_PORT , + (struct sockaddr_storage *)&dst6_rw_addr, + &addr_len) ==-1 )return -1 ;struct bpf_insn insns[] = {
@@ -1086,17 +1050,17 @@ static int init_addrs(const struct sock_addr_test *test, {socklen_t addr_len =sizeof (struct sockaddr_storage ); -if (mk_sockaddr (test->domain, test->expected_ip, test->expected_port, - (struct sockaddr *)expected_addr, addr_len) ==-1 ) +if (make_sockaddr (test->domain, test->expected_ip, test->expected_port, + expected_addr, &addr_len) ==-1 ) goto err; -if (mk_sockaddr (test->domain, test->requested_ip, test->requested_port, - (struct sockaddr *)requested_addr, addr_len) ==-1 ) +if (make_sockaddr (test->domain, test->requested_ip, test->requested_port, + requested_addr, &addr_len) ==-1 ) goto err;if (test->expected_src_ip && -mk_sockaddr (test->domain, test->expected_src_ip,0 , - (struct sockaddr *)expected_src_addr, addr_len) ==-1 ) +make_sockaddr (test->domain, test->expected_src_ip,0 , + expected_src_addr, &addr_len) ==-1 ) goto err;return 0 ;
Signature · 1 line
2.40.1
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 8 lines · On Tue, 23 Apr 2024 18:35:26 +0800 you wrote:
From: Geliang Tang <[email protected]>
This patchset uses more network helpers in
test_sock_addr.c, but first of all, patch 2 is needed to makenetwork_helpers.cindependent oftest_progs.c. Thennetwork_helpers.hcan be included intotest_sock_addr.cwithout compile errors.[...]
Here is the summary with links:
- [bpf-next,v2,1/5] selftests/bpf: Fix a fd leak in error paths in open_netns
https://git.kernel.org/bpf/bpf-next/c/151f74424366 - [bpf-next,v2,2/5] selftests/bpf: Use log_err in open_netns/close_netns https://git.kernel.org/bpf/bpf-next/c/285cffbaa8e6 - [bpf-next,v2,3/5] selftests/bpf: Use start_server_addr in test_sock_addr https://git.kernel.org/bpf/bpf-next/c/e1cdb70d075e - [bpf-next,v2,4/5] selftests/bpf: Use connect_to_addr in test_sock_addr https://git.kernel.org/bpf/bpf-next/c/c6c407984281 - [bpf-next,v2,5/5] selftests/bpf: Use make_sockaddr in test_sock_addr https://git.kernel.org/bpf/bpf-next/c/e4c68bbaff11
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html