Skip to content

Commit

Permalink
selftests/bpf/xdp_redirect_multi: Give tcpdump a chance to terminate …
Browse files Browse the repository at this point in the history
…cleanly

[ Upstream commit 648c367 ]

No need to kill tcpdump with -9.

Fixes: d232924 ("selftests/bpf: Add xdp_redirect_multi test")
Suggested-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20211027033553.962413-4-liuhangbin@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
liuhangbin authored and gregkh committed Nov 18, 2021
1 parent 00f9911 commit a99e4d9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
Expand Up @@ -106,7 +106,7 @@ do_egress_tests()
sleep 0.5
ip netns exec ns1 ping 192.0.2.254 -i 0.1 -c 4 &> /dev/null
sleep 0.5
pkill -9 tcpdump
pkill tcpdump

# mac check
grep -q "${veth_mac[2]} > ff:ff:ff:ff:ff:ff" ${LOG_DIR}/mac_ns1-2_${mode}.log && \
Expand All @@ -133,7 +133,7 @@ do_ping_tests()
# IPv6 test
ip netns exec ns1 ping6 2001:db8::2 -i 0.1 -c 2 &> /dev/null
sleep 0.5
pkill -9 tcpdump
pkill tcpdump

# All netns should receive the redirect arp requests
[ $(grep -cF "who-has 192.0.2.254" ${LOG_DIR}/ns1-1_${mode}.log) -eq 4 ] && \
Expand Down

0 comments on commit a99e4d9

Please sign in to comment.