Skip to content

Bring back vmlinux.h generation

Ian Rogers bpf linux-perf-users lkml 4 versions – Applied

Status from this message: Applied to perf-tools-next with it, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest4 patches 2 repliesApplied
  2. v34 patches 2 repliesSuperseded
  3. v24 patches 6 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v13 patches4 repliesSuperseded

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/4perf build: Add ability to build with a generated vmlinux.htools/perf/Makefile.config tools/perf/Makefile.perf tools/perf/util/bpf_skel/.gitignore +1 more+20 -10 replies
2/4perf bpf: Move the declaration of struct rqtools/perf/util/bpf_skel/lock_contention.bpf.c tools/perf/util/bpf_skel/vmlinux/vmlinux.h+10 -20 replies
3/4perf test: Add build tests for BUILD_BPF_SKELtools/perf/tests/make+4 -00 replies
4/4perf build: Filter out BTF sources without a .BTF sectiontools/perf/Makefile.perf+26 -30 replies

Reviews trailers per patch

All 4 patches have a Reviewed-by or Acked-by.

PatchAndrii NakryikoNamhyung KimJiri Olsa
1/4A-b A-b A-b
2/4A-b A-b A-b
3/4A-b A-b A-b
4/4A-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v4 thread

Cover letter [PATCH v4 0/4] Bring back vmlinux.h generation

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.

v4. Rebase and add Namhyung and Jiri's acked-by.
v3. Address Namhyung's comments on filtering ELF files with readelf. v2. Rebase on perf-tools-next. Add Andrii's acked-by. Add patch to
filter out kernels that lack a .BTF section and cause the build to break.

Ian Rogers (4):
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 perf build: Filter out BTF sources without a .BTF section

 tools/perf/Makefile.config                    |  4 ++
 tools/perf/Makefile.perf                      | 39 ++++++++++++++++++-
 tools/perf/tests/make                         |  4 ++
 tools/perf/util/bpf_skel/.gitignore           |  1 +
 .../perf/util/bpf_skel/lock_contention.bpf.c  |  2 -
 .../util/bpf_skel/{ => vmlinux}/vmlinux.h     | 10 +++++
 6 files changed, 57 insertions(+), 3 deletions(-)
 rename tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h (90%)
Signature · 1 line
2.41.0.162.gfafddb0af9-goog