samples/bpf: Use bpf_{btf,link,map,prog}_get_info_by_fd()

Use the new type-safe wrappers around bpf_obj_get_info_by_fd().

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20230214231221.249277-5-iii@linux.ibm.com

diff --git a/samples/bpf/test_map_in_map_user.c b/samples/bpf/test_map_in_map_user.c
index 9e79df4..55dca43 100644 (file)
--- a/samples/bpf/test_map_in_map_user.c
+++ b/samples/bpf/test_map_in_map_user.c
@@ -38,7 +38,7 @@ static void check_map_id(int inner_map_fd, int map_in_map_fd, uint32_t key)
        uint32_t info_len = sizeof(info);
        int ret, id;
 
-       ret = bpf_obj_get_info_by_fd(inner_map_fd, &info, &info_len);
+       ret = bpf_map_get_info_by_fd(inner_map_fd, &info, &info_len);
        assert(!ret);
 
        ret = bpf_map_lookup_elem(map_in_map_fd, &key, &id);

diff --git a/samples/bpf/xdp1_user.c b/samples/bpf/xdp1_user.c
index 281dc96..f05e797 100644 (file)
--- a/samples/bpf/xdp1_user.c
+++ b/samples/bpf/xdp1_user.c
@@ -153,7 +153,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
+       err = bpf_prog_get_info_by_fd(prog_fd, &info, &info_len);
        if (err) {
                printf("can't get prog info - %s\n", strerror(errno));
                return err;

diff --git a/samples/bpf/xdp_adjust_tail_user.c b/samples/bpf/xdp_adjust_tail_user.c
index 1676460..e9426bd 100644 (file)
--- a/samples/bpf/xdp_adjust_tail_user.c
+++ b/samples/bpf/xdp_adjust_tail_user.c
@@ -184,7 +184,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
+       err = bpf_prog_get_info_by_fd(prog_fd, &info, &info_len);
        if (err) {
                printf("can't get prog info - %s\n", strerror(errno));
                return 1;

diff --git a/samples/bpf/xdp_fwd_user.c b/samples/bpf/xdp_fwd_user.c
index 84f57f1..193b3b7 100644 (file)
--- a/samples/bpf/xdp_fwd_user.c
+++ b/samples/bpf/xdp_fwd_user.c
@@ -76,9 +76,9 @@ static int do_detach(int ifindex, const char *ifname, const char *app_name)
                return prog_fd;
        }
 
-       err = bpf_obj_get_info_by_fd(prog_fd, &prog_info, &info_len);
+       err = bpf_prog_get_info_by_fd(prog_fd, &prog_info, &info_len);
        if (err) {
-               printf("ERROR: bpf_obj_get_info_by_fd failed (%s)\n",
+               printf("ERROR: bpf_prog_get_info_by_fd failed (%s)\n",
                       strerror(errno));
                goto close_out;
        }

diff --git a/samples/bpf/xdp_redirect_cpu_user.c b/samples/bpf/xdp_redirect_cpu_user.c
index a12381c..e145840 100644 (file)
--- a/samples/bpf/xdp_redirect_cpu_user.c
+++ b/samples/bpf/xdp_redirect_cpu_user.c
@@ -494,9 +494,9 @@ int main(int argc, char **argv)
                goto end_cpu;
        }
 
-       ret = bpf_obj_get_info_by_fd(bpf_map__fd(skel->maps.cpu_map), &info, &infosz);
+       ret = bpf_map_get_info_by_fd(bpf_map__fd(skel->maps.cpu_map), &info, &infosz);
        if (ret < 0) {
-               fprintf(stderr, "Failed bpf_obj_get_info_by_fd for cpumap: %s\n",
+               fprintf(stderr, "Failed bpf_map_get_info_by_fd for cpumap: %s\n",
                        strerror(errno));
                goto end_cpu;
        }

diff --git a/samples/bpf/xdp_rxq_info_user.c b/samples/bpf/xdp_rxq_info_user.c
index 08f5331..b95e0ef 100644 (file)
--- a/samples/bpf/xdp_rxq_info_user.c
+++ b/samples/bpf/xdp_rxq_info_user.c
@@ -602,7 +602,7 @@ int main(int argc, char **argv)
                return EXIT_FAIL_XDP;
        }
 
-       err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
+       err = bpf_prog_get_info_by_fd(prog_fd, &info, &info_len);
        if (err) {
                printf("can't get prog info - %s\n", strerror(errno));
                return err;

diff --git a/samples/bpf/xdp_sample_pkts_user.c b/samples/bpf/xdp_sample_pkts_user.c
index 7df7163..e39d7f6 100644 (file)
--- a/samples/bpf/xdp_sample_pkts_user.c
+++ b/samples/bpf/xdp_sample_pkts_user.c
@@ -35,7 +35,7 @@ static int do_attach(int idx, int fd, const char *name)
                return err;
        }
 
-       err = bpf_obj_get_info_by_fd(fd, &info, &info_len);
+       err = bpf_prog_get_info_by_fd(fd, &info, &info_len);
        if (err) {
                printf("can't get prog info - %s\n", strerror(errno));
                return err;

diff --git a/samples/bpf/xdp_tx_iptunnel_user.c b/samples/bpf/xdp_tx_iptunnel_user.c
index 307baef..7e4b2f7 100644 (file)
--- a/samples/bpf/xdp_tx_iptunnel_user.c
+++ b/samples/bpf/xdp_tx_iptunnel_user.c
@@ -295,7 +295,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
+       err = bpf_prog_get_info_by_fd(prog_fd, &info, &info_len);
        if (err) {
                printf("can't get prog info - %s\n", strerror(errno));
                return err;