From: Anton Protopopov <aspsk@isovalent.com>
To: Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jiri Olsa <jolsa@kernel.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
Stanislav Fomichev <sdf@google.com>,
Yonghong Song <yonghong.song@linux.dev>,
Eduard Zingerman <eddyz87@gmail.com>,
Quentin Monnet <quentin@isovalent.com>,
bpf@vger.kernel.org
Cc: Anton Protopopov <aspsk@isovalent.com>
Subject: [PATCH v1 bpf-next 9/9] selftests/bpf: Add tests for new ja* instructions
Date: Fri, 2 Feb 2024 16:28:13 +0000 [thread overview]
Message-ID: <20240202162813.4184616-10-aspsk@isovalent.com> (raw)
In-Reply-To: <20240202162813.4184616-1-aspsk@isovalent.com>
Add several self-tests to test the new instructions and the new
BPF_STATIC_BRANCH_UPDATE syscall.
Signed-off-by: Anton Protopopov <aspsk@isovalent.com>
---
.../bpf/prog_tests/bpf_static_branches.c | 269 ++++++++++++++++++
1 file changed, 269 insertions(+)
create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_static_branches.c
diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_static_branches.c b/tools/testing/selftests/bpf/prog_tests/bpf_static_branches.c
new file mode 100644
index 000000000000..6f54002e6e15
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_static_branches.c
@@ -0,0 +1,269 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2024 Isovalent */
+
+#include <test_progs.h>
+
+#include <sys/syscall.h>
+#include <bpf/bpf.h>
+
+static inline int _bpf_prog_load(struct bpf_insn *insns, __u32 insn_cnt)
+{
+ union bpf_attr attr = {
+ .prog_type = BPF_PROG_TYPE_XDP, /* we don't care */
+ .insns = ptr_to_u64(insns),
+ .insn_cnt = insn_cnt,
+ .license = ptr_to_u64("GPL"),
+ };
+
+ return syscall(__NR_bpf, BPF_PROG_LOAD, &attr, sizeof(attr));
+}
+
+enum {
+ OFF,
+ ON
+};
+
+static inline int bpf_static_branch_update(int prog_fd, __u32 insn_off, __u32 on)
+{
+ union bpf_attr attr = {
+ .static_branch.prog_fd = (__u32)prog_fd,
+ .static_branch.insn_off = insn_off,
+ .static_branch.on = on,
+ };
+
+ return syscall(__NR_bpf, BPF_STATIC_BRANCH_UPDATE, &attr, sizeof(attr));
+}
+
+#define BPF_JMP32_OR_NOP(IMM, OFF) \
+ ((struct bpf_insn) { \
+ .code = BPF_JMP32 | BPF_JA | BPF_K, \
+ .dst_reg = 0, \
+ .src_reg = BPF_STATIC_BRANCH_JA, \
+ .off = OFF, \
+ .imm = IMM })
+
+#define BPF_JMP_OR_NOP(IMM, OFF) \
+ ((struct bpf_insn) { \
+ .code = BPF_JMP | BPF_JA | BPF_K, \
+ .dst_reg = 0, \
+ .src_reg = BPF_STATIC_BRANCH_JA, \
+ .off = OFF, \
+ .imm = IMM })
+
+#define BPF_NOP_OR_JMP32(IMM, OFF) \
+ ((struct bpf_insn) { \
+ .code = BPF_JMP32 | BPF_JA | BPF_K, \
+ .dst_reg = 0, \
+ .src_reg = BPF_STATIC_BRANCH_JA | \
+ BPF_STATIC_BRANCH_NOP, \
+ .off = OFF, \
+ .imm = IMM })
+
+#define BPF_NOP_OR_JMP(IMM, OFF) \
+ ((struct bpf_insn) { \
+ .code = BPF_JMP | BPF_JA | BPF_K, \
+ .dst_reg = 0, \
+ .src_reg = BPF_STATIC_BRANCH_JA | \
+ BPF_STATIC_BRANCH_NOP, \
+ .off = OFF, \
+ .imm = IMM })
+
+static const struct bpf_insn insns0[] = {
+ BPF_JMP_OR_NOP(0, 1),
+ BPF_NOP_OR_JMP(0, 1),
+ BPF_JMP32_OR_NOP(1, 0),
+ BPF_NOP_OR_JMP32(1, 0),
+};
+
+static void check_ops(void)
+{
+ struct bpf_insn insns[] = {
+ {}, /* we will substitute this by insn0[i], i=0,1,2,3 */
+ BPF_JMP_IMM(BPF_JA, 0, 0, 1),
+ BPF_JMP_IMM(BPF_JA, 0, 0, -2),
+ BPF_MOV64_IMM(BPF_REG_0, 0),
+ BPF_EXIT_INSN(),
+ };
+ union bpf_attr attr = {
+ .prog_type = BPF_PROG_TYPE_XDP,
+ .insns = ptr_to_u64(insns),
+ .insn_cnt = ARRAY_SIZE(insns),
+ .license = ptr_to_u64("GPL"),
+ };
+ bool stop = false;
+ int prog_fd[4];
+ int i;
+
+ for (i = 0; i < 4; i++) {
+ insns[0] = insns0[i];
+ prog_fd[i] = _bpf_prog_load(insns, ARRAY_SIZE(insns));
+ if (!ASSERT_GE(prog_fd[i], 0, "correct program"))
+ stop = true;
+ }
+
+ for (i = 0; i < 4; i++)
+ close(prog_fd[i]);
+
+ if (stop)
+ return;
+
+ /* load should fail: incorrect SRC */
+ for (i = 0; i < 4; i++) {
+ insns[0] = insns0[i];
+ insns[0].src_reg |= 4;
+ prog_fd[i] = _bpf_prog_load(insns, ARRAY_SIZE(insns));
+ if (!ASSERT_EQ(prog_fd[i], -1, "incorrect src"))
+ return;
+ }
+
+ /* load should fail: incorrect DST */
+ for (i = 0; i < 4; i++) {
+ insns[0] = insns0[i];
+ insns[0].dst_reg = i + 1; /* non-zero */
+ prog_fd[i] = _bpf_prog_load(insns, ARRAY_SIZE(insns));
+ if (!ASSERT_EQ(prog_fd[i], -1, "incorrect dst"))
+ return;
+ }
+
+ /* load should fail: both off and imm are set */
+ for (i = 0; i < 4; i++) {
+ insns[0] = insns0[i];
+ insns[0].imm = insns[0].off = insns0[i].imm ?: insns0[i].off;
+ prog_fd[i] = _bpf_prog_load(insns, ARRAY_SIZE(insns));
+ if (!ASSERT_EQ(prog_fd[i], -1, "incorrect imm/off"))
+ return;
+ }
+
+ /* load should fail: offset is incorrect */
+ for (i = 0; i < 4; i++) {
+ insns[0] = insns0[i];
+
+ if (insns0[i].imm)
+ insns[0].imm = -2;
+ else
+ insns[0].off = -2;
+ prog_fd[i] = _bpf_prog_load(insns, ARRAY_SIZE(insns));
+ if (!ASSERT_EQ(prog_fd[i], -1, "incorrect imm/off"))
+ return;
+
+ if (insns0[i].imm)
+ insns[0].imm = 42;
+ else
+ insns[0].off = 42;
+ prog_fd[i] = _bpf_prog_load(insns, ARRAY_SIZE(insns));
+ if (!ASSERT_EQ(prog_fd[i], -1, "incorrect imm/off"))
+ return;
+
+ /* 0 is not allowed */
+ insns[0].imm = insns[0].off = 0;
+ prog_fd[i] = _bpf_prog_load(insns, ARRAY_SIZE(insns));
+ if (!ASSERT_EQ(prog_fd[i], -1, "incorrect imm/off"))
+ return;
+ }
+
+ /* incorrect field is used */
+ for (i = 0; i < 4; i++) {
+ int tmp;
+
+ insns[0] = insns0[i];
+
+ tmp = insns[0].imm;
+ insns[0].imm = insns[0].off;
+ insns[0].off = tmp;
+
+ prog_fd[i] = _bpf_prog_load(insns, ARRAY_SIZE(insns));
+ if (!ASSERT_EQ(prog_fd[i], -1, "incorrect field"))
+ return;
+ }
+}
+
+static void check_syscall(void)
+{
+ struct bpf_insn insns[] = {
+ {}, /* we will substitute this by insn0[i], i=0,1,2,3 */
+ BPF_JMP_IMM(BPF_JA, 0, 0, 1),
+ BPF_JMP_IMM(BPF_JA, 0, 0, -2),
+ BPF_MOV64_IMM(BPF_REG_0, 0),
+ BPF_EXIT_INSN(),
+ };
+ union bpf_attr attr = {
+ .prog_type = BPF_PROG_TYPE_XDP,
+ .insns = ptr_to_u64(insns),
+ .insn_cnt = ARRAY_SIZE(insns),
+ .license = ptr_to_u64("GPL"),
+ };
+ bool stop = false;
+ int prog_fd[4];
+ __u32 insn_off;
+ int ret;
+ int i;
+
+ for (i = 0; i < 4; i++) {
+ insns[0] = insns0[i];
+ prog_fd[i] = _bpf_prog_load(insns, ARRAY_SIZE(insns));
+ if (!ASSERT_GE(prog_fd[i], 0, "correct program"))
+ stop = true;
+ }
+
+ if (stop)
+ goto end;
+
+ for (i = 0; i < 4; i++) {
+ /* we can set branch off */
+ ret = bpf_static_branch_update(prog_fd[i], 0, OFF);
+ if (!ASSERT_EQ(ret, 0, "correct update"))
+ goto end;
+
+ /* we can set branch on */
+ ret = bpf_static_branch_update(prog_fd[i], 0, ON);
+ if (!ASSERT_EQ(ret, 0, "correct update"))
+ goto end;
+
+ /* incorrect.static_branch.on: can only be 0|1 */
+ ret = bpf_static_branch_update(prog_fd[i], 0, 2);
+ if (!ASSERT_EQ(ret, -1, "incorrect static_branch.on value"))
+ goto end;
+
+ /* incorrect static_branch.insn_off: can only be 0 in this case */
+ for (insn_off = 1; insn_off < 5; insn_off++) {
+ ret = bpf_static_branch_update(prog_fd[i], insn_off, OFF);
+ if (!ASSERT_EQ(ret, -1, "incorrect insn_off: not a correct insns"))
+ goto end;
+ if (!ASSERT_EQ(errno, EINVAL, "incorrect insn_off: not a correct insns"))
+ goto end;
+ }
+ ret = bpf_static_branch_update(prog_fd[i], 666, OFF);
+ if (!ASSERT_EQ(ret, -1, "incorrect insn_off: out of range"))
+ goto end;
+ if (!ASSERT_EQ(errno, ERANGE, "incorrect insn_off: out puf range"))
+ goto end;
+
+ /* bad file descriptor: no open file */
+ ret = bpf_static_branch_update(-1, 0, OFF);
+ if (!ASSERT_EQ(ret, -1, "incorrect prog_fd: no file"))
+ goto end;
+ if (!ASSERT_EQ(errno, EBADF, "incorrect prog_fd: no file"))
+ goto end;
+
+ /* bad file descriptor: not a bpf prog */
+ ret = bpf_static_branch_update(0, 0, OFF);
+ if (!ASSERT_EQ(ret, -1, "incorrect prog_fd: not a bpf prog"))
+ goto end;
+ if (!ASSERT_EQ(errno, EINVAL, "incorrect prog_fd: not a bpf prog"))
+ goto end;
+ }
+
+end:
+ for (i = 0; i < 4; i++)
+ close(prog_fd[i]);
+
+}
+
+void test_bpf_static_branches(void)
+{
+ if (test__start_subtest("check_ops"))
+ check_ops();
+
+ if (test__start_subtest("check_syscall"))
+ check_syscall();
+}
--
2.34.1
next prev parent reply other threads:[~2024-02-02 16:34 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-02 16:28 [PATCH v1 bpf-next 0/9] BPF static branches Anton Protopopov
2024-02-02 16:28 ` [PATCH v1 bpf-next 1/9] bpf: fix potential error return Anton Protopopov
2024-02-02 16:28 ` [PATCH v1 bpf-next 2/9] bpf: keep track of and expose xlated insn offsets Anton Protopopov
2024-02-02 16:28 ` [PATCH v1 bpf-next 3/9] bpf: expose how xlated insns map to jitted insns Anton Protopopov
2024-02-06 1:09 ` Alexei Starovoitov
2024-02-06 10:02 ` Anton Protopopov
2024-02-07 2:26 ` Alexei Starovoitov
2024-02-08 11:05 ` Anton Protopopov
2024-02-15 6:48 ` Alexei Starovoitov
2024-02-16 13:57 ` Anton Protopopov
2024-02-21 1:09 ` Alexei Starovoitov
2024-03-06 10:44 ` Anton Protopopov
2024-03-14 1:56 ` Alexei Starovoitov
2024-03-14 9:03 ` Anton Protopopov
2024-03-14 17:07 ` Alexei Starovoitov
2024-03-14 20:06 ` Andrii Nakryiko
2024-03-14 21:41 ` Alexei Starovoitov
2024-03-15 13:11 ` Anton Protopopov
2024-03-15 16:32 ` Andrii Nakryiko
2024-03-15 17:22 ` Alexei Starovoitov
2024-03-15 17:29 ` Andrii Nakryiko
2024-03-28 16:37 ` Anton Protopopov
2024-03-29 22:44 ` Andrii Nakryiko
2024-04-01 9:47 ` Anton Protopopov
2024-02-02 16:28 ` [PATCH v1 bpf-next 4/9] selftests/bpf: Add tests for instructions mappings Anton Protopopov
2024-02-02 16:28 ` [PATCH v1 bpf-next 5/9] bpftool: dump new fields of bpf prog info Anton Protopopov
2024-02-02 16:28 ` [PATCH v1 bpf-next 6/9] bpf: add support for an extended JA instruction Anton Protopopov
2024-02-02 16:28 ` [PATCH v1 bpf-next 7/9] bpf: Add kernel/bpftool asm support for new instructions Anton Protopopov
2024-02-02 16:28 ` [PATCH v1 bpf-next 8/9] bpf: add BPF_STATIC_BRANCH_UPDATE syscall Anton Protopopov
2024-02-02 16:28 ` Anton Protopopov [this message]
2024-02-02 22:39 ` [PATCH v1 bpf-next 0/9] BPF static branches Andrii Nakryiko
2024-02-04 16:05 ` Anton Protopopov
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=20240202162813.4184616-10-aspsk@isovalent.com \
--to=aspsk@isovalent.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=jolsa@kernel.org \
--cc=martin.lau@linux.dev \
--cc=quentin@isovalent.com \
--cc=sdf@google.com \
--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