File perf-bpf-Fix-building-perf-with-BUILD_BPF_SKEL-1-by-default-in-more-distros.patch of Package perf
91
1
From: Song Liu <songliubraving@fb.com>2
Date: Fri, 3 Dec 2021 19:32:34 +00003
Subject: perf bpf: Fix building perf with BUILD_BPF_SKEL=1 by default in more4
distros5
Git-commit: f7c4e85bccea960203e5872553957511df86913e6
Patch-mainline: v5.16-rc57
References: git-fixes8
X-Info: dependent patch for 5a897531e00243cebbcc4dbe4ab06cd559ccf53f9
10
Arnaldo reported that building all his containers with BUILD_BPF_SKEL=111
to then make this the default he found problems in some distros where12
the system linux/bpf.h file was being used and lacked this:13
14
util/bpf_skel/bperf_leader.bpf.c:13:20: error: use of undeclared identifier 'BPF_F_PRESERVE_ELEMS'15
__uint(map_flags, BPF_F_PRESERVE_ELEMS);16
17
So use instead the vmlinux.h file generated by bpftool from BTF info.18
19
This fixed these as well, getting the build back working on debian:11,20
debian:experimental and ubuntu:21.10:21
22
In file included from In file included from util/bpf_skel/bperf_leader.bpf.cutil/bpf_skel/bpf_prog_profiler.bpf.c::33:23
:24
In file included from In file included from /usr/include/linux/bpf.h/usr/include/linux/bpf.h::1111:25
:26
/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:27
: : In file included from /usr/include/linux/bpf.h:'asm/types.h' file not found11'asm/types.h' file not found:28
29
/usr/include/linux/types.h:5:10: fatal error: 'asm/types.h' file not found30
#include <asm/types.h>#include <asm/types.h>31
32
^~~~~~~~~~~~~ ^~~~~~~~~~~~~33
34
#include <asm/types.h>35
^~~~~~~~~~~~~36
1 error generated.37
38
Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>39
Signed-off-by: Song Liu <song@kernel.org>40
Tested-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>41
Cc: Jiri Olsa <jolsa@kernel.org>42
Cc: Namhyung Kim <namhyung@kernel.org>43
Link: http://lore.kernel.org/lkml/CF175681-8101-43D1-ABDB-449E644BE986@fb.com44
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>45
Signed-off-by: Tony Jones <tonyj@suse.de>46
---47
tools/perf/util/bpf_skel/bperf_follower.bpf.c | 3 +--48
tools/perf/util/bpf_skel/bperf_leader.bpf.c | 3 +--49
tools/perf/util/bpf_skel/bpf_prog_profiler.bpf.c | 2 +-50
3 files changed, 3 insertions(+), 5 deletions(-)51
52
diff --git a/tools/perf/util/bpf_skel/bperf_follower.bpf.c b/tools/perf/util/bpf_skel/bperf_follower.bpf.c53
index b8fa3cb2da23..4a6acfde1493 10064454
--- a/tools/perf/util/bpf_skel/bperf_follower.bpf.c55
+++ b/tools/perf/util/bpf_skel/bperf_follower.bpf.c56
57
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)58
// Copyright (c) 2021 Facebook59
-#include <linux/bpf.h>60
-#include <linux/perf_event.h>61
+#include "vmlinux.h"62
#include <bpf/bpf_helpers.h>63
#include <bpf/bpf_tracing.h>64
#include "bperf.h"65
diff --git a/tools/perf/util/bpf_skel/bperf_leader.bpf.c b/tools/perf/util/bpf_skel/bperf_leader.bpf.c66
index 4f70d1459e86..40d962b05863 10064467
--- a/tools/perf/util/bpf_skel/bperf_leader.bpf.c68
+++ b/tools/perf/util/bpf_skel/bperf_leader.bpf.c69
70
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)71
// Copyright (c) 2021 Facebook72
-#include <linux/bpf.h>73
-#include <linux/perf_event.h>74
+#include "vmlinux.h"75
#include <bpf/bpf_helpers.h>76
#include <bpf/bpf_tracing.h>77
#include "bperf.h"78
diff --git a/tools/perf/util/bpf_skel/bpf_prog_profiler.bpf.c b/tools/perf/util/bpf_skel/bpf_prog_profiler.bpf.c79
index ab12b4c4ece2..97037d3b3d9f 10064480
--- a/tools/perf/util/bpf_skel/bpf_prog_profiler.bpf.c81
+++ b/tools/perf/util/bpf_skel/bpf_prog_profiler.bpf.c82
83
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)84
// Copyright (c) 2020 Facebook85
-#include <linux/bpf.h>86
+#include "vmlinux.h"87
#include <bpf/bpf_helpers.h>88
#include <bpf/bpf_tracing.h>89
90
91