[PATCH bpf-next v2 10/14] selftests/bpf: test_xsk: Don't exit immediately if validate_traffic fails

[Bastien Curutchet (eBPF Foundation)]

__testapp_validate_traffic() calls exit_with_error() on failures. This
exits the program immediately. It prevents the following tests from
running and isn't compliant with the CI.

Return TEST_FAILURE instead of calling exit_with_error().
Release the resource of the 1st thread if a failure happens between its
creation and the creation of the second thread.

Signed-off-by: Bastien Curutchet (eBPF Foundation) 
<bastien.curutc...@bootlin.com>
---
 tools/testing/selftests/bpf/test_xsk.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/bpf/test_xsk.c 
b/tools/testing/selftests/bpf/test_xsk.c
index 
516ebbf6248e4629acf69e9a16e2a46b19fdea81..b22b99f2e4acb528928654ec00995dc892487068
 100644
--- a/tools/testing/selftests/bpf/test_xsk.c
+++ b/tools/testing/selftests/bpf/test_xsk.c
@@ -1782,12 +1782,12 @@ static int __testapp_validate_traffic(struct test_spec 
*test, struct ifobject *i
        err = test_spec_set_mtu(test, test->mtu);
        if (err) {
                ksft_print_msg("Error, could not set mtu.\n");
-               exit_with_error(err);
+               return TEST_FAILURE;
        }
 
        if (ifobj2) {
                if (pthread_barrier_init(&barr, NULL, 2))
-                       exit_with_error(errno);
+                       return TEST_FAILURE;
                pkt_stream_reset(ifobj2->xsk->pkt_stream);
        }
 
@@ -1801,8 +1801,11 @@ static int __testapp_validate_traffic(struct test_spec 
*test, struct ifobject *i
 
        if (ifobj2) {
                pthread_barrier_wait(&barr);
-               if (pthread_barrier_destroy(&barr))
-                       exit_with_error(errno);
+               if (pthread_barrier_destroy(&barr)) {
+                       clean_sockets(test, ifobj1);
+                       clean_umem(test, ifobj1, NULL);
+                       return TEST_FAILURE;
+               }
 
                /*Spawn TX thread */
                pthread_create(&t1, NULL, ifobj2->func_ptr, test);

-- 
2.50.1