* [PATCH bpf-next] perf: stop using deprecated bpf_program__title()
@ 2020-09-08 18:01 Andrii Nakryiko
2020-09-09 7:21 ` Jiri Olsa
2020-09-09 9:12 ` Tobias Klauser
0 siblings, 2 replies; 4+ messages in thread
From: Andrii Nakryiko @ 2020-09-08 18:01 UTC (permalink / raw)
To: bpf, netdev, ast, daniel, acme
Cc: andrii.nakryiko, kernel-team, Andrii Nakryiko
Switch from deprecated bpf_program__title() API to
bpf_program__section_name(). Also drop unnecessary error checks because
neither bpf_program__title() nor bpf_program__section_name() can fail or
return NULL.
Fixes: 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name"")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
---
tools/perf/util/bpf-loader.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index 2feb751516ab..0374adcb223c 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -328,12 +328,6 @@ config_bpf_program(struct bpf_program *prog)
probe_conf.no_inlines = false;
probe_conf.force_add = false;
- config_str = bpf_program__title(prog, false);
- if (IS_ERR(config_str)) {
- pr_debug("bpf: unable to get title for program\n");
- return PTR_ERR(config_str);
- }
-
priv = calloc(sizeof(*priv), 1);
if (!priv) {
pr_debug("bpf: failed to alloc priv\n");
@@ -341,6 +335,7 @@ config_bpf_program(struct bpf_program *prog)
}
pev = &priv->pev;
+ config_str = bpf_program__section_name(prog);
pr_debug("bpf: config program '%s'\n", config_str);
err = parse_prog_config(config_str, &main_str, &is_tp, pev);
if (err)
@@ -454,10 +449,7 @@ preproc_gen_prologue(struct bpf_program *prog, int n,
if (err) {
const char *title;
- title = bpf_program__title(prog, false);
- if (!title)
- title = "[unknown]";
-
+ title = bpf_program__section_name(prog);
pr_debug("Failed to generate prologue for program %s\n",
title);
return err;
--
2.24.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next] perf: stop using deprecated bpf_program__title()
2020-09-08 18:01 [PATCH bpf-next] perf: stop using deprecated bpf_program__title() Andrii Nakryiko
@ 2020-09-09 7:21 ` Jiri Olsa
2020-09-09 9:12 ` Tobias Klauser
1 sibling, 0 replies; 4+ messages in thread
From: Jiri Olsa @ 2020-09-09 7:21 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: bpf, netdev, ast, daniel, acme, andrii.nakryiko, kernel-team
On Tue, Sep 08, 2020 at 11:01:27AM -0700, Andrii Nakryiko wrote:
> Switch from deprecated bpf_program__title() API to
> bpf_program__section_name(). Also drop unnecessary error checks because
> neither bpf_program__title() nor bpf_program__section_name() can fail or
> return NULL.
>
> Fixes: 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name"")
> Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
thanks,
jirka
> ---
> tools/perf/util/bpf-loader.c | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
> index 2feb751516ab..0374adcb223c 100644
> --- a/tools/perf/util/bpf-loader.c
> +++ b/tools/perf/util/bpf-loader.c
> @@ -328,12 +328,6 @@ config_bpf_program(struct bpf_program *prog)
> probe_conf.no_inlines = false;
> probe_conf.force_add = false;
>
> - config_str = bpf_program__title(prog, false);
> - if (IS_ERR(config_str)) {
> - pr_debug("bpf: unable to get title for program\n");
> - return PTR_ERR(config_str);
> - }
> -
> priv = calloc(sizeof(*priv), 1);
> if (!priv) {
> pr_debug("bpf: failed to alloc priv\n");
> @@ -341,6 +335,7 @@ config_bpf_program(struct bpf_program *prog)
> }
> pev = &priv->pev;
>
> + config_str = bpf_program__section_name(prog);
> pr_debug("bpf: config program '%s'\n", config_str);
> err = parse_prog_config(config_str, &main_str, &is_tp, pev);
> if (err)
> @@ -454,10 +449,7 @@ preproc_gen_prologue(struct bpf_program *prog, int n,
> if (err) {
> const char *title;
>
> - title = bpf_program__title(prog, false);
> - if (!title)
> - title = "[unknown]";
> -
> + title = bpf_program__section_name(prog);
> pr_debug("Failed to generate prologue for program %s\n",
> title);
> return err;
> --
> 2.24.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next] perf: stop using deprecated bpf_program__title()
2020-09-08 18:01 [PATCH bpf-next] perf: stop using deprecated bpf_program__title() Andrii Nakryiko
2020-09-09 7:21 ` Jiri Olsa
@ 2020-09-09 9:12 ` Tobias Klauser
2020-09-09 18:29 ` Alexei Starovoitov
1 sibling, 1 reply; 4+ messages in thread
From: Tobias Klauser @ 2020-09-09 9:12 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: bpf, netdev, ast, daniel, acme, andrii.nakryiko, kernel-team
On 2020-09-08 at 20:01:27 +0200, Andrii Nakryiko <andriin@fb.com> wrote:
> Switch from deprecated bpf_program__title() API to
> bpf_program__section_name(). Also drop unnecessary error checks because
> neither bpf_program__title() nor bpf_program__section_name() can fail or
> return NULL.
>
> Fixes: 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name"")
> Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Reviewed-by: Tobias Klauser <tklauser@distanz.ch>
Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next] perf: stop using deprecated bpf_program__title()
2020-09-09 9:12 ` Tobias Klauser
@ 2020-09-09 18:29 ` Alexei Starovoitov
0 siblings, 0 replies; 4+ messages in thread
From: Alexei Starovoitov @ 2020-09-09 18:29 UTC (permalink / raw)
To: Tobias Klauser
Cc: Andrii Nakryiko, bpf, Network Development, Alexei Starovoitov,
Daniel Borkmann, Arnaldo Carvalho de Melo, Andrii Nakryiko,
Kernel Team
On Wed, Sep 9, 2020 at 2:13 AM Tobias Klauser <tklauser@distanz.ch> wrote:
>
> On 2020-09-08 at 20:01:27 +0200, Andrii Nakryiko <andriin@fb.com> wrote:
> > Switch from deprecated bpf_program__title() API to
> > bpf_program__section_name(). Also drop unnecessary error checks because
> > neither bpf_program__title() nor bpf_program__section_name() can fail or
> > return NULL.
> >
> > Fixes: 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name"")
> > Signed-off-by: Andrii Nakryiko <andriin@fb.com>
>
> Reviewed-by: Tobias Klauser <tklauser@distanz.ch>
Applied to bpf-next. Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-09 18:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-08 18:01 [PATCH bpf-next] perf: stop using deprecated bpf_program__title() Andrii Nakryiko
2020-09-09 7:21 ` Jiri Olsa
2020-09-09 9:12 ` Tobias Klauser
2020-09-09 18:29 ` Alexei Starovoitov
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).