selftests/net: Amend per-netns counter checks
authorDmitry Safonov <dima@arista.com>
Fri, 2 Feb 2024 02:24:59 +0000 (02:24 +0000)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 6 Feb 2024 09:35:29 +0000 (10:35 +0100)
Selftests here check not only that connect()/accept() for
TCP-AO/TCP-MD5/non-signed-TCP combinations do/don't establish
connections, but also counters: those are per-AO-key, per-socket and
per-netns.

The counters are checked on the server's side, as the server listener
has TCP-AO/TCP-MD5/no keys for different peers. All tests run in
the same namespaces with the same veth pair, created in test_init().

After close() in both client and server, the sides go through
the regular FIN/ACK + FIN/ACK sequence, which goes in the background.
If the selftest has already started a new testing scenario, read
per-netns counters - it may fail in the end iff it doesn't expect
the TCPAOGood per-netns counters go up during the test.

Let's just kill both TCP-AO sides - that will avoid any asynchronous
background TCP-AO segments going to either sides.

Reported-by: Jakub Kicinski <kuba@kernel.org>
Closes: https://lore.kernel.org/all/20240201132153.4d68f45e@kernel.org/T/#u
Fixes: 6f0c472a6815 ("selftests/net: Add TCP-AO + TCP-MD5 + no sign listen socket tests")
Signed-off-by: Dmitry Safonov <dima@arista.com>
Link: https://lore.kernel.org/r/20240202-unsigned-md5-netns-counters-v1-1-8b90c37c0566@arista.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
tools/testing/selftests/net/tcp_ao/unsigned-md5.c

index c5b568c..6b59a65 100644 (file)
@@ -110,9 +110,9 @@ static void try_accept(const char *tst_name, unsigned int port,
                test_tcp_ao_counters_cmp(tst_name, &ao_cnt1, &ao_cnt2, cnt_expected);
 
 out:
-       synchronize_threads(); /* close() */
+       synchronize_threads(); /* test_kill_sk() */
        if (sk > 0)
-               close(sk);
+               test_kill_sk(sk);
 }
 
 static void server_add_routes(void)
@@ -302,10 +302,10 @@ static void try_connect(const char *tst_name, unsigned int port,
                test_ok("%s: connected", tst_name);
 
 out:
-       synchronize_threads(); /* close() */
+       synchronize_threads(); /* test_kill_sk() */
        /* _test_connect_socket() cleans up on failure */
        if (ret > 0)
-               close(sk);
+               test_kill_sk(sk);
 }
 
 #define PREINSTALL_MD5_FIRST   BIT(0)
@@ -486,10 +486,10 @@ static void try_to_add(const char *tst_name, unsigned int port,
        }
 
 out:
-       synchronize_threads(); /* close() */
+       synchronize_threads(); /* test_kill_sk() */
        /* _test_connect_socket() cleans up on failure */
        if (ret > 0)
-               close(sk);
+               test_kill_sk(sk);
 }
 
 static void client_add_ip(union tcp_addr *client, const char *ip)