Commit 3f712d46 authored Jan 20, 2022 by Alexei Starovoitov

Merge branch 'libbpf: streamline netlink-based XDP APIs'



Andrii Nakryiko says:

====================

Revamp existing low-level XDP APIs provided by libbpf to follow more
consistent naming (new APIs follow bpf_tc_xxx() approach where it makes
sense) and be extensible without ABI breakages (OPTS-based). See patch #1 for
details, remaining patches switch bpftool, selftests/bpf and samples/bpf to
new APIs.
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

parents 1713e33b d4e34bfc

samples/bpf/xdp1_user.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -26,12 +26,12 @@ static void int_exit(int sig)
		{
		__u32 curr_prog_id = 0;

		if (bpf_get_link_xdp_id(ifindex, &curr_prog_id, xdp_flags)) {
		printf("bpf_get_link_xdp_id failed\n");
		if (bpf_xdp_query_id(ifindex, xdp_flags, &curr_prog_id)) {
		printf("bpf_xdp_query_id failed\n");
		exit(1);
		}
		if (prog_id == curr_prog_id)
		bpf_set_link_xdp_fd(ifindex, -1, xdp_flags);
		bpf_xdp_detach(ifindex, xdp_flags, NULL);
		else if (!curr_prog_id)
		printf("couldn't find a prog id on a given interface\n");
		else
		@@ -143,7 +143,7 @@ int main(int argc, char **argv)
		signal(SIGINT, int_exit);
		signal(SIGTERM, int_exit);

		if (bpf_set_link_xdp_fd(ifindex, prog_fd, xdp_flags) < 0) {
		if (bpf_xdp_attach(ifindex, prog_fd, xdp_flags, NULL) < 0) {
		printf("link set xdp fd failed\n");
		return 1;
		}

samples/bpf/xdp_adjust_tail_user.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -34,12 +34,12 @@ static void int_exit(int sig)
		__u32 curr_prog_id = 0;

		if (ifindex > -1) {
		if (bpf_get_link_xdp_id(ifindex, &curr_prog_id, xdp_flags)) {
		printf("bpf_get_link_xdp_id failed\n");
		if (bpf_xdp_query_id(ifindex, xdp_flags, &curr_prog_id)) {
		printf("bpf_xdp_query_id failed\n");
		exit(1);
		}
		if (prog_id == curr_prog_id)
		bpf_set_link_xdp_fd(ifindex, -1, xdp_flags);
		bpf_xdp_detach(ifindex, xdp_flags, NULL);
		else if (!curr_prog_id)
		printf("couldn't find a prog id on a given iface\n");
		else
		@@ -173,7 +173,7 @@ int main(int argc, char **argv)
		signal(SIGINT, int_exit);
		signal(SIGTERM, int_exit);

		if (bpf_set_link_xdp_fd(ifindex, prog_fd, xdp_flags) < 0) {
		if (bpf_xdp_attach(ifindex, prog_fd, xdp_flags, NULL) < 0) {
		printf("link set xdp fd failed\n");
		return 1;
		}

samples/bpf/xdp_fwd_user.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ static int do_attach(int idx, int prog_fd, int map_fd, const char *name)
		{
		int err;

		err = bpf_set_link_xdp_fd(idx, prog_fd, xdp_flags);
		err = bpf_xdp_attach(idx, prog_fd, xdp_flags, NULL);
		if (err < 0) {
		printf("ERROR: failed to attach program to %s\n", name);
		return err;
		@@ -51,7 +51,7 @@ static int do_detach(int idx, const char *name)
		{
		int err;

		err = bpf_set_link_xdp_fd(idx, -1, xdp_flags);
		err = bpf_xdp_detach(idx, xdp_flags, NULL);
		if (err < 0)
		printf("ERROR: failed to detach program from %s\n", name);

samples/bpf/xdp_router_ipv4_user.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -43,13 +43,13 @@ static void int_exit(int sig)
		int i = 0;

		for (i = 0; i < total_ifindex; i++) {
		if (bpf_get_link_xdp_id(ifindex_list[i], &prog_id, flags)) {
		printf("bpf_get_link_xdp_id on iface %d failed\n",
		if (bpf_xdp_query_id(ifindex_list[i], flags, &prog_id)) {
		printf("bpf_xdp_query_id on iface %d failed\n",
		ifindex_list[i]);
		exit(1);
		}
		if (prog_id_list[i] == prog_id)
		bpf_set_link_xdp_fd(ifindex_list[i], -1, flags);
		bpf_xdp_detach(ifindex_list[i], flags, NULL);
		else if (!prog_id)
		printf("couldn't find a prog id on iface %d\n",
		ifindex_list[i]);
		@@ -716,12 +716,12 @@ int main(int ac, char **argv)
		}
		prog_id_list = (__u32 )calloc(total_ifindex, sizeof(__u32 ));
		for (i = 0; i < total_ifindex; i++) {
		if (bpf_set_link_xdp_fd(ifindex_list[i], prog_fd, flags) < 0) {
		if (bpf_xdp_attach(ifindex_list[i], prog_fd, flags, NULL) < 0) {
		printf("link set xdp fd failed\n");
		int recovery_index = i;

		for (i = 0; i < recovery_index; i++)
		bpf_set_link_xdp_fd(ifindex_list[i], -1, flags);
		bpf_xdp_detach(ifindex_list[i], flags, NULL);

		return 1;
		}

samples/bpf/xdp_rxq_info_user.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -62,15 +62,15 @@ static void int_exit(int sig)
		__u32 curr_prog_id = 0;

		if (ifindex > -1) {
		if (bpf_get_link_xdp_id(ifindex, &curr_prog_id, xdp_flags)) {
		printf("bpf_get_link_xdp_id failed\n");
		if (bpf_xdp_query_id(ifindex, xdp_flags, &curr_prog_id)) {
		printf("bpf_xdp_query_id failed\n");
		exit(EXIT_FAIL);
		}
		if (prog_id == curr_prog_id) {
		fprintf(stderr,
		"Interrupted: Removing XDP program on ifindex:%d device:%s\n",
		ifindex, ifname);
		bpf_set_link_xdp_fd(ifindex, -1, xdp_flags);
		bpf_xdp_detach(ifindex, xdp_flags, NULL);
		} else if (!curr_prog_id) {
		printf("couldn't find a prog id on a given iface\n");
		} else {
		@@ -582,7 +582,7 @@ int main(int argc, char **argv)
		signal(SIGINT, int_exit);
		signal(SIGTERM, int_exit);

		if (bpf_set_link_xdp_fd(ifindex, prog_fd, xdp_flags) < 0) {
		if (bpf_xdp_attach(ifindex, prog_fd, xdp_flags, NULL) < 0) {
		fprintf(stderr, "link set xdp fd failed\n");
		return EXIT_FAIL_XDP;
		}