tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

authored by

Ilya Leoshkevich and committed by
Andrii Nakryiko c0ca277b 38f0408e

+10 -10
+1 -1
samples/bpf/test_map_in_map_user.c
··· 38 38 uint32_t info_len = sizeof(info); 39 39 int ret, id; 40 40 41 - ret = bpf_obj_get_info_by_fd(inner_map_fd, &info, &info_len); 41 + ret = bpf_map_get_info_by_fd(inner_map_fd, &info, &info_len); 42 42 assert(!ret); 43 43 44 44 ret = bpf_map_lookup_elem(map_in_map_fd, &key, &id);
+1 -1
samples/bpf/xdp1_user.c
··· 153 153 return 1; 154 154 } 155 155 156 - err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len); 156 + err = bpf_prog_get_info_by_fd(prog_fd, &info, &info_len); 157 157 if (err) { 158 158 printf("can't get prog info - %s\n", strerror(errno)); 159 159 return err;
+1 -1
samples/bpf/xdp_adjust_tail_user.c
··· 184 184 return 1; 185 185 } 186 186 187 - err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len); 187 + err = bpf_prog_get_info_by_fd(prog_fd, &info, &info_len); 188 188 if (err) { 189 189 printf("can't get prog info - %s\n", strerror(errno)); 190 190 return 1;
+2 -2
samples/bpf/xdp_fwd_user.c
··· 76 76 return prog_fd; 77 77 } 78 78 79 - err = bpf_obj_get_info_by_fd(prog_fd, &prog_info, &info_len); 79 + err = bpf_prog_get_info_by_fd(prog_fd, &prog_info, &info_len); 80 80 if (err) { 81 - printf("ERROR: bpf_obj_get_info_by_fd failed (%s)\n", 81 + printf("ERROR: bpf_prog_get_info_by_fd failed (%s)\n", 82 82 strerror(errno)); 83 83 goto close_out; 84 84 }
+2 -2
samples/bpf/xdp_redirect_cpu_user.c
··· 494 494 goto end_cpu; 495 495 } 496 496 497 - ret = bpf_obj_get_info_by_fd(bpf_map__fd(skel->maps.cpu_map), &info, &infosz); 497 + ret = bpf_map_get_info_by_fd(bpf_map__fd(skel->maps.cpu_map), &info, &infosz); 498 498 if (ret < 0) { 499 - fprintf(stderr, "Failed bpf_obj_get_info_by_fd for cpumap: %s\n", 499 + fprintf(stderr, "Failed bpf_map_get_info_by_fd for cpumap: %s\n", 500 500 strerror(errno)); 501 501 goto end_cpu; 502 502 }
+1 -1
samples/bpf/xdp_rxq_info_user.c
··· 602 602 return EXIT_FAIL_XDP; 603 603 } 604 604 605 - err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len); 605 + err = bpf_prog_get_info_by_fd(prog_fd, &info, &info_len); 606 606 if (err) { 607 607 printf("can't get prog info - %s\n", strerror(errno)); 608 608 return err;
+1 -1
samples/bpf/xdp_sample_pkts_user.c
··· 35 35 return err; 36 36 } 37 37 38 - err = bpf_obj_get_info_by_fd(fd, &info, &info_len); 38 + err = bpf_prog_get_info_by_fd(fd, &info, &info_len); 39 39 if (err) { 40 40 printf("can't get prog info - %s\n", strerror(errno)); 41 41 return err;
+1 -1
samples/bpf/xdp_tx_iptunnel_user.c
··· 295 295 return 1; 296 296 } 297 297 298 - err = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len); 298 + err = bpf_prog_get_info_by_fd(prog_fd, &info, &info_len); 299 299 if (err) { 300 300 printf("can't get prog info - %s\n", strerror(errno)); 301 301 return err;