Commit c0ca277b authored by Ilya Leoshkevich's avatar Ilya Leoshkevich Committed by Andrii Nakryiko
Browse files

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: default avatarIlya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20230214231221.249277-5-iii@linux.ibm.com
parent 38f0408e

samples/bpf/test_map_in_map_user.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

samples/bpf/xdp1_user.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

samples/bpf/xdp_adjust_tail_user.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

samples/bpf/xdp_fwd_user.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

samples/bpf/xdp_redirect_cpu_user.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}