mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-19 18:41:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

selftests/bpf: test_xsk: Add return value to init_iface()

Browse Source 
init_iface() doesn't have any return value while it can fail. In case of
failure it calls exit_on_error() which exits the application
immediately. This prevents the following tests from being run and isn't
compliant with the CI

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

Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: Bastien Curutchet (eBPF Foundation) <bastien.curutchet@bootlin.com>
Link: https://lore.kernel.org/r/20251031-xsk-v7-8-39fe486593a3@bootlin.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Bastien Curutchet (eBPF Foundation)
2025-10-31 09:04:44 +01:00
committed by Alexei Starovoitov
parent f477b0fd75
commit e645bcfb16
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/testing/selftests/bpf/test_xsk.c
View File

@@ -2189,7 +2189,7 @@ static bool hugepages_present(void)
return true;
}
void init_iface(struct ifobject *ifobj, thread_func_t func_ptr)
int init_iface(struct ifobject *ifobj, thread_func_t func_ptr)
{
LIBBPF_OPTS(bpf_xdp_query_opts, query_opts);
int err;
@@ -2199,7 +2199,7 @@ void init_iface(struct ifobject *ifobj, thread_func_t func_ptr)
err = xsk_load_xdp_programs(ifobj);
if (err) {
ksft_print_msg("Error loading XDP program\n");
exit_with_error(err);
return err;
}
if (hugepages_present())
@@ -2208,7 +2208,7 @@ 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) {
ksft_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;
@@ -2220,6 +2220,8 @@ void init_iface(struct ifobject *ifobj, thread_func_t func_ptr)
ifobj->xdp_zc_max_segs = 0;
}
}
return 0;
}
int testapp_send_receive(struct test_spec *test)

2
tools/testing/selftests/bpf/test_xsk.h
View File

@@ -137,7 +137,7 @@ struct ifobject {
};
struct ifobject *ifobject_create(void);
void ifobject_delete(struct ifobject *ifobj);
void init_iface(struct ifobject *ifobj, thread_func_t func_ptr);
int init_iface(struct ifobject *ifobj, thread_func_t func_ptr);
int xsk_configure_umem(struct ifobject *ifobj, struct xsk_umem_info *umem, void *buffer, u64 size);
int xsk_configure_socket(struct xsk_socket_info *xsk, struct xsk_umem_info *umem,

7
tools/testing/selftests/bpf/xskxceiver.c
View File

@@ -373,8 +373,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)) {
ksft_print_msg("Error : can't initialize interfaces\n");
ksft_exit_xfail();
}
test_init(&test, ifobj_tx, ifobj_rx, 0, &tests[0]);
tx_pkt_stream_default = pkt_stream_generate(DEFAULT_PKT_CNT, MIN_PKT_SIZE);