[PATCH 04/13] selftests/bpf: test_xsk: Add return value to init_iface()

[Bastien Curutchet (eBPF Foundation)]

init_iface() doesn't have any return value while it can fail. In case of
failure it calls exit_on_error() which will terminate the test
immediately.

Add a return value to init_iface() so errors can be handled more
smoothly.

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

diff --git a/tools/testing/selftests/bpf/xskxceiver.c 
b/tools/testing/selftests/bpf/xskxceiver.c
index 
8b74a0f79c2e594b4db495acabd02a01a5b1b95f..01a0ddbf1cf52760a4a4d168da2fec1859e6b4b8
 100644
--- a/tools/testing/selftests/bpf/xskxceiver.c
+++ b/tools/testing/selftests/bpf/xskxceiver.c
@@ -2380,7 +2380,7 @@ static bool hugepages_present(void)
        return true;
 }
 
-static void init_iface(struct ifobject *ifobj, thread_func_t func_ptr)
+static int init_iface(struct ifobject *ifobj, thread_func_t func_ptr)
 {
        LIBBPF_OPTS(bpf_xdp_query_opts, query_opts);
        int err;
@@ -2390,7 +2390,7 @@ static void init_iface(struct ifobject *ifobj, 
thread_func_t func_ptr)
        err = xsk_load_xdp_programs(ifobj);
        if (err) {
                print_msg("Error loading XDP program\n");
-               exit_with_error(err);
+               return err;
        }
 
        if (hugepages_present())
@@ -2399,7 +2399,7 @@ static void init_iface(struct ifobject *ifobj, 
thread_func_t func_ptr)
        err = bpf_xdp_query(ifobj->ifindex, XDP_FLAGS_DRV_MODE, &query_opts);
        if (err) {
                print_msg("Error querying XDP capabilities\n");
-               exit_with_error(-err);
+               return err;
        }
        if (query_opts.feature_flags & NETDEV_XDP_ACT_RX_SG)
                ifobj->multi_buff_supp = true;
@@ -2411,6 +2411,8 @@ static void init_iface(struct ifobject *ifobj, 
thread_func_t func_ptr)
                        ifobj->xdp_zc_max_segs = 0;
                }
        }
+
+       return 0;
 }
 
 static int testapp_send_receive(struct test_spec *test)
@@ -2719,8 +2721,11 @@ int main(int argc, char **argv)
                ifobj_tx->set_ring.default_rx = ifobj_tx->ring.rx_pending;
        }
 
-       init_iface(ifobj_rx, worker_testapp_validate_rx);
-       init_iface(ifobj_tx, worker_testapp_validate_tx);
+       if (init_iface(ifobj_rx, worker_testapp_validate_rx) ||
+           init_iface(ifobj_tx, worker_testapp_validate_tx)) {
+               print_msg("Error : can't initialize interfaces\n");
+               ksft_exit_xfail();
+       }
 
        test_spec_init(&test, ifobj_tx, ifobj_rx, 0, &tests[0]);
        tx_pkt_stream_default = pkt_stream_generate(DEFAULT_PKT_CNT, 
MIN_PKT_SIZE);

-- 
2.48.1