Commit c3be3676 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-libbpf-deprecated-cleanup' 



Andrii Nakryiko says:

====================
Clean up remaining missed uses of deprecated libbpf APIs across samples/bpf,
selftests/bpf, libbpf, and bpftool.

Also fix uninit variable warning in bpftool.
====================

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents 707ee8ac 1e4edb6d

samples/bpf/xdp1_user.c

+11 −5
Original line number Diff line number Diff line
@@ -79,13 +79,11 @@ static void usage(const char *prog) 


int main(int argc, char **argv)

{

	struct bpf_prog_load_attr prog_load_attr = {

		.prog_type	= BPF_PROG_TYPE_XDP,

	};

	struct bpf_prog_info info = {};

	__u32 info_len = sizeof(info);

	const char *optstr = "FSN";

	int prog_fd, map_fd, opt;

	struct bpf_program *prog;

	struct bpf_object *obj;

	struct bpf_map *map;

	char filename[256];
@@ -123,11 +121,19 @@ int main(int argc, char **argv) 
	}



	snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);

	prog_load_attr.file = filename;

	obj = bpf_object__open_file(filename, NULL);

	if (libbpf_get_error(obj))

		return 1;



	prog = bpf_object__next_program(obj, NULL);

	bpf_program__set_type(prog, BPF_PROG_TYPE_XDP);



	if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))

	err = bpf_object__load(obj);

	if (err)

		return 1;



	prog_fd = bpf_program__fd(prog);



	map = bpf_object__next_map(obj, NULL);

	if (!map) {

		printf("finding a map in obj file failed\n");

samples/bpf/xdp_adjust_tail_user.c

+12 −5
Original line number Diff line number Diff line
@@ -82,15 +82,13 @@ static void usage(const char *cmd) 


int main(int argc, char **argv)

{

	struct bpf_prog_load_attr prog_load_attr = {

		.prog_type	= BPF_PROG_TYPE_XDP,

	};

	unsigned char opt_flags[256] = {};

	const char *optstr = "i:T:P:SNFh";

	struct bpf_prog_info info = {};

	__u32 info_len = sizeof(info);

	unsigned int kill_after_s = 0;

	int i, prog_fd, map_fd, opt;

	struct bpf_program *prog;

	struct bpf_object *obj;

	__u32 max_pckt_size = 0;

	__u32 key = 0;
@@ -148,11 +146,20 @@ int main(int argc, char **argv) 
	}



	snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);

	prog_load_attr.file = filename;



	if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))

	obj = bpf_object__open_file(filename, NULL);

	if (libbpf_get_error(obj))

		return 1;



	prog = bpf_object__next_program(obj, NULL);

	bpf_program__set_type(prog, BPF_PROG_TYPE_XDP);



	err = bpf_object__load(obj);

	if (err)

		return 1;



	prog_fd = bpf_program__fd(prog);



	/* static global var 'max_pcktsz' is accessible from .data section */

	if (max_pckt_size) {

		map_fd = bpf_object__find_map_fd_by_name(obj, "xdp_adju.data");

samples/bpf/xdp_fwd_user.c

+9 −6
Original line number Diff line number Diff line
@@ -75,14 +75,11 @@ static void usage(const char *prog) 


int main(int argc, char **argv)

{

	struct bpf_prog_load_attr prog_load_attr = {

		.prog_type	= BPF_PROG_TYPE_XDP,

	};

	const char *prog_name = "xdp_fwd";

	struct bpf_program *prog = NULL;

	struct bpf_program *pos;

	const char *sec_name;

	int prog_fd, map_fd = -1;

	int prog_fd = -1, map_fd = -1;

	char filename[PATH_MAX];

	struct bpf_object *obj;

	int opt, i, idx, err;
@@ -119,7 +116,6 @@ int main(int argc, char **argv) 


	if (attach) {

		snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);

		prog_load_attr.file = filename;



		if (access(filename, O_RDONLY) < 0) {

			printf("error accessing file %s: %s\n",
@@ -127,7 +123,14 @@ int main(int argc, char **argv) 
			return 1;

		}



		err = bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd);

		obj = bpf_object__open_file(filename, NULL);

		if (libbpf_get_error(obj))

			return 1;



		prog = bpf_object__next_program(obj, NULL);

		bpf_program__set_type(prog, BPF_PROG_TYPE_XDP);



		err = bpf_object__load(obj);

		if (err) {

			printf("Does kernel support devmap lookup?\n");

			/* If not, the error message will be:

samples/bpf/xdp_router_ipv4_user.c

+10 −7
Original line number Diff line number Diff line
@@ -640,12 +640,10 @@ static void usage(const char *prog) 


int main(int ac, char **argv)

{

	struct bpf_prog_load_attr prog_load_attr = {

		.prog_type	= BPF_PROG_TYPE_XDP,

	};

	struct bpf_prog_info info = {};

	__u32 info_len = sizeof(info);

	const char *optstr = "SF";

	struct bpf_program *prog;

	struct bpf_object *obj;

	char filename[256];

	char **ifname_list;
@@ -653,7 +651,6 @@ int main(int ac, char **argv) 
	int err, i = 1;



	snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);

	prog_load_attr.file = filename;



	total_ifindex = ac - 1;

	ifname_list = (argv + 1);
@@ -684,14 +681,20 @@ int main(int ac, char **argv) 
		return 1;

	}



	if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))

	obj = bpf_object__open_file(filename, NULL);

	if (libbpf_get_error(obj))

		return 1;



	prog = bpf_object__next_program(obj, NULL);

	bpf_program__set_type(prog, BPF_PROG_TYPE_XDP);



	printf("\n******************loading bpf file*********************\n");

	if (!prog_fd) {

		printf("bpf_prog_load_xattr: %s\n", strerror(errno));

	err = bpf_object__load(obj);

	if (err) {

		printf("bpf_object__load(): %s\n", strerror(errno));

		return 1;

	}

	prog_fd = bpf_program__fd(prog);



	lpm_map_fd = bpf_object__find_map_fd_by_name(obj, "lpm_map");

	rxcnt_map_fd = bpf_object__find_map_fd_by_name(obj, "rxcnt");

samples/bpf/xdp_rxq_info_user.c

+11 −5
Original line number Diff line number Diff line
@@ -450,14 +450,12 @@ static void stats_poll(int interval, int action, __u32 cfg_opt) 
int main(int argc, char **argv)

{

	__u32 cfg_options= NO_TOUCH ; /* Default: Don't touch packet memory */

	struct bpf_prog_load_attr prog_load_attr = {

		.prog_type	= BPF_PROG_TYPE_XDP,

	};

	struct bpf_prog_info info = {};

	__u32 info_len = sizeof(info);

	int prog_fd, map_fd, opt, err;

	bool use_separators = true;

	struct config cfg = { 0 };

	struct bpf_program *prog;

	struct bpf_object *obj;

	struct bpf_map *map;

	char filename[256];
@@ -471,10 +469,18 @@ int main(int argc, char **argv) 
	char *action_str = NULL;



	snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);

	prog_load_attr.file = filename;



	if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))

	obj = bpf_object__open_file(filename, NULL);

	if (libbpf_get_error(obj))

		return EXIT_FAIL;



	prog = bpf_object__next_program(obj, NULL);

	bpf_program__set_type(prog, BPF_PROG_TYPE_XDP);



	err = bpf_object__load(obj);

	if (err)

		return EXIT_FAIL;

	prog_fd = bpf_program__fd(prog);



	map =  bpf_object__find_map_by_name(obj, "config_map");

	stats_global_map = bpf_object__find_map_by_name(obj, "stats_global_map");