Merge branch 'libbpf-include-path'

Browse source

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: Andrii Nakryiko <andriin@fb.com>
Tested-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2020-01-20 16:37:46 -08:00

parent f1c3656c6d a2c9652f75

commit d49d0661b9

238 changed files with 392 additions and 388 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

samples/bpf/Makefile

View file

2

samples/bpf/cpustat_kern.c

View file

2

samples/bpf/fds_example.c

View file

4

samples/bpf/hbm.c

View file

4

samples/bpf/hbm_kern.h

View file

2

samples/bpf/ibumad_kern.c

View file

2

samples/bpf/ibumad_user.c

View file

2

samples/bpf/lathist_kern.c

View file

2

samples/bpf/lwt_len_hist_kern.c

View file

4

samples/bpf/map_perf_test_kern.c

View file

4

samples/bpf/offwaketime_kern.c

View file

2

samples/bpf/offwaketime_user.c

View file

2

samples/bpf/parse_ldabs.c

View file

2

samples/bpf/parse_simple.c

View file

2

samples/bpf/parse_varlen.c

View file

4

samples/bpf/sampleip_kern.c

View file

2

samples/bpf/sampleip_user.c

View file

2

samples/bpf/sock_flags_kern.c

View file

2

samples/bpf/sockex1_kern.c

View file

2

samples/bpf/sockex1_user.c

View file

2

samples/bpf/sockex2_kern.c

View file

2

samples/bpf/sockex2_user.c

View file

2

samples/bpf/sockex3_kern.c

View file

4

samples/bpf/spintest_kern.c

View file

2

samples/bpf/spintest_user.c

View file

2

samples/bpf/syscall_tp_kern.c

View file

2

samples/bpf/task_fd_query_kern.c

View file

2

samples/bpf/task_fd_query_user.c

View file

2

samples/bpf/tc_l2_redirect_kern.c

View file

2

samples/bpf/tcbpf1_kern.c

View file

4

samples/bpf/tcp_basertt_kern.c

View file

4

samples/bpf/tcp_bufs_kern.c

View file

4

samples/bpf/tcp_clamp_kern.c

View file

4

samples/bpf/tcp_cong_kern.c

View file

4

samples/bpf/tcp_dumpstats_kern.c

View file

4

samples/bpf/tcp_iw_kern.c

View file

4

samples/bpf/tcp_rwnd_kern.c

View file

4

samples/bpf/tcp_synrto_kern.c

View file

4

samples/bpf/tcp_tos_reflect_kern.c

View file

2

samples/bpf/test_cgrp2_tc_kern.c

View file

2

samples/bpf/test_current_task_under_cgroup_kern.c

View file

2

samples/bpf/test_lwt_bpf.c

View file

4

samples/bpf/test_map_in_map_kern.c

View file

4

samples/bpf/test_overhead_kprobe_kern.c

View file

2

samples/bpf/test_overhead_raw_tp_kern.c

View file

2

samples/bpf/test_overhead_tp_kern.c

View file

4

samples/bpf/test_probe_write_user_kern.c

View file

4

samples/bpf/trace_event_kern.c

View file

2

samples/bpf/trace_event_user.c

View file

2

samples/bpf/trace_output_kern.c

View file

2

samples/bpf/trace_output_user.c

View file

4

samples/bpf/tracex1_kern.c

View file

4

samples/bpf/tracex2_kern.c

View file

4

samples/bpf/tracex3_kern.c

View file

4

samples/bpf/tracex4_kern.c

View file

4

samples/bpf/tracex5_kern.c

View file

2

samples/bpf/tracex6_kern.c

View file

2

samples/bpf/tracex7_kern.c

View file

2

samples/bpf/xdp1_kern.c

View file

4

samples/bpf/xdp1_user.c

View file

2

samples/bpf/xdp2_kern.c

View file

2

samples/bpf/xdp2skb_meta_kern.c

View file

2

samples/bpf/xdp_adjust_tail_kern.c

View file

4

samples/bpf/xdp_adjust_tail_user.c

View file

2

samples/bpf/xdp_fwd_kern.c

View file

2

samples/bpf/xdp_fwd_user.c

View file

2

samples/bpf/xdp_monitor_kern.c

View file

2

samples/bpf/xdp_redirect_cpu_kern.c

View file

2

samples/bpf/xdp_redirect_cpu_user.c

View file

2

samples/bpf/xdp_redirect_kern.c

View file

2

samples/bpf/xdp_redirect_map_kern.c

View file

2

samples/bpf/xdp_redirect_map_user.c

View file

2

samples/bpf/xdp_redirect_user.c

View file

2

samples/bpf/xdp_router_ipv4_kern.c

View file

2

samples/bpf/xdp_router_ipv4_user.c

View file

2

samples/bpf/xdp_rxq_info_kern.c

View file

4

samples/bpf/xdp_rxq_info_user.c

View file

2

samples/bpf/xdp_sample_pkts_kern.c

View file

2

samples/bpf/xdp_sample_pkts_user.c

View file

2

samples/bpf/xdp_tx_iptunnel_kern.c

View file

2

samples/bpf/xdp_tx_iptunnel_user.c

View file

2

samples/bpf/xdpsock_kern.c

View file

6

samples/bpf/xdpsock_user.c

View file

2

tools/bpf/bpftool/Documentation/bpftool-gen.rst

View file

2

tools/bpf/bpftool/Makefile

View file

8

tools/bpf/bpftool/btf.c

View file

2

tools/bpf/bpftool/btf_dumper.c

View file

2

tools/bpf/bpftool/cgroup.c

View file

4

tools/bpf/bpftool/common.c

View file

4

tools/bpf/bpftool/feature.c

View file

10

tools/bpf/bpftool/gen.c

View file

2

tools/bpf/bpftool/jit_disasm.c

View file

4

tools/bpf/bpftool/main.c

View file

4

tools/bpf/bpftool/map.c

View file

4

tools/bpf/bpftool/map_perf_ring.c

View file

8

tools/bpf/bpftool/net.c

View file

4

tools/bpf/bpftool/netlink_dumper.c

View file

2

tools/bpf/bpftool/perf.c

View file

6

tools/bpf/bpftool/prog.c

View file

2

tools/bpf/bpftool/xlated_dumper.c

View file

Some files were not shown because too many files have changed in this diff Show more