Commit f41aa387 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'selftest-makefile-cleanup' 



Andrii Nakryiko says:

====================
Fix issues with bpf_helper_defs.h usage in selftests/bpf. As part of that, fix
the way clean up is performed for libbpf and selftests/bpf. Some for Makefile
output clean ups as well.
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 492ab020 965b9fee

tools/lib/bpf/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -274,9 +274,10 @@ config-clean: 


clean:

	$(call QUIET_CLEAN, libbpf) $(RM) -rf $(CMD_TARGETS)		     \

		*.o *~ *.a *.so *.so.$(LIBBPF_MAJOR_VERSION) .*.d .*.cmd \

		*.pc LIBBPF-CFLAGS $(BPF_HELPER_DEFS) \

		$(SHARED_OBJDIR) $(STATIC_OBJDIR)

		*~ .*.d .*.cmd LIBBPF-CFLAGS $(BPF_HELPER_DEFS)		     \

		$(SHARED_OBJDIR) $(STATIC_OBJDIR)			     \

		$(addprefix $(OUTPUT),					     \

			    *.o *.a *.so *.so.$(LIBBPF_MAJOR_VERSION) *.pc)

	$(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf

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/.gitignore

+0 −2
Original line number Diff line number Diff line
@@ -22,11 +22,9 @@ get_cgroup_id_user 
test_skb_cgroup_id_user

test_socket_cookie

test_cgroup_storage

test_select_reuseport

test_flow_dissector

flow_dissector_load

test_netcnt

test_section_names

test_tcpnotify_user

test_libbpf

test_tcp_check_syncookie_user

tools/testing/selftests/bpf/Makefile

+16 −11
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
@@ -83,9 +83,12 @@ TEST_CUSTOM_PROGS = urandom_read 
# $3 - target (assumed to be file); only file name will be emitted;

# $4 - optional extra arg, emitted as-is, if provided.

ifeq ($(V),1)

Q =

msg =

else

Q = @

msg = @$(info $(1)$(if $(2), [$(2)]) $(notdir $(3)))$(if $(4), $(4))

MAKEFLAGS += --no-print-directory

endif



# override lib.mk's default rules
@@ -93,6 +96,7 @@ OVERRIDE_TARGETS := 1 
override define CLEAN

	$(call msg,    CLEAN)

	$(RM) -r $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) $(EXTRA_CLEAN)

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

endef



include ../lib.mk
@@ -146,14 +150,14 @@ DEFAULT_BPFTOOL := $(OUTPUT)/tools/usr/local/sbin/bpftool 
BPFTOOL ?= $(DEFAULT_BPFTOOL)



$(DEFAULT_BPFTOOL): force

	$(MAKE) -C $(BPFTOOLDIR) DESTDIR=$(OUTPUT)/tools install

	$(Q)$(MAKE) -C $(BPFTOOLDIR) DESTDIR=$(OUTPUT)/tools install



$(BPFOBJ): force

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

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



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

$(OUTPUT)/bpf_helper_defs.h:

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

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

	$(Q)$(MAKE) -C $(BPFDIR) OUTPUT=$(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,
@@ -173,8 +177,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
@@ -252,6 +256,7 @@ define DEFINE_TEST_RUNNER_RULES 
ifeq ($($(TRUNNER_OUTPUT)-dir),)

$(TRUNNER_OUTPUT)-dir := y

$(TRUNNER_OUTPUT):

	$$(call msg,      MKDIR,,$$@)

	mkdir -p $$@

endif
@@ -328,7 +333,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))
@@ -377,5 +382,5 @@ $(OUTPUT)/test_cpp: test_cpp.cpp $(OUTPUT)/test_core_extern.skel.h $(BPFOBJ) 


EXTRA_CLEAN := $(TEST_CUSTOM_PROGS)					\

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

	feature $(OUTPUT)/*.o $(OUTPUT)/no_alu32 $(OUTPUT)/bpf_gcc	\

	tools *.skel.h
 
	feature								\

	$(addprefix $(OUTPUT)/,*.o *.skel.h no_alu32 bpf_gcc tools)

CRA Git | Maintained and supported by SUSTech CRA and CCSE