From nobody Sun Feb 8 04:57:34 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 From nobody Sun Feb 8 04:57:34 2026 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) (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 4A13A347BD9 for ; Fri, 6 Feb 2026 12:20:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770380450; cv=none; b=r0rZBbfHdR2huue+mKqsCVCT3geBykMQzprpUD3oabDRxyDccCGzlqPsgxXgfPdkItMtyhtmFbh4ZJ1ayhNVhYnjebKb+zDajxQsYLDCEmX0azuS4KyO7CGzVxamEvcUQ2F/x68rZl+6WBV/vmP8lpDZ7q0ZbIRl5tLlykCC8Gw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770380450; c=relaxed/simple; bh=BXCB5O0lsl1KDgarrow3CKKlQStgrGqr3H/LA/binx0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Wv9gir2tHYao+NrE8mQw0vkVapzf70w/qRb/7XBA0yIZVwzD+dzCeTEqRNL2H9eDpZthzg2WrRjhA39eP94sopsVX6kzvBPW6763lgQvI98NrjcBWkTnplxr+dKEEqqlzHMF4Rph10b5YA3MeE2iyAO7mCnnHpGyIRfMtGhI6lw= 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=ljvEQZHl; arc=none smtp.client-ip=209.85.210.194 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="ljvEQZHl" Received: by mail-pf1-f194.google.com with SMTP id d2e1a72fcca58-81e8b1bdf0cso1628044b3a.3 for ; Fri, 06 Feb 2026 04:20:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770380450; x=1770985250; 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=v4ky1VoxCCm0IDNE+FK0hSWCiQy7VCZX/E43cmszfqY=; b=ljvEQZHlKAnxTO/S5Kr0bYZr9oo6wIUPFJJ81JVaGFa38nzGVZjVenHOx7y+C1oQNp /wwA+LzuyEPEFlC7O+imx/0GyBaXMmSTqcnkAD5QwUiuLBe6nGjmJ3zaCKYDpVcN5fYn Tmbo0eqS+EjI9dpmgoiAvOCdg7cayW8dFcK1kCYLNzyGRmxrtwVY5zuiPnN5Pu75eeN2 5K3KhmvgnAgsM7qtthlUlGNqoV1aH3QdGUlHN/hxYfKDYnK/6wbswcTUpNvb7f5yUhGx 5FCoID/kBZxIR96irJf1QNnJn8md6M1UlHlQ409Zjg80+g2io7jNFQG+N1uJOLZ3V/5B v3ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770380450; x=1770985250; 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=v4ky1VoxCCm0IDNE+FK0hSWCiQy7VCZX/E43cmszfqY=; b=iz2rtLCwrP+CD7QxNDCOIQJMoRR6l/JVTrQrjLHvgbmNYnpI8Hf2vgFE393mAGFEcI FOqrlIsdBQMzm4AOoj8itirDroUT9HLxIV3+e+QPtXf0iADBpHCpPGQaGEfbmvFUt4rZ 6hZg8teWKU3eePR1lF/RHoeZiyv5MFOtGQISWnsMLozBlzCC8YEXwMmcxU9Q08hoW7bH hhfNxQ7EazquUKgKCTaEn+VZtrn1OebO3Jzo+Qp/8/XQaUK4mxr0XITLSYRpzlGdyGyW cXAv5ql5N+qEMJCKMB/afqAEJd9/4H0Y5UUdNUDUuEzxagM4egCt3rVZx0rGJh7DM97c vHyg== X-Forwarded-Encrypted: i=1; AJvYcCVAgqPzlkwexZZ88BbgE74N7CDyTaiNponMdD9BtV3mBWLaDYuvwjc32lvs0Ybm1p/wfi7loYnMIpkc77c=@vger.kernel.org X-Gm-Message-State: AOJu0YxtzGNwDR91GTq7LXZqcCTOWVWjCrayG/wFyDACiyEqgNBE2KXi ndVOkxs6Nvme/FlufmazRgqp0qsEh0GIv2eGXsBgilRhVXfqwRjFZARy X-Gm-Gg: AZuq6aKFxyoIfapUUAM5YdH+ucEG/25fnsXmSW1b3FlOcR0RIMp2eCRMFUBmOQMf9xJ /b/j0iuVYLRoJAdCaL+Xy1fOocD/IbgoT49Qv5orYIuhdJy0r7BELRLUqFol1o4Wzv5iwDROC2A /unm6CPdjJcQExepQtVsngvFfU8w7CqIoSvu9HgpEgM4Oc4l5EOkONSEXn0NXXWv4tOLH0wRz/l L9RvmlnQ9f8WRZ7J7s++GxurKV4PbO3rZhQgRQOFxZCn9L13fRwuK56q5PtJ9ACJFD8mMBTaWgD J8kJD5tPP0Mmz3C/l5fuGYp2GBrU341cDY+JQ4pMnb/28fuwRyc0M+JnouXxaC8KASTmhnj/kaR MjwT7tLAl3rlBPejuyX3D+ZKGz5b+SPlyXr23xt5b1dmjyt3l23BcjYiWKAahq/XJzcTlCqvUCB c1hkLh3WX77ffCCOeJG+0= X-Received: by 2002:a05:6a21:150c:b0:384:d0fc:f518 with SMTP id adf61e73a8af0-393ad44eef8mr2481014637.79.1770380449503; Fri, 06 Feb 2026 04:20:49 -0800 (PST) Received: from 7950hx ([103.173.155.241]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-354b301d93bsm1528222a91.1.2026.02.06.04.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 04:20:49 -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 2/3] bpf, riscv: add fsession support for trampolines Date: Fri, 6 Feb 2026 20:20:01 +0800 Message-ID: <20260206122002.1494125-3-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 Implement BPF_TRACE_FSESSION support in the RISC-V trampoline JIT. The logic here is similar to what we did in x86_64. In order to simply the logic, we factor out the function invoke_bpf() for fentry and fexit. Signed-off-by: Menglong Dong Tested-by: Bj=C3=B6rn T=C3=B6pel Acked-by: Bj=C3=B6rn T=C3=B6pel --- v3: - remove the "always" from the comment v2: - use bpf_prog_calls_session_cookie() in invoke_bpf() --- arch/riscv/net/bpf_jit_comp64.c | 74 ++++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 10 deletions(-) diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp6= 4.c index e4f45e2e7e2f..d45fa9c6a7dd 100644 --- a/arch/riscv/net/bpf_jit_comp64.c +++ b/arch/riscv/net/bpf_jit_comp64.c @@ -996,6 +996,29 @@ static int invoke_bpf_prog(struct bpf_tramp_link *l, i= nt args_off, int retval_of return ret; } =20 +static int invoke_bpf(struct bpf_tramp_links *tl, int args_off, int retval= _off, + int run_ctx_off, int func_meta_off, bool save_ret, u64 func_meta, + int cookie_off, struct rv_jit_context *ctx) +{ + int i, cur_cookie =3D (cookie_off - args_off) / 8; + + for (i =3D 0; i < tl->nr_links; i++) { + int err; + + if (bpf_prog_calls_session_cookie(&tl->links[i])) { + u64 meta =3D func_meta | ((u64)cur_cookie << BPF_TRAMP_COOKIE_INDEX_SHI= FT); + + emit_store_stack_imm64(RV_REG_T1, -func_meta_off, meta, ctx); + cur_cookie--; + } + err =3D invoke_bpf_prog(tl->links[i], args_off, retval_off, run_ctx_off, + save_ret, ctx); + if (err) + return err; + } + return 0; +} + static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, const struct btf_func_model *m, struct bpf_tramp_links *tlinks, @@ -1005,13 +1028,15 @@ static int __arch_prepare_bpf_trampoline(struct bpf= _tramp_image *im, int i, ret, offset; int *branches_off =3D NULL; int stack_size =3D 0, nr_arg_slots =3D 0; - int retval_off, args_off, nregs_off, ip_off, run_ctx_off, sreg_off, stk_a= rg_off; + int retval_off, args_off, func_meta_off, ip_off, run_ctx_off, sreg_off, s= tk_arg_off; + int cookie_off, cookie_cnt; struct bpf_tramp_links *fentry =3D &tlinks[BPF_TRAMP_FENTRY]; struct bpf_tramp_links *fexit =3D &tlinks[BPF_TRAMP_FEXIT]; struct bpf_tramp_links *fmod_ret =3D &tlinks[BPF_TRAMP_MODIFY_RETURN]; bool is_struct_ops =3D flags & BPF_TRAMP_F_INDIRECT; void *orig_call =3D func_addr; bool save_ret; + u64 func_meta; u32 insn; =20 /* Two types of generated trampoline stack layout: @@ -1042,10 +1067,14 @@ static int __arch_prepare_bpf_trampoline(struct bpf= _tramp_image *im, * [ ... ] * FP - args_off [ arg1 ] * - * FP - nregs_off [ regs count ] + * FP - func_meta_off [ regs count, etc ] * * FP - ip_off [ traced func ] BPF_TRAMP_F_IP_ARG * + * [ stack cookie N ] + * [ ... ] + * FP - cookie_off [ stack cookie 1 ] + * * FP - run_ctx_off [ bpf_tramp_run_ctx ] * * FP - sreg_off [ callee saved reg ] @@ -1077,14 +1106,20 @@ static int __arch_prepare_bpf_trampoline(struct bpf= _tramp_image *im, stack_size +=3D nr_arg_slots * 8; args_off =3D stack_size; =20 + /* function metadata, such as regs count */ stack_size +=3D 8; - nregs_off =3D stack_size; + func_meta_off =3D stack_size; =20 if (flags & BPF_TRAMP_F_IP_ARG) { stack_size +=3D 8; ip_off =3D stack_size; } =20 + cookie_cnt =3D bpf_fsession_cookie_cnt(tlinks); + /* room for session cookies */ + stack_size +=3D cookie_cnt * 8; + cookie_off =3D stack_size; + stack_size +=3D round_up(sizeof(struct bpf_tramp_run_ctx), 8); run_ctx_off =3D stack_size; =20 @@ -1132,10 +1167,19 @@ static int __arch_prepare_bpf_trampoline(struct bpf= _tramp_image *im, if (flags & BPF_TRAMP_F_IP_ARG) emit_store_stack_imm64(RV_REG_T1, -ip_off, (u64)func_addr, ctx); =20 - emit_store_stack_imm64(RV_REG_T1, -nregs_off, nr_arg_slots, ctx); + func_meta =3D nr_arg_slots; + emit_store_stack_imm64(RV_REG_T1, -func_meta_off, func_meta, ctx); =20 store_args(nr_arg_slots, args_off, ctx); =20 + if (bpf_fsession_cnt(tlinks)) { + /* clear all session cookies' value */ + for (i =3D 0; i < cookie_cnt; i++) + emit_sd(RV_REG_FP, -cookie_off + 8 * i, RV_REG_ZERO, ctx); + /* clear return value to make sure fentry always get 0 */ + emit_sd(RV_REG_FP, -retval_off, RV_REG_ZERO, ctx); + } + if (flags & BPF_TRAMP_F_CALL_ORIG) { emit_imm(RV_REG_A0, ctx->insns ? (const s64)im : RV_MAX_COUNT_IMM, ctx); ret =3D emit_call((const u64)__bpf_tramp_enter, true, ctx); @@ -1143,9 +1187,9 @@ static int __arch_prepare_bpf_trampoline(struct bpf_t= ramp_image *im, return ret; } =20 - for (i =3D 0; i < fentry->nr_links; i++) { - ret =3D invoke_bpf_prog(fentry->links[i], args_off, retval_off, run_ctx_= off, - flags & BPF_TRAMP_F_RET_FENTRY_RET, ctx); + if (fentry->nr_links) { + ret =3D invoke_bpf(fentry, args_off, retval_off, run_ctx_off, func_meta_= off, + flags & BPF_TRAMP_F_RET_FENTRY_RET, func_meta, cookie_off, ctx); if (ret) return ret; } @@ -1192,9 +1236,14 @@ static int __arch_prepare_bpf_trampoline(struct bpf_= tramp_image *im, *(u32 *)(ctx->insns + branches_off[i]) =3D insn; } =20 - for (i =3D 0; i < fexit->nr_links; i++) { - ret =3D invoke_bpf_prog(fexit->links[i], args_off, retval_off, - run_ctx_off, false, ctx); + /* set "is_return" flag for fsession */ + func_meta |=3D (1ULL << BPF_TRAMP_IS_RETURN_SHIFT); + if (bpf_fsession_cnt(tlinks)) + emit_store_stack_imm64(RV_REG_T1, -func_meta_off, func_meta, ctx); + + if (fexit->nr_links) { + ret =3D invoke_bpf(fexit, args_off, retval_off, run_ctx_off, func_meta_o= ff, + false, func_meta, cookie_off, ctx); if (ret) goto out; } @@ -2094,3 +2143,8 @@ bool bpf_jit_inlines_helper_call(s32 imm) return false; } } + +bool bpf_jit_supports_fsession(void) +{ + return true; +} --=20 2.53.0 From nobody Sun Feb 8 04:57:34 2026 Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) (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 CD02C333427 for ; Fri, 6 Feb 2026 12:21:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.68 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770380461; cv=none; b=pUDD/7Xibb6UiY60RjecFkZYp9zXCwWAIlo0g4UbPuM3O2PU74G1qu5x96N+bTUXASDlY7gPsGP5gJQga68wLYJp6U3oEk8LCNzl1xQaIHi8JEW12Jb15FU2oZ1kb+h9LZoKKZ7i3/vBrSzXFkWp4lnufN64tSvvId98TwDuX28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770380461; c=relaxed/simple; bh=WNVhyOL7okSH5jtf5uSAFPq08ifRlHDbQ+0d6p9ancM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GuDroHaIII0HlBnvK5cE4+e9x0i+ejUWaWvPcQ1F3FwG1Q+YzmcQvNk8WzD5SEkyLYAIVtlxthD2pvs0GxJv/z6qnF4UAlQsq1FoEYc3XTHFqpGGijV0KfycQrAFcG7YOcERZMMla7n7GRMpzXZEQAqAMlGqoz5PU4/nknCvbrU= 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=HeE+stIb; arc=none smtp.client-ip=209.85.216.68 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="HeE+stIb" Received: by mail-pj1-f68.google.com with SMTP id 98e67ed59e1d1-3540266d356so1373037a91.0 for ; Fri, 06 Feb 2026 04:21:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770380461; x=1770985261; 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=GOZtDu7jSNri6wkbo2wj70FyVnPCcpHXFtiLHwbu29Y=; b=HeE+stIbBgr+mYbMgRCNxIlsupDFH7IdUTPwN+s6GQKrC7Mg21S7t1XFSAgct0mE82 Z21DBJZxnxKVdir7399s6yTa5+N/JqsrsgQE/Yj+z0D7pslNQyaWNYdbYljnZczMDKuw 9zdUXCSsMo++7i5Oho7Qdc5QUHW2U3u+F0ObVaI5hKSwcWSdoXOY/m5K58URn7Gilvha /rcJm0dFn2WdWGfwOIaeNfZ+TE7gpdBTbiwxlVs9yPaFLD/XcXGAF+pXLu7ysvgQUGmL nIUa7ijspNY86mpTLg5l6BHDYAHl6q09UWp1yoaRuxsVbB9JhpqS8qOgXPklONfDY0nb 7WLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770380461; x=1770985261; 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=GOZtDu7jSNri6wkbo2wj70FyVnPCcpHXFtiLHwbu29Y=; b=dXWw7L1WrLeAlayqmo54gq+yL2kjcxuelR5LIoLHStGT9wLiyYRmi8VpW+rsOVwyXa zlW6d4T35yAKvH8mN34KbGRfxo9m6QtFvOJIP81ZSaD0c87NeBeCUzWfLA4QdWoaGjL8 B/lwERXstHmytdx0S+fDldPf3nrmWo0mVcVd56W0Jcl6xZsUZd21Lqgvc4VbpcqdlWLW 0Qe2InQQJMMSkB0VPbMU8CGn81jnUirTK1APt6+wrqxHxedkurn/QChJ0s6b5ZmUqsnG ELF5Iexcli4pO+orZh92RPnGUxDUGR5IUXda/XoRIvZ6aUcMKlp02RSAs6OlCVXRcDAn n1Yw== X-Forwarded-Encrypted: i=1; AJvYcCVP315S/+sLb5QwOFA9xklfP5tu2agp9S90hzvMI66yY/eA/CW3cEPvvknZ7RwZooK7tJBdKn84zcAhc20=@vger.kernel.org X-Gm-Message-State: AOJu0YwXEg7RAelntXw/UJZpY72ewkojOraU+AOJ8dzLUYo7aiAPZuW8 m/ZHGSzzZnWPgUEDAp7CJYaYGT6jhlwjEi7evsB/QWTbBnsT7RwrcbjX X-Gm-Gg: AZuq6aK96+Y7uajt/O7Se1bUEqFZzUoJbDwOpTEExcvqxzrYDn+p9Ku8Rl2rdt5ux+d Aopa7C+7mxaMsiqvZLhkrqeUvMBVYg+/bBKhyQykd3F2sVoc0e2X1iOxDraipNaNnIcgteKTg/m B9+O7mH8+Gkbvy2uOtdeoSyUjpYkwUcCICXf8Nen+v6gDZlSUzUg7hJFvhChxl/gQRJEVSzV7Bm Nz4VVUcQvdxfTwifZpac711WsiUM1HXnQjPhKIqDsE9rqmzmLMVYqZSXUde8FoxnGG9Vs6fARZx Ng4glG5K3yk33kQbXX1ib7TeKYjdyPWNQ0050u+aN2PdnI33dTzYg5rhzLmker300jMzBbAuCDd ctUE53917gkpcKqMZJUXWiOqZegCvlR/cBLsqdKD5NrCAoyz1qc04D0Y6mr9jLpAkjIv/Br41+c NUP+G4ojLsnSgK70a2coo= X-Received: by 2002:a17:90b:1e08:b0:34a:b1ea:664e with SMTP id 98e67ed59e1d1-354b3c8c50fmr2606450a91.15.1770380461134; Fri, 06 Feb 2026 04:21:01 -0800 (PST) Received: from 7950hx ([103.173.155.241]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-354b301d93bsm1528222a91.1.2026.02.06.04.20.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 04:21:00 -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 3/3] selftests/bpf: enable fsession_test on riscv64 Date: Fri, 6 Feb 2026 20:20:02 +0800 Message-ID: <20260206122002.1494125-4-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 Now that the RISC-V trampoline JIT supports BPF_TRACE_FSESSION, run the fsession selftest on riscv64 as well as x86_64. Signed-off-by: Menglong Dong Tested-by: Bj=C3=B6rn T=C3=B6pel Acked-by: Bj=C3=B6rn T=C3=B6pel --- tools/testing/selftests/bpf/progs/get_func_args_test.c | 2 +- tools/testing/selftests/bpf/progs/get_func_ip_test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/get_func_args_test.c b/tools= /testing/selftests/bpf/progs/get_func_args_test.c index 180ba5098ca1..075a1180ec26 100644 --- a/tools/testing/selftests/bpf/progs/get_func_args_test.c +++ b/tools/testing/selftests/bpf/progs/get_func_args_test.c @@ -167,7 +167,7 @@ int BPF_PROG(tp_test2) } =20 __u64 test7_result =3D 0; -#if defined(bpf_target_x86) || defined(bpf_target_arm64) +#if defined(bpf_target_x86) || defined(bpf_target_arm64) || defined(bpf_ta= rget_riscv) SEC("fsession/bpf_fentry_test1") int BPF_PROG(test7) { diff --git a/tools/testing/selftests/bpf/progs/get_func_ip_test.c b/tools/t= esting/selftests/bpf/progs/get_func_ip_test.c index 43ff836a8ed8..45eaa54d1ac7 100644 --- a/tools/testing/selftests/bpf/progs/get_func_ip_test.c +++ b/tools/testing/selftests/bpf/progs/get_func_ip_test.c @@ -106,7 +106,7 @@ int BPF_URETPROBE(test8, int ret) =20 __u64 test9_entry_result =3D 0; __u64 test9_exit_result =3D 0; -#if defined(bpf_target_x86) || defined(bpf_target_arm64) +#if defined(bpf_target_x86) || defined(bpf_target_arm64) || defined(bpf_ta= rget_riscv) SEC("fsession/bpf_fentry_test1") int BPF_PROG(test9, int a) { --=20 2.53.0