[PATCH bpf-next v3 05/14] selftests/bpf: test_xsk: Release resources when swap fails

[Bastien Curutchet (eBPF Foundation)]

testapp_validate_traffic() doesn't release the sockets and the umem
created by the threads if the test isn't currently in its last step.
Thus, if the swap_xsk_resources() fails before the last step, the
created resources aren't cleaned up.

Clean the sockets and the umem in case of swap_xsk_resources() failure.

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

diff --git a/tools/testing/selftests/bpf/test_xsk.c 
b/tools/testing/selftests/bpf/test_xsk.c
index 
f70a05d570681e36d3e592a6845637402d1bb58f..0805917eaa1a33469fef2f1ad0757975f39d3077
 100644
--- a/tools/testing/selftests/bpf/test_xsk.c
+++ b/tools/testing/selftests/bpf/test_xsk.c
@@ -1873,8 +1873,13 @@ int testapp_xdp_prog_cleanup(struct test_spec *test)
        if (testapp_validate_traffic(test))
                return TEST_FAILURE;
 
-       if (swap_xsk_resources(test))
+       if (swap_xsk_resources(test)) {
+               clean_sockets(test, test->ifobj_rx);
+               clean_sockets(test, test->ifobj_tx);
+               clean_umem(test, test->ifobj_rx, test->ifobj_tx);
                return TEST_FAILURE;
+       }
+
        return testapp_validate_traffic(test);
 }
 

-- 
2.50.1