On Sat, Sep 17, 2022 at 01:55:34AM +0200, Stefano Brivio wrote:There are some 'sleep 1' commands between starting the socat server and its corresponding client to avoid races due to the server not being ready as we start sending data. However, those don't cover all the cases where we might need them, and in some cases the sleep command actually ended up being before the server even starts. This fixes occasional failures in TCP and UDP simple transfer tests, that became apparent with the new command dispatch mechanism. Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com>Heh, I have a very similar patch in my upcoming series. I used sleep 0.1 though, to avoid taking so long, which seems to be sufficient in practice. I did look for a proper way to wait for the socat server to be ready, but I couldn't find anything workable. I thought I could retry on the client side, but that doesn't work (at least for host to guest connections) because passt is always listening on the forwarded ports, so the client won't see a connection refused from the actual server. I don't think there's any sane way to propagate connection refused in that way, although we could and probably should forward connection resets outwards. Btw, I've also been doing a bunch of work on the static checks - with some different options I've brought the runtime of make cppcheck from ~40 minutes down to ~40 seconds :).--- test/passt_in_ns/tcp | 29 +++++++++++++++++++++++++---- test/passt_in_ns/udp | 18 ++++++++++++++++-- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/test/passt_in_ns/tcp b/test/passt_in_ns/tcp index a2cb667..71fe1c1 100644 --- a/test/passt_in_ns/tcp +++ b/test/passt_in_ns/tcp @@ -18,8 +18,8 @@ nstools socat ip jq md5sum cut test TCP/IPv4: host to guest: big transfer set TEMP_BIG __STATEDIR__/big.img guestb socat -u TCP4-LISTEN:10001 OPEN:test_big.bin,create,trunc -sleep 1 host dd if=/dev/urandom bs=1M count=10 of=__TEMP_BIG__ +sleep 1 host socat -u OPEN:__TEMP_BIG__ TCP4:127.0.0.1:10001 guestw hout MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 @@ -29,6 +29,7 @@ check [ "__GUEST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv4: host to ns: big transfer set TEMP_NS_BIG __STATEDIR__/big_ns.img nsb socat -u TCP4-LISTEN:10002 OPEN:__TEMP_NS_BIG__,create,trunc +sleep 1 host socat -u OPEN:__TEMP_BIG__ TCP4:127.0.0.1:10002 nsw nsout NS_MD5_BIG md5sum __TEMP_NS_BIG__ | cut -d' ' -f1 @@ -37,6 +38,7 @@ check [ "__NS_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv4: guest to host: big transfer hostb socat -u TCP4-LISTEN:10003 OPEN:__TEMP_BIG__,create,trunc gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' +sleep 1 guest socat -u OPEN:test_big.bin TCP4:__GW__:10003 hostw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 @@ -44,14 +46,15 @@ check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv4: guest to ns: big transfer nsb socat -u TCP4-LISTEN:10002 OPEN:__TEMP_BIG__,create,trunc +sleep 1 guest socat -u OPEN:test_big.bin TCP4:__GW__:10002 nsw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv4: ns to host (spliced): big transfer -sleep 1 hostb socat -u TCP4-LISTEN:10003 OPEN:__TEMP_BIG__,create,trunc +sleep 1 ns socat -u OPEN:__TEMP_NS_BIG__ TCP4:127.0.0.1:10003 hostw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 @@ -59,6 +62,7 @@ check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv4: ns to host (via tap): big transfer hostb socat -u TCP4-LISTEN:10003 OPEN:__TEMP_BIG__,create,trunc +sleep 1 ns socat -u OPEN:__TEMP_NS_BIG__ TCP4:__GW__:10003 hostw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 @@ -76,6 +80,7 @@ test TCP/IPv4: ns to guest (using namespace address): big transfer guestb socat -u TCP4-LISTEN:10001 OPEN:test_big.bin,create,trunc nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' nsout ADDR ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' +sleep 1 ns socat -u OPEN:__TEMP_NS_BIG__ TCP4:__ADDR__:10001 guestw gout GUEST_MD5_BIG md5sum test_big.bin | cut -d' ' -f1 @@ -84,8 +89,8 @@ check [ "__GUEST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv4: host to guest: small transfer set TEMP_SMALL __STATEDIR__/small.img guestb socat -u TCP4-LISTEN:10001 OPEN:test_small.bin,create,trunc -sleep 1 host dd if=/dev/urandom bs=2k count=100 of=__TEMP_SMALL__ +sleep 1 host socat -u OPEN:__TEMP_SMALL__ TCP4:127.0.0.1:10001 guestw hout MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 @@ -95,6 +100,7 @@ check [ "__GUEST_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv4: host to ns: small transfer set TEMP_NS_SMALL __STATEDIR__/small_ns.img nsb socat -u TCP4-LISTEN:10002 OPEN:__TEMP_NS_SMALL__,create,trunc +sleep 1 host socat -u OPEN:__TEMP_SMALL__ TCP4:127.0.0.1:10002 nsw nsout NS_MD5_SMALL md5sum __TEMP_NS_SMALL__ | cut -d' ' -f1 @@ -103,6 +109,7 @@ check [ "__NS_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv4: guest to host: small transfer hostb socat -u TCP4-LISTEN:10003 OPEN:__TEMP_SMALL__,create,trunc gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' +sleep 1 guest socat -u OPEN:test_small.bin TCP4:__GW__:10003 hostw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 @@ -110,14 +117,15 @@ check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv4: guest to ns: small transfer nsb socat -u TCP4-LISTEN:10002 OPEN:__TEMP_SMALL__,create,trunc +sleep 1 guest socat -u OPEN:test_small.bin TCP4:__GW__:10002 nsw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv4: ns to host (spliced): small transfer -sleep 1 hostb socat -u TCP4-LISTEN:10003 OPEN:__TEMP_SMALL__,create,trunc +sleep 1 ns socat -u OPEN:__TEMP_NS_SMALL__ TCP4:127.0.0.1:10003 hostw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 @@ -125,6 +133,7 @@ check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv4: ns to host (via tap): small transfer hostb socat -u TCP4-LISTEN:10003 OPEN:__TEMP_SMALL__,create,trunc +sleep 1 ns socat -u OPEN:__TEMP_NS_SMALL__ TCP4:__GW__:10003 hostw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 @@ -156,6 +165,7 @@ check [ "__GUEST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv6: host to ns: big transfer nsb socat -u TCP6-LISTEN:10002 OPEN:__TEMP_NS_BIG__,create,trunc +sleep 1 host socat -u OPEN:__TEMP_BIG__ TCP6:[::1]:10002 nsw nsout NS_MD5_BIG md5sum __TEMP_NS_BIG__ | cut -d' ' -f1 @@ -165,6 +175,7 @@ test TCP/IPv6: guest to host: big transfer hostb socat -u TCP6-LISTEN:10003 OPEN:__TEMP_BIG__,create,trunc gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' +sleep 1 guest socat -u OPEN:test_big.bin TCP6:[__GW6__%__IFNAME__]:10003 hostw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 @@ -172,6 +183,7 @@ check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv6: guest to ns: big transfer nsb socat -u TCP6-LISTEN:10002 OPEN:__TEMP_BIG__,create,trunc +sleep 1 guest socat -u OPEN:test_big.bin TCP6:[__GW6__%__IFNAME__]:10002 nsw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 @@ -179,6 +191,7 @@ check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv6: ns to host (spliced): big transfer hostb socat -u TCP6-LISTEN:10003 OPEN:__TEMP_BIG__,create,trunc +sleep 1 ns socat -u OPEN:__TEMP_NS_BIG__ TCP6:[::1]:10003 hostw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 @@ -187,6 +200,7 @@ check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv6: ns to host (via tap): big transfer hostb socat -u TCP6-LISTEN:10003 OPEN:__TEMP_BIG__,create,trunc nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' +sleep 1 ns socat -u OPEN:__TEMP_NS_BIG__ TCP6:[__GW6__%__IFNAME__]:10003 hostw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 @@ -203,6 +217,7 @@ check [ "__GUEST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv6: ns to guest (using namespace address): big transfer guestb socat -u TCP6-LISTEN:10001 OPEN:test_big.bin,create,trunc nsout ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' +sleep 1 ns socat -u OPEN:__TEMP_NS_BIG__ TCP6:[__ADDR6__]:10001 guestw gout GUEST_MD5_BIG md5sum test_big.bin | cut -d' ' -f1 @@ -218,6 +233,7 @@ check [ "__GUEST_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv6: host to ns: small transfer nsb socat -u TCP6-LISTEN:10002 OPEN:__TEMP_NS_SMALL__,create,trunc +sleep 1 host socat -u OPEN:__TEMP_SMALL__ TCP6:[::1]:10002 nsw nsout NS_MD5_SMALL md5sum __TEMP_NS_SMALL__ | cut -d' ' -f1 @@ -227,6 +243,7 @@ test TCP/IPv6: guest to host: small transfer hostb socat -u TCP6-LISTEN:10003 OPEN:__TEMP_SMALL__,create,trunc gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' +sleep 1 guest socat -u OPEN:test_small.bin TCP6:[__GW6__%__IFNAME__]:10003 hostw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 @@ -234,6 +251,7 @@ check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv6: guest to ns: small transfer nsb socat -u TCP6-LISTEN:10002 OPEN:__TEMP_SMALL__ +sleep 1 guest socat -u OPEN:test_small.bin TCP6:[__GW6__%__IFNAME__]:10002 nsw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 @@ -241,6 +259,7 @@ check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv6: ns to host (spliced): small transfer hostb socat -u TCP6-LISTEN:10003 OPEN:__TEMP_SMALL__,create,trunc +sleep 1 ns socat -u OPEN:__TEMP_NS_SMALL__ TCP6:[::1]:10003 hostw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 @@ -249,6 +268,7 @@ check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv6: ns to host (via tap): small transfer hostb socat -u TCP6-LISTEN:10003 OPEN:__TEMP_SMALL__,create,trunc nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' +sleep 1 ns socat -u OPEN:__TEMP_NS_SMALL__ TCP6:[__GW6__%__IFNAME__]:10003 hostw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 @@ -264,6 +284,7 @@ check [ "__GUEST_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv6: ns to guest (using namespace address): small transfer guestb socat -u TCP6-LISTEN:10001 OPEN:test_small.bin,create,trunc +sleep 1 ns socat -u OPEN:__TEMP_NS_SMALL__ TCP6:[__ADDR6__]:10001 guestw gout GUEST_MD5_SMALL md5sum test_small.bin | cut -d' ' -f1 diff --git a/test/passt_in_ns/udp b/test/passt_in_ns/udp index 5f01cbf..b7e9cf3 100644 --- a/test/passt_in_ns/udp +++ b/test/passt_in_ns/udp @@ -18,8 +18,8 @@ htools dd socat ip jq md5sum cut test UDP/IPv4: host to guest set TEMP __STATEDIR__/data guestb socat -u UDP4-LISTEN:10001,null-eof OPEN:test.bin,create,trunc -sleep 1 host dd if=/dev/urandom bs=1k count=5 > __TEMP__ +sleep 1 host socat -u OPEN:__TEMP__ UDP4:127.0.0.1:10001,shut-null guestw hout MD5 md5sum __TEMP__ | cut -d' ' -f1 @@ -29,6 +29,7 @@ check [ "__GUEST_MD5__" = "__MD5__" ] test UDP/IPv4: host to ns set TEMP_NS __STATEDIR__/data_ns nsb socat -u UDP4-LISTEN:10002,null-eof OPEN:__TEMP_NS__,create,trunc +sleep 1 host socat -u OPEN:__TEMP__ UDP4:127.0.0.1:10002,shut-null nsw nsout NS_MD5 md5sum __TEMP_NS__ | cut -d' ' -f1 @@ -37,6 +38,7 @@ check [ "__NS_MD5__" = "__MD5__" ] test UDP/IPv4: guest to host hostb socat -u UDP4-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' +sleep 1 guest socat -u OPEN:test.bin UDP4:__GW__:10003,shut-null hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 @@ -44,14 +46,15 @@ check [ "__HOST_MD5__" = "__MD5__" ] test UDP/IPv4: guest to ns nsb socat -u UDP4-LISTEN:10002,null-eof OPEN:__TEMP_NS__,create,trunc +sleep 1 guest socat -u OPEN:test.bin UDP4:__GW__:10002,shut-null nsw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 check [ "__HOST_MD5__" = "__MD5__" ] test UDP/IPv4: ns to host (recvmmsg/sendmmsg) -sleep 1 hostb socat -u UDP4-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc +sleep 1 ns socat -u OPEN:__TEMP_NS__ UDP4:127.0.0.1:10003,shut-null hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 @@ -59,6 +62,7 @@ check [ "__HOST_MD5__" = "__MD5__" ] test UDP/IPv4: ns to host (via tap) hostb socat -u UDP4-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc +sleep 1 ns socat -u OPEN:__TEMP_NS__ UDP4:__GW__:10003,shut-null hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 @@ -66,6 +70,7 @@ check [ "__HOST_MD5__" = "__MD5__" ] test UDP/IPv4: ns to guest (using loopback address) guestb socat -u UDP4-LISTEN:10001,null-eof OPEN:test.bin,create,trunc +sleep 1 ns socat -u OPEN:__TEMP_NS__ UDP4:127.0.0.1:10001,shut-null guestw gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 @@ -75,6 +80,7 @@ test UDP/IPv4: ns to guest (using namespace address) guestb socat -u UDP4-LISTEN:10001,null-eof OPEN:test.bin,create,trunc nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' nsout ADDR ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' +sleep 1 ns socat -u OPEN:__TEMP_NS__ UDP4:__ADDR__:10001,shut-null guestw gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 @@ -82,6 +88,7 @@ check [ "__GUEST_MD5__" = "__MD5__" ] test UDP/IPv6: host to guest guestb socat -u UDP6-LISTEN:10001,null-eof OPEN:test.bin,create,trunc +sleep 1 host socat -u OPEN:__TEMP__ UDP6:[::1]:10001,shut-null guestw gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 @@ -89,6 +96,7 @@ check [ "__GUEST_MD5__" = "__MD5__" ] test UDP/IPv6: host to ns nsb socat -u UDP6-LISTEN:10002,null-eof OPEN:__TEMP_NS__,create,trunc +sleep 1 host socat -u OPEN:__TEMP__ UDP6:[::1]:10002,shut-null nsw nsout NS_MD5 md5sum __TEMP_NS__ | cut -d' ' -f1 @@ -98,6 +106,7 @@ test UDP/IPv6: guest to host hostb socat -u UDP6-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' +sleep 1 guest socat -u OPEN:test.bin UDP6:[__GW6__%__IFNAME__]:10003,shut-null hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 @@ -105,6 +114,7 @@ check [ "__HOST_MD5__" = "__MD5__" ] test UDP/IPv6: guest to ns nsb socat -u UDP6-LISTEN:10002,null-eof OPEN:__TEMP_NS__,create,trunc +sleep 1 guest socat -u OPEN:test.bin UDP6:[__GW6__%__IFNAME__]:10002,shut-null nsw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 @@ -112,6 +122,7 @@ check [ "__HOST_MD5__" = "__MD5__" ] test UDP/IPv6: ns to host (recvmmsg/sendmmsg) hostb socat -u UDP6-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc +sleep 1 ns socat -u OPEN:__TEMP_NS__ UDP6:[::1]:10003,shut-null hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 @@ -120,6 +131,7 @@ check [ "__HOST_MD5__" = "__MD5__" ] test UDP/IPv6: ns to host (via tap) hostb socat -u UDP6-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' +sleep 1 ns socat -u OPEN:__TEMP_NS__ UDP6:[__GW6__%__IFNAME__]:10003,shut-null hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 @@ -127,6 +139,7 @@ check [ "__HOST_MD5__" = "__MD5__" ] test UDP/IPv6: ns to guest (using loopback address) guestb socat -u UDP6-LISTEN:10001,null-eof OPEN:test.bin,create,trunc +sleep 1 ns socat -u OPEN:__TEMP_NS__ UDP6:[::1]:10001,shut-null guestw gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 @@ -135,6 +148,7 @@ check [ "__GUEST_MD5__" = "__MD5__" ] test UDP/IPv6: ns to guest (using namespace address) guestb socat -u UDP6-LISTEN:10001,null-eof OPEN:test.bin,create,trunc nsout ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' +sleep 1 ns socat -u OPEN:__TEMP_NS__ UDP6:[__ADDR6__]:10001,shut-null guestw gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1-- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson