perf: mute libbpf API deprecations temporarily
Subsystems (2)
Andrii Nakryiko
maintainerPATCH 1/1 perf: mute libbpf API deprecations temporarily
Libbpf development version was bumped to 0.7 in c93faaaf2f67 ("libbpf: Deprecate bpf_prog_load_xattr() API"), activating a bunch of previously scheduled deprecations. Most APIs are pretty straightforward to replace with newer APIs, but perf has a complicated mixed setup with libbpf used both as static and shared configurations, which makes it non-trivial to migrate the APIs.
Further, bpf_program__set_prep() needs more involved refactoring, which will require help from Arnaldo and/or Jiri.
So for now, mute deprecation warnings and work on migrating perf off of deprecated APIs separately with the input from owners of the perf tool.
--- tools/perf/tests/bpf.c | 4 ++++ tools/perf/util/bpf-loader.c | 3 +++ 2 files changed, 7 insertions(+)
tools/perf/tests/bpf.c +4 -0
@@ -312,9 +312,13 @@ static int check_env(void)return err; } +/* temporarily disable libbpf deprecation warnings */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" err =bpf_load_program (BPF_PROG_TYPE_KPROBE , insns,sizeof (insns) /sizeof (insns[0 ]), license, kver_int,NULL ,0 ); +#pragma GCC diagnostic popif (err <0 ) {pr_err ("Missing basic BPF support, skip this test: %s\n" ,strerror (errno));
tools/perf/util/bpf-loader.c +3 -0
@@ -29,6 +29,9 @@#include <internal/xyarray.h> +/* temporarily disable libbpf deprecation warnings */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +static int libbpf_perf_print (enum libbpf_print_level level __attribute__((unused)),const char *fmt,va_list args) {
Signature · 1 line
2.30.2
Quoted 11 lines · Andrii Nakryiko
Libbpf development version was bumped to 0.7 in
c93faaaf2f67("libbpf: Deprecatebpf_prog_load_xattr()API"), activating a bunch of previously scheduled deprecations. Most APIs are pretty straightforward to replace with newer APIs, but perf has a complicated mixed setup with libbpf used both as static and shared configurations, which makes it non-trivial to migrate the APIs.Further,
bpf_program__set_prep()needs more involved refactoring, which will require help from Arnaldo and/or Jiri.
Quoted 6 lines
So for now, mute deprecation warnings and work on migrating perf off of deprecated APIs separately with the input from owners of the perf tool.
Fixes c93faaaf2f67 ("libbpf: Deprecate bpf_prog_load_xattr() API")Signed-off-by Andrii Nakryiko <[email protected]>---
Stephen,
This patch (when applied to bpf-next) should fix the build failure you reported in your recent "linux-next: build failure after merge of the bpf-next tree" email (that I didn't get directly, but thankfully Alexei forwarded to me). Can you please also cc [email protected] future bpf-next tree issues, as that's a more directly related mailing list (ideally also cc me at [email protected] directly so that we don't rely on Gmail not dropping the email, I've, unfortunately, had multiple problems with this recently). Thanks for understanding!
Arnaldo, Jiri,
Getting rid of most deprecations is pretty trivial, if not for the hybrid static/dynamic setup. Please advise on the path forward. Do I do __weak re-definitions of new APIs and switch the source code to new variants?
As for bpf_program__set_prep(), assuming it's used to do program cloning, bpf_program__insns() is a more straightforward and cleaner way to do it now. But the logic seems to be more involved, so I'd like you guys to do this conversion, if that's not too much trouble.
Regardless, let's work together to clean up perf's use of deprecated APIs. Thanks!
Quoted 39 lines
tools/perf/tests/bpf.c | 4 ++++ tools/perf/util/bpf-loader.c | 3 +++ 2 files changed, 7 insertions(+)tools/perf/tests/bpf.c +4
-0@@ -312,9 +312,13 @@ static int check_env(void)return err; } +/* temporarily disable libbpf deprecation warnings */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" err =bpf_load_program (BPF_PROG_TYPE_KPROBE , insns,sizeof (insns) /sizeof (insns[0 ]), license, kver_int,NULL ,0 ); +#pragma GCC diagnostic popif (err <0 ) {pr_err ("Missing basic BPF support, skip this test: %s\n" ,strerror (errno));tools/perf/util/bpf-loader.c +3
-1@@ -29,6 +29,9 @@#include <internal/xyarray.h> +/* temporarily disable libbpf deprecation warnings */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +static int libbpf_perf_print (enum libbpf_print_level level __attribute__((unused)),const char *fmt,va_list args) { --2.30.2
Hi Andrii,
Quoted 9 lines · On Thu, 2 Dec 2021 17:00:40 -0800 Andrii Nakryiko <[email protected]>…
This patch (when applied to bpf-next) should fix the build failure you reported in your recent "linux-next: build failure after merge of the bpf-next tree" email (that I didn't get directly, but thankfully Alexei forwarded to me). Can you please also cc [email protected] future bpf-next tree issues, as that's a more directly related mailing list (ideally also cc me at [email protected] directly so that we don't rely on Gmail not dropping the email, I've, unfortunately, had multiple problems with this recently). Thanks for understanding!
Hopefully that patch will be applied soon :-)
I have added the bpf list and you to my contacts for the bpf and bpf-next trees in linux-next.
Signature · 2 lines
Cheers, Stephen Rothwell