Commit 47a92ae0 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'cleanup-selftests-bpf-makefile' 



Andrii Nakryiko says:

====================
This patch set extensively revamps selftests/bpf's Makefile to generalize test
runner concept and apply it uniformly to test_maps and test_progs test
runners, along with test_progs' few build "flavors", exercising various ways
to build BPF programs.

As we do that, we fix dependencies between various phases of test runners, and
simplify some one-off rules and dependencies currently present in Makefile.
test_progs' flavors are now built into root $(OUTPUT) directory and can be run
without any extra steps right from there. E.g., test_progs-alu32 is built and
is supposed to be run from $(OUTPUT). It will cd into alu32/ subdirectory to
load correct set of BPF object files (which are different from the ones built
for test_progs).

Outline:
- patch #1 teaches test_progs about flavor sub-directories;
- patch #2 fixes one of CO-RE tests to not depend strictly on process name;
- patch #3 changes test_maps's usage of map_tests/tests.h to be the same as
  test_progs' one;
- patch #4 adds convenient short `make test_progs`-like targets to build only
  individual tests, if necessary;
- patch #5 is a main patch in the series; it uses a bunch of make magic
  (mainly $(call) and $(eval)) to define test runner "skeleton" and apply it
  to 4 different test runners, lots more details in corresponding commit
  description;
- patch #6 does a bit of post-clean up for test_queue_map and test_stack_map
  BPF programs;
- patch #7 cleans up test_libbpf.sh/test_libbpf_open superseded by test_progs.

v3->v4:
- remove accidentally checked in binaries;

v2->v3:
- drop test_xdp.o mixed compilation mode, remove test_libbpf.sh (Alexei);

v1->v2:
- drop test_progs-native causing compilation failures due to
  __builtin_preserve_field_access, add back test_xdp.o override, which will
  now emit rule re-definition warning.
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 8d285a3b cb79a4e1

tools/testing/selftests/bpf/.gitignore

+3 −3
Original line number Diff line number Diff line
@@ -7,11 +7,10 @@ FEATURE-DUMP.libbpf 
fixdep

test_align

test_dev_cgroup

test_progs

/test_progs*

test_tcpbpf_user

test_verifier_log

feature

test_libbpf_open

test_sock

test_sock_addr

test_sock_fields
@@ -33,9 +32,10 @@ test_tcpnotify_user 
test_libbpf

test_tcp_check_syncookie_user

test_sysctl

alu32

libbpf.pc

libbpf.so.*

test_hashmap

test_btf_dump

xdping

/alu32

/bpf_gcc

tools/testing/selftests/bpf/Makefile

+188 −147
Original line number Diff line number Diff line
@@ -2,10 +2,12 @@ 
include ../../../../scripts/Kbuild.include

include ../../../scripts/Makefile.arch



LIBDIR := ../../../lib

CURDIR := $(abspath .)

LIBDIR := $(abspath ../../../lib)

BPFDIR := $(LIBDIR)/bpf

APIDIR := ../../../include/uapi

GENDIR := ../../../../include/generated

TOOLSDIR := $(abspath ../../../include)

APIDIR := $(TOOLSDIR)/uapi

GENDIR := $(abspath ../../../../include/generated)

GENHDR := $(GENDIR)/autoconf.h



ifneq ($(wildcard $(GENHDR)),)
@@ -16,7 +18,8 @@ CLANG ?= clang 
LLC		?= llc

LLVM_OBJCOPY	?= llvm-objcopy

BPF_GCC		?= $(shell command -v bpf-gcc;)

CFLAGS += -g -Wall -O2 -I$(APIDIR) -I$(LIBDIR) -I$(BPFDIR) -I$(GENDIR) $(GENFLAGS) -I../../../include \

CFLAGS += -g -Wall -O2 $(GENFLAGS) -I$(APIDIR) -I$(LIBDIR) -I$(BPFDIR)	\

	  -I$(GENDIR) -I$(TOOLSDIR) -I$(CURDIR)				\

	  -Dbpf_prog_load=bpf_prog_test_load				\

	  -Dbpf_load_program=bpf_test_load_program

LDLIBS += -lcap -lelf -lrt -lpthread
@@ -29,12 +32,6 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test 
	test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \

	test_cgroup_attach xdping



BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))

TEST_GEN_FILES = $(BPF_OBJ_FILES)



BTF_C_FILES = $(wildcard progs/btf_dump_test_case_*.c)

TEST_FILES = $(BTF_C_FILES)



# Also test sub-register code-gen if LLVM has eBPF v3 processor support which

# contains both ALU32 and JMP32 instructions.

SUBREG_CODEGEN := $(shell echo "int cal(int a) { return a > 0; }" | \
@@ -42,16 +39,19 @@ SUBREG_CODEGEN := $(shell echo "int cal(int a) { return a > 0; }" | \ 
			$(LLC) -mattr=+alu32 -mcpu=v3 2>&1 | \

			grep 'if w')

ifneq ($(SUBREG_CODEGEN),)

TEST_GEN_FILES += $(patsubst %.o,alu32/%.o, $(BPF_OBJ_FILES))

TEST_GEN_PROGS += test_progs-alu32

endif



# Also test bpf-gcc, if present

ifneq ($(BPF_GCC),)

TEST_GEN_FILES += $(patsubst %.o,bpf_gcc/%.o, $(BPF_OBJ_FILES))

TEST_GEN_PROGS += test_progs-bpf_gcc

endif



TEST_GEN_FILES =

TEST_FILES =



# Order correspond to 'make run_tests' order

TEST_PROGS := test_kmod.sh \

	test_libbpf.sh \

	test_xdp_redirect.sh \

	test_xdp_meta.sh \

	test_xdp_veth.sh \
@@ -78,27 +78,30 @@ TEST_PROGS_EXTENDED := with_addr.sh \ 
	test_xdp_vlan.sh



# Compile but not part of 'make run_tests'

TEST_GEN_PROGS_EXTENDED = test_libbpf_open test_sock_addr test_skb_cgroup_id_user \

TEST_GEN_PROGS_EXTENDED = test_sock_addr test_skb_cgroup_id_user \

	flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \

	test_lirc_mode2_user



include ../lib.mk

TEST_CUSTOM_PROGS = urandom_read



# NOTE: $(OUTPUT) won't get default value if used before lib.mk

TEST_CUSTOM_PROGS = $(OUTPUT)/urandom_read

all: $(TEST_CUSTOM_PROGS)

include ../lib.mk



$(OUTPUT)/urandom_read: $(OUTPUT)/%: %.c

# Define simple and short `make test_progs`, `make test_sysctl`, etc targets

# to build individual tests.

# NOTE: Semicolon at the end is critical to override lib.mk's default static

# rule for binaries.

$(notdir $(TEST_GEN_PROGS)						\

	 $(TEST_PROGS)							\

	 $(TEST_PROGS_EXTENDED)						\

	 $(TEST_GEN_PROGS_EXTENDED)					\

	 $(TEST_CUSTOM_PROGS)): %: $(OUTPUT)/% ;



$(OUTPUT)/urandom_read: urandom_read.c

	$(CC) -o $@ $< -Wl,--build-id



$(OUTPUT)/test_stub.o: test_stub.c

	$(CC) $(TEST_PROGS_CFLAGS) $(CFLAGS) -c -o $@ $<



BPFOBJ := $(OUTPUT)/libbpf.a



$(TEST_GEN_PROGS): $(OUTPUT)/test_stub.o $(BPFOBJ)



$(TEST_GEN_PROGS_EXTENDED): $(OUTPUT)/test_stub.o $(OUTPUT)/libbpf.a

$(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): $(OUTPUT)/test_stub.o $(BPFOBJ)



$(OUTPUT)/test_dev_cgroup: cgroup_helpers.c

$(OUTPUT)/test_skb_cgroup_id_user: cgroup_helpers.c
@@ -108,7 +111,6 @@ $(OUTPUT)/test_socket_cookie: cgroup_helpers.c 
$(OUTPUT)/test_sockmap: cgroup_helpers.c

$(OUTPUT)/test_tcpbpf_user: cgroup_helpers.c

$(OUTPUT)/test_tcpnotify_user: cgroup_helpers.c trace_helpers.c

$(OUTPUT)/test_progs: cgroup_helpers.c trace_helpers.c

$(OUTPUT)/get_cgroup_id_user: cgroup_helpers.c

$(OUTPUT)/test_cgroup_storage: cgroup_helpers.c

$(OUTPUT)/test_netcnt: cgroup_helpers.c
@@ -124,6 +126,10 @@ force: 
$(BPFOBJ): force

	$(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/



BPF_HELPERS := $(BPFDIR)/bpf_helper_defs.h $(wildcard $(BPFDIR)/bpf_*.h)

$(BPFDIR)/bpf_helper_defs.h:

	$(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ bpf_helper_defs.h



# Get Clang's default includes on this system, as opposed to those seen by

# '-target bpf'. This fixes "missing" files on some architectures/distros,

# such as asm/byteorder.h, asm/socket.h, asm/sockios.h, sys/cdefs.h etc.
@@ -134,10 +140,11 @@ define get_sys_includes 
$(shell $(1) -v -E - </dev/null 2>&1 \

	| sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }')

endef



CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG))

BPF_CFLAGS = -g -D__TARGET_ARCH_$(SRCARCH) 				\

	     -I. -I./include/uapi -I../../../include/uapi 		\

	     -I$(BPFDIR) -I$(OUTPUT)/../usr/include

	     -I. -I./include/uapi -I$(APIDIR)				\

	     -I$(BPFDIR) -I$(abspath $(OUTPUT)/../usr/include)



CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \

	       -Wno-compare-distinct-pointer-types
@@ -145,137 +152,171 @@ CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \ 
$(OUTPUT)/test_l4lb_noinline.o: BPF_CFLAGS += -fno-inline

$(OUTPUT)/test_xdp_noinline.o: BPF_CFLAGS += -fno-inline



$(OUTPUT)/test_queue_map.o: test_queue_stack_map.h

$(OUTPUT)/test_stack_map.o: test_queue_stack_map.h



$(OUTPUT)/flow_dissector_load.o: flow_dissector_load.h

$(OUTPUT)/test_progs.o: flow_dissector_load.h



TEST_PROGS_CFLAGS := -I. -I$(OUTPUT)

TEST_MAPS_CFLAGS := -I. -I$(OUTPUT)

TEST_VERIFIER_CFLAGS := -I. -I$(OUTPUT) -Iverifier

# Build BPF object using Clang

# $1 - input .c file

# $2 - output .o file

# $3 - CFLAGS

# $4 - LDFLAGS

define CLANG_BPF_BUILD_RULE

	($(CLANG) $3 -O2 -target bpf -emit-llvm				\

		-c $1 -o - || echo "BPF obj compilation failed") | 	\

	$(LLC) -march=bpf -mcpu=probe $4 -filetype=obj -o $2

endef

# Similar to CLANG_BPF_BUILD_RULE, but using native Clang and bpf LLC

define CLANG_NATIVE_BPF_BUILD_RULE

	($(CLANG) $3 -O2 -emit-llvm					\

		-c $1 -o - || echo "BPF obj compilation failed") | 	\

	$(LLC) -march=bpf -mcpu=probe $4 -filetype=obj -o $2

endef

# Build BPF object using GCC

define GCC_BPF_BUILD_RULE

	$(BPF_GCC) $3 $4 -O2 -c $1 -o $2

endef



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

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

# Parameters:

# $1 - test runner base binary name (e.g., test_progs)

# $2 - test runner extra "flavor" (e.g., alu32, gcc-bpf, etc)

define DEFINE_TEST_RUNNER



TRUNNER_OUTPUT := $(OUTPUT)$(if $2,/)$2

TRUNNER_BINARY := $1$(if $2,-)$2

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_EXTRA_HDRS := $$(filter %.h,$(TRUNNER_EXTRA_SOURCES))

TRUNNER_TESTS_HDR := $(TRUNNER_TESTS_DIR)/tests.h

TRUNNER_BPF_OBJS := $$(patsubst %.c,$$(TRUNNER_OUTPUT)/%.o,		\

				$$(notdir $$(wildcard $(TRUNNER_BPF_PROGS_DIR)/*.c)))



# Evaluate rules now with extra TRUNNER_XXX variables above already defined

$$(eval $$(call DEFINE_TEST_RUNNER_RULES,$1,$2))



endef



# Using TRUNNER_XXX variables, provided by callers of DEFINE_TEST_RUNNER and

# set up by DEFINE_TEST_RUNNER itself, create test runner build rules with:

# $1 - test runner base binary name (e.g., test_progs)

# $2 - test runner extra "flavor" (e.g., alu32, gcc-bpf, etc)

define DEFINE_TEST_RUNNER_RULES



ifeq ($($(TRUNNER_OUTPUT)-dir),)

$(TRUNNER_OUTPUT)-dir := y

$(TRUNNER_OUTPUT):

	mkdir -p $$@

endif



# ensure we set up BPF objects generation rule just once for a given

# input/output directory combination

ifeq ($($(TRUNNER_BPF_PROGS_DIR)$(if $2,-)$2-bpfobjs),)

$(TRUNNER_BPF_PROGS_DIR)$(if $2,-)$2-bpfobjs := y

$(TRUNNER_BPF_OBJS): $(TRUNNER_OUTPUT)/%.o:				\

		     $(TRUNNER_BPF_PROGS_DIR)/%.c			\

		     $(TRUNNER_BPF_PROGS_DIR)/*.h			\

		     $$(BPF_HELPERS) | $(TRUNNER_OUTPUT)

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

					  $(TRUNNER_BPF_CFLAGS),	\

					  $(TRUNNER_BPF_LDFLAGS))

endif



# ensure we set up tests.h header generation rule just once

ifeq ($($(TRUNNER_TESTS_DIR)-tests-hdr),)

$(TRUNNER_TESTS_DIR)-tests-hdr := y

$(TRUNNER_TESTS_HDR): $(TRUNNER_TESTS_DIR)/*.c

	$$(shell ( cd $(TRUNNER_TESTS_DIR);				\

		  echo '/* Generated header, do not edit */';		\

		  ls *.c 2> /dev/null |					\

			sed -e 's@\([^\.]*\)\.c@DEFINE_TEST(\1)@';	\

		 ) > $$@)

endif



# compile individual test files

# Note: we cd into output directory to ensure embedded BPF object is found

$(TRUNNER_TEST_OBJS): $(TRUNNER_OUTPUT)/%.test.o:			\

		      $(TRUNNER_TESTS_DIR)/%.c				\

		      $(TRUNNER_EXTRA_HDRS)				\

		      $(TRUNNER_BPF_OBJS)				\

		      $$(BPFOBJ) | $(TRUNNER_OUTPUT)

	cd $$(@D) && $$(CC) $$(CFLAGS) $$(LDLIBS) -c $(CURDIR)/$$< -o $$(@F)



$(TRUNNER_EXTRA_OBJS): $(TRUNNER_OUTPUT)/%.o:				\

		       %.c						\

		       $(TRUNNER_EXTRA_HDRS)				\

		       $(TRUNNER_TESTS_HDR)				\

		       $$(BPFOBJ) | $(TRUNNER_OUTPUT)

	$$(CC) $$(CFLAGS) $$(LDLIBS) -c $$< -o $$@



$(TRUNNER_BINARY)-extras: $(TRUNNER_EXTRA_FILES) | $(TRUNNER_OUTPUT)

ifneq ($2,)

	# only copy extra resources if in flavored build

	cp -a $$^ $(TRUNNER_OUTPUT)/

endif



$(OUTPUT)/$(TRUNNER_BINARY): $(TRUNNER_TEST_OBJS)			\

			     $(TRUNNER_EXTRA_OBJS) $$(BPFOBJ)		\

			     | $(TRUNNER_BINARY)-extras

	$$(CC) $$(CFLAGS) $$(LDLIBS) $$(filter %.a %.o,$$^) -o $$@



endef



# Define test_progs test runner.

TRUNNER_TESTS_DIR := prog_tests

TRUNNER_BPF_PROGS_DIR := progs

TRUNNER_EXTRA_SOURCES := test_progs.c cgroup_helpers.c trace_helpers.c	\

			 flow_dissector_load.h

TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read				\

		       $(wildcard progs/btf_dump_test_case_*.c)

TRUNNER_BPF_BUILD_RULE := CLANG_BPF_BUILD_RULE

TRUNNER_BPF_CFLAGS := -I. -I$(OUTPUT) $(BPF_CFLAGS) $(CLANG_CFLAGS)

TRUNNER_BPF_LDFLAGS :=

$(eval $(call DEFINE_TEST_RUNNER,test_progs))



# Define test_progs-alu32 test runner.

ifneq ($(SUBREG_CODEGEN),)

ALU32_BUILD_DIR = $(OUTPUT)/alu32

TEST_CUSTOM_PROGS += $(ALU32_BUILD_DIR)/test_progs_32

$(ALU32_BUILD_DIR):

	mkdir -p $@



$(ALU32_BUILD_DIR)/urandom_read: $(OUTPUT)/urandom_read | $(ALU32_BUILD_DIR)

	cp $< $@



$(ALU32_BUILD_DIR)/test_progs_32: test_progs.c $(OUTPUT)/libbpf.a\

						$(ALU32_BUILD_DIR)/urandom_read \

						| $(ALU32_BUILD_DIR)

	$(CC) $(TEST_PROGS_CFLAGS) $(CFLAGS) \

		-o $(ALU32_BUILD_DIR)/test_progs_32 \

		test_progs.c test_stub.c cgroup_helpers.c trace_helpers.c prog_tests/*.c \

		$(OUTPUT)/libbpf.a $(LDLIBS)



$(ALU32_BUILD_DIR)/test_progs_32: $(PROG_TESTS_H)

$(ALU32_BUILD_DIR)/test_progs_32: prog_tests/*.c



$(ALU32_BUILD_DIR)/%.o: progs/%.c $(ALU32_BUILD_DIR)/test_progs_32 \

					| $(ALU32_BUILD_DIR)

	($(CLANG) $(BPF_CFLAGS) $(CLANG_CFLAGS) -O2 -target bpf -emit-llvm \

		-c $< -o - || echo "clang failed") | \

	$(LLC) -march=bpf -mcpu=probe -mattr=+alu32 $(LLC_FLAGS) \

		-filetype=obj -o $@

TRUNNER_BPF_LDFLAGS += -mattr=+alu32

$(eval $(call DEFINE_TEST_RUNNER,test_progs,alu32))

endif



# Define test_progs BPF-GCC-flavored test runner.

ifneq ($(BPF_GCC),)

GCC_SYS_INCLUDES = $(call get_sys_includes,gcc)

IS_LITTLE_ENDIAN = $(shell $(CC) -dM -E - </dev/null | \

			grep 'define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__')

ifeq ($(IS_LITTLE_ENDIAN),)

MENDIAN=-mbig-endian

else

MENDIAN=-mlittle-endian

endif

BPF_GCC_CFLAGS = $(GCC_SYS_INCLUDES) $(MENDIAN)

BPF_GCC_BUILD_DIR = $(OUTPUT)/bpf_gcc

TEST_CUSTOM_PROGS += $(BPF_GCC_BUILD_DIR)/test_progs_bpf_gcc

$(BPF_GCC_BUILD_DIR):

	mkdir -p $@



$(BPF_GCC_BUILD_DIR)/urandom_read: $(OUTPUT)/urandom_read | $(BPF_GCC_BUILD_DIR)

	cp $< $@



$(BPF_GCC_BUILD_DIR)/test_progs_bpf_gcc: $(OUTPUT)/test_progs \

					 | $(BPF_GCC_BUILD_DIR)

	cp $< $@



$(BPF_GCC_BUILD_DIR)/%.o: progs/%.c $(BPF_GCC_BUILD_DIR)/test_progs_bpf_gcc \

			  | $(BPF_GCC_BUILD_DIR)

	$(BPF_GCC) $(BPF_CFLAGS) $(BPF_GCC_CFLAGS) -O2 -c $< -o $@

MENDIAN=$(if $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian)



TRUNNER_BPF_BUILD_RULE := GCC_BPF_BUILD_RULE

TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(call get_sys_includes,gcc) $(MENDIAN)

TRUNNER_BPF_LDFLAGS :=

$(eval $(call DEFINE_TEST_RUNNER,test_progs,bpf_gcc))

endif



# Have one program compiled without "-target bpf" to test whether libbpf loads

# it successfully

$(OUTPUT)/test_xdp.o: progs/test_xdp.c

	($(CLANG) $(BPF_CFLAGS) $(CLANG_CFLAGS) -O2 -emit-llvm -c $< -o - || \

		echo "clang failed") | \

	$(LLC) -march=bpf -mcpu=probe $(LLC_FLAGS) -filetype=obj -o $@



# libbpf has to be built before BPF programs due to bpf_helper_defs.h

$(OUTPUT)/%.o: progs/%.c | $(BPFOBJ)

	($(CLANG) $(BPF_CFLAGS) $(CLANG_CFLAGS) -O2 -target bpf -emit-llvm \

		-c $< -o - || echo "clang failed") | \

	$(LLC) -march=bpf -mcpu=probe $(LLC_FLAGS) -filetype=obj -o $@



PROG_TESTS_DIR = $(OUTPUT)/prog_tests

$(PROG_TESTS_DIR):

	mkdir -p $@

PROG_TESTS_H := $(PROG_TESTS_DIR)/tests.h

PROG_TESTS_FILES := $(wildcard prog_tests/*.c)

test_progs.c: $(PROG_TESTS_H)

$(OUTPUT)/test_progs: CFLAGS += $(TEST_PROGS_CFLAGS)

$(OUTPUT)/test_progs: test_progs.c $(PROG_TESTS_FILES) | $(OUTPUT)/test_attach_probe.o $(PROG_TESTS_H)

$(PROG_TESTS_H): $(PROG_TESTS_FILES) | $(PROG_TESTS_DIR)

	$(shell ( cd prog_tests/; \

		  echo '/* Generated header, do not edit */'; \

		  ls *.c 2> /dev/null | \

			sed -e 's@\([^\.]*\)\.c@DEFINE_TEST(\1)@'; \

		 ) > $(PROG_TESTS_H))



MAP_TESTS_DIR = $(OUTPUT)/map_tests

$(MAP_TESTS_DIR):

	mkdir -p $@

MAP_TESTS_H := $(MAP_TESTS_DIR)/tests.h

MAP_TESTS_FILES := $(wildcard map_tests/*.c)

test_maps.c: $(MAP_TESTS_H)

$(OUTPUT)/test_maps: CFLAGS += $(TEST_MAPS_CFLAGS)

$(OUTPUT)/test_maps: test_maps.c $(MAP_TESTS_FILES) | $(MAP_TESTS_H)

$(MAP_TESTS_H): $(MAP_TESTS_FILES) | $(MAP_TESTS_DIR)

	$(shell ( cd map_tests/; \

		  echo '/* Generated header, do not edit */'; \

		  echo '#ifdef DECLARE'; \

		  ls *.c 2> /dev/null | \

			sed -e 's@\([^\.]*\)\.c@extern void test_\1(void);@'; \

		  echo '#endif'; \

		  echo '#ifdef CALL'; \

		  ls *.c 2> /dev/null | \

			sed -e 's@\([^\.]*\)\.c@test_\1();@'; \

		  echo '#endif' \

		 ) > $(MAP_TESTS_H))



VERIFIER_TESTS_DIR = $(OUTPUT)/verifier

$(VERIFIER_TESTS_DIR):

	mkdir -p $@

VERIFIER_TESTS_H := $(VERIFIER_TESTS_DIR)/tests.h

VERIFIER_TEST_FILES := $(wildcard verifier/*.c)

test_verifier.c: $(VERIFIER_TESTS_H)

$(OUTPUT)/test_verifier: CFLAGS += $(TEST_VERIFIER_CFLAGS)

$(OUTPUT)/test_verifier: test_verifier.c | $(VERIFIER_TEST_FILES) $(VERIFIER_TESTS_H)

$(VERIFIER_TESTS_H): $(VERIFIER_TEST_FILES) | $(VERIFIER_TESTS_DIR)

# Define test_maps test runner.

TRUNNER_TESTS_DIR := map_tests

TRUNNER_BPF_PROGS_DIR := progs

TRUNNER_EXTRA_SOURCES := test_maps.c

TRUNNER_EXTRA_FILES :=

TRUNNER_BPF_BUILD_RULE := $$(error no BPF objects should be built)

TRUNNER_BPF_CFLAGS :=

TRUNNER_BPF_LDFLAGS :=

$(eval $(call DEFINE_TEST_RUNNER,test_maps))



# Define test_verifier test runner.

# It is much simpler than test_maps/test_progs and sufficiently different from

# them (e.g., test.h is using completely pattern), that it's worth just

# explicitly defining all the rules explicitly.

verifier/tests.h: verifier/*.c

	$(shell ( cd verifier/; \

		  echo '/* Generated header, do not edit */'; \

		  echo '#ifdef FILL_ARRAY'; \

		  ls *.c 2> /dev/null | \

			sed -e 's@\(.*\)@#include \"\1\"@'; \

		  ls *.c 2> /dev/null | sed -e 's@\(.*\)@#include \"\1\"@'; \

		  echo '#endif' \

		 ) > $(VERIFIER_TESTS_H))

		) > verifier/tests.h)

$(OUTPUT)/test_verifier: test_verifier.c verifier/tests.h $(BPFOBJ) | $(OUTPUT)

	$(CC) $(CFLAGS) $(LDLIBS) $(filter %.a %.o %.c,$^) -o $@



EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(ALU32_BUILD_DIR) $(BPF_GCC_BUILD_DIR) \

	$(VERIFIER_TESTS_H) $(PROG_TESTS_H) $(MAP_TESTS_H) \

	feature
 
EXTRA_CLEAN := $(TEST_CUSTOM_PROGS)					\

	prog_tests/tests.h map_tests/tests.h verifier/tests.h		\

	feature $(OUTPUT)/*.o $(OUTPUT)/alu32 $(OUTPUT)/bpf_gcc

tools/testing/selftests/bpf/prog_tests/core_reloc.c

+2 −2
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ static struct core_reloc_test_case test_cases[] = { 
		.input_len = 0,

		.output = STRUCT_TO_CHAR_PTR(core_reloc_kernel_output) {

			.valid = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, },

			.comm = "test_progs\0\0\0\0\0",

			.comm_len = 11,

			.comm = "test_progs",

			.comm_len = sizeof("test_progs"),

		},

		.output_len = sizeof(struct core_reloc_kernel_output),

	},

tools/testing/selftests/bpf/progs/core_reloc_types.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


struct core_reloc_kernel_output {

	int valid[10];

	char comm[16];

	char comm[sizeof("test_progs")];

	int comm_len;

};

tools/testing/selftests/bpf/progs/test_core_reloc_kernel.c

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ static volatile struct data { 


struct core_reloc_kernel_output {

	int valid[10];

	char comm[16];

	/* we have test_progs[-flavor], so cut flavor part */

	char comm[sizeof("test_progs")];

	int comm_len;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE