Commit c7f2188d authored by Shigeru Yoshida's avatar Shigeru Yoshida Committed by Alexei Starovoitov
Browse files

selftests/bpf: Adjust data size to have ETH_HLEN 



The function bpf_test_init() now returns an error if user_size
(.data_size_in) is less than ETH_HLEN, causing the tests to
fail. Adjust the data size to ensure it meets the requirement of
ETH_HLEN.

Signed-off-by: default avatarShigeru Yoshida <syoshida@redhat.com>
Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Link: https://patch.msgid.link/20250121150643.671650-2-syoshida@redhat.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 6b3d638c

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

+2 −2
Original line number Diff line number Diff line
@@ -52,10 +52,10 @@ static void test_xdp_with_cpumap_helpers(void) 
	ASSERT_EQ(info.id, val.bpf_prog.id, "Match program id to cpumap entry prog_id");



	/* send a packet to trigger any potential bugs in there */

	char data[10] = {};

	char data[ETH_HLEN] = {};

	DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,

			    .data_in = &data,

			    .data_size_in = 10,

			    .data_size_in = sizeof(data),

			    .flags = BPF_F_TEST_XDP_LIVE_FRAMES,

			    .repeat = 1,

		);

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

+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static void test_xdp_with_devmap_helpers(void) 
	__u32 len = sizeof(info);

	int err, dm_fd, dm_fd_redir, map_fd;

	struct nstoken *nstoken = NULL;

	char data[10] = {};

	char data[ETH_HLEN] = {};

	__u32 idx = 0;



	SYS(out_close, "ip netns add %s", TEST_NS);
@@ -58,7 +58,7 @@ static void test_xdp_with_devmap_helpers(void) 
	/* send a packet to trigger any potential bugs in there */

	DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,

			    .data_in = &data,

			    .data_size_in = 10,

			    .data_size_in = sizeof(data),

			    .flags = BPF_F_TEST_XDP_LIVE_FRAMES,

			    .repeat = 1,

		);
@@ -158,7 +158,7 @@ static void test_xdp_with_devmap_helpers_veth(void) 
	struct nstoken *nstoken = NULL;

	__u32 len = sizeof(info);

	int err, dm_fd, dm_fd_redir, map_fd, ifindex_dst;

	char data[10] = {};

	char data[ETH_HLEN] = {};

	__u32 idx = 0;



	SYS(out_close, "ip netns add %s", TEST_NS);
@@ -208,7 +208,7 @@ static void test_xdp_with_devmap_helpers_veth(void) 
	/* send a packet to trigger any potential bugs in there */

	DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,

			    .data_in = &data,

			    .data_size_in = 10,

			    .data_size_in = sizeof(data),

			    .flags = BPF_F_TEST_XDP_LIVE_FRAMES,

			    .repeat = 1,

		);