]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selftests/bpf: Pass just bpf_map to xdp_context_test helper
authorJakub Sitnicki <jakub@cloudflare.com>
Thu, 14 Aug 2025 09:59:30 +0000 (11:59 +0200)
committerMartin KaFai Lau <martin.lau@kernel.org>
Mon, 18 Aug 2025 17:29:42 +0000 (10:29 -0700)
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: Jakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Reviewed-by: Jesse Brandeburg <jbrandeburg@cloudflare.com>
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://patch.msgid.link/20250814-skb-metadata-thru-dynptr-v7-4-8a39e636e0fb@cloudflare.com
tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c

index b9d9f0a502cea77074cec82ce6cb25145597a864..0134651d94ab08f7ba779f55d5ae87d6c4589768 100644 (file)
@@ -156,15 +156,14 @@ err:
        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)