lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 750/849] selftests/bpf/xdp_redirect_multi: Give tcpdump a chance to terminate cleanly
    Date
    From: Hangbin Liu <liuhangbin@gmail.com>

    [ Upstream commit 648c3677062fbd14d754b853daebb295426771e8 ]

    No need to kill tcpdump with -9.

    Fixes: d23292476297 ("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>
    ---
    tools/testing/selftests/bpf/test_xdp_redirect_multi.sh | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh b/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
    index c2a933caa32d4..37e347159ab44 100755
    --- a/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
    +++ b/tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
    @@ -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 && \
    @@ -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 ] && \
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:40    [W:4.046 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site