[PATCH bpf-next v3 04/14] selftests/bpf: test_xsk: Wrap test clean-up in functions

[Bastien Curutchet (eBPF Foundation)]

The clean-up done at the end of a test in __testapp_validate_traffic()
isn't wrapped in a function. It isn't convenient if we want to use it
somewhere else in the code.

Wrap the clean-up in two new functions : the first deletes the sockets,
the second releases the umem.

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

diff --git a/tools/testing/selftests/bpf/test_xsk.c 
b/tools/testing/selftests/bpf/test_xsk.c
index 
e4059c7d0a289449a6b73669fa87f7440b7f55c0..f70a05d570681e36d3e592a6845637402d1bb58f
 100644
--- a/tools/testing/selftests/bpf/test_xsk.c
+++ b/tools/testing/selftests/bpf/test_xsk.c
@@ -1689,6 +1689,27 @@ static void xsk_attach_xdp_progs(struct test_spec *test, 
struct ifobject *ifobj_
                xsk_reattach_xdp(ifobj_tx, test->xdp_prog_tx, test->xskmap_tx, 
test->mode);
 }
 
+static void clean_sockets(struct test_spec *test, struct ifobject *ifobj)
+{
+       u32 i;
+
+       if (!ifobj || !test)
+               return;
+
+       for (i = 0; i < test->nb_sockets; i++)
+               xsk_socket__delete(ifobj->xsk_arr[i].xsk);
+}
+
+static void clean_umem(struct test_spec *test, struct ifobject *ifobj1, struct 
ifobject *ifobj2)
+{
+       if (!ifobj1)
+               return;
+
+       testapp_clean_xsk_umem(ifobj1);
+       if (ifobj2 && !ifobj2->shared_umem)
+               testapp_clean_xsk_umem(ifobj2);
+}
+
 static int __testapp_validate_traffic(struct test_spec *test, struct ifobject 
*ifobj1,
                                      struct ifobject *ifobj2)
 {
@@ -1744,18 +1765,9 @@ static int __testapp_validate_traffic(struct test_spec 
*test, struct ifobject *i
                pthread_join(t0, NULL);
 
        if (test->total_steps == test->current_step || test->fail) {
-               u32 i;
-
-               if (ifobj2)
-                       for (i = 0; i < test->nb_sockets; i++)
-                               xsk_socket__delete(ifobj2->xsk_arr[i].xsk);
-
-               for (i = 0; i < test->nb_sockets; i++)
-                       xsk_socket__delete(ifobj1->xsk_arr[i].xsk);
-
-               testapp_clean_xsk_umem(ifobj1);
-               if (ifobj2 && !ifobj2->shared_umem)
-                       testapp_clean_xsk_umem(ifobj2);
+               clean_sockets(test, ifobj1);
+               clean_sockets(test, ifobj2);
+               clean_umem(test, ifobj1, ifobj2);
        }
 
        return !!test->fail;

-- 
2.50.1