Commit 0bfb95f5 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

selftests, bpf: Do not yet switch to new libbpf XDP APIs 



Revert commit 54435652 ("selftests/bpf: switch to new libbpf XDP APIs")
for now given this will heavily conflict with 4b27480d ("bpf/selftests:
convert xdp_link test to ASSERT_* macros") upon merge. Andrii agreed to redo
the conversion cleanly after trees merged.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parent b4ec6a19

tools/testing/selftests/bpf/prog_tests/xdp_attach.c

+16 −13
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ void serial_test_xdp_attach(void) 
	const char *file = "./test_xdp.o";

	struct bpf_prog_info info = {};

	int err, fd1, fd2, fd3;

	LIBBPF_OPTS(bpf_xdp_attach_opts, opts);

	DECLARE_LIBBPF_OPTS(bpf_xdp_set_link_opts, opts,

			    .old_fd = -1);



	len = sizeof(info);
@@ -37,47 +38,49 @@ void serial_test_xdp_attach(void) 
	if (CHECK_FAIL(err))

		goto out_2;



	err = bpf_xdp_attach(IFINDEX_LO, fd1, XDP_FLAGS_REPLACE, &opts);

	err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, fd1, XDP_FLAGS_REPLACE,

				       &opts);

	if (CHECK(err, "load_ok", "initial load failed"))

		goto out_close;



	err = bpf_xdp_query_id(IFINDEX_LO, 0, &id0);

	err = bpf_get_link_xdp_id(IFINDEX_LO, &id0, 0);

	if (CHECK(err || id0 != id1, "id1_check",

		  "loaded prog id %u != id1 %u, err %d", id0, id1, err))

		goto out_close;



	err = bpf_xdp_attach(IFINDEX_LO, fd2, XDP_FLAGS_REPLACE, &opts);

	err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, fd2, XDP_FLAGS_REPLACE,

				       &opts);

	if (CHECK(!err, "load_fail", "load with expected id didn't fail"))

		goto out;



	opts.old_prog_fd = fd1;

	err = bpf_xdp_attach(IFINDEX_LO, fd2, 0, &opts);

	opts.old_fd = fd1;

	err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, fd2, 0, &opts);

	if (CHECK(err, "replace_ok", "replace valid old_fd failed"))

		goto out;

	err = bpf_xdp_query_id(IFINDEX_LO, 0, &id0);

	err = bpf_get_link_xdp_id(IFINDEX_LO, &id0, 0);

	if (CHECK(err || id0 != id2, "id2_check",

		  "loaded prog id %u != id2 %u, err %d", id0, id2, err))

		goto out_close;



	err = bpf_xdp_attach(IFINDEX_LO, fd3, 0, &opts);

	err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, fd3, 0, &opts);

	if (CHECK(!err, "replace_fail", "replace invalid old_fd didn't fail"))

		goto out;



	err = bpf_xdp_detach(IFINDEX_LO, 0, &opts);

	err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, -1, 0, &opts);

	if (CHECK(!err, "remove_fail", "remove invalid old_fd didn't fail"))

		goto out;



	opts.old_prog_fd = fd2;

	err = bpf_xdp_detach(IFINDEX_LO, 0, &opts);

	opts.old_fd = fd2;

	err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, -1, 0, &opts);

	if (CHECK(err, "remove_ok", "remove valid old_fd failed"))

		goto out;



	err = bpf_xdp_query_id(IFINDEX_LO, 0, &id0);

	err = bpf_get_link_xdp_id(IFINDEX_LO, &id0, 0);

	if (CHECK(err || id0 != 0, "unload_check",

		  "loaded prog id %u != 0, err %d", id0, err))

		goto out_close;

out:

	bpf_xdp_detach(IFINDEX_LO, 0, NULL);

	bpf_set_link_xdp_fd(IFINDEX_LO, -1, 0);

out_close:

	bpf_object__close(obj3);

out_2:

tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c

+4 −4
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ void test_xdp_with_cpumap_helpers(void) 
		return;



	prog_fd = bpf_program__fd(skel->progs.xdp_redir_prog);

	err = bpf_xdp_attach(IFINDEX_LO, prog_fd, XDP_FLAGS_SKB_MODE, NULL);

	err = bpf_set_link_xdp_fd(IFINDEX_LO, prog_fd, XDP_FLAGS_SKB_MODE);

	if (!ASSERT_OK(err, "Generic attach of program with 8-byte CPUMAP"))

		goto out_close;



	err = bpf_xdp_detach(IFINDEX_LO, XDP_FLAGS_SKB_MODE, NULL);

	err = bpf_set_link_xdp_fd(IFINDEX_LO, -1, XDP_FLAGS_SKB_MODE);

	ASSERT_OK(err, "XDP program detach");



	prog_fd = bpf_program__fd(skel->progs.xdp_dummy_cm);
@@ -46,9 +46,9 @@ void test_xdp_with_cpumap_helpers(void) 
	ASSERT_EQ(info.id, val.bpf_prog.id, "Match program id to cpumap entry prog_id");



	/* can not attach BPF_XDP_CPUMAP program to a device */

	err = bpf_xdp_attach(IFINDEX_LO, prog_fd, XDP_FLAGS_SKB_MODE, NULL);

	err = bpf_set_link_xdp_fd(IFINDEX_LO, prog_fd, XDP_FLAGS_SKB_MODE);

	if (!ASSERT_NEQ(err, 0, "Attach of BPF_XDP_CPUMAP program"))

		bpf_xdp_detach(IFINDEX_LO, XDP_FLAGS_SKB_MODE, NULL);

		bpf_set_link_xdp_fd(IFINDEX_LO, -1, XDP_FLAGS_SKB_MODE);



	val.qsize = 192;

	val.bpf_prog.fd = bpf_program__fd(skel->progs.xdp_dummy_prog);

tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c

+4 −4
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ static void test_xdp_with_devmap_helpers(void) 
		return;



	dm_fd = bpf_program__fd(skel->progs.xdp_redir_prog);

	err = bpf_xdp_attach(IFINDEX_LO, dm_fd, XDP_FLAGS_SKB_MODE, NULL);

	err = bpf_set_link_xdp_fd(IFINDEX_LO, dm_fd, XDP_FLAGS_SKB_MODE);

	if (!ASSERT_OK(err, "Generic attach of program with 8-byte devmap"))

		goto out_close;



	err = bpf_xdp_detach(IFINDEX_LO, XDP_FLAGS_SKB_MODE, NULL);

	err = bpf_set_link_xdp_fd(IFINDEX_LO, -1, XDP_FLAGS_SKB_MODE);

	ASSERT_OK(err, "XDP program detach");



	dm_fd = bpf_program__fd(skel->progs.xdp_dummy_dm);
@@ -48,9 +48,9 @@ static void test_xdp_with_devmap_helpers(void) 
	ASSERT_EQ(info.id, val.bpf_prog.id, "Match program id to devmap entry prog_id");



	/* can not attach BPF_XDP_DEVMAP program to a device */

	err = bpf_xdp_attach(IFINDEX_LO, dm_fd, XDP_FLAGS_SKB_MODE, NULL);

	err = bpf_set_link_xdp_fd(IFINDEX_LO, dm_fd, XDP_FLAGS_SKB_MODE);

	if (!ASSERT_NEQ(err, 0, "Attach of BPF_XDP_DEVMAP program"))

		bpf_xdp_detach(IFINDEX_LO, XDP_FLAGS_SKB_MODE, NULL);

		bpf_set_link_xdp_fd(IFINDEX_LO, -1, XDP_FLAGS_SKB_MODE);



	val.ifindex = 1;

	val.bpf_prog.fd = bpf_program__fd(skel->progs.xdp_dummy_prog);

tools/testing/selftests/bpf/prog_tests/xdp_info.c

+7 −7
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ void serial_test_xdp_info(void) 


	/* Get prog_id for XDP_ATTACHED_NONE mode */



	err = bpf_xdp_query_id(IFINDEX_LO, 0, &prog_id);

	err = bpf_get_link_xdp_id(IFINDEX_LO, &prog_id, 0);

	if (CHECK(err, "get_xdp_none", "errno=%d\n", errno))

		return;

	if (CHECK(prog_id, "prog_id_none", "unexpected prog_id=%u\n", prog_id))

		return;



	err = bpf_xdp_query_id(IFINDEX_LO, XDP_FLAGS_SKB_MODE, &prog_id);

	err = bpf_get_link_xdp_id(IFINDEX_LO, &prog_id, XDP_FLAGS_SKB_MODE);

	if (CHECK(err, "get_xdp_none_skb", "errno=%d\n", errno))

		return;

	if (CHECK(prog_id, "prog_id_none_skb", "unexpected prog_id=%u\n",
@@ -37,32 +37,32 @@ void serial_test_xdp_info(void) 
	if (CHECK(err, "get_prog_info", "errno=%d\n", errno))

		goto out_close;



	err = bpf_xdp_attach(IFINDEX_LO, prog_fd, XDP_FLAGS_SKB_MODE, NULL);

	err = bpf_set_link_xdp_fd(IFINDEX_LO, prog_fd, XDP_FLAGS_SKB_MODE);

	if (CHECK(err, "set_xdp_skb", "errno=%d\n", errno))

		goto out_close;



	/* Get prog_id for single prog mode */



	err = bpf_xdp_query_id(IFINDEX_LO, 0, &prog_id);

	err = bpf_get_link_xdp_id(IFINDEX_LO, &prog_id, 0);

	if (CHECK(err, "get_xdp", "errno=%d\n", errno))

		goto out;

	if (CHECK(prog_id != info.id, "prog_id", "prog_id not available\n"))

		goto out;



	err = bpf_xdp_query_id(IFINDEX_LO, XDP_FLAGS_SKB_MODE, &prog_id);

	err = bpf_get_link_xdp_id(IFINDEX_LO, &prog_id, XDP_FLAGS_SKB_MODE);

	if (CHECK(err, "get_xdp_skb", "errno=%d\n", errno))

		goto out;

	if (CHECK(prog_id != info.id, "prog_id_skb", "prog_id not available\n"))

		goto out;



	err = bpf_xdp_query_id(IFINDEX_LO, XDP_FLAGS_DRV_MODE, &prog_id);

	err = bpf_get_link_xdp_id(IFINDEX_LO, &prog_id, XDP_FLAGS_DRV_MODE);

	if (CHECK(err, "get_xdp_drv", "errno=%d\n", errno))

		goto out;

	if (CHECK(prog_id, "prog_id_drv", "unexpected prog_id=%u\n", prog_id))

		goto out;



out:

	bpf_xdp_detach(IFINDEX_LO, 0, NULL);

	bpf_set_link_xdp_fd(IFINDEX_LO, -1, 0);

out_close:

	bpf_object__close(obj);

}

tools/testing/selftests/bpf/prog_tests/xdp_link.c

+13 −13
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
void serial_test_xdp_link(void)

{

	__u32 duration = 0, id1, id2, id0 = 0, prog_fd1, prog_fd2, err;

	DECLARE_LIBBPF_OPTS(bpf_xdp_set_link_opts, opts, .old_fd = -1);

	struct test_xdp_link *skel1 = NULL, *skel2 = NULL;

	LIBBPF_OPTS(bpf_xdp_attach_opts, opts);

	struct bpf_link_info link_info;

	struct bpf_prog_info prog_info;

	struct bpf_link *link;
@@ -40,12 +40,12 @@ void serial_test_xdp_link(void) 
	id2 = prog_info.id;



	/* set initial prog attachment */

	err = bpf_xdp_attach(IFINDEX_LO, prog_fd1, XDP_FLAGS_REPLACE, &opts);

	err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, prog_fd1, XDP_FLAGS_REPLACE, &opts);

	if (CHECK(err, "fd_attach", "initial prog attach failed: %d\n", err))

		goto cleanup;



	/* validate prog ID */

	err = bpf_xdp_query_id(IFINDEX_LO, 0, &id0);

	err = bpf_get_link_xdp_id(IFINDEX_LO, &id0, 0);

	CHECK(err || id0 != id1, "id1_check",

	      "loaded prog id %u != id1 %u, err %d", id0, id1, err);
@@ -54,14 +54,14 @@ void serial_test_xdp_link(void) 
	if (!ASSERT_ERR_PTR(link, "link_attach_should_fail")) {

		bpf_link__destroy(link);

		/* best-effort detach prog */

		opts.old_prog_fd = prog_fd1;

		bpf_xdp_detach(IFINDEX_LO, XDP_FLAGS_REPLACE, &opts);

		opts.old_fd = prog_fd1;

		bpf_set_link_xdp_fd_opts(IFINDEX_LO, -1, XDP_FLAGS_REPLACE, &opts);

		goto cleanup;

	}



	/* detach BPF program */

	opts.old_prog_fd = prog_fd1;

	err = bpf_xdp_detach(IFINDEX_LO, XDP_FLAGS_REPLACE, &opts);

	opts.old_fd = prog_fd1;

	err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, -1, XDP_FLAGS_REPLACE, &opts);

	if (CHECK(err, "prog_detach", "failed %d\n", err))

		goto cleanup;
@@ -72,24 +72,24 @@ void serial_test_xdp_link(void) 
	skel1->links.xdp_handler = link;



	/* validate prog ID */

	err = bpf_xdp_query_id(IFINDEX_LO, 0, &id0);

	err = bpf_get_link_xdp_id(IFINDEX_LO, &id0, 0);

	if (CHECK(err || id0 != id1, "id1_check",

		  "loaded prog id %u != id1 %u, err %d", id0, id1, err))

		goto cleanup;



	/* BPF prog attach is not allowed to replace BPF link */

	opts.old_prog_fd = prog_fd1;

	err = bpf_xdp_attach(IFINDEX_LO, prog_fd2, XDP_FLAGS_REPLACE, &opts);

	opts.old_fd = prog_fd1;

	err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, prog_fd2, XDP_FLAGS_REPLACE, &opts);

	if (CHECK(!err, "prog_attach_fail", "unexpected success\n"))

		goto cleanup;



	/* Can't force-update when BPF link is active */

	err = bpf_xdp_attach(IFINDEX_LO, prog_fd2, 0, NULL);

	err = bpf_set_link_xdp_fd(IFINDEX_LO, prog_fd2, 0);

	if (CHECK(!err, "prog_update_fail", "unexpected success\n"))

		goto cleanup;



	/* Can't force-detach when BPF link is active */

	err = bpf_xdp_detach(IFINDEX_LO, 0, NULL);

	err = bpf_set_link_xdp_fd(IFINDEX_LO, -1, 0);

	if (CHECK(!err, "prog_detach_fail", "unexpected success\n"))

		goto cleanup;
@@ -109,7 +109,7 @@ void serial_test_xdp_link(void) 
		goto cleanup;

	skel2->links.xdp_handler = link;



	err = bpf_xdp_query_id(IFINDEX_LO, 0, &id0);

	err = bpf_get_link_xdp_id(IFINDEX_LO, &id0, 0);

	if (CHECK(err || id0 != id2, "id2_check",

		  "loaded prog id %u != id2 %u, err %d", id0, id1, err))

		goto cleanup;