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.

Fixes: 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name"")
Signed-off-by: Daniel T. Lee <danieltimlee@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20200904063434.24963-1-danieltimlee@gmail.com

diff --git a/samples/bpf/sockex3_user.c b/samples/bpf/sockex3_user.c
index 4dbee7427d470706b4284d9e6bae0a698cfbfde8..7793f6a6ae7ecbf3e480c1d34e637258497dfeb5 100644 (file)
--- a/samples/bpf/sockex3_user.c
+++ b/samples/bpf/sockex3_user.c
@@ -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;
                }

diff --git a/samples/bpf/spintest_user.c b/samples/bpf/spintest_user.c
index 847da9284fa806861657ef29410b689eee06715f..f090d0dc60d62d7bf3f0c46a171c62975531a974 100644 (file)
--- a/samples/bpf/spintest_user.c
+++ b/samples/bpf/spintest_user.c
@@ -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 */

diff --git a/samples/bpf/tracex5_user.c b/samples/bpf/tracex5_user.c
index 98dad57a96c4e1b77891b0a699363beb90fe55ee..c17d3fb5fd6443346deab9a691e1c7a580384dc1 100644 (file)
--- a/samples/bpf/tracex5_user.c
+++ b/samples/bpf/tracex5_user.c
@@ -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);

diff --git a/samples/bpf/xdp_redirect_cpu_user.c b/samples/bpf/xdp_redirect_cpu_user.c
index 004c0622c913efc5cd0b68f3ba6d0aedc93078e4..3dd366e9474d595954a807fa837e8c83b0a16416 100644 (file)
--- a/samples/bpf/xdp_redirect_cpu_user.c
+++ b/samples/bpf/xdp_redirect_cpu_user.c
@@ -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));
        }
 }