Commit 38960ac8 authored by Ihor Solodrai's avatar Ihor Solodrai Committed by Andrii Nakryiko
Browse files

selftests/bpf: Specify libbpf headers required for %.bpf.o progs 



Test %.bpf.o objects actually depend only on some libbpf headers.
Define a list of required headers and use it as TRUNNER_BPF_OBJS
dependency.

bpf_*.h list was determined by:

    $ grep -rh 'include <bpf/bpf_' progs | sort -u

Signed-off-by: default avatarIhor Solodrai <ihor.solodrai@pm.me>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link:
Link: https://lore.kernel.org/bpf/20240828174608.377204-1-ihor.solodrai@pm.me

https://lore.kernel.org/bpf/CAEf4BzYQ-j2i_xjs94Nn=8+FVfkWt51mLZyiYKiz9oA4Z=pCeA@mail.gmail.com/
parent 181b0d1a

tools/testing/selftests/bpf/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -516,6 +516,12 @@ xdp_features.skel.h-deps := xdp_features.bpf.o 
LINKED_BPF_OBJS := $(foreach skel,$(LINKED_SKELS),$($(skel)-deps))

LINKED_BPF_SRCS := $(patsubst %.bpf.o,%.c,$(LINKED_BPF_OBJS))



HEADERS_FOR_BPF_OBJS := $(wildcard $(BPFDIR)/*.bpf.h)		\

			$(addprefix $(BPFDIR)/,	bpf_core_read.h	\

			                        bpf_endian.h	\

						bpf_helpers.h	\

			                        bpf_tracing.h)



# Set up extra TRUNNER_XXX "temporary" variables in the environment (relies on

# $eval()) and pass control to DEFINE_TEST_RUNNER_RULES.

# Parameters:
@@ -566,8 +572,7 @@ $(TRUNNER_BPF_OBJS): $(TRUNNER_OUTPUT)/%.bpf.o: \ 
		     $(TRUNNER_BPF_PROGS_DIR)/%.c			\

		     $(TRUNNER_BPF_PROGS_DIR)/*.h			\

		     $$(INCLUDE_DIR)/vmlinux.h				\

		     $(wildcard $(BPFDIR)/bpf_*.h)			\

		     $(wildcard $(BPFDIR)/*.bpf.h)			\

		     $(HEADERS_FOR_BPF_OBJS)				\

		     | $(TRUNNER_OUTPUT) $$(BPFOBJ)

	$$(call $(TRUNNER_BPF_BUILD_RULE),$$<,$$@,			\

					  $(TRUNNER_BPF_CFLAGS)         \