From nobody Mon Feb 9 21:19:43 2026 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFA773783AB for ; Fri, 6 Feb 2026 11:58:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770379133; cv=none; b=MLpS8xKVd3tqrq6+/PslMmN+F+cZE4CbIWljsFBdmI2NnfNOVRC6xTELHD+itlJo+CctTnML+sweD1mV10zBmW0CpyoGa8d4pkaPm0/U5GW+NuMTeDHxohVylXxxiMABVk942DnwGsbuY4usJ81wfpe4kgY9Gka+GYUgk+wxwGo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770379133; c=relaxed/simple; bh=w5NGJ74MU5R3R7DpzqJ2S6IYEkng2ht1IhcPzlGqqV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MaUVG6trwj+5nYHJwtp1XnkvnxBpBhsK2vG02sGR1N2GudGx6u9vscEDyhE5yXBc4BzAtok39I4xj29NIHkVk0QCw3blYxhM8UcBfrK3ytHlWoWSr6VAEnFOZfam/lg2PfO6I0sGiZ1dxDfKGDOf5DW+EWANJLyMWn1on6EpKb8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Yw8I63IX; arc=none smtp.client-ip=209.85.215.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Yw8I63IX" Received: by mail-pg1-f195.google.com with SMTP id 41be03b00d2f7-c648bc907ebso1288406a12.3 for ; Fri, 06 Feb 2026 03:58:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770379133; x=1770983933; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n5ZW0Lp2uS+rJ6cqos6DM9CIgCyO+gQDhoGFyA1Jyks=; b=Yw8I63IX5uKg6zVHCvSyd3kxa+LTuAgOtLxmRdXxGBQVOejZIzYZ86sZj7Y8+BuVLY N+rgDmji+7lEARkZVnCH2+xtUDlcbgZ16l4uLtBRki02MQqnuqVck6U4PebR/EepPtnz XC2/vdWsaVUhNo1xya6pW5dDJnFWUzmvoOAM82JnECM0LJoSUMYIqsEB+vNW2n7bNJF7 oIoQXglB5ZqzJ4EZPTpmo9arNozcc8I04u/LkiQ+V89rqOg9StEWyiQT9jVfRuQK48Kh vpXyDkaqejIw+zlYgqf2ev2j+jyz5yxIYin+v4VSgaK+DYY/M9G62Sy/PgnJacflBKuf 6DWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770379133; x=1770983933; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=n5ZW0Lp2uS+rJ6cqos6DM9CIgCyO+gQDhoGFyA1Jyks=; b=NMSDr1H38nsNyLk0fC+lEhBL2uLbqFqYtUBkiBn3k5vGCI4UQXqbjxQe9i2q0E5rbI tu8KSofJRKSPc2YG+epozabjL+r8vFvqMxFdCLQXl0oL8Yd1y00/EXkcJtvEAWwwBfdx nFbaAHOmhb66RVxFX13FVhzmzE2yHyDGJdR22nIBvKCsdjMjWWTSD2UBM+pmnXLoPLgA zwOYxNEPVu0y0QVfbnIDJRijdDw5jPfwVaSp76I9MXVvIUgCc3KWGdZ5hm7+9zXpOcHq U7uHkzGBQQbWKc9eLSM5spaqu0UjacrFOxrXQqlCgiSM7uTS00xNPy+e6H1uWzj44wHW 9S7g== X-Forwarded-Encrypted: i=1; AJvYcCWY1pKeluK21CdvzN9lbbK9jgIBX6CXVtN+05WL0WFUeBHdC4mCwNfI3JnPudVCjohLJ1rJOebCX28C5Vc=@vger.kernel.org X-Gm-Message-State: AOJu0Ywo8Bg+3nUyB+LbkUEFd9pYaL5pauzOxFmJxqljFBBkqL0zUM52 mpExLp9YIyjh5Beoc6ugIx8Pp7NQMlEJJLLQK8qWw0O/spUojMdHzp9x X-Gm-Gg: AZuq6aJ7okdkbbuA9EXlsZWTZUultNKkQkV7Z+DFhCJG1iYdluPkrLEI6Mm6nGzI1RI /SNXnOuq8Hl0G6X65//4HhiYC+2QcgrJ0sOuWpho3ZjG1gMOpX/XZPvRkNfkW6HdXeDZR+ZgEnS NOfdLkWcFqUG8twjJqnXDZKF3jpag1XK2CKSAxC88jKRvOpVAau3lqIEqm2sS22t1k2Q8Lqti8e Pu1WPp9yea68YS2prTwdpquNzrvqCKrL8L+Ajgw0KfqEYT3CVZqnyCX4lB0Re9JtJ0I1mghfNqn QxZRMtITf4OqtTK2faWlgBLZOSpZILRKFwDZEaurz/J8uZFxSf4i36yCnoOCqyUDCoxsGsMWcjX Ca78/LZ0U4c9JnIXky1KFVC8cZjPy9WgQNxexVohT8dij9/YnhKF4G4cJ67BT1Ji6dzclwHYdp4 Uc+vt3xbco23DnmSLnp0k= X-Received: by 2002:a17:903:8c3:b0:2a7:7c72:42b6 with SMTP id d9443c01a7336-2a95162538amr31216585ad.18.1770379133082; Fri, 06 Feb 2026 03:58:53 -0800 (PST) Received: from 7950hx ([103.173.155.241]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a951c8ac5asm22856395ad.35.2026.02.06.03.58.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 03:58:52 -0800 (PST) From: Menglong Dong X-Google-Original-From: Menglong Dong To: ast@kernel.org, bjorn@kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, pulehui@huawei.com, puranjay@kernel.org, pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, bpf@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, jiang.biao@linux.dev Subject: [PATCH bpf-next v2 1/3] bpf, riscv: introduce emit_store_stack_imm64() for trampoline Date: Fri, 6 Feb 2026 19:58:21 +0800 Message-ID: <20260206115823.1070354-2-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260206115823.1070354-1-dongml2@chinatelecom.cn> References: <20260206115823.1070354-1-dongml2@chinatelecom.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Introduce a helper to store 64-bit immediate on the trampoline stack with a help of a register. Signed-off-by: Menglong Dong Tested-by: Bj=C3=B6rn T=C3=B6pel Acked-by: Bj=C3=B6rn T=C3=B6pel --- arch/riscv/net/bpf_jit_comp64.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp6= 4.c index 37888abee70c..e4f45e2e7e2f 100644 --- a/arch/riscv/net/bpf_jit_comp64.c +++ b/arch/riscv/net/bpf_jit_comp64.c @@ -926,6 +926,14 @@ static void restore_stack_args(int nr_stack_args, int = args_off, int stk_arg_off, } } =20 +static void emit_store_stack_imm64(u8 reg, int stack_off, u64 imm64, + struct rv_jit_context *ctx) +{ + /* Load imm64 into reg and store it at [FP + stack_off]. */ + emit_imm(reg, (s64)imm64, ctx); + emit_sd(RV_REG_FP, stack_off, reg, ctx); +} + static int invoke_bpf_prog(struct bpf_tramp_link *l, int args_off, int ret= val_off, int run_ctx_off, bool save_ret, struct rv_jit_context *ctx) { @@ -933,12 +941,10 @@ static int invoke_bpf_prog(struct bpf_tramp_link *l, = int args_off, int retval_of struct bpf_prog *p =3D l->link.prog; int cookie_off =3D offsetof(struct bpf_tramp_run_ctx, bpf_cookie); =20 - if (l->cookie) { - emit_imm(RV_REG_T1, l->cookie, ctx); - emit_sd(RV_REG_FP, -run_ctx_off + cookie_off, RV_REG_T1, ctx); - } else { + if (l->cookie) + emit_store_stack_imm64(RV_REG_T1, -run_ctx_off + cookie_off, l->cookie, = ctx); + else emit_sd(RV_REG_FP, -run_ctx_off + cookie_off, RV_REG_ZERO, ctx); - } =20 /* arg1: prog */ emit_imm(RV_REG_A0, (const s64)p, ctx); @@ -1123,13 +1129,10 @@ static int __arch_prepare_bpf_trampoline(struct bpf= _tramp_image *im, emit_sd(RV_REG_FP, -sreg_off, RV_REG_S1, ctx); =20 /* store ip address of the traced function */ - if (flags & BPF_TRAMP_F_IP_ARG) { - emit_imm(RV_REG_T1, (const s64)func_addr, ctx); - emit_sd(RV_REG_FP, -ip_off, RV_REG_T1, ctx); - } + if (flags & BPF_TRAMP_F_IP_ARG) + emit_store_stack_imm64(RV_REG_T1, -ip_off, (u64)func_addr, ctx); =20 - emit_li(RV_REG_T1, nr_arg_slots, ctx); - emit_sd(RV_REG_FP, -nregs_off, RV_REG_T1, ctx); + emit_store_stack_imm64(RV_REG_T1, -nregs_off, nr_arg_slots, ctx); =20 store_args(nr_arg_slots, args_off, ctx); =20 --=20 2.53.0