| From 93f684db7d95164206270ca840c09ef5ff4ed47b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 17 Dec 2024 22:16:51 +0100 |
| Subject: selftests: openvswitch: fix tcpdump execution |
| |
| From: Adrian Moreno <amorenoz@redhat.com> |
| |
| [ Upstream commit a17975992cc11588767175247ccaae1213a8b582 ] |
| |
| Fix the way tcpdump is executed by: |
| - Using the right variable for the namespace. Currently the use of the |
| empty "ns" makes the command fail. |
| - Waiting until it starts to capture to ensure the interesting traffic |
| is caught on slow systems. |
| - Using line-buffered output to ensure logs are available when the test |
| is paused with "-p". Otherwise the last chunk of data might only be |
| written when tcpdump is killed. |
| |
| Fixes: 74cc26f416b9 ("selftests: openvswitch: add interface support") |
| Signed-off-by: Adrian Moreno <amorenoz@redhat.com> |
| Acked-by: Eelco Chaudron <echaudro@redhat.com> |
| Link: https://patch.msgid.link/20241217211652.483016-1-amorenoz@redhat.com |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/testing/selftests/net/openvswitch/openvswitch.sh | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/tools/testing/selftests/net/openvswitch/openvswitch.sh b/tools/testing/selftests/net/openvswitch/openvswitch.sh |
| index cc0bfae2bafa..960e1ab4dd04 100755 |
| --- a/tools/testing/selftests/net/openvswitch/openvswitch.sh |
| +++ b/tools/testing/selftests/net/openvswitch/openvswitch.sh |
| @@ -171,8 +171,10 @@ ovs_add_netns_and_veths () { |
| ovs_add_if "$1" "$2" "$4" -u || return 1 |
| fi |
| |
| - [ $TRACING -eq 1 ] && ovs_netns_spawn_daemon "$1" "$ns" \ |
| - tcpdump -i any -s 65535 |
| + if [ $TRACING -eq 1 ]; then |
| + ovs_netns_spawn_daemon "$1" "$3" tcpdump -l -i any -s 6553 |
| + ovs_wait grep -q "listening on any" ${ovs_dir}/stderr |
| + fi |
| |
| return 0 |
| } |
| -- |
| 2.39.5 |
| |
