Commit cb9f4a30 authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski
Browse files

selftests: net: cut more slack for gro fwd tests. 



The udpgro_fwd.sh self-tests are somewhat unstable. There are
a few timing constraints the we struggle to meet on very slow
environments.

Instead of skipping the whole tests in such envs, increase the
test resilience WRT very slow hosts: increase the inter-packets
timeouts, avoid resetting the counters every second and finally
disable reduce the background traffic noise.

Tested with:

for I in $(seq 1 100); do
	./tools/testing/selftests/kselftest_install/run_kselftest.sh \
		-t net:udpgro_fwd.sh || exit -1
done

in a slow environment.

Fixes: a062260a ("selftests: net: add UDP GRO forwarding self-tests")
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/f4b6b11064a0d39182a9ae6a853abae3e9b4426a.1706812005.git.pabeni@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2e7d3b67

tools/testing/selftests/net/udpgro_fwd.sh

+12 −2
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ create_ns() { 
	for ns in $NS_SRC $NS_DST; do

		ip netns add $ns

		ip -n $ns link set dev lo up



		# disable route solicitations to decrease 'noise' traffic

		ip netns exec $ns sysctl -qw net.ipv6.conf.default.router_solicitations=0

		ip netns exec $ns sysctl -qw net.ipv6.conf.all.router_solicitations=0

	done



	ip link add name veth$SRC type veth peer name veth$DST
@@ -80,6 +84,12 @@ create_vxlan_pair() { 
		create_vxlan_endpoint $BASE$ns veth$ns $BM_NET_V6$((3 - $ns)) vxlan6$ns 6

		ip -n $BASE$ns addr add dev vxlan6$ns $OL_NET_V6$ns/24 nodad

	done



	# preload neighbur cache, do avoid some noisy traffic

	local addr_dst=$(ip -j -n $BASE$DST link show dev vxlan6$DST  |jq -r '.[]["address"]')

	local addr_src=$(ip -j -n $BASE$SRC link show dev vxlan6$SRC  |jq -r '.[]["address"]')

	ip -n $BASE$DST neigh add dev vxlan6$DST lladdr $addr_src $OL_NET_V6$SRC

	ip -n $BASE$SRC neigh add dev vxlan6$SRC lladdr $addr_dst $OL_NET_V6$DST

}



is_ipv6() {
@@ -119,7 +129,7 @@ run_test() { 
	# not enable GRO

	ip netns exec $NS_DST $ipt -A INPUT -p udp --dport 4789

	ip netns exec $NS_DST $ipt -A INPUT -p udp --dport 8000

	ip netns exec $NS_DST ./udpgso_bench_rx -C 1000 -R 10 -n 10 -l 1300 $rx_args &

	ip netns exec $NS_DST ./udpgso_bench_rx -C 2000 -R 100 -n 10 -l 1300 $rx_args &

	local spid=$!

	wait_local_port_listen "$NS_DST" 8000 udp

	ip netns exec $NS_SRC ./udpgso_bench_tx $family -M 1 -s 13000 -S 1300 -D $dst
@@ -168,7 +178,7 @@ run_bench() { 
	# bind the sender and the receiver to different CPUs to try

	# get reproducible results

	ip netns exec $NS_DST bash -c "echo 2 > /sys/class/net/veth$DST/queues/rx-0/rps_cpus"

	ip netns exec $NS_DST taskset 0x2 ./udpgso_bench_rx -C 1000 -R 10  &

	ip netns exec $NS_DST taskset 0x2 ./udpgso_bench_rx -C 2000 -R 100  &

	local spid=$!

	wait_local_port_listen "$NS_DST" 8000 udp

	ip netns exec $NS_SRC taskset 0x1 ./udpgso_bench_tx $family -l 3 -S 1300 -D $dst

tools/testing/selftests/net/udpgso_bench_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static void do_recv(void) 
			do_flush_udp(fd);



		tnow = gettimeofday_ms();

		if (tnow > treport) {

		if (!cfg_expected_pkt_nr && tnow > treport) {

			if (packets)

				fprintf(stderr,

					"%s rx: %6lu MB/s %8lu calls/s\n",