From nobody Mon Feb 9 12:23:57 2026 Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) (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 EA442333427 for ; Fri, 6 Feb 2026 12:20:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.66 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770380438; cv=none; b=lAx5rnU5JEJP44HMpJUnhN6CQ51yZq4ywonkndcMOMoTqIGjpUm7TmJXpQDHqgxzR4JTHnc6dnetZQH1HTJhGKO6Q3RDV60chyPzuaAgW8AznTkt751TCc4jmu87wJlcMrWixL/YQ7+jlEh8XvADB92B0qdWeVCOukQq4Kp9Dcs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770380438; c=relaxed/simple; bh=w5NGJ74MU5R3R7DpzqJ2S6IYEkng2ht1IhcPzlGqqV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NjFQLTb5qaoVre8/K3mmLOKDzK2S1c9uCOv4ixqwssANT3AUbmIwzjT1yvsRuh4V8C1v301FyHJ8oaTvvLM7+toPGUYdyUlcuE8Rf/aFRM4AADTMzMHlPRlW6wuvzCbTGuplnG4pPyPizMUIVXnFwNrzkgo4yl5BUo8bLLQhLYs= 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=O5WIf1X0; arc=none smtp.client-ip=209.85.216.66 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="O5WIf1X0" Received: by mail-pj1-f66.google.com with SMTP id 98e67ed59e1d1-352c5bd2769so1190677a91.1 for ; Fri, 06 Feb 2026 04:20:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770380437; x=1770985237; 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=O5WIf1X0Ig3XVBnQ5Av81M/eCfJx6Qlv1CxrCElqE35Rrq8ymRP+cN2mhMoTENgBZu 8w2S/orTAw0hhyF2IdunTItg8o7tDAOpseX9qyUA6AJX7rF3eEK3SRDXfov2P0JSK8aM zVPcC01GOiE8QvKeNdFyqtWPDeZQjZ1Z/PvZArZzv2Bqq7tld84AGfOSvf8G4+5blobO dz81H2WE3MoEGfji+QXFfyGaNSiaFOJR+MBvBGguUUYtgkNEc7TYGssUKWOwK8mTRFLn wiFo9GRSKsThnPPtE8lJY7WEKh97ExpEiAKN9oMExuTi2DaD91T724NK8nP5QxlYTKTu H1Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770380437; x=1770985237; 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=PgaWlRLA3cqR+KC0yDzc3lfiYjj8KNO0mQbhK1/RCdRzbPUhXRdrTIgglsjUZIJ4MZ frlLM+rnGEEIGHlbgHpSv5Lb/rjQfsbehHHV4KLyeh/s4+U41uRJm/8y4JB7kzMc0Pz9 PlW9yvjdyRC63CTuS/i09HMXNklbg000X/UfuhSIqFOoaTs8HsNHO/tHFIWz/QLXjuDg YJADHy0bdeFpgKRvduhTD5vv5utqQ72CRysJQsmEp0C8AknUdvUOIOCAKxwEpW6L02JF THxijyHPc9qs5nkbcggiS3Eff7OO1JRtylwlnj4VVYVJH/kdk9LS5jNFN72Vq8mXyf9x Q0RA== X-Forwarded-Encrypted: i=1; AJvYcCXglMEQpDiNxGzjGVnoI9wYrH9iJufsUq8bhHLgsbc7LVDi7/C6qhekVFlqLNF8abGL7L6Nls0Xw8A56yA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz62rUC7B+bn9cJ8F13Sv/2ZYCZ+/iHRo55f458E0yeX9v70eF3 2l1acJt26J4BeWJry9RTiiNRHB/sU1N3mv1bkdyuVg4aiz0jEXeS/o7z X-Gm-Gg: AZuq6aJlXEwsfQDD8/KNdemCVYvzeFeuACEAruhPVB+nA9hXnTXSVjVh4cQl0SURSO9 OlsfNfM4VjWCSBOPPMNDJiYBMyo6cPg/wj7Uiqe1kgGeuVbl5zPcsaG6YlSmsYTR0RDPf6Te2x+ sJwQSy6hW/qGvabms2d38+27ynji6efsBhpU8Qwyj+0tURjis4w02oIxKJZz70WIepyiYrm5Tls fp0MJyt1V+kcPbSyYvOUJP2zS/9aFLlMFK2A8VjUt3gqPreG2544x4VVqYSgtQHnILQFXVD7FSg +Jz+fcWdXBY67DZqJiec0UO3PVYrEghUAn9PAvInTdNJRnu72+OYM5dGdGlsXEz18ipq8efz37T jmFuStEc5Hu6q2r+TXsMvTwwtnlB/1Ee1cgcuN/13ZAL7oLU6WnG2do8wWs7BFXYKri/hKeFuyl 4mk3vV7nFo X-Received: by 2002:a17:90b:254a:b0:341:8601:d77a with SMTP id 98e67ed59e1d1-354b3e4c67amr1926559a91.29.1770380437161; Fri, 06 Feb 2026 04:20:37 -0800 (PST) Received: from 7950hx ([103.173.155.241]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-354b301d93bsm1528222a91.1.2026.02.06.04.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 04:20:36 -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 v3 1/3] bpf, riscv: introduce emit_store_stack_imm64() for trampoline Date: Fri, 6 Feb 2026 20:20:00 +0800 Message-ID: <20260206122002.1494125-2-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260206122002.1494125-1-dongml2@chinatelecom.cn> References: <20260206122002.1494125-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