Commit 6910d7d3 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir 



Reorder includes search path to ensure $(OUTPUT) and $(CURDIR) go before
libbpf's directory. Also fix bpf_helpers.h to include bpf_helper_defs.h in
such a way as to leverage includes search path. This allows selftests to not
use libbpf's local and potentially stale bpf_helper_defs.h. It's important
because selftests/bpf's Makefile only re-generates bpf_helper_defs.h in
seltests' output directory, not the one in libbpf's directory.

Also force regeneration of bpf_helper_defs.h when libbpf.a is updated to
reduce staleness.

Fixes: fa633a0f ("libbpf: Fix build on read-only filesystems")
Reported-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200110051716.1591485-3-andriin@fb.com
parent 2031af28

tools/lib/bpf/bpf_helpers.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef __BPF_HELPERS__

#define __BPF_HELPERS__



#include "bpf_helper_defs.h"

#include <bpf_helper_defs.h>



#define __uint(name, val) int (*name)[val]

#define __type(name, val) typeof(val) *name

tools/testing/selftests/bpf/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ CLANG ?= clang 
LLC		?= llc

LLVM_OBJCOPY	?= llvm-objcopy

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

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

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

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

	  -I$(BPFDIR) -I$(GENDIR) -I$(TOOLSINCDIR)			\

	  -Dbpf_prog_load=bpf_prog_test_load				\

	  -Dbpf_load_program=bpf_test_load_program

LDLIBS += -lcap -lelf -lz -lrt -lpthread
@@ -153,7 +153,7 @@ $(BPFOBJ): force 
	$(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/



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

$(OUTPUT)/bpf_helper_defs.h:

$(OUTPUT)/bpf_helper_defs.h: $(BPFOBJ)

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



# Get Clang's default includes on this system, as opposed to those seen by
@@ -174,8 +174,8 @@ MENDIAN=$(if $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian) 


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

BPF_CFLAGS = -g -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) 			\

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

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

	     -I$(OUTPUT) -I$(CURDIR) -I$(CURDIR)/include/uapi		\

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



CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \

	       -Wno-compare-distinct-pointer-types
@@ -329,7 +329,7 @@ TRUNNER_EXTRA_SOURCES := test_progs.c cgroup_helpers.c trace_helpers.c \ 
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_CFLAGS := $(BPF_CFLAGS) $(CLANG_CFLAGS)

TRUNNER_BPF_LDFLAGS := -mattr=+alu32

$(eval $(call DEFINE_TEST_RUNNER,test_progs))

CRA Git | Maintained and supported by SUSTech CRA and CCSE