From: Pu Lehui <pulehui@huawei.com>
To: "Feng Jiang" <jiangfeng@kylinos.cn>,
"Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Andrii Nakryiko" <andrii@kernel.org>,
"Eduard Zingerman" <eddyz87@gmail.com>,
"Kumar Kartikeya Dwivedi" <memxor@gmail.com>,
"Martin KaFai Lau" <martin.lau@linux.dev>,
"Song Liu" <song@kernel.org>,
"Yonghong Song" <yonghong.song@linux.dev>,
"Jiri Olsa" <jolsa@kernel.org>,
"Emil Tsalapatis" <emil@etsalapatis.com>,
"Luke Nelson" <luke.r.nels@gmail.com>,
"Xi Wang" <xi.wang@gmail.com>, "Björn Töpel" <bjorn@kernel.org>,
"Puranjay Mohan" <puranjay@kernel.org>,
"Paul Walmsley" <pjw@kernel.org>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Albert Ou" <aou@eecs.berkeley.edu>,
"Alexandre Ghiti" <alex@ghiti.fr>,
"Shuah Khan" <shuah@kernel.org>,
"Ihor Solodrai" <ihor.solodrai@linux.dev>
Cc: <bpf@vger.kernel.org>, <linux-riscv@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <linux-kselftest@vger.kernel.org>
Subject: Re: [PATCH bpf-next v5 1/3] bpf, riscv: add support for timed may_goto
Date: Thu, 23 Jul 2026 18:10:21 +0800 [thread overview]
Message-ID: <4b4c8567-b5f5-4703-b06f-6369bd47e0ed@huawei.com> (raw)
In-Reply-To: <20260723-riscv-bpf-timed-may-goto-v5-1-86acb54e5642@kylinos.cn>
On 2026/7/23 13:41, Feng Jiang wrote:
> Implement arch_bpf_timed_may_goto() for the RV64 JIT. The argument and
> return value are carried in BPF_REG_AX, and BPF R0-R5 are preserved
> across the call to the generic bpf_check_timed_may_goto().
>
> Enable bpf_jit_supports_timed_may_goto() so the verifier uses the timed
> expansion path.
>
> Signed-off-by: Feng Jiang <jiangfeng@kylinos.cn>
> ---
> arch/riscv/net/Makefile | 2 +-
> arch/riscv/net/bpf_jit_comp64.c | 12 +++++++++-
> arch/riscv/net/bpf_timed_may_goto.S | 47 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 59 insertions(+), 2 deletions(-)
Reviewed-by: Pu Lehui <pulehui@huawei.com>
>
> diff --git a/arch/riscv/net/Makefile b/arch/riscv/net/Makefile
> index 9a1e5f0a94e5..6458d4d51990 100644
> --- a/arch/riscv/net/Makefile
> +++ b/arch/riscv/net/Makefile
> @@ -3,7 +3,7 @@
> obj-$(CONFIG_BPF_JIT) += bpf_jit_core.o
>
> ifeq ($(CONFIG_ARCH_RV64I),y)
> - obj-$(CONFIG_BPF_JIT) += bpf_jit_comp64.o
> + obj-$(CONFIG_BPF_JIT) += bpf_jit_comp64.o bpf_timed_may_goto.o
> else
> obj-$(CONFIG_BPF_JIT) += bpf_jit_comp32.o
> endif
> diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
> index ad089a9a4ea9..8fe8969fb8a0 100644
> --- a/arch/riscv/net/bpf_jit_comp64.c
> +++ b/arch/riscv/net/bpf_jit_comp64.c
> @@ -1841,7 +1841,12 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
> if (aux->tail_call_reachable && insn->src_reg == BPF_PSEUDO_CALL)
> emit_sd(RV_REG_SP, ctx->tcc_offset, RV_REG_TCC, ctx);
>
> - if (insn->src_reg != BPF_PSEUDO_CALL)
> + /*
> + * arch_bpf_timed_may_goto() is emitted by the verifier and
> + * returns its result in BPF_REG_AX instead of BPF_REG_0, so
> + * skip the normal "move return register into R0".
> + */
> + if (insn->src_reg != BPF_PSEUDO_CALL && addr != (u64)arch_bpf_timed_may_goto)
> emit_mv(bpf_to_rv_reg(BPF_REG_0, ctx), RV_REG_A0, ctx);
> break;
> }
> @@ -2161,3 +2166,8 @@ bool bpf_jit_supports_subprog_tailcalls(void)
> {
> return true;
> }
> +
> +bool bpf_jit_supports_timed_may_goto(void)
> +{
> + return true;
> +}
> diff --git a/arch/riscv/net/bpf_timed_may_goto.S b/arch/riscv/net/bpf_timed_may_goto.S
> new file mode 100644
> index 000000000000..02c637d87420
> --- /dev/null
> +++ b/arch/riscv/net/bpf_timed_may_goto.S
> @@ -0,0 +1,47 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/* Copyright (c) 2026 Feng Jiang <jiangfeng@kylinos.cn> */
> +
> +#include <linux/linkage.h>
> +#include <asm/asm.h>
> +
> +/*
> + * Trampoline for the BPF timed may_goto loop bound. Custom calling convention:
> + * - input: stack offset in BPF_REG_AX (t0)
> + * - output: updated count in BPF_REG_AX (t0)
> + *
> + * Calls bpf_check_timed_may_goto(ptr) with the standard RISC-V ABI, where
> + * ptr = BPF_REG_FP (s5) + BPF_REG_AX (t0). BPF R0-R5 (a5, a0-a4) are saved
> + * across the call; BPF_REG_FP (s5) is callee-saved and needs no saving.
> + */
> +
> +SYM_FUNC_START(arch_bpf_timed_may_goto)
> + addi sp, sp, -(8*SZREG)
> + REG_S ra, 7*SZREG(sp)
> + REG_S s0, 6*SZREG(sp)
> + addi s0, sp, 8*SZREG
> +
> + /* Save BPF registers R0-R5 (a5, a0-a4) */
> + REG_S a5, 5*SZREG(sp)
> + REG_S a0, 4*SZREG(sp)
> + REG_S a1, 3*SZREG(sp)
> + REG_S a2, 2*SZREG(sp)
> + REG_S a3, 1*SZREG(sp)
> + REG_S a4, 0*SZREG(sp)
> +
> + add a0, t0, s5
> + call bpf_check_timed_may_goto
> + mv t0, a0
> +
> + /* Restore BPF registers R0-R5 */
> + REG_L a4, 0*SZREG(sp)
> + REG_L a3, 1*SZREG(sp)
> + REG_L a2, 2*SZREG(sp)
> + REG_L a1, 3*SZREG(sp)
> + REG_L a0, 4*SZREG(sp)
> + REG_L a5, 5*SZREG(sp)
> +
> + REG_L s0, 6*SZREG(sp)
> + REG_L ra, 7*SZREG(sp)
> + addi sp, sp, 8*SZREG
> + ret
> +SYM_FUNC_END(arch_bpf_timed_may_goto)
>
next prev parent reply other threads:[~2026-07-23 10:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-23 5:41 [PATCH bpf-next v5 0/3] bpf, riscv: add timed may_goto support Feng Jiang
2026-07-23 5:41 ` [PATCH bpf-next v5 1/3] bpf, riscv: add support for timed may_goto Feng Jiang
2026-07-23 10:10 ` Pu Lehui [this message]
2026-07-23 5:41 ` [PATCH bpf-next v5 2/3] selftests/bpf: test timed may_goto preserves R0-R5 Feng Jiang
2026-07-23 10:10 ` Pu Lehui
2026-07-23 5:41 ` [PATCH bpf-next v5 3/3] selftests/bpf: enable timed may_goto tests for riscv64 Feng Jiang
2026-07-23 10:15 ` Pu Lehui
2026-07-24 19:51 ` Björn Töpel
2026-07-23 10:16 ` [PATCH bpf-next v5 0/3] bpf, riscv: add timed may_goto support Pu Lehui
2026-07-24 19:52 ` Björn Töpel
2026-07-24 20:40 ` 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=4b4c8567-b5f5-4703-b06f-6369bd47e0ed@huawei.com \
--to=pulehui@huawei.com \
--cc=alex@ghiti.fr \
--cc=andrii@kernel.org \
--cc=aou@eecs.berkeley.edu \
--cc=ast@kernel.org \
--cc=bjorn@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=emil@etsalapatis.com \
--cc=ihor.solodrai@linux.dev \
--cc=jiangfeng@kylinos.cn \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=luke.r.nels@gmail.com \
--cc=martin.lau@linux.dev \
--cc=memxor@gmail.com \
--cc=palmer@dabbelt.com \
--cc=pjw@kernel.org \
--cc=puranjay@kernel.org \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=xi.wang@gmail.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
all inboxes | Powered by JetHome®