Commit 6dfd5e01 authored by Jakub Sitnicki's avatar Jakub Sitnicki Committed by Martin KaFai Lau
Browse files

selftests/bpf: Pass just bpf_map to xdp_context_test helper



Prepare for parametrizing the xdp_context tests. The assert_test_result
helper doesn't need the whole skeleton. Pass just what it needs.

Signed-off-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Reviewed-by: default avatarJesse Brandeburg <jbrandeburg@cloudflare.com>
Acked-by: default avatarEduard Zingerman <eddyz87@gmail.com>
Link: https://patch.msgid.link/20250814-skb-metadata-thru-dynptr-v7-4-8a39e636e0fb@cloudflare.com
parent 0e74eb4d
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -156,15 +156,14 @@ static int send_test_packet(int ifindex)
	return -1;
}

static void assert_test_result(struct test_xdp_meta *skel)
static void assert_test_result(const struct bpf_map *result_map)
{
	int err;
	__u32 map_key = 0;
	__u8 map_value[TEST_PAYLOAD_LEN];

	err = bpf_map__lookup_elem(skel->maps.test_result, &map_key,
				   sizeof(map_key), &map_value,
				   TEST_PAYLOAD_LEN, BPF_ANY);
	err = bpf_map__lookup_elem(result_map, &map_key, sizeof(map_key),
				   &map_value, TEST_PAYLOAD_LEN, BPF_ANY);
	if (!ASSERT_OK(err, "lookup test_result"))
		return;

@@ -248,7 +247,7 @@ void test_xdp_context_veth(void)
	if (!ASSERT_OK(ret, "send_test_packet"))
		goto close;

	assert_test_result(skel);
	assert_test_result(skel->maps.test_result);

close:
	close_netns(nstoken);
@@ -313,7 +312,7 @@ void test_xdp_context_tuntap(void)
	if (!ASSERT_EQ(ret, sizeof(packet), "write packet"))
		goto close;

	assert_test_result(skel);
	assert_test_result(skel->maps.test_result);

close:
	if (tap_fd >= 0)