Commit 38f033a1 authored by Andrii Nakryiko's avatar Andrii Nakryiko
Browse files

Merge branch 'rely on ASSERT marcos in xdp_bpf2bpf.c/xdp_adjust_tail.c' 



Lorenzo Bianconi says:

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

Rely on ASSERT* macros and get rid of deprecated CHECK ones in xdp_bpf2bpf and
xdp_adjust_tail bpf selftests.
This is a preliminary series for XDP multi-frags support.

Changes since v1:
- run each ASSERT test separately
- drop unnecessary return statements
- drop unnecessary if condition in test_xdp_bpf2bpf()
====================

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parents 4e950747 fa6fde35

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

+28 −40
Original line number Diff line number Diff line
@@ -11,22 +11,21 @@ static void test_xdp_adjust_tail_shrink(void) 
	char buf[128];



	err = bpf_prog_test_load(file, BPF_PROG_TYPE_XDP, &obj, &prog_fd);

	if (CHECK_FAIL(err))

	if (ASSERT_OK(err, "test_xdp_adjust_tail_shrink"))

		return;



	err = bpf_prog_test_run(prog_fd, 1, &pkt_v4, sizeof(pkt_v4),

				buf, &size, &retval, &duration);



	CHECK(err || retval != XDP_DROP,

	      "ipv4", "err %d errno %d retval %d size %d\n",

	      err, errno, retval, size);

	ASSERT_OK(err, "ipv4");

	ASSERT_EQ(retval, XDP_DROP, "ipv4 retval");



	expect_sz = sizeof(pkt_v6) - 20;  /* Test shrink with 20 bytes */

	err = bpf_prog_test_run(prog_fd, 1, &pkt_v6, sizeof(pkt_v6),

				buf, &size, &retval, &duration);

	CHECK(err || retval != XDP_TX || size != expect_sz,

	      "ipv6", "err %d errno %d retval %d size %d expect-size %d\n",

	      err, errno, retval, size, expect_sz);

	ASSERT_OK(err, "ipv6");

	ASSERT_EQ(retval, XDP_TX, "ipv6 retval");

	ASSERT_EQ(size, expect_sz, "ipv6 size");



	bpf_object__close(obj);

}
@@ -39,21 +38,20 @@ static void test_xdp_adjust_tail_grow(void) 
	int err, prog_fd;



	err = bpf_prog_test_load(file, BPF_PROG_TYPE_XDP, &obj, &prog_fd);

	if (CHECK_FAIL(err))

	if (ASSERT_OK(err, "test_xdp_adjust_tail_grow"))

		return;



	err = bpf_prog_test_run(prog_fd, 1, &pkt_v4, sizeof(pkt_v4),

				buf, &size, &retval, &duration);

	CHECK(err || retval != XDP_DROP,

	      "ipv4", "err %d errno %d retval %d size %d\n",

	      err, errno, retval, size);

	ASSERT_OK(err, "ipv4");

	ASSERT_EQ(retval, XDP_DROP, "ipv4 retval");



	expect_sz = sizeof(pkt_v6) + 40; /* Test grow with 40 bytes */

	err = bpf_prog_test_run(prog_fd, 1, &pkt_v6, sizeof(pkt_v6) /* 74 */,

				buf, &size, &retval, &duration);

	CHECK(err || retval != XDP_TX || size != expect_sz,

	      "ipv6", "err %d errno %d retval %d size %d expect-size %d\n",

	      err, errno, retval, size, expect_sz);

	ASSERT_OK(err, "ipv6");

	ASSERT_EQ(retval, XDP_TX, "ipv6 retval");

	ASSERT_EQ(size, expect_sz, "ipv6 size");



	bpf_object__close(obj);

}
@@ -76,7 +74,7 @@ static void test_xdp_adjust_tail_grow2(void) 
	};



	err = bpf_prog_test_load(file, BPF_PROG_TYPE_XDP, &obj, &tattr.prog_fd);

	if (CHECK_ATTR(err, "load", "err %d errno %d\n", err, errno))

	if (ASSERT_OK(err, "test_xdp_adjust_tail_grow"))

		return;



	/* Test case-64 */
@@ -86,21 +84,17 @@ static void test_xdp_adjust_tail_grow2(void) 
	/* Kernel side alloc packet memory area that is zero init */

	err = bpf_prog_test_run_xattr(&tattr);



	CHECK_ATTR(errno != ENOSPC /* Due limit copy_size in bpf_test_finish */

		   || tattr.retval != XDP_TX

		   || tattr.data_size_out != 192, /* Expected grow size */

		   "case-64",

		   "err %d errno %d retval %d size %d\n",

		   err, errno, tattr.retval, tattr.data_size_out);

	ASSERT_EQ(errno, ENOSPC, "case-64 errno"); /* Due limit copy_size in bpf_test_finish */

	ASSERT_EQ(tattr.retval, XDP_TX, "case-64 retval");

	ASSERT_EQ(tattr.data_size_out, 192, "case-64 data_size_out"); /* Expected grow size */



	/* Extra checks for data contents */

	CHECK_ATTR(tattr.data_size_out != 192

		   || buf[0]   != 1 ||  buf[63]  != 1  /*  0-63  memset to 1 */

		   || buf[64]  != 0 ||  buf[127] != 0  /* 64-127 memset to 0 */

		   || buf[128] != 1 ||  buf[191] != 1, /*128-191 memset to 1 */

		   "case-64-data",

		   "err %d errno %d retval %d size %d\n",

		   err, errno, tattr.retval, tattr.data_size_out);

	ASSERT_EQ(buf[0], 1, "case-64-data buf[0]"); /*  0-63  memset to 1 */

	ASSERT_EQ(buf[63], 1, "case-64-data buf[63]");

	ASSERT_EQ(buf[64], 0, "case-64-data buf[64]"); /* 64-127 memset to 0 */

	ASSERT_EQ(buf[127], 0, "case-64-data buf[127]");

	ASSERT_EQ(buf[128], 1, "case-64-data buf[128]"); /* 128-191 memset to 1 */

	ASSERT_EQ(buf[191], 1, "case-64-data buf[191]");



	/* Test case-128 */

	memset(buf, 2, sizeof(buf));
@@ -109,23 +103,17 @@ static void test_xdp_adjust_tail_grow2(void) 
	err = bpf_prog_test_run_xattr(&tattr);



	max_grow = 4096 - XDP_PACKET_HEADROOM -	tailroom; /* 3520 */

	CHECK_ATTR(err

		   || tattr.retval != XDP_TX

		   || tattr.data_size_out != max_grow,/* Expect max grow size */

		   "case-128",

		   "err %d errno %d retval %d size %d expect-size %d\n",

		   err, errno, tattr.retval, tattr.data_size_out, max_grow);

	ASSERT_OK(err, "case-128");

	ASSERT_EQ(tattr.retval, XDP_TX, "case-128 retval");

	ASSERT_EQ(tattr.data_size_out, max_grow, "case-128 data_size_out"); /* Expect max grow */



	/* Extra checks for data content: Count grow size, will contain zeros */

	for (i = 0, cnt = 0; i < sizeof(buf); i++) {

		if (buf[i] == 0)

			cnt++;

	}

	CHECK_ATTR((cnt != (max_grow - tattr.data_size_in)) /* Grow increase */

		   || tattr.data_size_out != max_grow, /* Total grow size */

		   "case-128-data",

		   "err %d errno %d retval %d size %d grow-size %d\n",

		   err, errno, tattr.retval, tattr.data_size_out, cnt);

	ASSERT_EQ(cnt, max_grow - tattr.data_size_in, "case-128-data cnt"); /* Grow increase */

	ASSERT_EQ(tattr.data_size_out, max_grow, "case-128-data data_size_out"); /* Total grow */



	bpf_object__close(obj);

}

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

+20 −40
Original line number Diff line number Diff line
@@ -12,26 +12,14 @@ struct meta { 


static void on_sample(void *ctx, int cpu, void *data, __u32 size)

{

	int duration = 0;

	struct meta *meta = (struct meta *)data;

	struct ipv4_packet *trace_pkt_v4 = data + sizeof(*meta);



	if (CHECK(size < sizeof(pkt_v4) + sizeof(*meta),

		  "check_size", "size %u < %zu\n",

		  size, sizeof(pkt_v4) + sizeof(*meta)))

		return;



	if (CHECK(meta->ifindex != if_nametoindex("lo"), "check_meta_ifindex",

		  "meta->ifindex = %d\n", meta->ifindex))

		return;



	if (CHECK(meta->pkt_len != sizeof(pkt_v4), "check_meta_pkt_len",

		  "meta->pkt_len = %zd\n", sizeof(pkt_v4)))

		return;



	if (CHECK(memcmp(trace_pkt_v4, &pkt_v4, sizeof(pkt_v4)),

		  "check_packet_content", "content not the same\n"))

		return;

	ASSERT_GE(size, sizeof(pkt_v4) + sizeof(*meta), "check_size");

	ASSERT_EQ(meta->ifindex, if_nametoindex("lo"), "check_meta_ifindex");

	ASSERT_EQ(meta->pkt_len, sizeof(pkt_v4), "check_meta_pkt_len");

	ASSERT_EQ(memcmp(trace_pkt_v4, &pkt_v4, sizeof(pkt_v4)), 0,

		  "check_packet_content");



	*(bool *)ctx = true;

}
@@ -52,7 +40,7 @@ void test_xdp_bpf2bpf(void) 


	/* Load XDP program to introspect */

	pkt_skel = test_xdp__open_and_load();

	if (CHECK(!pkt_skel, "pkt_skel_load", "test_xdp skeleton failed\n"))

	if (!ASSERT_OK_PTR(pkt_skel, "test_xdp__open_and_load"))

		return;



	pkt_fd = bpf_program__fd(pkt_skel->progs._xdp_tx_iptunnel);
@@ -62,7 +50,7 @@ void test_xdp_bpf2bpf(void) 


	/* Load trace program */

	ftrace_skel = test_xdp_bpf2bpf__open();

	if (CHECK(!ftrace_skel, "__open", "ftrace skeleton failed\n"))

	if (!ASSERT_OK_PTR(ftrace_skel, "test_xdp_bpf2bpf__open"))

		goto out;



	/* Demonstrate the bpf_program__set_attach_target() API rather than
@@ -77,11 +65,11 @@ void test_xdp_bpf2bpf(void) 
	bpf_program__set_attach_target(prog, pkt_fd, "_xdp_tx_iptunnel");



	err = test_xdp_bpf2bpf__load(ftrace_skel);

	if (CHECK(err, "__load", "ftrace skeleton failed\n"))

	if (!ASSERT_OK(err, "test_xdp_bpf2bpf__load"))

		goto out;



	err = test_xdp_bpf2bpf__attach(ftrace_skel);

	if (CHECK(err, "ftrace_attach", "ftrace attach failed: %d\n", err))

	if (!ASSERT_OK(err, "test_xdp_bpf2bpf__attach"))

		goto out;



	/* Set up perf buffer */
@@ -94,32 +82,24 @@ void test_xdp_bpf2bpf(void) 
	err = bpf_prog_test_run(pkt_fd, 1, &pkt_v4, sizeof(pkt_v4),

				buf, &size, &retval, &duration);

	memcpy(&iph, buf + sizeof(struct ethhdr), sizeof(iph));

	if (CHECK(err || retval != XDP_TX || size != 74 ||

		  iph.protocol != IPPROTO_IPIP, "ipv4",

		  "err %d errno %d retval %d size %d\n",

		  err, errno, retval, size))

		goto out;



	ASSERT_OK(err, "ipv4");

	ASSERT_EQ(retval, XDP_TX, "ipv4 retval");

	ASSERT_EQ(size, 74, "ipv4 size");

	ASSERT_EQ(iph.protocol, IPPROTO_IPIP, "ipv4 proto");



	/* Make sure bpf_xdp_output() was triggered and it sent the expected

	 * data to the perf ring buffer.

	 */

	err = perf_buffer__poll(pb, 100);

	if (CHECK(err < 0, "perf_buffer__poll", "err %d\n", err))

		goto out;



	CHECK_FAIL(!passed);



	ASSERT_GE(err, 0, "perf_buffer__poll");

	ASSERT_TRUE(passed, "test passed");

	/* Verify test results */

	if (CHECK(ftrace_skel->bss->test_result_fentry != if_nametoindex("lo"),

		  "result", "fentry failed err %llu\n",

		  ftrace_skel->bss->test_result_fentry))

		goto out;



	CHECK(ftrace_skel->bss->test_result_fexit != XDP_TX, "result",

	      "fexit failed err %llu\n", ftrace_skel->bss->test_result_fexit);



	ASSERT_EQ(ftrace_skel->bss->test_result_fentry, if_nametoindex("lo"),

		  "fentry result");

	ASSERT_EQ(ftrace_skel->bss->test_result_fexit, XDP_TX, "fexit result");

out:

	if (pb)

	perf_buffer__free(pb);

	test_xdp__destroy(pkt_skel);

	test_xdp_bpf2bpf__destroy(ftrace_skel);