From: Tao Chen <chen.dylane@gmail.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Eduard Zingerman <eddyz87@gmail.com>, Song Liu <song@kernel.org>,
Hou Tao <houtao1@huawei.com>,
Yonghong Song <yonghong.song@linux.dev>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@fomichev.me>
Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
Tao Chen <chen.dylane@gmail.com>,
jinke han <jinkehan@didiglobal.com>
Subject: [v2 PATCH bpf-next 2/2] bpf/selftests: Check errno when percpu map value size exceeds
Date: Mon, 9 Sep 2024 15:13:46 +0800 [thread overview]
Message-ID: <20240909071346.1300093-3-chen.dylane@gmail.com> (raw)
In-Reply-To: <20240909071346.1300093-1-chen.dylane@gmail.com>
This test case checks the errno message when percpu map value size
exceeds PCPU_MIN_UNIT_SIZE.
root@debian:~# ./test_progs -t map_init
#160/1 map_init/pcpu_map_init:OK
#160/2 map_init/pcpu_lru_map_init:OK
#160/3 map_init/pcpu map value size:OK
#160 map_init:OK
Summary: 1/3 PASSED, 0 SKIPPED, 0 FAILED
Signed-off-by: Tao Chen <chen.dylane@gmail.com>
Signed-off-by: jinke han <jinkehan@didiglobal.com>
---
.../selftests/bpf/prog_tests/map_init.c | 32 +++++++++++++++++++
.../selftests/bpf/progs/test_map_init.c | 6 ++++
2 files changed, 38 insertions(+)
diff --git a/tools/testing/selftests/bpf/prog_tests/map_init.c b/tools/testing/selftests/bpf/prog_tests/map_init.c
index 14a31109dd0e..7f1a6fa3679f 100644
--- a/tools/testing/selftests/bpf/prog_tests/map_init.c
+++ b/tools/testing/selftests/bpf/prog_tests/map_init.c
@@ -6,6 +6,7 @@
#define TEST_VALUE 0x1234
#define FILL_VALUE 0xdeadbeef
+#define PCPU_MIN_UNIT_SIZE 32768
static int nr_cpus;
static int duration;
@@ -118,6 +119,35 @@ static int check_values_one_cpu(pcpu_map_value_t *value, map_value_t expected)
return 0;
}
+/*
+ * percpu map value size is bound by PCPU_MIN_UNIT_SIZE
+ * check the errno when the value exceed PCPU_MIN_UNIT_SIZE
+ */
+static void test_pcpu_map_value_size(void)
+{
+ struct test_map_init *skel;
+ int err;
+ int value_sz = PCPU_MIN_UNIT_SIZE + 1;
+ enum bpf_map_type map_types[] = { BPF_MAP_TYPE_PERCPU_ARRAY,
+ BPF_MAP_TYPE_PERCPU_HASH,
+ BPF_MAP_TYPE_LRU_PERCPU_HASH };
+ for (int i = 0; i < ARRAY_SIZE(map_types); i++) {
+ skel = test_map_init__open();
+ if (!ASSERT_OK_PTR(skel, "skel_open"))
+ return;
+ err = bpf_map__set_type(skel->maps.hashmap2, map_types[i]);
+ if (!ASSERT_OK(err, "bpf_map__set_type"))
+ goto error;
+ err = bpf_map__set_value_size(skel->maps.hashmap2, value_sz);
+ if (!ASSERT_OK(err, "bpf_map__set_value_size"))
+ goto error;
+
+ err = test_map_init__load(skel);
+ ASSERT_EQ(err, -E2BIG, "skel_load");
+error:
+ test_map_init__destroy(skel);
+ }
+}
/* Add key=1 elem with values set for all CPUs
* Delete elem key=1
@@ -211,4 +241,6 @@ void test_map_init(void)
test_pcpu_map_init();
if (test__start_subtest("pcpu_lru_map_init"))
test_pcpu_lru_map_init();
+ if (test__start_subtest("pcpu map value size"))
+ test_pcpu_map_value_size();
}
diff --git a/tools/testing/selftests/bpf/progs/test_map_init.c b/tools/testing/selftests/bpf/progs/test_map_init.c
index c89d28ead673..7a772cbf0570 100644
--- a/tools/testing/selftests/bpf/progs/test_map_init.c
+++ b/tools/testing/selftests/bpf/progs/test_map_init.c
@@ -15,6 +15,12 @@ struct {
__type(value, __u64);
} hashmap1 SEC(".maps");
+struct {
+ __uint(type, BPF_MAP_TYPE_HASH);
+ __uint(max_entries, 1);
+ __type(key, __u32);
+ __type(value, __u64);
+} hashmap2 SEC(".maps");
SEC("tp/syscalls/sys_enter_getpgid")
int sysenter_getpgid(const void *ctx)
--
2.25.1
next prev parent reply other threads:[~2024-09-09 7:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-09 7:13 [v2 PATCH bpf-next 0/2] bpf: Add percpu map value size check Tao Chen
2024-09-09 7:13 ` [v2 PATCH bpf-next 1/2] bpf: Check percpu map value size first Tao Chen
2024-09-09 20:17 ` Andrii Nakryiko
2024-09-10 2:35 ` Tao Chen
2024-09-09 7:13 ` Tao Chen [this message]
2024-09-09 20:16 ` [v2 PATCH bpf-next 2/2] bpf/selftests: Check errno when percpu map value size exceeds Andrii Nakryiko
2024-09-10 2:40 ` Tao Chen
2024-09-09 9:17 ` [v2 PATCH bpf-next 0/2] bpf: Add percpu map value size check Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240909071346.1300093-3-chen.dylane@gmail.com \
--to=chen.dylane@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=houtao1@huawei.com \
--cc=jinkehan@didiglobal.com \
--cc=john.fastabend@gmail.com \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sdf@fomichev.me \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox