Skip to content

selftests/bpf: Integrate test_xsk.c to test_progs framework #10009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: bpf-next_base
Choose a base branch
from
+3,174 −2,724
Open

selftests/bpf: Integrate test_xsk.c to test_progs framework #10009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e067aee
selftests/bpf: test_xsk: Split xskxceiver
bastien-curutchet Oct 16, 2025
b31317a
selftests/bpf: test_xsk: Initialize bitmap before use
bastien-curutchet Oct 16, 2025
b65c90b
selftests/bpf: test_xsk: Fix __testapp_validate_traffic()'s return value
bastien-curutchet Oct 16, 2025
6fafdb6
selftests/bpf: test_xsk: fix memory leak in testapp_stats_rx_dropped()
bastien-curutchet Oct 16, 2025
5b05e9c
selftests/bpf: test_xsk: fix memory leak in testapp_xdp_shared_umem()
bastien-curutchet Oct 16, 2025
eab3a99
selftests/bpf: test_xsk: Wrap test clean-up in functions
bastien-curutchet Oct 16, 2025
014b5cf
selftests/bpf: test_xsk: Release resources when swap fails
bastien-curutchet Oct 16, 2025
1f5ab13
selftests/bpf: test_xsk: Add return value to init_iface()
bastien-curutchet Oct 16, 2025
b2f9549
selftests/bpf: test_xsk: Don't exit immediately when xsk_attach fails
bastien-curutchet Oct 16, 2025
bb9789e
selftests/bpf: test_xsk: Don't exit immediately when gettimeofday fails
bastien-curutchet Oct 16, 2025
859e3ae
selftests/bpf: test_xsk: Don't exit immediately when workers fail
bastien-curutchet Oct 16, 2025
9b39cf7
selftests/bpf: test_xsk: Don't exit immediately if validate_traffic f…
bastien-curutchet Oct 16, 2025
130bf47
selftests/bpf: test_xsk: Don't exit immediately on allocation failures
bastien-curutchet Oct 16, 2025
d819c09
selftests/bpf: test_xsk: Isolate flaky tests
bastien-curutchet Oct 16, 2025
8b32442
selftests/bpf: test_xsk: Integrate test_xsk.c to test_progs framework
bastien-curutchet Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion tools/testing/selftests/bpf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,8 @@ TRUNNER_TEST_OBJS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.test.o, \
$$(notdir $$(wildcard $(TRUNNER_TESTS_DIR)/*.c)))
TRUNNER_EXTRA_OBJS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.o, \
$$(filter %.c,$(TRUNNER_EXTRA_SOURCES)))
TRUNNER_LIB_OBJS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.o, \
$$(filter %.c,$(TRUNNER_LIB_SOURCES)))
TRUNNER_EXTRA_HDRS := $$(filter %.h,$(TRUNNER_EXTRA_SOURCES))
TRUNNER_TESTS_HDR := $(TRUNNER_TESTS_DIR)/tests.h
TRUNNER_BPF_SRCS := $$(notdir $$(wildcard $(TRUNNER_BPF_PROGS_DIR)/*.c))
Expand Down Expand Up @@ -687,6 +689,10 @@ $(TRUNNER_EXTRA_OBJS): $(TRUNNER_OUTPUT)/%.o: \
$$(call msg,EXT-OBJ,$(TRUNNER_BINARY),$$@)
$(Q)$$(CC) $$(CFLAGS) -c $$< $$(LDLIBS) -o $$@

$(TRUNNER_LIB_OBJS): $(TRUNNER_OUTPUT)/%.o:$(TOOLSDIR)/lib/%.c
$$(call msg,LIB-OBJ,$(TRUNNER_BINARY),$$@)
$(Q)$$(CC) $$(CFLAGS) -c $$< $$(LDLIBS) -o $$@

# non-flavored in-srctree builds receive special treatment, in particular, we
# do not need to copy extra resources (see e.g. test_btf_dump_case())
$(TRUNNER_BINARY)-extras: $(TRUNNER_EXTRA_FILES) | $(TRUNNER_OUTPUT)
Expand All @@ -700,6 +706,7 @@ $(OUTPUT)/$(TRUNNER_BINARY): | $(TRUNNER_BPF_OBJS)

$(OUTPUT)/$(TRUNNER_BINARY): $(TRUNNER_TEST_OBJS) \
$(TRUNNER_EXTRA_OBJS) $$(BPFOBJ) \
$(TRUNNER_LIB_OBJS) \
$(RESOLVE_BTFIDS) \
$(TRUNNER_BPFTOOL) \
$(OUTPUT)/veristat \
Expand Down Expand Up @@ -746,6 +753,7 @@ TRUNNER_EXTRA_SOURCES := test_progs.c \
$(VERIFY_SIG_HDR) \
flow_dissector_load.h \
ip_check_defrag_frags.h
TRUNNER_LIB_SOURCES := find_bit.c
TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read \
$(OUTPUT)/liburandom_read.so \
$(OUTPUT)/xdp_synproxy \
Expand Down Expand Up @@ -783,6 +791,7 @@ endif
TRUNNER_TESTS_DIR := map_tests
TRUNNER_BPF_PROGS_DIR := progs
TRUNNER_EXTRA_SOURCES := test_maps.c
TRUNNER_LIB_SOURCES :=
TRUNNER_EXTRA_FILES :=
TRUNNER_BPF_BUILD_RULE := $$(error no BPF objects should be built)
TRUNNER_BPF_CFLAGS :=
Expand All @@ -804,7 +813,7 @@ $(OUTPUT)/test_verifier: test_verifier.c verifier/tests.h $(BPFOBJ) | $(OUTPUT)
$(Q)$(CC) $(CFLAGS) $(filter %.a %.o %.c,$^) $(LDLIBS) -o $@

# Include find_bit.c to compile xskxceiver.
EXTRA_SRC := $(TOOLSDIR)/lib/find_bit.c
EXTRA_SRC := $(TOOLSDIR)/lib/find_bit.c prog_tests/test_xsk.c prog_tests/test_xsk.h
$(OUTPUT)/xskxceiver: $(EXTRA_SRC) xskxceiver.c xskxceiver.h $(OUTPUT)/network_helpers.o $(OUTPUT)/xsk.o $(OUTPUT)/xsk_xdp_progs.skel.h $(BPFOBJ) | $(OUTPUT)
$(call msg,BINARY,,$@)
$(Q)$(CC) $(CFLAGS) $(filter %.a %.o %.c,$^) $(LDLIBS) -o $@
Expand Down
Loading
Loading