From nobody Tue Feb 10 12:57:41 2026 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) (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 253BB364047 for ; Fri, 6 Feb 2026 11:59:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770379146; cv=none; b=jmzfYNrIuxu92t44Mw/JUXowT+s64FV8pO9eDVrMi8OnJKlDw/vwZ58krkwnNcRgt7o7nQwdC+9nh0Y4qHwSO+YE6PnU0k+sfJEOuT50B4RbY0PRwCoSV2iEqO6DtB86zBbQP60PQoPctuS9XkXcFRP4mpnOhhPHUZJGgmxiprc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770379146; c=relaxed/simple; bh=ex7pg+/a47djsuVc4OdqDsq537mZczIBwUXPeyJxiIk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mISUUKQ6Y7Je2sAyPMjBH25M0mgg8m3II4JxER20p9JinLbGbWbgasKxlio8JzFPalk7KWqRY9c/xRV6HMHt3IROjBZr41Sg12gbQZu75TaD3dEKMsonUPLXQwMAZzJj3iC/t4CqV39THeLwfA+j6zdNTTKnplsn0xzw3UFcfBs= 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=VLW6PyPD; arc=none smtp.client-ip=209.85.214.193 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="VLW6PyPD" Received: by mail-pl1-f193.google.com with SMTP id d9443c01a7336-2a0c20ee83dso17188895ad.2 for ; Fri, 06 Feb 2026 03:59:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770379145; x=1770983945; 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=gKCGPnONbZI0qEqzzIyNptG3JQ40rKzjv21uU5qJoWc=; b=VLW6PyPDLUXVMZS/LuYpgssf52PILjW6Et5iZbz8OWCr6aCFXEjPgjJCZvNy5pPHet fJYeY0Nu+wnFqJunkbo4HRhJBSqpmmg9Wih82+k5t6vqjXEIkg2cGeg7O3IMSH4fYyEz KokBOxzIhL+ctQeRxyUfEXTcsgp9NhKKwDj+3rHiNBLRjA3t0D8pCZkhkGoB8e57tGib vMEWt/23USmah4xki1R80TscH0f2yK9VEE3SFwPMZyUguorjMEV+TIwNvUuWCm9iohQj 13sEsuyea1xFsJ8ho2vguf7zD1DokP4QOABEIHaUTMsL7x4W8eKtTwf+HlOrfBRFA7Ev uPSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770379145; x=1770983945; 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=gKCGPnONbZI0qEqzzIyNptG3JQ40rKzjv21uU5qJoWc=; b=v07FCMrqbiKDaP8wIdmwwQsun32D4+r+hoS74Xr+ouiXKkgkoG0l6DR3TOg3+WMeQR yxrMLcSmmOQ+eHlkO6tw3PonoUB9dIOuHUKcX2vsIcRUM5KSkgYCV2yC9e+3fV+TLRa3 wOS+CL9zH728cZ8hPnIl7ndIRfppKGiWkbOEb5B6QEoLHpyB0RzH74O8zxmOi18UT8O8 mjRRjFui/fRmND3e42YwLl0vjxi6wKfGIWCNNVziKyHWyoL14kx4sdThfAobM9RnjZWj BR1C9KmaghGxNf8hR7KpiIWL/woCDQOyWHXl2MCJpr8+4MGWU8o24+UO+mZk4rs5y0Vo DfAA== X-Forwarded-Encrypted: i=1; AJvYcCVOU8LCbR7TkQjupQw7CNMTzl1k12z1+zC/9e0cmj+UymHlNU/6mFJmZlbFbk5qX4aiAiljkMejclEKBvE=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/Kex6ZiEgjfQ4HRrxxQn50eaziHZsIbVWEJcnBxu+iqd5CpWz LBkHsMS4+zCNcn2Aj5BDlBxeXKq8yQ5nVm1MRAqjiUsWjL6GDKTuikPk X-Gm-Gg: AZuq6aKShCVvRtnskohlx/FCVOuMKVzwKODHEicGEB81sys3/FOVJkaL4iWSJWCQHYt QCL3VKkGxNWv6uTRmNt9EnO//2Uf9Wev1NmN3CPBz/yZPagdMkPJ0T64IIoXyMXX+PZLEOAsnYL Gvtjl3fLVPk+Q90TQ9tMzdEubyZ9B4TD/+P8e0Y2wUtdUJ1JUFTC5RGHBdjpd08au3HAFsZkocY rxd1Gc4AuRToDX6ywAxb2j8NZgiqo7qCDQdYRC8330e9OjcnYj1ujL8k7tzlspMOJxmPtw38ZcY ElNXhu34LBPRd/nGjX94LRgLshmYmBbgCNfcmlvh2sepx0tiSfrMNEKjWbeLfVVZ8E8LvSFbY4r fQvTXocoufwjf3OqmhfEXwbSFKygIzLxXxHQAU+n/vZxEosWoByjXtvDoYten4l0SGNanJGRb5Q MKjiiGptUC1eCoJGYRPT4= X-Received: by 2002:a17:903:8c3:b0:2a7:7c72:42b6 with SMTP id d9443c01a7336-2a95162538amr31219295ad.18.1770379145457; Fri, 06 Feb 2026 03:59:05 -0800 (PST) Received: from 7950hx ([103.173.155.241]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a951c8ac5asm22856395ad.35.2026.02.06.03.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 03:59:05 -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 2/3] bpf, riscv: add fsession support for trampolines Date: Fri, 6 Feb 2026 19:58:22 +0800 Message-ID: <20260206115823.1070354-3-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 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 --- 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..f0e0609b4922 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 ] always * * 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