From: Yonghong Song <yhs@fb.com>
To: <bpf@vger.kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>, <kernel-team@fb.com>,
KP Singh <kpsingh@kernel.org>,
Martin KaFai Lau <martin.lau@kernel.org>,
Tejun Heo <tj@kernel.org>
Subject: [PATCH bpf-next v6 6/9] selftests/bpf: Fix test test_libbpf_str/bpf_map_type_str
Date: Tue, 25 Oct 2022 21:29:06 -0700 [thread overview]
Message-ID: <20221026042906.674830-1-yhs@fb.com> (raw)
In-Reply-To: <20221026042835.672317-1-yhs@fb.com>
Previous bpf patch made a change to uapi bpf.h like
@@ -922,7 +922,14 @@ enum bpf_map_type {
BPF_MAP_TYPE_SOCKHASH,
- BPF_MAP_TYPE_CGROUP_STORAGE,
+ BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED,
+ BPF_MAP_TYPE_CGROUP_STORAGE = BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED,
BPF_MAP_TYPE_REUSEPORT_SOCKARRAY,
where BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED and BPF_MAP_TYPE_CGROUP_STORAGE
have the same enum value. This will cause selftest test_libbpf_str/bpf_map_type_str
failing. This patch fixed the issue by avoid the check for
BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED in the test.
Signed-off-by: Yonghong Song <yhs@fb.com>
---
tools/testing/selftests/bpf/prog_tests/libbpf_str.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tools/testing/selftests/bpf/prog_tests/libbpf_str.c b/tools/testing/selftests/bpf/prog_tests/libbpf_str.c
index 93e9cddaadcf..efb8bd43653c 100644
--- a/tools/testing/selftests/bpf/prog_tests/libbpf_str.c
+++ b/tools/testing/selftests/bpf/prog_tests/libbpf_str.c
@@ -139,6 +139,14 @@ static void test_libbpf_bpf_map_type_str(void)
snprintf(buf, sizeof(buf), "BPF_MAP_TYPE_%s", map_type_str);
uppercase(buf);
+ /* Special case for map_type_name BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED
+ * where it and BPF_MAP_TYPE_CGROUP_STORAGE have the same enum value
+ * (map_type). For this enum value, libbpf_bpf_map_type_str() picks
+ * BPF_MAP_TYPE_CGROUP_STORAGE.
+ */
+ if (strcmp(map_type_name, "BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED") == 0)
+ continue;
+
ASSERT_STREQ(buf, map_type_name, "exp_str_value");
}
--
2.30.2
next prev parent reply other threads:[~2022-10-26 4:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-26 4:28 [PATCH bpf-next v6 0/9] bpf: Implement cgroup local storage available to non-cgroup-attached bpf progs Yonghong Song
2022-10-26 4:28 ` [PATCH bpf-next v6 1/9] bpf: Make struct cgroup btf id global Yonghong Song
2022-10-26 4:28 ` [PATCH bpf-next v6 2/9] bpf: Refactor some inode/task/sk storage functions for reuse Yonghong Song
2022-10-26 4:28 ` [PATCH bpf-next v6 3/9] bpf: Implement cgroup storage available to non-cgroup-attached bpf progs Yonghong Song
2022-10-26 4:28 ` [PATCH bpf-next v6 4/9] libbpf: Support new cgroup local storage Yonghong Song
2022-10-26 4:29 ` [PATCH bpf-next v6 5/9] bpftool: " Yonghong Song
2022-10-26 4:29 ` Yonghong Song [this message]
2022-10-26 4:29 ` [PATCH bpf-next v6 7/9] selftests/bpf: Add selftests for " Yonghong Song
2022-10-26 4:29 ` [PATCH bpf-next v6 8/9] selftests/bpf: Add test cgrp_local_storage to DENYLIST.s390x Yonghong Song
2022-10-26 4:29 ` [PATCH bpf-next v6 9/9] docs/bpf: Add documentation for new cgroup local storage Yonghong Song
2022-10-26 6:40 ` [PATCH bpf-next v6 0/9] bpf: Implement cgroup local storage available to non-cgroup-attached bpf progs patchwork-bot+netdevbpf
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=20221026042906.674830-1-yhs@fb.com \
--to=yhs@fb.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=kpsingh@kernel.org \
--cc=martin.lau@kernel.org \
--cc=tj@kernel.org \
/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