Commit 285cffba authored by Geliang Tang's avatar Geliang Tang Committed by Martin KaFai Lau
Browse files

selftests/bpf: Use log_err in open_netns/close_netns 



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().

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/d1dad22b2ff4909af3f8bfd0667d046e235303cb.1713868264.git.tanggeliang@kylinos.cn


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent 151f7442

tools/testing/selftests/bpf/network_helpers.c

+14 −5
Original line number Diff line number Diff line
@@ -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(%s)", nspath);

		goto fail;

	}



	err = setns(nsfd, CLONE_NEWNET);

	close(nsfd);

	if (!ASSERT_OK(err, "setns"))

	if (err) {

		log_err("Failed to setns(nsfd)");

		goto fail;

	}



	return token;

fail:
@@ -489,7 +497,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(orig_netns_fd)");

	close(token->orig_netns_fd);

	free(token);

}

tools/testing/selftests/bpf/prog_tests/empty_skb.c

+2 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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"))