From: Eduard Zingerman <eddyz87@gmail.com>
To: bpf@vger.kernel.org, ast@kernel.org
Cc: andrii@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev,
kernel-team@fb.com, yonghong.song@linux.dev,
jose.marchesi@oracle.com, Eduard Zingerman <eddyz87@gmail.com>
Subject: [RFC bpf-next v1 3/8] bpf, x86: no_caller_saved_registers for bpf_get_smp_processor_id()
Date: Sat, 29 Jun 2024 02:47:28 -0700 [thread overview]
Message-ID: <20240629094733.3863850-4-eddyz87@gmail.com> (raw)
In-Reply-To: <20240629094733.3863850-1-eddyz87@gmail.com>
On x86 verifier replaces call to bpf_get_smp_processor_id() with a
sequence of instructions that modify only R0.
This satisfies attribute no_caller_saved_registers contract.
Allow rewrite of no_caller_saved_registers patterns for
bpf_get_smp_processor_id() in order to use this function
as a canary for no_caller_saved_registers tests.
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
---
kernel/bpf/helpers.c | 1 +
kernel/bpf/verifier.c | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
index 229396172026..1df01f454590 100644
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@ -158,6 +158,7 @@ const struct bpf_func_proto bpf_get_smp_processor_id_proto = {
.func = bpf_get_smp_processor_id,
.gpl_only = false,
.ret_type = RET_INTEGER,
+ .nocsr = true,
};
BPF_CALL_0(bpf_get_numa_node_id)
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 1340d3e60d30..d68ed70186c8 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -16030,7 +16030,14 @@ static u8 get_helper_reg_mask(const struct bpf_func_proto *fn)
*/
static bool verifier_inlines_helper_call(struct bpf_verifier_env *env, s32 imm)
{
- return false;
+ switch (imm) {
+#ifdef CONFIG_X86_64
+ case BPF_FUNC_get_smp_processor_id:
+ return env->prog->jit_requested && bpf_jit_supports_percpu_insn();
+#endif
+ default:
+ return false;
+ }
}
/* If 'insn' is a call that follows no_caller_saved_registers contract
@@ -20666,7 +20673,7 @@ static int do_misc_fixups(struct bpf_verifier_env *env)
#ifdef CONFIG_X86_64
/* Implement bpf_get_smp_processor_id() inline. */
if (insn->imm == BPF_FUNC_get_smp_processor_id &&
- prog->jit_requested && bpf_jit_supports_percpu_insn()) {
+ verifier_inlines_helper_call(env, insn->imm)) {
/* BPF_FUNC_get_smp_processor_id inlining is an
* optimization, so if pcpu_hot.cpu_number is ever
* changed in some incompatible and hard to support
--
2.45.2
next prev parent reply other threads:[~2024-06-29 9:48 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-29 9:47 [RFC bpf-next v1 0/8] no_caller_saved_registers attribute for helper calls Eduard Zingerman
2024-06-29 9:47 ` [RFC bpf-next v1 1/8] bpf: add a get_helper_proto() utility function Eduard Zingerman
2024-07-02 0:41 ` Andrii Nakryiko
2024-07-02 20:07 ` Eduard Zingerman
2024-06-29 9:47 ` [RFC bpf-next v1 2/8] bpf: no_caller_saved_registers attribute for helper calls Eduard Zingerman
2024-07-01 19:01 ` Eduard Zingerman
2024-07-02 0:41 ` Andrii Nakryiko
2024-07-02 20:38 ` Eduard Zingerman
2024-07-02 21:09 ` Andrii Nakryiko
2024-07-02 21:19 ` Eduard Zingerman
2024-07-02 21:22 ` Andrii Nakryiko
2024-07-03 11:57 ` Puranjay Mohan
2024-07-03 16:13 ` Eduard Zingerman
2024-07-04 10:55 ` Puranjay Mohan
2024-06-29 9:47 ` Eduard Zingerman [this message]
2024-07-02 0:41 ` [RFC bpf-next v1 3/8] bpf, x86: no_caller_saved_registers for bpf_get_smp_processor_id() Andrii Nakryiko
2024-07-02 20:43 ` Eduard Zingerman
2024-07-02 21:11 ` Andrii Nakryiko
2024-07-02 21:25 ` Eduard Zingerman
2024-07-03 11:27 ` Puranjay Mohan
2024-07-03 23:14 ` Eduard Zingerman
2024-07-04 11:19 ` Puranjay Mohan
2024-07-04 16:39 ` Eduard Zingerman
2024-07-04 17:00 ` Eduard Zingerman
2024-07-04 17:24 ` Puranjay Mohan
2024-07-04 17:39 ` Eduard Zingerman
2024-06-29 9:47 ` [RFC bpf-next v1 4/8] selftests/bpf: extract utility function for BPF disassembly Eduard Zingerman
2024-07-02 0:41 ` Andrii Nakryiko
2024-07-02 20:59 ` Eduard Zingerman
2024-07-02 21:16 ` Andrii Nakryiko
2024-07-02 21:23 ` Eduard Zingerman
2024-06-29 9:47 ` [RFC bpf-next v1 5/8] selftests/bpf: no need to track next_match_pos in struct test_loader Eduard Zingerman
2024-07-02 0:41 ` Andrii Nakryiko
2024-07-02 21:05 ` Eduard Zingerman
2024-07-02 21:18 ` Andrii Nakryiko
2024-06-29 9:47 ` [RFC bpf-next v1 6/8] selftests/bpf: extract test_loader->expect_msgs as a data structure Eduard Zingerman
2024-07-02 0:42 ` Andrii Nakryiko
2024-07-02 21:06 ` Eduard Zingerman
2024-06-29 9:47 ` [RFC bpf-next v1 7/8] selftests/bpf: allow checking xlated programs in verifier_* tests Eduard Zingerman
2024-07-02 0:42 ` Andrii Nakryiko
2024-07-02 21:07 ` Eduard Zingerman
2024-07-02 21:19 ` Andrii Nakryiko
2024-06-29 9:47 ` [RFC bpf-next v1 8/8] selftests/bpf: test no_caller_saved_registers spill/fill removal Eduard Zingerman
2024-07-02 0:42 ` Andrii Nakryiko
2024-07-02 21:12 ` Eduard Zingerman
2024-07-02 21:20 ` Andrii Nakryiko
2024-07-02 0:41 ` [RFC bpf-next v1 0/8] no_caller_saved_registers attribute for helper calls Andrii Nakryiko
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=20240629094733.3863850-4-eddyz87@gmail.com \
--to=eddyz87@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jose.marchesi@oracle.com \
--cc=kernel-team@fb.com \
--cc=martin.lau@linux.dev \
--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