lkml.org 
[lkml]   [2023]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH v1 0/3] Bring back vmlinux.h generation
On Mon, May 22, 2023 at 1:41 PM Ian Rogers <irogers@google.com> wrote:
>
> 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
>
>

LGTM, for the series:

Acked-by: Andrii Nakryiko <andrii@kernel.org>

\
 
 \ /
  Last update: 2023-05-23 02:39    [W:0.090 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site