From nobody Mon Feb 9 08:28:44 2026 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.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 01280337BB4 for ; Wed, 24 Dec 2025 13:08:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766581730; cv=none; b=VGJMTpsAMnvXQ9GyW93husotI6ENYM0kuAmEttSc2RbrXGz3zhrLcCX5sg7mp5/Jz7vvgu7OLUErp4uZElPjsEDxuhfdvRYEigNrm54HUrc4FMp2tqvdLy+WKCuYw1ExcRjd6OjnfITjxDzcTNJ40fZxKkE8mqhhjLTK0TlYo6g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766581730; c=relaxed/simple; bh=AwalfVv6m0dQt+f9r7kLNSHNISYXkJr76Q3fUrZMrgQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PdhxDgaJWVqPAaMgljXQfTym95zC2QCjEMdxrUMX/EbSev+dSjYBwIxvpBz6CLDShPXZEJf99mKLj+n8wB36uYdYryLOUxBPo93zpa5hDHZ0cz8jErwlUAhxh4OtC7wOqh42NMq8lAUmci+4+O2VEppIjtMLk307kqsk/mmGX6k= 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=mRSfmIlW; arc=none smtp.client-ip=209.85.210.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="mRSfmIlW" Received: by mail-pf1-f193.google.com with SMTP id d2e1a72fcca58-7bc248dc16aso4854532b3a.0 for ; Wed, 24 Dec 2025 05:08:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766581727; x=1767186527; 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=o0tuqo4muaPkDdS8W/BNaU8fWSvfbpQMCrEFv+IUd5c=; b=mRSfmIlWRmlVrdDBF5OJ/N0E/+N07MyTAE+gxoSudWX+Rto5B+ehyVDKvGV3TCur1s R8LMwQHRkxi5BjJE49DUbC/uTepzIsSzUIjrAiKLvQQJmnkqZcG5FppW9WJHpZ+yjuwf MLofoo4i3XDzPaHj+l0u8JbVFU2FLqGaQowtTV58dl0DbztdoAHDeqA5pmsX8Juz4scA 4H1ZAtRGelnTNBy2hTxtRmpZQgasgJ3AtPRScCzWsxku7LIv/Vu/DCKTj6P65+5brUMp z+LJu9r1Rkp1T8CxqMhkOPbqUGYRJF1MpUPbcNx9Rk7M60+f6JTE8rqj2Q8jQdRb0SGU UWPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766581727; x=1767186527; 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=o0tuqo4muaPkDdS8W/BNaU8fWSvfbpQMCrEFv+IUd5c=; b=f9tZ0JztZjg4XTtSHeiG3rUCbCD068IaUi2XMF4GoqAiUOA+ObxpuByHzKgkGlrlXA p0a29oNggGoBCJboZbN/nm1SbEbzncHsSP/4yUa9pc33TSzN/pO/7cr1ALkNyH0qOsGc wUK4X3wVY7F9qKg6yYS/heijtwBt0d8x8cwYuldx/Sh1+CER8nmv+EeLly1yudjWFfyL aPMpIGjnFXSUCeS6PibOnTH16FFP9/5LqHKD/gEdfhJblUXV+cyNhjllLDb9g4+wODrD 8H3DAV1UsGF+iRMMEBipEcQ8DqZdZvtlrby0MEezTQeBdjdiaIWYpNOzaoJaZLVtc5v4 60cg== X-Forwarded-Encrypted: i=1; AJvYcCWldQzAuHtnLqh010C+GbTpiBU5ctpjCebCPK8RjIiks12Z7hVBIvdTtD0tdV02tbU3hWDT/TYt5G+mZ+I=@vger.kernel.org X-Gm-Message-State: AOJu0YxJVinpWUdOqEPgtlMKXsyLgfbkjJN6CZrvhqeeExLVle/ZDETf Jhz3pnv1l2hmyzDTpE980+Y3S5gr4lxHxw/AEywbwzuZkr5QJ1JtuX51 X-Gm-Gg: AY/fxX4IpAtWJBsp/+9MWgMAd/Xw5EXzNhdixPDNJB6oWbMoWHE4P38AMI9+lousagC VwfrOFXkIUn/by9OQASkVFfgg+tfZi89rEUGieRFJiW9Uacc8bxmiXBU2vt2Pjo63QL6nT8uJ3o s+MnJjHivU04m+CrENqxBMuQhcr5N1VjJNVBZvHrCds0V3OmC5NqBCfTtzvm9Mt1fbGDmd02zdw 7dxGI3REcrjnjIS1lxq2xRpMg8GGnFpLsYqnUiqYB1laKaJMYlUsWlP8DFrXGS28QKQbS9uNITL iY6bxqEYNMiaQILkFzaFkxVpd4Vg9JdtX/aTcGK/ILDrTRgnF3ydeQ8G7zEcmc4JhIufJ4BOlhN x/h/cHxGu/7cG43SPYazuXTkVOV/Zukn1YQ7y6TYx9Hv+xjCLkPgVytkOoVuGRnnZeVf6GaHZ7X EmZ/A7KycVuVY3qx1KXQ== X-Google-Smtp-Source: AGHT+IGloR8ssu486avHCKEdAqC0Ix5YfcJO8N9W563abq1gR5GklfLvtmD3nhTAWb70QG6dAC43rw== X-Received: by 2002:a05:6a00:3395:b0:7e8:4587:e8ca with SMTP id d2e1a72fcca58-7ff66a6c4eamr15790814b3a.61.1766581727172; Wed, 24 Dec 2025 05:08:47 -0800 (PST) Received: from 7950hx ([160.187.0.149]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7ff7dfac28fsm16841173b3a.32.2025.12.24.05.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Dec 2025 05:08:46 -0800 (PST) From: Menglong Dong X-Google-Original-From: Menglong Dong To: ast@kernel.org, andrii@kernel.org Cc: daniel@iogearbox.net, 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, davem@davemloft.net, dsahern@kernel.org, tglx@linutronix.de, mingo@redhat.com, jiang.biao@linux.dev, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v5 04/10] bpf: add the kfunc bpf_fsession_cookie Date: Wed, 24 Dec 2025 21:07:29 +0800 Message-ID: <20251224130735.201422-5-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251224130735.201422-1-dongml2@chinatelecom.cn> References: <20251224130735.201422-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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Implement session cookie for fsession. In order to limit the stack usage, we make 4 as the maximum of the cookie count. The offset of the current cookie is stored in the "(ctx[-1] >> BPF_TRAMP_M_COOKIE) & 0xFF". Therefore, we can get the session cookie with ctx[-offset]. The stack will look like this: return value -> 8 bytes argN -> 8 bytes ... arg1 -> 8 bytes nr_args -> 8 bytes ip (optional) -> 8 bytes cookie2 -> 8 bytes cookie1 -> 8 bytes Inline the bpf_fsession_cookie() in the verifier too. Signed-off-by: Menglong Dong --- v5: - remove "cookie_cnt" in struct bpf_trampoline v4: - limit the maximum of the cookie count to 4 - store the session cookies before nr_regs in stack --- include/linux/bpf.h | 15 +++++++++++++++ kernel/bpf/trampoline.c | 13 +++++++++++-- kernel/bpf/verifier.c | 20 ++++++++++++++++++-- kernel/trace/bpf_trace.c | 9 +++++++++ 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index dc6b4109f0bf..4095f4c2f833 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1215,6 +1215,7 @@ enum { =20 #define BPF_TRAMP_M_NR_ARGS 0 #define BPF_TRAMP_M_IS_RETURN 8 +#define BPF_TRAMP_M_COOKIE 9 =20 struct bpf_tramp_links { struct bpf_tramp_link *links[BPF_MAX_TRAMP_LINKS]; @@ -1762,6 +1763,7 @@ struct bpf_prog { enforce_expected_attach_type:1, /* Enforce expected_attach_type checki= ng at attach time */ call_get_stack:1, /* Do we call bpf_get_stack() or bpf_get_stackid() */ call_get_func_ip:1, /* Do we call get_func_ip() */ + call_session_cookie:1, /* Do we call bpf_fsession_cookie() */ tstamp_type_access:1, /* Accessed __sk_buff->tstamp_type */ sleepable:1; /* BPF program is sleepable */ enum bpf_prog_type type; /* Type of BPF program */ @@ -2137,6 +2139,19 @@ static inline int bpf_fsession_cnt(struct bpf_tramp_= links *links) return cnt; } =20 +static inline int bpf_fsession_cookie_cnt(struct bpf_tramp_links *links) +{ + struct bpf_tramp_links fentries =3D links[BPF_TRAMP_FENTRY]; + int cnt =3D 0; + + for (int i =3D 0; i < links[BPF_TRAMP_FENTRY].nr_links; i++) { + if (fentries.links[i]->link.prog->call_session_cookie) + cnt++; + } + + return cnt; +} + int bpf_prog_ctx_arg_info_init(struct bpf_prog *prog, const struct bpf_ctx_arg_aux *info, u32 cnt); =20 diff --git a/kernel/bpf/trampoline.c b/kernel/bpf/trampoline.c index 77d474fc973a..347e92e7c54e 100644 --- a/kernel/bpf/trampoline.c +++ b/kernel/bpf/trampoline.c @@ -592,6 +592,8 @@ static int bpf_freplace_check_tgt_prog(struct bpf_prog = *tgt_prog) return 0; } =20 +#define BPF_TRAMP_MAX_COOKIES 4 + static int __bpf_trampoline_link_prog(struct bpf_tramp_link *link, struct bpf_trampoline *tr, struct bpf_prog *tgt_prog) @@ -600,7 +602,7 @@ static int __bpf_trampoline_link_prog(struct bpf_tramp_= link *link, struct bpf_tramp_link *link_exiting; struct bpf_fsession_link *fslink; struct hlist_head *prog_list; - int err =3D 0; + int err =3D 0, cookie_cnt =3D 0; int cnt =3D 0, i; =20 kind =3D bpf_attach_type_to_tramp(link->link.prog); @@ -637,11 +639,18 @@ static int __bpf_trampoline_link_prog(struct bpf_tram= p_link *link, /* prog already linked */ return -EBUSY; hlist_for_each_entry(link_exiting, prog_list, tramp_hlist) { - if (link_exiting->link.prog !=3D link->link.prog) + if (link_exiting->link.prog !=3D link->link.prog) { + if (kind =3D=3D BPF_TRAMP_FSESSION && + link_exiting->link.prog->call_session_cookie) + cookie_cnt++; continue; + } /* prog already linked */ return -EBUSY; } + if (link->link.prog->call_session_cookie && + cookie_cnt >=3D BPF_TRAMP_MAX_COOKIES) + return -E2BIG; =20 hlist_add_head(&link->tramp_hlist, prog_list); if (kind =3D=3D BPF_TRAMP_FSESSION) { diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 8a5787e6ab0b..8928ce5bbeb1 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -12381,6 +12381,7 @@ enum special_kfunc_type { KF_bpf_task_work_schedule_signal_impl, KF_bpf_task_work_schedule_resume_impl, KF_bpf_fsession_is_return, + KF_bpf_fsession_cookie, }; =20 BTF_ID_LIST(special_kfunc_list) @@ -12456,6 +12457,7 @@ BTF_ID(func, __bpf_trap) BTF_ID(func, bpf_task_work_schedule_signal_impl) BTF_ID(func, bpf_task_work_schedule_resume_impl) BTF_ID(func, bpf_fsession_is_return) +BTF_ID(func, bpf_fsession_cookie) =20 static bool is_task_work_add_kfunc(u32 func_id) { @@ -12511,7 +12513,8 @@ get_kfunc_ptr_arg_type(struct bpf_verifier_env *env, bool arg_mem_size =3D false; =20 if (meta->func_id =3D=3D special_kfunc_list[KF_bpf_cast_to_kern_ctx] || - meta->func_id =3D=3D special_kfunc_list[KF_bpf_fsession_is_return]) + meta->func_id =3D=3D special_kfunc_list[KF_bpf_fsession_is_return] || + meta->func_id =3D=3D special_kfunc_list[KF_bpf_fsession_cookie]) return KF_ARG_PTR_TO_CTX; =20 /* In this function, we verify the kfunc's BTF as per the argument type, @@ -14009,7 +14012,8 @@ static int check_kfunc_call(struct bpf_verifier_env= *env, struct bpf_insn *insn, } } =20 - if (meta.func_id =3D=3D special_kfunc_list[KF_bpf_session_cookie]) { + if (meta.func_id =3D=3D special_kfunc_list[KF_bpf_session_cookie] || + meta.func_id =3D=3D special_kfunc_list[KF_bpf_fsession_cookie]) { meta.r0_size =3D sizeof(u64); meta.r0_rdonly =3D false; } @@ -14293,6 +14297,9 @@ static int check_kfunc_call(struct bpf_verifier_env= *env, struct bpf_insn *insn, return err; } =20 + if (meta.func_id =3D=3D special_kfunc_list[KF_bpf_fsession_cookie]) + env->prog->call_session_cookie =3D true; + return 0; } =20 @@ -22565,6 +22572,15 @@ static int fixup_kfunc_call(struct bpf_verifier_en= v *env, struct bpf_insn *insn, insn_buf[1] =3D BPF_ALU64_IMM(BPF_RSH, BPF_REG_0, BPF_TRAMP_M_IS_RETURN); insn_buf[2] =3D BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1); *cnt =3D 3; + } else if (desc->func_id =3D=3D special_kfunc_list[KF_bpf_fsession_cookie= ]) { + /* Load nr_args from ctx - 8 */ + insn_buf[0] =3D BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8); + insn_buf[1] =3D BPF_ALU64_IMM(BPF_RSH, BPF_REG_0, BPF_TRAMP_M_COOKIE); + insn_buf[2] =3D BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 0xFF); + insn_buf[3] =3D BPF_ALU64_IMM(BPF_LSH, BPF_REG_0, 3); + insn_buf[4] =3D BPF_ALU64_REG(BPF_SUB, BPF_REG_0, BPF_REG_1); + insn_buf[5] =3D BPF_ALU64_IMM(BPF_NEG, BPF_REG_0, 0); + *cnt =3D 6; } =20 if (env->insn_aux_data[insn_idx].arg_prog) { diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 8a94a507bd51..67f673c41d50 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -3364,10 +3364,19 @@ __bpf_kfunc bool bpf_fsession_is_return(void *ctx) return !!(((u64 *)ctx)[-1] & (1 << BPF_TRAMP_M_IS_RETURN)); } =20 +__bpf_kfunc u64 *bpf_fsession_cookie(void *ctx) +{ + /* This helper call is inlined by verifier. */ + u64 off =3D (((u64 *)ctx)[-1] >> BPF_TRAMP_M_COOKIE) & 0xFF; + + return &((u64 *)ctx)[-off]; +} + __bpf_kfunc_end_defs(); =20 BTF_KFUNCS_START(tracing_kfunc_set_ids) BTF_ID_FLAGS(func, bpf_fsession_is_return, KF_FASTCALL) +BTF_ID_FLAGS(func, bpf_fsession_cookie, KF_FASTCALL) BTF_KFUNCS_END(tracing_kfunc_set_ids) =20 static int bpf_tracing_filter(const struct bpf_prog *prog, u32 kfunc_id) --=20 2.52.0