OSDN Git Service

bpftool: Use linux/types.h from source tree for profiler build
authorTobias Klauser <tklauser@distanz.ch>
Thu, 12 Mar 2020 13:03:30 +0000 (14:03 +0100)
committerDaniel Borkmann <daniel@iogearbox.net>
Thu, 12 Mar 2020 15:22:41 +0000 (16:22 +0100)
commitfe4eb069edb7ab845160350d9e67d572c026a4a7
tree840739e27a07ed6f88a4ea40a1950b74c9a8392c
parent37ccc12bbcef880e6b3fdf7e03cf9e5fe9df99f2
bpftool: Use linux/types.h from source tree for profiler build

When compiling bpftool on a system where the /usr/include/asm symlink
doesn't exist (e.g. on an Ubuntu system without gcc-multilib installed),
the build fails with:

    CLANG    skeleton/profiler.bpf.o
  In file included from skeleton/profiler.bpf.c:4:
  In file included from /usr/include/linux/bpf.h:11:
  /usr/include/linux/types.h:5:10: fatal error: 'asm/types.h' file not found
  #include <asm/types.h>
           ^~~~~~~~~~~~~
  1 error generated.
  make: *** [Makefile:123: skeleton/profiler.bpf.o] Error 1

This indicates that the build is using linux/types.h from system headers
instead of source tree headers.

To fix this, adjust the clang search path to include the necessary
headers from tools/testing/selftests/bpf/include/uapi and
tools/include/uapi. Also use __bitwise__ instead of __bitwise in
skeleton/profiler.h to avoid clashing with the definition in
tools/testing/selftests/bpf/include/uapi/linux/types.h.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Quentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20200312130330.32239-1-tklauser@distanz.ch
tools/bpf/bpftool/Makefile
tools/bpf/bpftool/skeleton/profiler.h