From: Ian Rogers <irogers@google.com>
To: 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>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Andres Freund <andres@anarazel.de>,
Quentin Monnet <quentin@isovalent.com>,
Roberto Sassu <roberto.sassu@huawei.com>,
Christy Lee <christylee@fb.com>,
Andrii Nakryiko <andrii@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
bpf@vger.kernel.org
Cc: Ian Rogers <irogers@google.com>
Subject: [PATCH v2 0/3] Assume libbpf 1.0+
Date: Sun, 15 Jan 2023 17:01:12 -0800 [thread overview]
Message-ID: <20230116010115.490713-1-irogers@google.com> (raw)
libbpf 1.0 was a major change in API. Perf has partially supported
older libbpf's but an implementation may be:
..
pr_err("%s: not support, update libbpf\n", __func__);
return -ENOTSUP;
..
Rather than build a binary that would fail at runtime it is
preferrential just to build libbpf statically and link against
that. The static version is in the kernel tools tree and newer than
1.0.
These patches change the libbpf test to only pass when at least
version 1.0 is installed, then remove the conditional build and
feature logic.
The issue is discussed here:
https://lore.kernel.org/lkml/20230106151320.619514-1-irogers@google.com/
perf bpf:
A variant of this fix was added to Linux 6.2 in:
"perf bpf: Avoid build breakage with libbpf < 0.8.0 + LIBBPF_DYNAMIC=1"
https://lore.kernel.org/lkml/Y71+eh00Ju7WeEFX@kernel.org/
This change goes further in removing logic that is now no longer
necessary.
v2. Rebase now that breakage fix patch is in linus/master.
Ian Rogers (3):
tools build: Pass libbpf feature only if libbpf 1.0+
perf build: Remove libbpf pre-1.0 feature tests
perf bpf: Remove pre libbpf 1.0 conditional logic
tools/build/feature/Makefile | 7 --
.../feature/test-libbpf-bpf_map_create.c | 8 ---
.../test-libbpf-bpf_object__next_map.c | 8 ---
.../test-libbpf-bpf_object__next_program.c | 8 ---
.../build/feature/test-libbpf-bpf_prog_load.c | 9 ---
.../test-libbpf-bpf_program__set_insns.c | 8 ---
.../test-libbpf-btf__load_from_kernel_by_id.c | 8 ---
.../build/feature/test-libbpf-btf__raw_data.c | 8 ---
tools/build/feature/test-libbpf.c | 4 ++
tools/perf/Makefile.config | 39 +----------
tools/perf/util/bpf-event.c | 66 -------------------
tools/perf/util/bpf-loader.c | 18 -----
tools/perf/util/bpf_counter.c | 18 -----
13 files changed, 5 insertions(+), 204 deletions(-)
delete mode 100644 tools/build/feature/test-libbpf-bpf_map_create.c
delete mode 100644 tools/build/feature/test-libbpf-bpf_object__next_map.c
delete mode 100644 tools/build/feature/test-libbpf-bpf_object__next_program.c
delete mode 100644 tools/build/feature/test-libbpf-bpf_prog_load.c
delete mode 100644 tools/build/feature/test-libbpf-bpf_program__set_insns.c
delete mode 100644 tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c
delete mode 100644 tools/build/feature/test-libbpf-btf__raw_data.c
--
2.39.0.314.g84b9a713c41-goog
next reply other threads:[~2023-01-16 1:01 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-16 1:01 Ian Rogers [this message]
2023-01-16 1:01 ` [PATCH v2 1/3] tools build: Pass libbpf feature only if libbpf 1.0+ Ian Rogers
2023-01-16 1:01 ` [PATCH v2 2/3] perf build: Remove libbpf pre-1.0 feature tests Ian Rogers
2023-03-13 21:10 ` Arnaldo Carvalho de Melo
2023-03-13 21:38 ` Arnaldo Carvalho de Melo
2023-03-14 0:19 ` Ian Rogers
2023-03-14 1:51 ` Ian Rogers
2023-03-14 11:36 ` Arnaldo Carvalho de Melo
2023-01-16 1:01 ` [PATCH v2 3/3] perf bpf: Remove pre libbpf 1.0 conditional logic Ian Rogers
2023-01-19 17:11 ` [PATCH v2 0/3] Assume libbpf 1.0+ Ian Rogers
2023-01-19 17:41 ` Arnaldo Carvalho de Melo
2023-01-19 17:47 ` Arnaldo Carvalho de Melo
2023-01-19 18:12 ` Ian Rogers
2023-01-19 21:13 ` Jiri Olsa
2023-03-09 2:13 ` Ian Rogers
2023-03-09 7:58 ` Guilherme Amadio
2023-03-09 17:24 ` Andrii Nakryiko
2023-03-10 3:26 ` Ian Rogers
2023-03-10 20:22 ` Andrii Nakryiko
2023-03-12 1:00 ` Ian Rogers
2023-03-12 9:51 ` Jiri Olsa
2023-03-10 9:09 ` Jiri Olsa
2023-03-10 14:08 ` Justin Forbes
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=20230116010115.490713-1-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=andres@anarazel.de \
--cc=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=christylee@fb.com \
--cc=jolsa@kernel.org \
--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=quentin@isovalent.com \
--cc=roberto.sassu@huawei.com \
/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).