tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: 6910d7d3867a ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir")
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/157952560911.1683545.8795966751309534150.stgit@toke.dk
authored by
Toke Høiland-Jørgensen
and committed by
Alexei Starovoitov
7cf245a3
521fe8bb
+112
-113
+1
-2
samples/bpf/Makefile
+1
-2
samples/bpf/Makefile
···
184
184
TPROGS_CFLAGS += -Wstrict-prototypes
185
185
186
186
TPROGS_CFLAGS += -I$(objtree)/usr/include
187
-
TPROGS_CFLAGS += -I$(srctree)/tools/lib/bpf/
188
187
TPROGS_CFLAGS += -I$(srctree)/tools/testing/selftests/bpf/
189
188
TPROGS_CFLAGS += -I$(srctree)/tools/lib/
190
189
TPROGS_CFLAGS += -I$(srctree)/tools/include
···
304
305
@echo " CLANG-bpf " $@
305
306
$(Q)$(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(BPF_EXTRA_CFLAGS) \
306
307
-I$(obj) -I$(srctree)/tools/testing/selftests/bpf/ \
307
-
-I$(srctree)/tools/lib/bpf/ \
308
+
-I$(srctree)/tools/lib/ \
308
309
-D__KERNEL__ -D__BPF_TRACING__ -Wno-unused-value -Wno-pointer-sign \
309
310
-D__TARGET_ARCH_$(SRCARCH) -Wno-compare-distinct-pointer-types \
310
311
-Wno-gnu-variable-sized-type-not-at-end \
+1
-1
samples/bpf/cpustat_kern.c
+1
-1
samples/bpf/cpustat_kern.c
+1
-1
samples/bpf/fds_example.c
+1
-1
samples/bpf/fds_example.c
+2
-2
samples/bpf/hbm.c
+2
-2
samples/bpf/hbm.c
+2
-2
samples/bpf/hbm_kern.h
+2
-2
samples/bpf/hbm_kern.h
+1
-1
samples/bpf/ibumad_kern.c
+1
-1
samples/bpf/ibumad_kern.c
+1
-1
samples/bpf/ibumad_user.c
+1
-1
samples/bpf/ibumad_user.c
+1
-1
samples/bpf/lathist_kern.c
+1
-1
samples/bpf/lathist_kern.c
+1
-1
samples/bpf/lwt_len_hist_kern.c
+1
-1
samples/bpf/lwt_len_hist_kern.c
+2
-2
samples/bpf/map_perf_test_kern.c
+2
-2
samples/bpf/map_perf_test_kern.c
···
8
8
#include <linux/netdevice.h>
9
9
#include <linux/version.h>
10
10
#include <uapi/linux/bpf.h>
11
-
#include "bpf_helpers.h"
11
+
#include <bpf/bpf_helpers.h>
12
12
#include "bpf_legacy.h"
13
-
#include "bpf_tracing.h"
13
+
#include <bpf/bpf_tracing.h>
14
14
15
15
#define MAX_ENTRIES 1000
16
16
#define MAX_NR_CPUS 1024
+2
-2
samples/bpf/offwaketime_kern.c
+2
-2
samples/bpf/offwaketime_kern.c
···
5
5
* License as published by the Free Software Foundation.
6
6
*/
7
7
#include <uapi/linux/bpf.h>
8
-
#include "bpf_helpers.h"
9
-
#include "bpf_tracing.h"
8
+
#include <bpf/bpf_helpers.h>
9
+
#include <bpf/bpf_tracing.h>
10
10
#include <uapi/linux/ptrace.h>
11
11
#include <uapi/linux/perf_event.h>
12
12
#include <linux/version.h>
+1
-1
samples/bpf/offwaketime_user.c
+1
-1
samples/bpf/offwaketime_user.c
+1
-1
samples/bpf/parse_ldabs.c
+1
-1
samples/bpf/parse_ldabs.c
+1
-1
samples/bpf/parse_simple.c
+1
-1
samples/bpf/parse_simple.c
+1
-1
samples/bpf/parse_varlen.c
+1
-1
samples/bpf/parse_varlen.c
+2
-2
samples/bpf/sampleip_kern.c
+2
-2
samples/bpf/sampleip_kern.c
+1
-1
samples/bpf/sampleip_user.c
+1
-1
samples/bpf/sampleip_user.c
+1
-1
samples/bpf/sock_flags_kern.c
+1
-1
samples/bpf/sock_flags_kern.c
+1
-1
samples/bpf/sockex1_kern.c
+1
-1
samples/bpf/sockex1_kern.c
+1
-1
samples/bpf/sockex1_user.c
+1
-1
samples/bpf/sockex1_user.c
+1
-1
samples/bpf/sockex2_kern.c
+1
-1
samples/bpf/sockex2_kern.c
+1
-1
samples/bpf/sockex2_user.c
+1
-1
samples/bpf/sockex2_user.c
+1
-1
samples/bpf/sockex3_kern.c
+1
-1
samples/bpf/sockex3_kern.c
+2
-2
samples/bpf/spintest_kern.c
+2
-2
samples/bpf/spintest_kern.c
···
9
9
#include <linux/version.h>
10
10
#include <uapi/linux/bpf.h>
11
11
#include <uapi/linux/perf_event.h>
12
-
#include "bpf_helpers.h"
13
-
#include "bpf_tracing.h"
12
+
#include <bpf/bpf_helpers.h>
13
+
#include <bpf/bpf_tracing.h>
14
14
15
15
struct bpf_map_def SEC("maps") my_map = {
16
16
.type = BPF_MAP_TYPE_HASH,
+1
-1
samples/bpf/spintest_user.c
+1
-1
samples/bpf/spintest_user.c
+1
-1
samples/bpf/syscall_tp_kern.c
+1
-1
samples/bpf/syscall_tp_kern.c
+1
-1
samples/bpf/task_fd_query_kern.c
+1
-1
samples/bpf/task_fd_query_kern.c
+1
-1
samples/bpf/task_fd_query_user.c
+1
-1
samples/bpf/task_fd_query_user.c
+1
-1
samples/bpf/tc_l2_redirect_kern.c
+1
-1
samples/bpf/tc_l2_redirect_kern.c
+1
-1
samples/bpf/tcbpf1_kern.c
+1
-1
samples/bpf/tcbpf1_kern.c
+2
-2
samples/bpf/tcp_basertt_kern.c
+2
-2
samples/bpf/tcp_basertt_kern.c
+2
-2
samples/bpf/tcp_bufs_kern.c
+2
-2
samples/bpf/tcp_bufs_kern.c
+2
-2
samples/bpf/tcp_clamp_kern.c
+2
-2
samples/bpf/tcp_clamp_kern.c
+2
-2
samples/bpf/tcp_cong_kern.c
+2
-2
samples/bpf/tcp_cong_kern.c
+2
-2
samples/bpf/tcp_dumpstats_kern.c
+2
-2
samples/bpf/tcp_dumpstats_kern.c
+2
-2
samples/bpf/tcp_iw_kern.c
+2
-2
samples/bpf/tcp_iw_kern.c
+2
-2
samples/bpf/tcp_rwnd_kern.c
+2
-2
samples/bpf/tcp_rwnd_kern.c
+2
-2
samples/bpf/tcp_synrto_kern.c
+2
-2
samples/bpf/tcp_synrto_kern.c
+2
-2
samples/bpf/tcp_tos_reflect_kern.c
+2
-2
samples/bpf/tcp_tos_reflect_kern.c
+1
-1
samples/bpf/test_cgrp2_tc_kern.c
+1
-1
samples/bpf/test_cgrp2_tc_kern.c
+1
-1
samples/bpf/test_current_task_under_cgroup_kern.c
+1
-1
samples/bpf/test_current_task_under_cgroup_kern.c
+1
-1
samples/bpf/test_lwt_bpf.c
+1
-1
samples/bpf/test_lwt_bpf.c
+2
-2
samples/bpf/test_map_in_map_kern.c
+2
-2
samples/bpf/test_map_in_map_kern.c
···
10
10
#include <linux/version.h>
11
11
#include <uapi/linux/bpf.h>
12
12
#include <uapi/linux/in6.h>
13
-
#include "bpf_helpers.h"
13
+
#include <bpf/bpf_helpers.h>
14
14
#include "bpf_legacy.h"
15
-
#include "bpf_tracing.h"
15
+
#include <bpf/bpf_tracing.h>
16
16
17
17
#define MAX_NR_PORTS 65536
18
18
+2
-2
samples/bpf/test_overhead_kprobe_kern.c
+2
-2
samples/bpf/test_overhead_kprobe_kern.c
···
7
7
#include <linux/version.h>
8
8
#include <linux/ptrace.h>
9
9
#include <uapi/linux/bpf.h>
10
-
#include "bpf_helpers.h"
11
-
#include "bpf_tracing.h"
10
+
#include <bpf/bpf_helpers.h>
11
+
#include <bpf/bpf_tracing.h>
12
12
13
13
#define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;})
14
14
+1
-1
samples/bpf/test_overhead_raw_tp_kern.c
+1
-1
samples/bpf/test_overhead_raw_tp_kern.c
+1
-1
samples/bpf/test_overhead_tp_kern.c
+1
-1
samples/bpf/test_overhead_tp_kern.c
+2
-2
samples/bpf/test_probe_write_user_kern.c
+2
-2
samples/bpf/test_probe_write_user_kern.c
···
8
8
#include <linux/netdevice.h>
9
9
#include <uapi/linux/bpf.h>
10
10
#include <linux/version.h>
11
-
#include "bpf_helpers.h"
12
-
#include "bpf_tracing.h"
11
+
#include <bpf/bpf_helpers.h>
12
+
#include <bpf/bpf_tracing.h>
13
13
14
14
struct bpf_map_def SEC("maps") dnat_map = {
15
15
.type = BPF_MAP_TYPE_HASH,
+2
-2
samples/bpf/trace_event_kern.c
+2
-2
samples/bpf/trace_event_kern.c
···
9
9
#include <uapi/linux/bpf.h>
10
10
#include <uapi/linux/bpf_perf_event.h>
11
11
#include <uapi/linux/perf_event.h>
12
-
#include "bpf_helpers.h"
13
-
#include "bpf_tracing.h"
12
+
#include <bpf/bpf_helpers.h>
13
+
#include <bpf/bpf_tracing.h>
14
14
15
15
struct key_t {
16
16
char comm[TASK_COMM_LEN];
+1
-1
samples/bpf/trace_event_user.c
+1
-1
samples/bpf/trace_event_user.c
+1
-1
samples/bpf/trace_output_kern.c
+1
-1
samples/bpf/trace_output_kern.c
+1
-1
samples/bpf/trace_output_user.c
+1
-1
samples/bpf/trace_output_user.c
+2
-2
samples/bpf/tracex1_kern.c
+2
-2
samples/bpf/tracex1_kern.c
···
8
8
#include <linux/netdevice.h>
9
9
#include <uapi/linux/bpf.h>
10
10
#include <linux/version.h>
11
-
#include "bpf_helpers.h"
12
-
#include "bpf_tracing.h"
11
+
#include <bpf/bpf_helpers.h>
12
+
#include <bpf/bpf_tracing.h>
13
13
14
14
#define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;})
15
15
+2
-2
samples/bpf/tracex2_kern.c
+2
-2
samples/bpf/tracex2_kern.c
···
8
8
#include <linux/netdevice.h>
9
9
#include <linux/version.h>
10
10
#include <uapi/linux/bpf.h>
11
-
#include "bpf_helpers.h"
12
-
#include "bpf_tracing.h"
11
+
#include <bpf/bpf_helpers.h>
12
+
#include <bpf/bpf_tracing.h>
13
13
14
14
struct bpf_map_def SEC("maps") my_map = {
15
15
.type = BPF_MAP_TYPE_HASH,
+2
-2
samples/bpf/tracex3_kern.c
+2
-2
samples/bpf/tracex3_kern.c
···
8
8
#include <linux/netdevice.h>
9
9
#include <linux/version.h>
10
10
#include <uapi/linux/bpf.h>
11
-
#include "bpf_helpers.h"
12
-
#include "bpf_tracing.h"
11
+
#include <bpf/bpf_helpers.h>
12
+
#include <bpf/bpf_tracing.h>
13
13
14
14
struct bpf_map_def SEC("maps") my_map = {
15
15
.type = BPF_MAP_TYPE_HASH,
+2
-2
samples/bpf/tracex4_kern.c
+2
-2
samples/bpf/tracex4_kern.c
+2
-2
samples/bpf/tracex5_kern.c
+2
-2
samples/bpf/tracex5_kern.c
···
10
10
#include <uapi/linux/seccomp.h>
11
11
#include <uapi/linux/unistd.h>
12
12
#include "syscall_nrs.h"
13
-
#include "bpf_helpers.h"
14
-
#include "bpf_tracing.h"
13
+
#include <bpf/bpf_helpers.h>
14
+
#include <bpf/bpf_tracing.h>
15
15
16
16
#define PROG(F) SEC("kprobe/"__stringify(F)) int bpf_func_##F
17
17
+1
-1
samples/bpf/tracex6_kern.c
+1
-1
samples/bpf/tracex6_kern.c
+1
-1
samples/bpf/tracex7_kern.c
+1
-1
samples/bpf/tracex7_kern.c
+1
-1
samples/bpf/xdp1_kern.c
+1
-1
samples/bpf/xdp1_kern.c
+2
-2
samples/bpf/xdp1_user.c
+2
-2
samples/bpf/xdp1_user.c
+1
-1
samples/bpf/xdp2_kern.c
+1
-1
samples/bpf/xdp2_kern.c
+1
-1
samples/bpf/xdp2skb_meta_kern.c
+1
-1
samples/bpf/xdp2skb_meta_kern.c
+1
-1
samples/bpf/xdp_adjust_tail_kern.c
+1
-1
samples/bpf/xdp_adjust_tail_kern.c
+2
-2
samples/bpf/xdp_adjust_tail_user.c
+2
-2
samples/bpf/xdp_adjust_tail_user.c
+1
-1
samples/bpf/xdp_fwd_kern.c
+1
-1
samples/bpf/xdp_fwd_kern.c
+1
-1
samples/bpf/xdp_fwd_user.c
+1
-1
samples/bpf/xdp_fwd_user.c
+1
-1
samples/bpf/xdp_monitor_kern.c
+1
-1
samples/bpf/xdp_monitor_kern.c
+1
-1
samples/bpf/xdp_redirect_cpu_kern.c
+1
-1
samples/bpf/xdp_redirect_cpu_kern.c
+1
-1
samples/bpf/xdp_redirect_cpu_user.c
+1
-1
samples/bpf/xdp_redirect_cpu_user.c
+1
-1
samples/bpf/xdp_redirect_kern.c
+1
-1
samples/bpf/xdp_redirect_kern.c
+1
-1
samples/bpf/xdp_redirect_map_kern.c
+1
-1
samples/bpf/xdp_redirect_map_kern.c
+1
-1
samples/bpf/xdp_redirect_map_user.c
+1
-1
samples/bpf/xdp_redirect_map_user.c
+1
-1
samples/bpf/xdp_redirect_user.c
+1
-1
samples/bpf/xdp_redirect_user.c
+1
-1
samples/bpf/xdp_router_ipv4_kern.c
+1
-1
samples/bpf/xdp_router_ipv4_kern.c
+1
-1
samples/bpf/xdp_router_ipv4_user.c
+1
-1
samples/bpf/xdp_router_ipv4_user.c
+1
-1
samples/bpf/xdp_rxq_info_kern.c
+1
-1
samples/bpf/xdp_rxq_info_kern.c
+2
-2
samples/bpf/xdp_rxq_info_user.c
+2
-2
samples/bpf/xdp_rxq_info_user.c
+1
-1
samples/bpf/xdp_sample_pkts_kern.c
+1
-1
samples/bpf/xdp_sample_pkts_kern.c
+1
-1
samples/bpf/xdp_sample_pkts_user.c
+1
-1
samples/bpf/xdp_sample_pkts_user.c
+1
-1
samples/bpf/xdp_tx_iptunnel_kern.c
+1
-1
samples/bpf/xdp_tx_iptunnel_kern.c
+1
-1
samples/bpf/xdp_tx_iptunnel_user.c
+1
-1
samples/bpf/xdp_tx_iptunnel_user.c
+1
-1
samples/bpf/xdpsock_kern.c
+1
-1
samples/bpf/xdpsock_kern.c
+3
-3
samples/bpf/xdpsock_user.c
+3
-3
samples/bpf/xdpsock_user.c