Commit fbaf59a9 authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Alexei Starovoitov
Browse files

selftests/bpf: Remove "&>" usage in the selftests 



In s390, CI reported that the sock_iter_batch selftest
hits this error very often:

2024-01-26T16:56:49.3091804Z Bind /proc/self/ns/net -> /run/netns/sock_iter_batch_netns failed: No such file or directory
2024-01-26T16:56:49.3149524Z Cannot remove namespace file "/run/netns/sock_iter_batch_netns": No such file or directory
2024-01-26T16:56:49.3772213Z test_sock_iter_batch:FAIL:ip netns add sock_iter_batch_netns unexpected error: 256 (errno 0)

It happens very often in s390 but Manu also noticed it happens very
sparsely in other arch also.

It turns out the default dash shell does not recognize "&>"
as a redirection operator, so the command went to the background.
In the sock_iter_batch selftest, the "ip netns delete" went
into background and then race with the following "ip netns add"
command.

This patch replaces the "&> /dev/null" usage with ">/dev/null 2>&1"
and does this redirection in the SYS_NOFAIL macro instead of doing
it individually by its caller. The SYS_NOFAIL callers do not care
about failure, so it is no harm to do this redirection even if
some of the existing callers do not redirect to /dev/null now.

It touches different test files, so I skipped the Fixes tags
in this patch. Some of the changed tests do not use "&>"
but they use the SYS_NOFAIL, so these tests are also
changed to avoid doing its own redirection because
SYS_NOFAIL does it internally now.

Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Link: https://lore.kernel.org/r/20240127025017.950825-1-martin.lau@linux.dev


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent add9c58c

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

+1 −1
Original line number Diff line number Diff line
@@ -72,6 +72,6 @@ void test_decap_sanity(void) 
		bpf_tc_hook_destroy(&qdisc_hook);

		close_netns(nstoken);

	}

	SYS_NOFAIL("ip netns del " NS_TEST " &> /dev/null");

	SYS_NOFAIL("ip netns del " NS_TEST);

	decap_sanity__destroy(skel);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -298,6 +298,6 @@ void test_fib_lookup(void) 
fail:

	if (nstoken)

		close_netns(nstoken);

	SYS_NOFAIL("ip netns del " NS_TEST " &> /dev/null");

	SYS_NOFAIL("ip netns del " NS_TEST);

	fib_lookup__destroy(skel);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -59,9 +59,9 @@ static int setup_topology(bool ipv6) 
	/* Wait for up to 5s for links to come up */

	for (i = 0; i < 5; ++i) {

		if (ipv6)

			up = !system("ip netns exec " NS0 " ping -6 -c 1 -W 1 " VETH1_ADDR6 " &>/dev/null");

			up = !SYS_NOFAIL("ip netns exec " NS0 " ping -6 -c 1 -W 1 " VETH1_ADDR6);

		else

			up = !system("ip netns exec " NS0 " ping -c 1 -W 1 " VETH1_ADDR " &>/dev/null");

			up = !SYS_NOFAIL("ip netns exec " NS0 " ping -c 1 -W 1 " VETH1_ADDR);



		if (up)

			break;

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

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void ping_dev(const char *dev, bool is_ingress) 
		snprintf(ip, sizeof(ip), "20.0.0.%d", link_index);



	/* We won't get a reply. Don't fail here */

	SYS_NOFAIL("ping %s -c1 -W1 -s %d >/dev/null 2>&1",

	SYS_NOFAIL("ping %s -c1 -W1 -s %d",

		   ip, ICMP_PAYLOAD_SIZE);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
static void ping_once(const char *ip)

{

	/* We won't get a reply. Don't fail here */

	SYS_NOFAIL("ping %s -c1 -W1 -s %d >/dev/null 2>&1",

	SYS_NOFAIL("ping %s -c1 -W1 -s %d",

		   ip, ICMP_PAYLOAD_SIZE);

}