From: Jiri Olsa <olsajiri@gmail.com>
To: Ian Rogers <irogers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Namhyung Kim <namhyung@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
James Clark <james.clark@arm.com>,
Tiezhu Yang <yangtiezhu@loongson.cn>,
Yang Jihong <yangjihong1@huawei.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
bpf@vger.kernel.org
Subject: Re: [PATCH v3 0/4] Bring back vmlinux.h generation
Date: Sun, 11 Jun 2023 00:14:23 +0200 [thread overview]
Message-ID: <ZIT1v4oUKJreqd/I@krava> (raw)
In-Reply-To: <20230609043240.43890-1-irogers@google.com>
On Thu, Jun 08, 2023 at 09:32:36PM -0700, Ian Rogers 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.
>
> v3. Address Namhyung's comments on filtering ELF files with readelf.
Acked-by: Jiri Olsa <jolsa@kernel.org>
jirka
> 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%)
>
> --
> 2.41.0.162.gfafddb0af9-goog
>
prev parent reply other threads:[~2023-06-10 22:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-09 4:32 [PATCH v3 0/4] Bring back vmlinux.h generation Ian Rogers
2023-06-09 4:32 ` [PATCH v3 1/4] perf build: Add ability to build with a generated vmlinux.h Ian Rogers
2023-06-09 4:32 ` [PATCH v3 2/4] perf bpf: Move the declaration of struct rq Ian Rogers
2023-06-09 4:32 ` [PATCH v3 3/4] perf test: Add build tests for BUILD_BPF_SKEL Ian Rogers
2023-06-09 4:32 ` [PATCH v3 4/4] perf build: Filter out BTF sources without a .BTF section Ian Rogers
2023-06-09 6:34 ` [PATCH v3 0/4] Bring back vmlinux.h generation Namhyung Kim
2023-06-10 22:14 ` Jiri Olsa [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZIT1v4oUKJreqd/I@krava \
--to=olsajiri@gmail.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=bpf@vger.kernel.org \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=yangjihong1@huawei.com \
--cc=yangtiezhu@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).