selftests/bpf: Create task_local_storage map with invalid uptr's struct

This patch tests the map creation failure when the map_value
has unsupported uptr. The three cases are the struct is larger
than one page, the struct is empty, and the struct is a kernel struct.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Link: https://lore.kernel.org/r/20241023234759.860539-13-martin.lau@linux.dev
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/prog_tests/task_local_storage.c b/tools/testing/selftests/bpf/prog_tests/task_local_storage.c
index 772ed7ce4febdea8fc403fee4c48992ba98f7039..00cc9d0aee5d3ec924504ab53df0252867eee085 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/task_local_storage.c
+++ b/tools/testing/selftests/bpf/prog_tests/task_local_storage.c
@@ -10,6 +10,7 @@
 #include <sys/eventfd.h>
 #include <sys/mman.h>
 #include <test_progs.h>
+#include <bpf/btf.h>
 #include "task_local_storage_helpers.h"
 #include "task_local_storage.skel.h"
 #include "task_local_storage_exit_creds.skel.h"
@@ -19,6 +20,7 @@
 #include "task_ls_uptr.skel.h"
 #include "uptr_update_failure.skel.h"
 #include "uptr_failure.skel.h"
+#include "uptr_map_failure.skel.h"
 
 static void test_sys_enter_exit(void)
 {
@@ -452,6 +454,40 @@ out:
        close(task_fd);
 }
 
+static void test_uptr_map_failure(const char *map_name, int expected_errno)
+{
+       LIBBPF_OPTS(bpf_map_create_opts, create_attr);
+       struct uptr_map_failure *skel;
+       struct bpf_map *map;
+       struct btf *btf;
+       int map_fd, err;
+
+       skel = uptr_map_failure__open();
+       if (!ASSERT_OK_PTR(skel, "uptr_map_failure__open"))
+               return;
+
+       map = bpf_object__find_map_by_name(skel->obj, map_name);
+       btf = bpf_object__btf(skel->obj);
+       err = btf__load_into_kernel(btf);
+       if (!ASSERT_OK(err, "btf__load_into_kernel"))
+               goto done;
+
+       create_attr.map_flags = bpf_map__map_flags(map);
+       create_attr.btf_fd = btf__fd(btf);
+       create_attr.btf_key_type_id = bpf_map__btf_key_type_id(map);
+       create_attr.btf_value_type_id = bpf_map__btf_value_type_id(map);
+       map_fd = bpf_map_create(bpf_map__type(map), map_name,
+                               bpf_map__key_size(map), bpf_map__value_size(map),
+                               0, &create_attr);
+       if (ASSERT_ERR_FD(map_fd, "map_create"))
+               ASSERT_EQ(errno, expected_errno, "errno");
+       else
+               close(map_fd);
+
+done:
+       uptr_map_failure__destroy(skel);
+}
+
 void test_task_local_storage(void)
 {
        if (test__start_subtest("sys_enter_exit"))
@@ -468,5 +504,15 @@ void test_task_local_storage(void)
                test_uptr_across_pages();
        if (test__start_subtest("uptr_update_failure"))
                test_uptr_update_failure();
+       if (test__start_subtest("uptr_map_failure_e2big")) {
+               if (getpagesize() == PAGE_SIZE)
+                       test_uptr_map_failure("large_uptr_map", E2BIG);
+               else
+                       test__skip();
+       }
+       if (test__start_subtest("uptr_map_failure_size0"))
+               test_uptr_map_failure("empty_uptr_map", EINVAL);
+       if (test__start_subtest("uptr_map_failure_kstruct"))
+               test_uptr_map_failure("kstruct_uptr_map", EINVAL);
        RUN_TESTS(uptr_failure);
 }

diff --git a/tools/testing/selftests/bpf/progs/uptr_map_failure.c b/tools/testing/selftests/bpf/progs/uptr_map_failure.c
new file mode 100644 (file)
index 0000000..417b763
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/uptr_map_failure.c
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */
+
+#include <vmlinux.h>
+#include <bpf/bpf_helpers.h>
+#include "uptr_test_common.h"
+
+struct {
+       __uint(type, BPF_MAP_TYPE_TASK_STORAGE);
+       __uint(map_flags, BPF_F_NO_PREALLOC);
+       __type(key, int);
+       __type(value, struct large_uptr);
+} large_uptr_map SEC(".maps");
+
+struct {
+       __uint(type, BPF_MAP_TYPE_TASK_STORAGE);
+       __uint(map_flags, BPF_F_NO_PREALLOC);
+       __type(key, int);
+       __type(value, struct empty_uptr);
+} empty_uptr_map SEC(".maps");
+
+struct {
+       __uint(type, BPF_MAP_TYPE_TASK_STORAGE);
+       __uint(map_flags, BPF_F_NO_PREALLOC);
+       __type(key, int);
+       __type(value, struct kstruct_uptr);
+} kstruct_uptr_map SEC(".maps");

diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h
index 7767d9a825ae806d690c5a391ecf20611f34e0f3..7a58895867c3e26aaad3026fd151617bdaa7d652 100644 (file)
--- a/tools/testing/selftests/bpf/test_progs.h
+++ b/tools/testing/selftests/bpf/test_progs.h
@@ -390,6 +390,14 @@ int test__join_cgroup(const char *path);
        ___ok;                                                          \
 })
 
+#define ASSERT_ERR_FD(fd, name) ({                                     \
+       static int duration = 0;                                        \
+       int ___fd = (fd);                                               \
+       bool ___ok = ___fd < 0;                                         \
+       CHECK(!___ok, (name), "unexpected fd: %d\n", ___fd);            \
+       ___ok;                                                          \
+})
+
 #define SYS(goto_label, fmt, ...)                                      \
        ({                                                              \
                char cmd[1024];                                         \

diff --git a/tools/testing/selftests/bpf/uptr_test_common.h b/tools/testing/selftests/bpf/uptr_test_common.h
index 45c00c80d9352cdb835890b8864b58db4b9c5567..f8a134ba12f95d18e66d33d5f5e9558faa09f173 100644 (file)
--- a/tools/testing/selftests/bpf/uptr_test_common.h
+++ b/tools/testing/selftests/bpf/uptr_test_common.h
@@ -5,9 +5,12 @@
 #define _UPTR_TEST_COMMON_H
 
 #define MAGIC_VALUE 0xabcd1234
+#define PAGE_SIZE 4096
 
 #ifdef __BPF__
 /* Avoid fwd btf type being generated for the following struct */
+struct large_data *dummy_large_data;
+struct empty_data *dummy_empty_data;
 struct user_data *dummy_data;
 struct cgroup *dummy_cgrp;
 #else
@@ -37,4 +40,24 @@ struct value_lock_type {
        struct bpf_spin_lock lock;
 };
 
+struct large_data {
+       __u8 one_page[PAGE_SIZE];
+       int a;
+};
+
+struct large_uptr {
+       struct large_data __uptr *udata;
+};
+
+struct empty_data {
+};
+
+struct empty_uptr {
+       struct empty_data __uptr *udata;
+};
+
+struct kstruct_uptr {
+       struct cgroup __uptr *cgrp;
+};
+
 #endif