[PATCH v1 0/3] Bring back vmlinux.h generation

* [PATCH v1 0/3] Bring back vmlinux.h generation
@ 2023-05-22 20:40 Ian Rogers
  2023-05-22 20:40 ` [PATCH v1 1/3] perf build: Add ability to build with a generated vmlinux.h Ian Rogers
                   ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: Ian Rogers @ 2023-05-22 20:40 UTC (permalink / raw)
  To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
	Ian Rogers, Adrian Hunter, James Clark, Tiezhu Yang, Yang Jihong,
	linux-perf-users, linux-kernel, bpf

Commit 760ebc45746b ("perf lock contention: Add empty 'struct rq' to
satisfy libbpf 'runqueue' type verification") inadvertently created a
declaration of 'struct rq' that conflicted with a generated
vmlinux.h's:

```
util/bpf_skel/lock_contention.bpf.c:419:8: error: redefinition of 'rq'
struct rq {};
       ^
/tmp/perf/util/bpf_skel/.tmp/../vmlinux.h:45630:8: note: previous definition is here
struct rq {
       ^
1 error generated.
```

Fix the issue by moving the declaration to vmlinux.h. So this can't
happen again, bring back build support for generating vmlinux.h then
add build tests.

Ian Rogers (3):
  perf build: Add ability to build with a generated vmlinux.h
  perf bpf: Move the declaration of struct rq
  perf test: Add build tests for BUILD_BPF_SKEL

 tools/perf/Makefile.config                       |  4 ++++
 tools/perf/Makefile.perf                         | 16 +++++++++++++++-
 tools/perf/tests/make                            |  4 ++++
 tools/perf/util/bpf_skel/.gitignore              |  1 +
 tools/perf/util/bpf_skel/lock_contention.bpf.c   |  2 --
 tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h | 10 ++++++++++
 6 files changed, 34 insertions(+), 3 deletions(-)
 rename tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h (90%)

-- 
2.40.1.698.g37aff9b760-goog

^ permalink raw reply	[flat|nested] 9+ messages in thread