Skip to contentSkip to conversation

perf: stop using deprecated bpf_program__title()

PATCH Applied Andrii Nakryiko 4 participants 4 messages Sep 8, 2020 – Sep 9, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf: stop using deprecated bpf_program__title()

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"")
---
 tools/perf/util/bpf-loader.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
tools/perf/util/bpf-loader.c +2 -10
index 2feb751516ab..0374adcb223c 100644
@@ -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;
Signature · 1 line
2.24.1
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · 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"")

thanks,
jirka

Quoted 44 lines
---
 tools/perf/util/bpf-loader.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
tools/perf/util/bpf-loader.c +2 -10
index 2feb751516ab..0374adcb223c 100644
@@ -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;
Signature · 1 line
2.24.1
Reviewed-by on v1 1/1
#2 lore raw
In reply to Andrii Nakryiko
Quoted 7 lines · 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"")

Thanks

#3 lore raw
Quoted 11 lines · Tobias Klauser
Quoted 7 lines · 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"")

Applied to bpf-next. Thanks