Commit 7cf245a3 authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Alexei Starovoitov
Browse files

samples/bpf: Use consistent include paths for libbpf 



Fix all files in samples/bpf to include libbpf header files with the bpf/
prefix, to be consistent with external users of the library. Also ensure
that all includes of exported libbpf header files (those that are exported
on 'make install' of the library) use bracketed includes instead of quoted.

To make sure no new files are introduced that doesn't include the bpf/
prefix in its include, remove tools/lib/bpf from the include path entirely,
and use tools/lib instead.

Fixes: 6910d7d3 ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir")
Signed-off-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/157952560911.1683545.8795966751309534150.stgit@toke.dk
parent 521fe8bb

samples/bpf/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ TPROGS_CFLAGS += -Wmissing-prototypes 
TPROGS_CFLAGS += -Wstrict-prototypes



TPROGS_CFLAGS += -I$(objtree)/usr/include

TPROGS_CFLAGS += -I$(srctree)/tools/lib/bpf/

TPROGS_CFLAGS += -I$(srctree)/tools/testing/selftests/bpf/

TPROGS_CFLAGS += -I$(srctree)/tools/lib/

TPROGS_CFLAGS += -I$(srctree)/tools/include
@@ -305,7 +304,7 @@ $(obj)/%.o: $(src)/%.c 
	@echo "  CLANG-bpf " $@

	$(Q)$(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(BPF_EXTRA_CFLAGS) \

		-I$(obj) -I$(srctree)/tools/testing/selftests/bpf/ \

		-I$(srctree)/tools/lib/bpf/ \

		-I$(srctree)/tools/lib/ \

		-D__KERNEL__ -D__BPF_TRACING__ -Wno-unused-value -Wno-pointer-sign \

		-D__TARGET_ARCH_$(SRCARCH) -Wno-compare-distinct-pointer-types \

		-Wno-gnu-variable-sized-type-not-at-end \

samples/bpf/cpustat_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <linux/version.h>

#include <linux/ptrace.h>

#include <uapi/linux/bpf.h>

#include "bpf_helpers.h"

#include <bpf/bpf_helpers.h>



/*

 * The CPU number, cstate number and pstate number are based

samples/bpf/fds_example.c

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


#include <bpf/bpf.h>



#include "libbpf.h"

#include <bpf/libbpf.h>

#include "bpf_insn.h"

#include "sock_example.h"

samples/bpf/hbm.c

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ 
#include "cgroup_helpers.h"

#include "hbm.h"

#include "bpf_util.h"

#include "bpf.h"

#include "libbpf.h"

#include <bpf/bpf.h>

#include <bpf/libbpf.h>



bool outFlag = true;

int minRate = 1000;		/* cgroup rate limit in Mbps */

samples/bpf/hbm_kern.h

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
#include <uapi/linux/pkt_cls.h>

#include <net/ipv6.h>

#include <net/inet_ecn.h>

#include "bpf_endian.h"

#include "bpf_helpers.h"

#include <bpf/bpf_endian.h>

#include <bpf/bpf_helpers.h>

#include "hbm.h"



#define DROP_PKT	0

CRA Git | Maintained and supported by SUSTech CRA and CCSE