)]}' { "commit": "f7c4e85bccea960203e5872553957511df86913e", "tree": "a4a8ffb1eb78ad7ae8c1678d41747e6e6471ddac", "parents": [ "4747395082abc67c700a75e4cf3b796e79c7cf3a" ], "author": { "name": "Song Liu", "email": "songliubraving@fb.com", "time": "Fri Dec 03 19:32:34 2021 +0000" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Dec 06 21:57:53 2021 -0300" }, "message": "perf bpf: Fix building perf with BUILD_BPF_SKEL\u003d1 by default in more distros\n\nArnaldo reported that building all his containers with BUILD_BPF_SKEL\u003d1\nto then make this the default he found problems in some distros where\nthe system linux/bpf.h file was being used and lacked this:\n\n util/bpf_skel/bperf_leader.bpf.c:13:20: error: use of undeclared identifier \u0027BPF_F_PRESERVE_ELEMS\u0027\n __uint(map_flags, BPF_F_PRESERVE_ELEMS);\n\nSo use instead the vmlinux.h file generated by bpftool from BTF info.\n\nThis fixed these as well, getting the build back working on debian:11,\ndebian:experimental and ubuntu:21.10:\n\n In file included from In file included from util/bpf_skel/bperf_leader.bpf.cutil/bpf_skel/bpf_prog_profiler.bpf.c::33:\n :\n In file included from In file included from /usr/include/linux/bpf.h/usr/include/linux/bpf.h::1111:\n :\n /usr/include/linux/types.h/usr/include/linux/types.h::55::1010:: In file included from util/bpf_skel/bperf_follower.bpf.c:3fatal errorfatal error:\n : : In file included from /usr/include/linux/bpf.h:\u0027asm/types.h\u0027 file not found11\u0027asm/types.h\u0027 file not found:\n\n /usr/include/linux/types.h:5:10: fatal error: \u0027asm/types.h\u0027 file not found\n #include \u003casm/types.h\u003e#include \u003casm/types.h\u003e\n\n ^~~~~~~~~~~~~ ^~~~~~~~~~~~~\n\n #include \u003casm/types.h\u003e\n ^~~~~~~~~~~~~\n 1 error generated.\n\nReported-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nSigned-off-by: Song Liu \u003csong@kernel.org\u003e\nTested-by: Athira Rajeev \u003catrajeev@linux.vnet.ibm.com\u003e\nCc: Jiri Olsa \u003cjolsa@kernel.org\u003e\nCc: Namhyung Kim \u003cnamhyung@kernel.org\u003e\nLink: http://lore.kernel.org/lkml/CF175681-8101-43D1-ABDB-449E644BE986@fb.com\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n", "tree_diff": [ { "type": "modify", "old_id": "b8fa3cb2da2308034f8fe651f4a0cdb70d9cb6e7", "old_mode": 33188, "old_path": "tools/perf/util/bpf_skel/bperf_follower.bpf.c", "new_id": "4a6acfde14937704d2d2144e8fc3458d86112bb9", "new_mode": 33188, "new_path": "tools/perf/util/bpf_skel/bperf_follower.bpf.c" }, { "type": "modify", "old_id": "4f70d1459e86cb99e72a38d0889a0f3c79a84f06", "old_mode": 33188, "old_path": "tools/perf/util/bpf_skel/bperf_leader.bpf.c", "new_id": "40d962b05863421e4fab735bf21f4969a7057541", "new_mode": 33188, "new_path": "tools/perf/util/bpf_skel/bperf_leader.bpf.c" }, { "type": "modify", "old_id": "ab12b4c4ece21a9a3fd0f1f540d67241b34e5f03", "old_mode": 33188, "old_path": "tools/perf/util/bpf_skel/bpf_prog_profiler.bpf.c", "new_id": "97037d3b3d9fa4cd70838b32397c4f0f488c115e", "new_mode": 33188, "new_path": "tools/perf/util/bpf_skel/bpf_prog_profiler.bpf.c" } ] }