Commit d49d0661 authored by Alexei Starovoitov's avatar Alexei Starovoitov

Merge branch 'libbpf-include-path'

Toke Høiland-Jørgensen says:

====================
We are currently being somewhat inconsistent with the libbpf include paths,
which makes it difficult to move files from the kernel into an external
libbpf-using project without adjusting include paths.

Having the bpf/ subdir of $INCLUDEDIR in the include path has never been a
requirement for building against libbpf before, and indeed the libbpf pkg-config
file doesn't include it. So let's make all libbpf includes across the kernel
tree use the bpf/ prefix in their includes. Since bpftool skeleton generation
emits code with a libbpf include, this also ensures that those can be used in
existing external projects using the regular pkg-config include path.

This turns out to be a somewhat invasive change in the number of files touched;
however, the actual changes to files are fairly trivial (most of them are simply
made with 'sed'). The series is split to make the change for one tool subdir at
a time, while trying not to break the build along the way. It is structured like
this:

- Patch 1-3: Trivial fixes to Makefiles for issues I discovered while changing
  the include paths.

- Patch 4-8: Change the include directives to use the bpf/ prefix, and updates
  Makefiles to make sure tools/lib/ is part of the include path, but without
  removing tools/lib/bpf

- Patch 9-11: Remove tools/lib/bpf from include paths to make sure we don't
  inadvertently re-introduce includes without the bpf/ prefix.

Changelog:

v5:
  - Combine the libbpf build rules in selftests Makefile (using Andrii's
    suggestion for a make rule).
  - Re-use self-tests libbpf build for runqslower (new patch 10)
  - Formatting fixes

v4:
  - Move runqslower error on missing BTF into make rule
  - Make sure we don't always force a rebuild selftests
  - Rebase on latest bpf-next (dropping patch 11)

v3:
  - Don't add the kernel build dir to the runqslower Makefile, pass it in from
    selftests instead.
  - Use libbpf's 'make install_headers' in selftests instead of trying to
    generate bpf_helper_defs.h in-place (to also work on read-only filesystems).
  - Use a scratch builddir for both libbpf and bpftool when building in selftests.
  - Revert bpf_helpers.h to quoted include instead of angled include with a bpf/
    prefix.
  - Fix a few style nits from Andrii

v2:
  - Do a full cleanup of libbpf includes instead of just changing the
    bpf_helper_defs.h include.
====================
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Tested-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents f1c3656c a2c9652f
...@@ -184,7 +184,6 @@ TPROGS_CFLAGS += -Wmissing-prototypes ...@@ -184,7 +184,6 @@ TPROGS_CFLAGS += -Wmissing-prototypes
TPROGS_CFLAGS += -Wstrict-prototypes TPROGS_CFLAGS += -Wstrict-prototypes
TPROGS_CFLAGS += -I$(objtree)/usr/include 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/testing/selftests/bpf/
TPROGS_CFLAGS += -I$(srctree)/tools/lib/ TPROGS_CFLAGS += -I$(srctree)/tools/lib/
TPROGS_CFLAGS += -I$(srctree)/tools/include TPROGS_CFLAGS += -I$(srctree)/tools/include
...@@ -254,7 +253,7 @@ all: ...@@ -254,7 +253,7 @@ all:
clean: clean:
$(MAKE) -C ../../ M=$(CURDIR) clean $(MAKE) -C ../../ M=$(CURDIR) clean
@rm -f *~ @find $(CURDIR) -type f -name '*~' -delete
$(LIBBPF): FORCE $(LIBBPF): FORCE
# Fix up variables inherited from Kbuild that tools/ build system won't like # Fix up variables inherited from Kbuild that tools/ build system won't like
...@@ -305,7 +304,7 @@ $(obj)/%.o: $(src)/%.c ...@@ -305,7 +304,7 @@ $(obj)/%.o: $(src)/%.c
@echo " CLANG-bpf " $@ @echo " CLANG-bpf " $@
$(Q)$(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(BPF_EXTRA_CFLAGS) \ $(Q)$(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(BPF_EXTRA_CFLAGS) \
-I$(obj) -I$(srctree)/tools/testing/selftests/bpf/ \ -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__KERNEL__ -D__BPF_TRACING__ -Wno-unused-value -Wno-pointer-sign \
-D__TARGET_ARCH_$(SRCARCH) -Wno-compare-distinct-pointer-types \ -D__TARGET_ARCH_$(SRCARCH) -Wno-compare-distinct-pointer-types \
-Wno-gnu-variable-sized-type-not-at-end \ -Wno-gnu-variable-sized-type-not-at-end \
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <uapi/linux/bpf.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 * The CPU number, cstate number and pstate number are based
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <bpf/bpf.h> #include <bpf/bpf.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include "bpf_insn.h" #include "bpf_insn.h"
#include "sock_example.h" #include "sock_example.h"
......
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,8 @@
#include "cgroup_helpers.h" #include "cgroup_helpers.h"
#include "hbm.h" #include "hbm.h"
#include "bpf_util.h" #include "bpf_util.h"
#include "bpf.h" #include <bpf/bpf.h>
#include "libbpf.h" #include <bpf/libbpf.h>
bool outFlag = true; bool outFlag = true;
int minRate = 1000; /* cgroup rate limit in Mbps */ int minRate = 1000; /* cgroup rate limit in Mbps */
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <uapi/linux/pkt_cls.h> #include <uapi/linux/pkt_cls.h>
#include <net/ipv6.h> #include <net/ipv6.h>
#include <net/inet_ecn.h> #include <net/inet_ecn.h>
#include "bpf_endian.h" #include <bpf/bpf_endian.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "hbm.h" #include "hbm.h"
#define DROP_PKT 0 #define DROP_PKT 0
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#define KBUILD_MODNAME "ibumad_count_pkts_by_class" #define KBUILD_MODNAME "ibumad_count_pkts_by_class"
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
struct bpf_map_def SEC("maps") read_count = { struct bpf_map_def SEC("maps") read_count = {
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "bpf_load.h" #include "bpf_load.h"
#include "bpf_util.h" #include "bpf_util.h"
#include "libbpf.h" #include <bpf/libbpf.h>
static void dump_counts(int fd) static void dump_counts(int fd)
{ {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#define MAX_ENTRIES 20 #define MAX_ENTRIES 20
#define MAX_CPU 4 #define MAX_CPU 4
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <uapi/linux/if_ether.h> #include <uapi/linux/if_ether.h>
#include <uapi/linux/ip.h> #include <uapi/linux/ip.h>
#include <uapi/linux/in.h> #include <uapi/linux/in.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
# define printk(fmt, ...) \ # define printk(fmt, ...) \
({ \ ({ \
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/version.h> #include <linux/version.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_legacy.h" #include "bpf_legacy.h"
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
#define MAX_ENTRIES 1000 #define MAX_ENTRIES 1000
#define MAX_NR_CPUS 1024 #define MAX_NR_CPUS 1024
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* License as published by the Free Software Foundation. * License as published by the Free Software Foundation.
*/ */
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
#include <uapi/linux/ptrace.h> #include <uapi/linux/ptrace.h>
#include <uapi/linux/perf_event.h> #include <uapi/linux/perf_event.h>
#include <linux/version.h> #include <linux/version.h>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <assert.h> #include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include <sys/resource.h> #include <sys/resource.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include "bpf_load.h" #include "bpf_load.h"
#include "trace_helpers.h" #include "trace_helpers.h"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/tcp.h> #include <linux/tcp.h>
#include <linux/udp.h> #include <linux/udp.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_legacy.h" #include "bpf_legacy.h"
#define DEFAULT_PKTGEN_UDP_PORT 9 #define DEFAULT_PKTGEN_UDP_PORT 9
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/udp.h> #include <linux/udp.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include <net/ip.h> #include <net/ip.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#define DEFAULT_PKTGEN_UDP_PORT 9 #define DEFAULT_PKTGEN_UDP_PORT 9
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/udp.h> #include <linux/udp.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include <net/ip.h> #include <net/ip.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#define DEFAULT_PKTGEN_UDP_PORT 9 #define DEFAULT_PKTGEN_UDP_PORT 9
#define DEBUG 0 #define DEBUG 0
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include <uapi/linux/bpf_perf_event.h> #include <uapi/linux/bpf_perf_event.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
#define MAX_IPS 8192 #define MAX_IPS 8192
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/bpf.h> #include <linux/bpf.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include "bpf_load.h" #include "bpf_load.h"
#include "perf-sys.h" #include "perf-sys.h"
#include "trace_helpers.h" #include "trace_helpers.h"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <linux/net.h> #include <linux/net.h>
#include <uapi/linux/in.h> #include <uapi/linux/in.h>
#include <uapi/linux/in6.h> #include <uapi/linux/in6.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
SEC("cgroup/sock1") SEC("cgroup/sock1")
int bpf_prog1(struct bpf_sock *sk) int bpf_prog1(struct bpf_sock *sk)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <uapi/linux/if_ether.h> #include <uapi/linux/if_ether.h>
#include <uapi/linux/if_packet.h> #include <uapi/linux/if_packet.h>
#include <uapi/linux/ip.h> #include <uapi/linux/ip.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_legacy.h" #include "bpf_legacy.h"
struct { struct {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <assert.h> #include <assert.h>
#include <linux/bpf.h> #include <linux/bpf.h>
#include <bpf/bpf.h> #include <bpf/bpf.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include "sock_example.h" #include "sock_example.h"
#include <unistd.h> #include <unistd.h>
#include <arpa/inet.h> #include <arpa/inet.h>
......
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_legacy.h" #include "bpf_legacy.h"
#include <uapi/linux/in.h> #include <uapi/linux/in.h>
#include <uapi/linux/if.h> #include <uapi/linux/if.h>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <assert.h> #include <assert.h>
#include <linux/bpf.h> #include <linux/bpf.h>
#include <bpf/bpf.h> #include <bpf/bpf.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include "sock_example.h" #include "sock_example.h"
#include <unistd.h> #include <unistd.h>
#include <arpa/inet.h> #include <arpa/inet.h>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* License as published by the Free Software Foundation. * License as published by the Free Software Foundation.
*/ */
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_legacy.h" #include "bpf_legacy.h"
#include <uapi/linux/in.h> #include <uapi/linux/in.h>
#include <uapi/linux/if.h> #include <uapi/linux/if.h>
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include <linux/version.h> #include <linux/version.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include <uapi/linux/perf_event.h> #include <uapi/linux/perf_event.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
struct bpf_map_def SEC("maps") my_map = { struct bpf_map_def SEC("maps") my_map = {
.type = BPF_MAP_TYPE_HASH, .type = BPF_MAP_TYPE_HASH,
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <sys/resource.h> #include <sys/resource.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include "bpf_load.h" #include "bpf_load.h"
#include "trace_helpers.h" #include "trace_helpers.h"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* Copyright (c) 2017 Facebook /* Copyright (c) 2017 Facebook
*/ */
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
struct syscalls_enter_open_args { struct syscalls_enter_open_args {
unsigned long long unused; unsigned long long unused;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
SEC("kprobe/blk_mq_start_request") SEC("kprobe/blk_mq_start_request")
int bpf_prog1(struct pt_regs *ctx) int bpf_prog1(struct pt_regs *ctx)
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <linux/perf_event.h> #include <linux/perf_event.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include "bpf_load.h" #include "bpf_load.h"
#include "bpf_util.h" #include "bpf_util.h"
#include "perf-sys.h" #include "perf-sys.h"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <uapi/linux/filter.h> #include <uapi/linux/filter.h>
#include <uapi/linux/pkt_cls.h> #include <uapi/linux/pkt_cls.h>
#include <net/ipv6.h> #include <net/ipv6.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#define _htonl __builtin_bswap32 #define _htonl __builtin_bswap32
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <uapi/linux/tcp.h> #include <uapi/linux/tcp.h>
#include <uapi/linux/filter.h> #include <uapi/linux/filter.h>
#include <uapi/linux/pkt_cls.h> #include <uapi/linux/pkt_cls.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_legacy.h" #include "bpf_legacy.h"
/* compiler workaround */ /* compiler workaround */
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <uapi/linux/if_packet.h> #include <uapi/linux/if_packet.h>
#include <uapi/linux/ip.h> #include <uapi/linux/ip.h>
#include <linux/socket.h> #include <linux/socket.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_endian.h" #include <bpf/bpf_endian.h>
#define DEBUG 1 #define DEBUG 1
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include <uapi/linux/if_packet.h> #include <uapi/linux/if_packet.h>
#include <uapi/linux/ip.h> #include <uapi/linux/ip.h>
#include <linux/socket.h> #include <linux/socket.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_endian.h" #include <bpf/bpf_endian.h>
#define DEBUG 1 #define DEBUG 1
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include <uapi/linux/if_packet.h> #include <uapi/linux/if_packet.h>
#include <uapi/linux/ip.h> #include <uapi/linux/ip.h>
#include <linux/socket.h> #include <linux/socket.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_endian.h" #include <bpf/bpf_endian.h>
#define DEBUG 1 #define DEBUG 1
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <uapi/linux/if_packet.h> #include <uapi/linux/if_packet.h>
#include <uapi/linux/ip.h> #include <uapi/linux/ip.h>
#include <linux/socket.h> #include <linux/socket.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_endian.h" #include <bpf/bpf_endian.h>
#define DEBUG 1 #define DEBUG 1
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
*/ */
#include <linux/bpf.h> #include <linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_endian.h" #include <bpf/bpf_endian.h>
#define INTERVAL 1000000000ULL #define INTERVAL 1000000000ULL
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include <uapi/linux/if_packet.h> #include <uapi/linux/if_packet.h>
#include <uapi/linux/ip.h> #include <uapi/linux/ip.h>
#include <linux/socket.h> #include <linux/socket.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_endian.h" #include <bpf/bpf_endian.h>
#define DEBUG 1 #define DEBUG 1
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <uapi/linux/if_packet.h> #include <uapi/linux/if_packet.h>
#include <uapi/linux/ip.h> #include <uapi/linux/ip.h>
#include <linux/socket.h> #include <linux/socket.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_endian.h" #include <bpf/bpf_endian.h>
#define DEBUG 1 #define DEBUG 1
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <uapi/linux/if_packet.h> #include <uapi/linux/if_packet.h>
#include <uapi/linux/ip.h> #include <uapi/linux/ip.h>
#include <linux/socket.h> #include <linux/socket.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_endian.h" #include <bpf/bpf_endian.h>
#define DEBUG 1 #define DEBUG 1
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
#include <uapi/linux/ipv6.h> #include <uapi/linux/ipv6.h>
#include <uapi/linux/in.h> #include <uapi/linux/in.h>
#include <linux/socket.h> #include <linux/socket.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_endian.h" #include <bpf/bpf_endian.h>
#define DEBUG 1 #define DEBUG 1
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <uapi/linux/ipv6.h> #include <uapi/linux/ipv6.h>
#include <uapi/linux/pkt_cls.h> #include <uapi/linux/pkt_cls.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
/* copy of 'struct ethhdr' without __packed */ /* copy of 'struct ethhdr' without __packed */
struct eth_hdr { struct eth_hdr {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include <linux/version.h> #include <linux/version.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include <uapi/linux/utsname.h> #include <uapi/linux/utsname.h>
struct bpf_map_def SEC("maps") cgroup_map = { struct bpf_map_def SEC("maps") cgroup_map = {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <linux/udp.h> #include <linux/udp.h>
#include <linux/icmpv6.h> #include <linux/icmpv6.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include <string.h> #include <string.h>
# define printk(fmt, ...) \ # define printk(fmt, ...) \
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
#include <linux/version.h> #include <linux/version.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include <uapi/linux/in6.h> #include <uapi/linux/in6.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_legacy.h" #include "bpf_legacy.h"
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
#define MAX_NR_PORTS 65536 #define MAX_NR_PORTS 65536
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
#define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;}) #define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;})
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2018 Facebook */ /* Copyright (c) 2018 Facebook */
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
SEC("raw_tracepoint/task_rename") SEC("raw_tracepoint/task_rename")
int prog(struct bpf_raw_tracepoint_args *ctx) int prog(struct bpf_raw_tracepoint_args *ctx)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* License as published by the Free Software Foundation. * License as published by the Free Software Foundation.
*/ */
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
/* from /sys/kernel/debug/tracing/events/task/task_rename/format */ /* from /sys/kernel/debug/tracing/events/task/task_rename/format */
struct task_rename { struct task_rename {
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include <linux/version.h> #include <linux/version.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
struct bpf_map_def SEC("maps") dnat_map = { struct bpf_map_def SEC("maps") dnat_map = {
.type = BPF_MAP_TYPE_HASH, .type = BPF_MAP_TYPE_HASH,
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include <uapi/linux/bpf_perf_event.h> #include <uapi/linux/bpf_perf_event.h>
#include <uapi/linux/perf_event.h> #include <uapi/linux/perf_event.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
struct key_t { struct key_t {
char comm[TASK_COMM_LEN]; char comm[TASK_COMM_LEN];
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <sys/resource.h> #include <sys/resource.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include "bpf_load.h" #include "bpf_load.h"
#include "perf-sys.h" #include "perf-sys.h"
#include "trace_helpers.h" #include "trace_helpers.h"
......
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/version.h> #include <linux/version.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
struct bpf_map_def SEC("maps") my_map = { struct bpf_map_def SEC("maps") my_map = {
.type = BPF_MAP_TYPE_PERF_EVENT_ARRAY, .type = BPF_MAP_TYPE_PERF_EVENT_ARRAY,
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <time.h> #include <time.h>
#include <signal.h> #include <signal.h>
#include <libbpf.h> #include <bpf/libbpf.h>
#include "bpf_load.h" #include "bpf_load.h"
#include "perf-sys.h" #include "perf-sys.h"
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include <linux/version.h> #include <linux/version.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
#define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;}) #define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;})
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/version.h> #include <linux/version.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
struct bpf_map_def SEC("maps") my_map = { struct bpf_map_def SEC("maps") my_map = {
.type = BPF_MAP_TYPE_HASH, .type = BPF_MAP_TYPE_HASH,
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/version.h> #include <linux/version.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
struct bpf_map_def SEC("maps") my_map = { struct bpf_map_def SEC("maps") my_map = {
.type = BPF_MAP_TYPE_HASH, .type = BPF_MAP_TYPE_HASH,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/version.h> #include <linux/version.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
struct pair { struct pair {
u64 val; u64 val;
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <uapi/linux/seccomp.h> #include <uapi/linux/seccomp.h>
#include <uapi/linux/unistd.h> #include <uapi/linux/unistd.h>
#include "syscall_nrs.h" #include "syscall_nrs.h"
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "bpf_tracing.h" #include <bpf/bpf_tracing.h>
#define PROG(F) SEC("kprobe/"__stringify(F)) int bpf_func_##F #define PROG(F) SEC("kprobe/"__stringify(F)) int bpf_func_##F
......
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/version.h> #include <linux/version.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
struct bpf_map_def SEC("maps") counters = { struct bpf_map_def SEC("maps") counters = {
.type = BPF_MAP_TYPE_PERF_EVENT_ARRAY, .type = BPF_MAP_TYPE_PERF_EVENT_ARRAY,
......
#include <uapi/linux/ptrace.h> #include <uapi/linux/ptrace.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include <linux/version.h> #include <linux/version.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
SEC("kprobe/open_ctree") SEC("kprobe/open_ctree")
int bpf_prog1(struct pt_regs *ctx) int bpf_prog1(struct pt_regs *ctx)
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
struct { struct {
__uint(type, BPF_MAP_TYPE_PERCPU_ARRAY); __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
#include <net/if.h> #include <net/if.h>
#include "bpf_util.h" #include "bpf_util.h"
#include "bpf.h" #include <bpf/bpf.h>
#include "libbpf.h" #include <bpf/libbpf.h>
static int ifindex; static int ifindex;
static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST; static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
struct { struct {
__uint(type, BPF_MAP_TYPE_PERCPU_ARRAY); __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include <uapi/linux/pkt_cls.h> #include <uapi/linux/pkt_cls.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
/* /*
* This struct is stored in the XDP 'data_meta' area, which is located * This struct is stored in the XDP 'data_meta' area, which is located
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/icmp.h> #include <linux/icmp.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#define DEFAULT_TTL 64 #define DEFAULT_TTL 64
#define MAX_PCKT_SIZE 600 #define MAX_PCKT_SIZE 600
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include <netinet/ether.h> #include <netinet/ether.h>
#include <unistd.h> #include <unistd.h>
#include <time.h> #include <time.h>
#include "bpf.h" #include <bpf/bpf.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#define STATS_INTERVAL_S 2U #define STATS_INTERVAL_S 2U
#define MAX_PCKT_SIZE 600 #define MAX_PCKT_SIZE 600
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF) #define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF)
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <libgen.h> #include <libgen.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include <bpf/bpf.h> #include <bpf/bpf.h>
static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST; static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* XDP monitor tool, based on tracepoints * XDP monitor tool, based on tracepoints
*/ */
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
struct bpf_map_def SEC("maps") redirect_err_cnt = { struct bpf_map_def SEC("maps") redirect_err_cnt = {
.type = BPF_MAP_TYPE_PERCPU_ARRAY, .type = BPF_MAP_TYPE_PERCPU_ARRAY,
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <uapi/linux/udp.h> #include <uapi/linux/udp.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "hash_func01.h" #include "hash_func01.h"
#define MAX_CPUS 64 /* WARNING - sync with _user.c */ #define MAX_CPUS 64 /* WARNING - sync with _user.c */
......
...@@ -30,7 +30,7 @@ static const char *__doc__ = ...@@ -30,7 +30,7 @@ static const char *__doc__ =
#define MAX_PROG 6 #define MAX_PROG 6
#include <bpf/bpf.h> #include <bpf/bpf.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include "bpf_util.h" #include "bpf_util.h"
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
struct { struct {
__uint(type, BPF_MAP_TYPE_ARRAY); __uint(type, BPF_MAP_TYPE_ARRAY);
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
struct { struct {
__uint(type, BPF_MAP_TYPE_DEVMAP); __uint(type, BPF_MAP_TYPE_DEVMAP);
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "bpf_util.h" #include "bpf_util.h"
#include <bpf/bpf.h> #include <bpf/bpf.h>
#include "libbpf.h" #include <bpf/libbpf.h>
static int ifindex_in; static int ifindex_in;
static int ifindex_out; static int ifindex_out;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "bpf_util.h" #include "bpf_util.h"
#include <bpf/bpf.h> #include <bpf/bpf.h>
#include "libbpf.h" #include <bpf/libbpf.h>
static int ifindex_in; static int ifindex_in;
static int ifindex_out; static int ifindex_out;
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <net/ip_fib.h> #include <net/ip_fib.h>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include "bpf_util.h" #include "bpf_util.h"
#include "libbpf.h" #include <bpf/libbpf.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <libgen.h> #include <libgen.h>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include <uapi/linux/if_ether.h> #include <uapi/linux/if_ether.h>
#include <uapi/linux/in.h> #include <uapi/linux/in.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
/* Config setup from with userspace /* Config setup from with userspace
* *
......
...@@ -22,8 +22,8 @@ static const char *__doc__ = " XDP RX-queue info extract example\n\n" ...@@ -22,8 +22,8 @@ static const char *__doc__ = " XDP RX-queue info extract example\n\n"
#include <arpa/inet.h> #include <arpa/inet.h>
#include <linux/if_link.h> #include <linux/if_link.h>
#include "bpf.h" #include <bpf/bpf.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include "bpf_util.h" #include "bpf_util.h"
static int ifindex = -1; static int ifindex = -1;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/version.h> #include <linux/version.h>
#include <uapi/linux/bpf.h> #include <uapi/linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#define SAMPLE_SIZE 64ul #define SAMPLE_SIZE 64ul
#define MAX_CPUS 128 #define MAX_CPUS 128
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <sys/sysinfo.h> #include <sys/sysinfo.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <signal.h> #include <signal.h>
#include <libbpf.h> #include <bpf/libbpf.h>
#include <bpf/bpf.h> #include <bpf/bpf.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <libgen.h> #include <libgen.h>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "xdp_tx_iptunnel_common.h" #include "xdp_tx_iptunnel_common.h"
struct { struct {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <netinet/ether.h> #include <netinet/ether.h>
#include <unistd.h> #include <unistd.h>
#include <time.h> #include <time.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include <bpf/bpf.h> #include <bpf/bpf.h>
#include "bpf_util.h" #include "bpf_util.h"
#include "xdp_tx_iptunnel_common.h" #include "xdp_tx_iptunnel_common.h"
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <linux/bpf.h> #include <linux/bpf.h>
#include "bpf_helpers.h" #include <bpf/bpf_helpers.h>
#include "xdpsock.h" #include "xdpsock.h"
/* This XDP program is only needed for the XDP_SHARED_UMEM mode. /* This XDP program is only needed for the XDP_SHARED_UMEM mode.
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include "libbpf.h" #include <bpf/libbpf.h>
#include "xsk.h" #include <bpf/xsk.h>
#include "xdpsock.h"
#include <bpf/bpf.h> #include <bpf/bpf.h>
#include "xdpsock.h"
#ifndef SOL_XDP #ifndef SOL_XDP
#define SOL_XDP 283 #define SOL_XDP 283
......
...@@ -196,7 +196,7 @@ and global variables. ...@@ -196,7 +196,7 @@ and global variables.
#define __EXAMPLE_SKEL_H__ #define __EXAMPLE_SKEL_H__
#include <stdlib.h> #include <stdlib.h>
#include <libbpf.h> #include <bpf/libbpf.h>
struct example { struct example {
struct bpf_object_skeleton *skeleton; struct bpf_object_skeleton *skeleton;
......
...@@ -45,7 +45,7 @@ CFLAGS += -DPACKAGE='"bpftool"' -D__EXPORTED_HEADERS__ \ ...@@ -45,7 +45,7 @@ CFLAGS += -DPACKAGE='"bpftool"' -D__EXPORTED_HEADERS__ \
-I$(srctree)/kernel/bpf/ \ -I$(srctree)/kernel/bpf/ \
-I$(srctree)/tools/include \ -I$(srctree)/tools/include \
-I$(srctree)/tools/include/uapi \ -I$(srctree)/tools/include/uapi \
-I$(srctree)/tools/lib/bpf \ -I$(srctree)/tools/lib \
-I$(srctree)/tools/perf -I$(srctree)/tools/perf
CFLAGS += -DBPFTOOL_VERSION='"$(BPFTOOL_VERSION)"' CFLAGS += -DBPFTOOL_VERSION='"$(BPFTOOL_VERSION)"'
ifneq ($(EXTRA_CFLAGS),) ifneq ($(EXTRA_CFLAGS),)
......
...@@ -8,15 +8,15 @@ ...@@ -8,15 +8,15 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <bpf.h> #include <bpf/bpf.h>
#include <libbpf.h> #include <bpf/btf.h>
#include <bpf/libbpf.h>
#include <linux/btf.h> #include <linux/btf.h>
#include <linux/hashtable.h> #include <linux/hashtable.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include "btf.h"
#include "json_writer.h" #include "json_writer.h"
#include "main.h" #include "main.h"
...@@ -532,7 +532,7 @@ static int do_dump(int argc, char **argv) ...@@ -532,7 +532,7 @@ static int do_dump(int argc, char **argv)
if (IS_ERR(btf)) { if (IS_ERR(btf)) {
err = PTR_ERR(btf); err = PTR_ERR(btf);
btf = NULL; btf = NULL;
p_err("failed to load BTF from %s: %s", p_err("failed to load BTF from %s: %s",
*argv, strerror(err)); *argv, strerror(err));
goto done; goto done;
} }
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/btf.h> #include <linux/btf.h>
#include <linux/err.h> #include <linux/err.h>
#include <bpf/btf.h>
#include "btf.h"
#include "json_writer.h" #include "json_writer.h"
#include "main.h" #include "main.h"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <bpf.h> #include <bpf/bpf.h>
#include "main.h" #include "main.h"
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/vfs.h> #include <sys/vfs.h>
#include <bpf.h> #include <bpf/bpf.h>
#include <libbpf.h> /* libbpf_num_possible_cpus */ #include <bpf/libbpf.h> /* libbpf_num_possible_cpus */
#include "main.h" #include "main.h"
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include <linux/filter.h> #include <linux/filter.h>
#include <linux/limits.h> #include <linux/limits.h>
#include <bpf.h> #include <bpf/bpf.h>
#include <libbpf.h> #include <bpf/libbpf.h>
#include <zlib.h> #include <zlib.h>
#include "main.h" #include "main.h"
......
...@@ -12,15 +12,15 @@ ...@@ -12,15 +12,15 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <bpf.h> #include <bpf/bpf.h>
#include <libbpf.h> #include <bpf/libbpf.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
#include <bpf/btf.h>
#include "btf.h" #include "bpf/libbpf_internal.h"
#include "libbpf_internal.h"
#include "json_writer.h" #include "json_writer.h"
#include "main.h" #include "main.h"
...@@ -333,7 +333,7 @@ static int do_skeleton(int argc, char **argv) ...@@ -333,7 +333,7 @@ static int do_skeleton(int argc, char **argv)
#define %2$s \n\ #define %2$s \n\
\n\ \n\
#include <stdlib.h> \n\ #include <stdlib.h> \n\
#include <libbpf.h> \n\ #include <bpf/libbpf.h> \n\
\n\ \n\
struct %1$s { \n\ struct %1$s { \n\
struct bpf_object_skeleton *skeleton; \n\ struct bpf_object_skeleton *skeleton; \n\
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <dis-asm.h> #include <dis-asm.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <limits.h> #include <limits.h>
#include <libbpf.h> #include <bpf/libbpf.h>
#include "json_writer.h" #include "json_writer.h"
#include "main.h" #include "main.h"
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <bpf.h> #include <bpf/bpf.h>
#include <libbpf.h> #include <bpf/libbpf.h>
#include "main.h" #include "main.h"
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <bpf.h> #include <bpf/bpf.h>
#include <bpf/btf.h>
#include "btf.h"
#include "json_writer.h" #include "json_writer.h"
#include "main.h" #include "main.h"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <libbpf.h> #include <bpf/libbpf.h>
#include <poll.h> #include <poll.h>
#include <signal.h> #include <signal.h>
#include <stdbool.h> #include <stdbool.h>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <bpf.h> #include <bpf/bpf.h>
#include <perf-sys.h> #include <perf-sys.h>
#include "main.h" #include "main.h"
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <libbpf.h> #include <bpf/bpf.h>
#include <bpf/libbpf.h>
#include <net/if.h> #include <net/if.h>
#include <linux/if.h> #include <linux/if.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
...@@ -16,9 +17,8 @@ ...@@ -16,9 +17,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <bpf.h> #include "bpf/nlattr.h"
#include <nlattr.h> #include "bpf/libbpf_internal.h"
#include "libbpf_internal.h"
#include "main.h" #include "main.h"
#include "netlink_dumper.h" #include "netlink_dumper.h"
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <libbpf.h> #include <bpf/libbpf.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/tc_act/tc_bpf.h> #include <linux/tc_act/tc_bpf.h>
#include <nlattr.h> #include "bpf/nlattr.h"
#include "main.h" #include "main.h"
#include "netlink_dumper.h" #include "netlink_dumper.h"
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <unistd.h> #include <unistd.h>
#include <ftw.h> #include <ftw.h>
#include <bpf.h> #include <bpf/bpf.h>
#include "main.h" #include "main.h"
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <bpf.h> #include <bpf/bpf.h>
#include <btf.h> #include <bpf/btf.h>
#include <libbpf.h> #include <bpf/libbpf.h>
#include "cfg.h" #include "cfg.h"
#include "main.h" #include "main.h"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <libbpf.h> #include <bpf/libbpf.h>
#include "disasm.h" #include "disasm.h"
#include "json_writer.h" #include "json_writer.h"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment