prog_tests/xsk.c runs the xskxceiver cases inside test_progs. With the AF_XDP test suite moving to selftests/net in a following patch, the wrapper would make test_progs build the engine and its XDP program from there, so drop it. BPF CI loses ns_xsk_skb and ns_xsk_drv. test_xsk.sh still covers the same cases over veth, but no CI runs it until the suite is ready for NIPA. ci_skip_tests[] only held the cases that the wrapper left out, so fold it into tests[]. The test IDs do not change. Reviewed-by: Björn Töpel Signed-off-by: Maciej Fijalkowski --- .../selftests/bpf/prog_tests/test_xsk.h | 3 - tools/testing/selftests/bpf/prog_tests/xsk.c | 170 ------------------ tools/testing/selftests/bpf/xskxceiver.c | 10 +- 3 files changed, 2 insertions(+), 181 deletions(-) delete mode 100644 tools/testing/selftests/bpf/prog_tests/xsk.c diff --git a/tools/testing/selftests/bpf/prog_tests/test_xsk.h b/tools/testing/selftests/bpf/prog_tests/test_xsk.h index 03753ddc5dcd..69158b67466c 100644 --- a/tools/testing/selftests/bpf/prog_tests/test_xsk.h +++ b/tools/testing/selftests/bpf/prog_tests/test_xsk.h @@ -297,9 +297,6 @@ static const struct test_spec tests[] = { {.name = "TOO_MANY_FRAGS", .test_func = testapp_too_many_frags}, {.name = "XDP_ADJUST_TAIL_SHRINK", .test_func = testapp_adjust_tail_shrink}, {.name = "TX_QUEUE_CONSUMER", .test_func = testapp_tx_queue_consumer}, - }; - -static const struct test_spec ci_skip_tests[] = { /* Flaky tests */ {.name = "XDP_ADJUST_TAIL_SHRINK_MULTI_BUFF", .test_func = testapp_adjust_tail_shrink_mb}, {.name = "XDP_ADJUST_TAIL_GROW", .test_func = testapp_adjust_tail_grow}, diff --git a/tools/testing/selftests/bpf/prog_tests/xsk.c b/tools/testing/selftests/bpf/prog_tests/xsk.c deleted file mode 100644 index 772f3dd7ce64..000000000000 --- a/tools/testing/selftests/bpf/prog_tests/xsk.c +++ /dev/null @@ -1,170 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include - -#include "network_helpers.h" -#include "test_progs.h" -#include "test_xsk.h" -#include "xsk_xdp_progs.skel.h" - -#define VETH_RX "veth0" -#define VETH_TX "veth1" -#define MTU 1500 - -int setup_veth(bool busy_poll) -{ - SYS(fail, - "ip link add %s numtxqueues 4 numrxqueues 4 type veth peer name %s numtxqueues 4 numrxqueues 4", - VETH_RX, VETH_TX); - SYS(fail, "sysctl -wq net.ipv6.conf.%s.disable_ipv6=1", VETH_RX); - SYS(fail, "sysctl -wq net.ipv6.conf.%s.disable_ipv6=1", VETH_TX); - - if (busy_poll) { - SYS(fail, "echo 2 > /sys/class/net/%s/napi_defer_hard_irqs", VETH_RX); - SYS(fail, "echo 200000 > /sys/class/net/%s/gro_flush_timeout", VETH_RX); - SYS(fail, "echo 2 > /sys/class/net/%s/napi_defer_hard_irqs", VETH_TX); - SYS(fail, "echo 200000 > /sys/class/net/%s/gro_flush_timeout", VETH_TX); - } - - SYS(fail, "ip link set %s mtu %d", VETH_RX, MTU); - SYS(fail, "ip link set %s mtu %d", VETH_TX, MTU); - SYS(fail, "ip link set %s up", VETH_RX); - SYS(fail, "ip link set %s up", VETH_TX); - - return 0; - -fail: - return -1; -} - -void delete_veth(void) -{ - SYS_NOFAIL("ip link del %s", VETH_RX); - SYS_NOFAIL("ip link del %s", VETH_TX); -} - -int configure_ifobj(struct ifobject *tx, struct ifobject *rx) -{ - rx->ifindex = if_nametoindex(VETH_RX); - if (!ASSERT_OK_FD(rx->ifindex, "get RX ifindex")) - return -1; - - tx->ifindex = if_nametoindex(VETH_TX); - if (!ASSERT_OK_FD(tx->ifindex, "get TX ifindex")) - return -1; - - tx->shared_umem = false; - rx->shared_umem = false; - - - return 0; -} - -static void test_xsk(const struct test_spec *test_to_run, enum test_mode mode) -{ - u32 max_frags, umem_tailroom, cache_line_size; - struct ifobject *ifobj_tx, *ifobj_rx; - struct test_spec test; - int ret; - - ifobj_tx = ifobject_create(); - if (!ASSERT_OK_PTR(ifobj_tx, "create ifobj_tx")) - return; - - ifobj_rx = ifobject_create(); - if (!ASSERT_OK_PTR(ifobj_rx, "create ifobj_rx")) - goto delete_tx; - - if (!ASSERT_OK(configure_ifobj(ifobj_tx, ifobj_rx), "configure ifobj")) - goto delete_rx; - - ret = get_hw_ring_size(ifobj_tx->ifname, &ifobj_tx->ring); - if (!ret) { - ifobj_tx->hw_ring_size_supp = true; - ifobj_tx->set_ring.default_tx = ifobj_tx->ring.tx_pending; - ifobj_tx->set_ring.default_rx = ifobj_tx->ring.rx_pending; - } - - cache_line_size = read_procfs_val(SMP_CACHE_BYTES_PATH); - if (!cache_line_size) - cache_line_size = 64; - - max_frags = read_procfs_val(MAX_SKB_FRAGS_PATH); - if (!max_frags) - max_frags = 17; - - ifobj_tx->max_skb_frags = max_frags; - ifobj_rx->max_skb_frags = max_frags; - - /* 48 bytes is a part of skb_shared_info w/o frags array; - * 16 bytes is sizeof(skb_frag_t) - */ - umem_tailroom = ALIGN(48 + (max_frags * 16), cache_line_size); - ifobj_tx->umem_tailroom = umem_tailroom; - ifobj_rx->umem_tailroom = umem_tailroom; - - if (!ASSERT_OK(init_iface(ifobj_rx, worker_testapp_validate_rx), "init RX")) - goto delete_rx; - if (!ASSERT_OK(init_iface(ifobj_tx, worker_testapp_validate_tx), "init TX")) - goto delete_rx; - - test_init(&test, ifobj_tx, ifobj_rx, 0, &tests[0]); - - test.tx_pkt_stream_default = pkt_stream_generate(DEFAULT_PKT_CNT, MIN_PKT_SIZE); - if (!ASSERT_OK_PTR(test.tx_pkt_stream_default, "TX pkt generation")) - goto delete_rx; - test.rx_pkt_stream_default = pkt_stream_generate(DEFAULT_PKT_CNT, MIN_PKT_SIZE); - if (!ASSERT_OK_PTR(test.rx_pkt_stream_default, "RX pkt generation")) - goto delete_rx; - - - test_init(&test, ifobj_tx, ifobj_rx, mode, test_to_run); - ret = test.test_func(&test); - if (ret != TEST_SKIP) - ASSERT_OK(ret, "Run test"); - pkt_stream_restore_default(&test); - - if (ifobj_tx->hw_ring_size_supp) - hw_ring_size_reset(ifobj_tx); - - pkt_stream_delete(test.tx_pkt_stream_default); - pkt_stream_delete(test.rx_pkt_stream_default); - xsk_xdp_progs__destroy(ifobj_tx->xdp_progs); - xsk_xdp_progs__destroy(ifobj_rx->xdp_progs); - -delete_rx: - ifobject_delete(ifobj_rx); -delete_tx: - ifobject_delete(ifobj_tx); -} - -void test_ns_xsk_skb(void) -{ - int i; - - if (!ASSERT_OK(setup_veth(false), "setup veth")) - return; - - for (i = 0; i < ARRAY_SIZE(tests); i++) { - if (test__start_subtest(tests[i].name)) - test_xsk(&tests[i], TEST_MODE_SKB); - } - - delete_veth(); -} - -void test_ns_xsk_drv(void) -{ - int i; - - if (!ASSERT_OK(setup_veth(false), "setup veth")) - return; - - for (i = 0; i < ARRAY_SIZE(tests); i++) { - if (test__start_subtest(tests[i].name)) - test_xsk(&tests[i], TEST_MODE_DRV); - } - - delete_veth(); -} - diff --git a/tools/testing/selftests/bpf/xskxceiver.c b/tools/testing/selftests/bpf/xskxceiver.c index 7dad8556a722..6cf95a44c8c0 100644 --- a/tools/testing/selftests/bpf/xskxceiver.c +++ b/tools/testing/selftests/bpf/xskxceiver.c @@ -327,14 +327,12 @@ static void print_tests(void) printf("Tests:\n"); for (i = 0; i < ARRAY_SIZE(tests); i++) printf("%u: %s\n", i, tests[i].name); - for (i = ARRAY_SIZE(tests); i < ARRAY_SIZE(tests) + ARRAY_SIZE(ci_skip_tests); i++) - printf("%u: %s\n", i, ci_skip_tests[i - ARRAY_SIZE(tests)].name); } int main(int argc, char **argv) { - const size_t total_tests = ARRAY_SIZE(tests) + ARRAY_SIZE(ci_skip_tests); u32 cache_line_size, max_frags, umem_tailroom; + const size_t total_tests = ARRAY_SIZE(tests); struct pkt_stream *rx_pkt_stream_default; struct pkt_stream *tx_pkt_stream_default; struct ifobject *ifobj_tx, *ifobj_rx; @@ -449,11 +447,7 @@ int main(int argc, char **argv) if (opt_run_test != RUN_ALL_TESTS && j != opt_run_test) continue; - if (j < ARRAY_SIZE(tests)) - test_init(&test, ifobj_tx, ifobj_rx, i, &tests[j]); - else - test_init(&test, ifobj_tx, ifobj_rx, i, - &ci_skip_tests[j - ARRAY_SIZE(tests)]); + test_init(&test, ifobj_tx, ifobj_rx, i, &tests[j]); run_pkt_test(&test); usleep(USLEEP_MAX); -- 2.43.0