selftests: net: lib: Add kill_process

pmachata · kuba-moo · commit 46f6569cf075 · 2024-11-15T16:39:19.000-08:00
A number of selftests run processes in the background and need to kill them afterwards. Instead for everyone to open-code the kill / wait / redirect mantra, add a helper in net/lib.sh. Convert existing open-code sites. Signed-off-by: Petr Machata <petrm@nvidia.com> Acked-by: Shuah Khan <skhan@linuxfoundation.org> Reviewed-by: Amit Cohen <amcohen@nvidia.com> Link: https://patch.msgid.link/a9db102067d741c118f0bd93b10c75e2a34665ea.1731589511.git.petrm@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap.sh b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap.sh
@@ -116,7 +116,7 @@ dev_del_test()
 
 	log_test "Device delete"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 }
 
 trap cleanup EXIT
diff --git a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_drops.sh b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_drops.sh
@@ -595,7 +595,7 @@ irif_disabled_test()
 
 	log_test "Ingress RIF disabled"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	ip link set dev $rp1 nomaster
 	__addr_add_del $rp1 add 192.0.2.2/24 2001:db8:1::2/64
 	ip link del dev br0 type bridge
@@ -645,7 +645,7 @@ erif_disabled_test()
 
 	log_test "Egress RIF disabled"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	__addr_add_del $rp1 add 192.0.2.2/24 2001:db8:1::2/64
 	ip link del dev br0 type bridge
 	devlink_trap_action_set $trap_name "drop"
diff --git a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_exceptions.sh b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_exceptions.sh
@@ -202,7 +202,7 @@ mtu_value_is_too_small_test()
 
 	mtu_restore $rp2
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	tc filter del dev $h1 ingress protocol ip pref 1 handle 101 flower
 }
 
@@ -235,7 +235,7 @@ __ttl_value_is_too_small_test()
 
 	log_test "TTL value is too small: TTL=$ttl_val"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	tc filter del dev $h1 ingress protocol ip pref 1 handle 101 flower
 }
 
@@ -299,7 +299,7 @@ __mc_reverse_path_forwarding_test()
 
 	log_test "Multicast reverse path forwarding: $desc"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	tc filter del dev $rp2 egress protocol $proto pref 1 handle 101 flower
 }
 
@@ -347,7 +347,7 @@ __reject_route_test()
 
 	log_test "Reject route: $desc"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	ip route del unreachable $unreachable
 	tc filter del dev $h1 ingress protocol $proto pref 1 handle 101 flower
 }
@@ -542,7 +542,7 @@ ipv4_lpm_miss_test()
 
 	log_test "LPM miss: IPv4"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	vrf_without_routes_destroy
 }
 
@@ -569,7 +569,7 @@ ipv6_lpm_miss_test()
 
 	log_test "LPM miss: IPv6"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	vrf_without_routes_destroy
 }
 
diff --git a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_ipip.sh b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_ipip.sh
@@ -176,7 +176,7 @@ ecn_decap_test()
 
 	log_test "$desc: Inner ECN is not ECT and outer is $ecn_desc"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	tc filter del dev $swp1 egress protocol ip pref 1 handle 101 flower
 }
 
@@ -207,7 +207,7 @@ no_matching_tunnel_test()
 
 	log_test "$desc"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	tc filter del dev $swp1 egress protocol ip pref 1 handle 101 flower
 }
 
diff --git a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_ipip6.sh b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_ipip6.sh
@@ -176,7 +176,7 @@ ecn_decap_test()
 
 	log_test "$desc: Inner ECN is not ECT and outer is $ecn_desc"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	tc filter del dev $swp1 egress protocol ipv6 pref 1 handle 101 flower
 }
 
@@ -207,7 +207,7 @@ no_matching_tunnel_test()
 
 	log_test "$desc"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	tc filter del dev $swp1 egress protocol ipv6 pref 1 handle 101 flower
 }
 
diff --git a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_vxlan.sh b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_vxlan.sh
@@ -183,7 +183,7 @@ ecn_decap_test()
 
 	log_test "$desc: Inner ECN is not ECT and outer is $ecn_desc"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	tc filter del dev $swp1 egress protocol ip pref 1 handle 101 flower
 }
 
@@ -253,7 +253,7 @@ corrupted_packet_test()
 
 	log_test "$desc"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	tc filter del dev $swp1 egress protocol ip pref 1 handle 101 flower
 }
 
diff --git a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_vxlan_ipv6.sh b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_vxlan_ipv6.sh
@@ -188,7 +188,7 @@ ecn_decap_test()
 
 	log_test "$desc: Inner ECN is not ECT and outer is $ecn_desc"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	tc filter del dev $swp1 egress protocol ipv6 pref 1 handle 101 flower
 }
 
@@ -262,7 +262,7 @@ corrupted_packet_test()
 
 	log_test "$desc"
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	tc filter del dev $swp1 egress protocol ipv6 pref 1 handle 101 flower
 }
 
diff --git a/tools/testing/selftests/drivers/net/mlxsw/tc_sample.sh b/tools/testing/selftests/drivers/net/mlxsw/tc_sample.sh
@@ -218,7 +218,7 @@ psample_capture_start()
 
 psample_capture_stop()
 {
-	{ kill %% && wait %%; } 2>/dev/null
+	kill_process %%
 }
 
 __tc_sample_rate_test()
@@ -499,7 +499,7 @@ tc_sample_md_out_tc_occ_test()
 	backlog=$(tc -j -p -s qdisc show dev $rp2 | jq '.[0]["backlog"]')
 
 	# Kill mausezahn.
-	{ kill %% && wait %%; } 2>/dev/null
+	kill_process %%
 
 	psample_capture_stop
 
diff --git a/tools/testing/selftests/drivers/net/netdevsim/fib_notifications.sh b/tools/testing/selftests/drivers/net/netdevsim/fib_notifications.sh
@@ -94,7 +94,7 @@ route_addition_check()
 	sleep 1
 	$IP route add $route dev dummy1
 	sleep 1
-	kill %% && wait %% &> /dev/null
+	kill_process %%
 
 	route_notify_check $outfile $expected_num_notifications $offload_failed
 	rm -f $outfile
@@ -148,7 +148,7 @@ route_deletion_check()
 	sleep 1
 	$IP route del $route dev dummy1
 	sleep 1
-	kill %% && wait %% &> /dev/null
+	kill_process %%
 
 	route_notify_check $outfile $expected_num_notifications
 	rm -f $outfile
@@ -191,7 +191,7 @@ route_replacement_check()
 	sleep 1
 	$IP route replace $route dev dummy2
 	sleep 1
-	kill %% && wait %% &> /dev/null
+	kill_process %%
 
 	route_notify_check $outfile $expected_num_notifications
 	rm -f $outfile
diff --git a/tools/testing/selftests/net/drop_monitor_tests.sh b/tools/testing/selftests/net/drop_monitor_tests.sh
@@ -77,7 +77,7 @@ sw_drops_test()
 
 	rm ${dir}/packets.pcap
 
-	{ kill %% && wait %%; } 2>/dev/null
+	kill_process %%
 	timeout 5 dwdump -o sw -w ${dir}/packets.pcap
 	(( $(tshark -r ${dir}/packets.pcap \
 		-Y 'ip.dst == 192.0.2.10' 2> /dev/null | wc -l) == 0))
diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh
@@ -689,7 +689,7 @@ fib6_notify_test()
 
 	log_test $ret 0 "ipv6 route add notify"
 
-	{ kill %% && wait %%; } 2>/dev/null
+	kill_process %%
 
 	#rm errors.txt
 
@@ -736,7 +736,7 @@ fib_notify_test()
 
 	log_test $ret 0 "ipv4 route add notify"
 
-	{ kill %% && wait %%; } 2>/dev/null
+	kill_process %%
 
 	rm  errors.txt
 
@@ -2328,7 +2328,7 @@ ipv4_mangle_test()
 	$IP route del table 123 172.16.101.0/24 dev veth1
 	$IP rule del pref 100
 
-	{ kill %% && wait %%; } 2>/dev/null
+	kill_process %%
 	rm $tmp_file
 
 	route_cleanup
@@ -2386,7 +2386,7 @@ ipv6_mangle_test()
 	$IP -6 route del table 123 2001:db8:101::/64 dev veth1
 	$IP -6 rule del pref 100
 
-	{ kill %% && wait %%; } 2>/dev/null
+	kill_process %%
 	rm $tmp_file
 
 	route_cleanup
diff --git a/tools/testing/selftests/net/forwarding/devlink_lib.sh b/tools/testing/selftests/net/forwarding/devlink_lib.sh
@@ -501,7 +501,7 @@ devlink_trap_drop_cleanup()
 	local pref=$1; shift
 	local handle=$1; shift
 
-	kill $mz_pid && wait $mz_pid &> /dev/null
+	kill_process $mz_pid
 	tc filter del dev $dev egress protocol $proto pref $pref handle $handle flower
 }
 
diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
@@ -1574,8 +1574,7 @@ stop_traffic()
 {
 	local pid=${1-%%}; shift
 
-	# Suppress noise from killing mausezahn.
-	{ kill $pid && wait $pid; } 2>/dev/null
+	kill_process "$pid"
 }
 
 declare -A cappid
diff --git a/tools/testing/selftests/net/forwarding/tc_police.sh b/tools/testing/selftests/net/forwarding/tc_police.sh
@@ -148,7 +148,7 @@ police_common_test()
 
 	log_test "$test_name"
 
-	{ kill %% && wait %%; } 2>/dev/null
+	kill_process %%
 	tc filter del dev $h2 ingress protocol ip pref 1 handle 101 flower
 }
 
@@ -198,7 +198,7 @@ police_shared_common_test()
 
 	log_test "$test_name"
 
-	{ kill %% && wait %%; } 2>/dev/null
+	kill_process %%
 }
 
 police_shared_test()
@@ -278,7 +278,7 @@ police_mirror_common_test()
 
 	log_test "$test_name"
 
-	{ kill %% && wait %%; } 2>/dev/null
+	kill_process %%
 	tc filter del dev $pol_if $dir protocol ip pref 1 handle 101 flower
 	tc filter del dev $h3 ingress protocol ip pref 1 handle 101 flower
 	tc filter del dev $h2 ingress protocol ip pref 1 handle 101 flower
@@ -320,7 +320,7 @@ police_pps_common_test()
 
 	log_test "$test_name"
 
-	{ kill %% && wait %%; } 2>/dev/null
+	kill_process %%
 	tc filter del dev $h2 ingress protocol ip pref 1 handle 101 flower
 }
 
diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh
@@ -434,3 +434,11 @@ xfail_on_veth()
 		"$@"
 	fi
 }
+
+kill_process()
+{
+	local pid=$1; shift
+
+	# Suppress noise from killing the process.
+	{ kill $pid && wait $pid; } 2>/dev/null
+}

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ dev_del_test()`
`116`	`116`
`117`	`117`	`log_test "Device delete"`
`118`	`118`
`119`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`119`	`+ kill_process $mz_pid`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`trap cleanup EXIT`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ mtu_value_is_too_small_test()`
`202`	`202`
`203`	`203`	`mtu_restore $rp2`
`204`	`204`
`205`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`205`	`+ kill_process $mz_pid`
`206`	`206`	`tc filter del dev $h1 ingress protocol ip pref 1 handle 101 flower`
`207`	`207`	`}`
`208`	`208`
`@@ -235,7 +235,7 @@ __ttl_value_is_too_small_test()`
`235`	`235`
`236`	`236`	`log_test "TTL value is too small: TTL=$ttl_val"`
`237`	`237`
`238`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`238`	`+ kill_process $mz_pid`
`239`	`239`	`tc filter del dev $h1 ingress protocol ip pref 1 handle 101 flower`
`240`	`240`	`}`
`241`	`241`
`@@ -299,7 +299,7 @@ __mc_reverse_path_forwarding_test()`
`299`	`299`
`300`	`300`	`log_test "Multicast reverse path forwarding: $desc"`
`301`	`301`
`302`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`302`	`+ kill_process $mz_pid`
`303`	`303`	`tc filter del dev $rp2 egress protocol $proto pref 1 handle 101 flower`
`304`	`304`	`}`
`305`	`305`
`@@ -347,7 +347,7 @@ __reject_route_test()`
`347`	`347`
`348`	`348`	`log_test "Reject route: $desc"`
`349`	`349`
`350`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`350`	`+ kill_process $mz_pid`
`351`	`351`	`ip route del unreachable $unreachable`
`352`	`352`	`tc filter del dev $h1 ingress protocol $proto pref 1 handle 101 flower`
`353`	`353`	`}`
`@@ -542,7 +542,7 @@ ipv4_lpm_miss_test()`
`542`	`542`
`543`	`543`	`log_test "LPM miss: IPv4"`
`544`	`544`
`545`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`545`	`+ kill_process $mz_pid`
`546`	`546`	`vrf_without_routes_destroy`
`547`	`547`	`}`
`548`	`548`
`@@ -569,7 +569,7 @@ ipv6_lpm_miss_test()`
`569`	`569`
`570`	`570`	`log_test "LPM miss: IPv6"`
`571`	`571`
`572`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`572`	`+ kill_process $mz_pid`
`573`	`573`	`vrf_without_routes_destroy`
`574`	`574`	`}`
`575`	`575`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ ecn_decap_test()`
`176`	`176`
`177`	`177`	`log_test "$desc: Inner ECN is not ECT and outer is $ecn_desc"`
`178`	`178`
`179`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`179`	`+ kill_process $mz_pid`
`180`	`180`	`tc filter del dev $swp1 egress protocol ip pref 1 handle 101 flower`
`181`	`181`	`}`
`182`	`182`
`@@ -207,7 +207,7 @@ no_matching_tunnel_test()`
`207`	`207`
`208`	`208`	`log_test "$desc"`
`209`	`209`
`210`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`210`	`+ kill_process $mz_pid`
`211`	`211`	`tc filter del dev $swp1 egress protocol ip pref 1 handle 101 flower`
`212`	`212`	`}`
`213`	`213`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ ecn_decap_test()`
`183`	`183`
`184`	`184`	`log_test "$desc: Inner ECN is not ECT and outer is $ecn_desc"`
`185`	`185`
`186`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`186`	`+ kill_process $mz_pid`
`187`	`187`	`tc filter del dev $swp1 egress protocol ip pref 1 handle 101 flower`
`188`	`188`	`}`
`189`	`189`
`@@ -253,7 +253,7 @@ corrupted_packet_test()`
`253`	`253`
`254`	`254`	`log_test "$desc"`
`255`	`255`
`256`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`256`	`+ kill_process $mz_pid`
`257`	`257`	`tc filter del dev $swp1 egress protocol ip pref 1 handle 101 flower`
`258`	`258`	`}`
`259`	`259`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ ecn_decap_test()`
`188`	`188`
`189`	`189`	`log_test "$desc: Inner ECN is not ECT and outer is $ecn_desc"`
`190`	`190`
`191`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`191`	`+ kill_process $mz_pid`
`192`	`192`	`tc filter del dev $swp1 egress protocol ipv6 pref 1 handle 101 flower`
`193`	`193`	`}`
`194`	`194`
`@@ -262,7 +262,7 @@ corrupted_packet_test()`
`262`	`262`
`263`	`263`	`log_test "$desc"`
`264`	`264`
`265`		`- kill $mz_pid && wait $mz_pid &> /dev/null`
	`265`	`+ kill_process $mz_pid`
`266`	`266`	`tc filter del dev $swp1 egress protocol ipv6 pref 1 handle 101 flower`
`267`	`267`	`}`
`268`	`268`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ psample_capture_start()`
`218`	`218`
`219`	`219`	`psample_capture_stop()`
`220`	`220`	`{`
`221`		`- { kill %% && wait %%; } 2>/dev/null`
	`221`	`+ kill_process %%`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`__tc_sample_rate_test()`
`@@ -499,7 +499,7 @@ tc_sample_md_out_tc_occ_test()`
`499`	`499`	`backlog=$(tc -j -p -s qdisc show dev $rp2 \| jq '.[0]["backlog"]')`
`500`	`500`
`501`	`501`	`# Kill mausezahn.`
`502`		`- { kill %% && wait %%; } 2>/dev/null`
	`502`	`+ kill_process %%`
`503`	`503`
`504`	`504`	`psample_capture_stop`
`505`	`505`