samples: bpf: Replace bpf_program__title() with bpf_program__section_name()
Subsystems (4)
PATCH 1/2 samples: bpf: Replace bpf_program__title() with bpf_program__section_name()
From commit 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name""), the term title has been replaced with section name in libbpf.
Since the bpf_program__title() has been deprecated, this commit switches this function to bpf_program__section_name(). Due to this commit, the compilation warning issue has also been resolved.
--- samples/bpf/sockex3_user.c | 6 +++--- samples/bpf/spintest_user.c | 6 +++--- samples/bpf/tracex5_user.c | 6 +++--- samples/bpf/xdp_redirect_cpu_user.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)
samples/bpf/sockex3_user.c +3 -3
@@ -29,8 +29,8 @@ int main(int argc, char **argv)struct rlimit r = {RLIM_INFINITY ,RLIM_INFINITY };struct bpf_program *prog;struct bpf_object *obj; +const char *section;char filename[256 ]; -const char *title;FILE *f;snprintf (filename,sizeof (filename),"%s_kern.o" , argv[0 ]);
@@ -58,8 +58,8 @@ int main(int argc, char **argv)bpf_object__for_each_program (prog, obj) { fd =bpf_program__fd (prog); - title =bpf_program__title (prog, false); -if (sscanf (title,"socket/%d" , &key) !=1 ) { + section =bpf_program__section_name (prog); +if (sscanf (section,"socket/%d" , &key) !=1 ) {fprintf (stderr,"ERROR: finding prog failed\n" ); goto cleanup; }
samples/bpf/spintest_user.c +3 -3
@@ -17,7 +17,7 @@ int main(int ac, char **argv)long key, next_key, value;struct bpf_program *prog;int map_fd, i, j =0 ; -const char *title; +const char *section;struct ksym *sym;if (setrlimit (RLIMIT_MEMLOCK , &r)) {
@@ -51,8 +51,8 @@ int main(int ac, char **argv) }bpf_object__for_each_program (prog, obj) { - title =bpf_program__title (prog, false); -if (sscanf (title,"kprobe/%s" , symbol) !=1 ) + section =bpf_program__section_name (prog); +if (sscanf (section,"kprobe/%s" , symbol) !=1 )continue ;/* Attach prog only when symbol exists */
samples/bpf/tracex5_user.c +3 -3
@@ -39,8 +39,8 @@ int main(int ac, char **argv)struct bpf_program *prog;struct bpf_object *obj;int key, fd, progs_fd; +const char *section;char filename[256 ]; -const char *title;FILE *f;setrlimit (RLIMIT_MEMLOCK , &r);
@@ -78,9 +78,9 @@ int main(int ac, char **argv) }bpf_object__for_each_program (prog, obj) { - title =bpf_program__title (prog, false); + section =bpf_program__section_name (prog);/* register only syscalls to PROG_ARRAY */ -if (sscanf (title,"kprobe/%d" , &key) !=1 ) +if (sscanf (section,"kprobe/%d" , &key) !=1 )continue ; fd =bpf_program__fd (prog);
samples/bpf/xdp_redirect_cpu_user.c +1 -1
@@ -111,7 +111,7 @@ static void print_avail_progs(struct bpf_object *obj)bpf_object__for_each_program (pos, obj) {if (bpf_program__is_xdp (pos)) -printf (" %s\n" ,bpf_program__title (pos, false)); +printf (" %s\n" ,bpf_program__section_name (pos)); } }
Signature · 1 line
2.25.1
PATCH 2/2 samples: bpf: add xsk_fwd test file to .gitignore
This commit adds xsk_fwd test file to .gitignore which is newly added to samples/bpf.
--- samples/bpf/.gitignore | 1 + 1 file changed, 1 insertion(+)
samples/bpf/.gitignore +1 -0
@@ -50,4 +50,5 @@ xdp_rxq_info xdp_sample_pkts xdp_tx_iptunnel xdpsock +xsk_fwd testfile.img
Signature · 1 line
2.25.1
Quoted 5 lines · Daniel T. Lee
From commit 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name""), the term title has been replaced with section name in libbpf.
Quoted 7 lines
Since the
bpf_program__title()has been deprecated, this commit switches this function tobpf_program__section_name(). Due to this commit, the compilation warning issue has also been resolved.Fixes 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name"")Signed-off-by Daniel T. Lee <[email protected]>---
Quoted 6 lines
samples/bpf/sockex3_user.c | 6 +++--- samples/bpf/spintest_user.c | 6 +++--- samples/bpf/tracex5_user.c | 6 +++--- samples/bpf/xdp_redirect_cpu_user.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)
[...]
Daniel Borkmann
maintainerQuoted 10 lines · Daniel T. Lee
From commit 521095842027 ("libbpf: Deprecate notion of BPF program
"title" in favor of "section name""), the term title has been replaced with section name in libbpf.Since the
bpf_program__title()has been deprecated, this commit switches this function tobpf_program__section_name(). Due to this commit, the compilation warning issue has also been resolved.Fixes 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name"")Signed-off-by Daniel T. Lee <[email protected]>
Both applied, thanks!