From nobody Mon Feb 9 16:51:01 2026 Received: from mail-yw1-f193.google.com (mail-yw1-f193.google.com [209.85.128.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 17B322749DC for ; Sun, 4 Jan 2026 12:29:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767529767; cv=none; b=ebgIwEfq4jlIp72fOrOGza8FQRWiQpUcxPg4IdAMyoNlIazUUDcXUEarD1i8dxMcsl+OmeVQZI+cEJn/cfVR5aF9GyYQx2wPSQXFGKyOqRlQ4uZKUnBXWhbgSz3cgSCauSc2DD8dlJGjMF62zFR8rROgnHtw+MT5Nk11Tq8X13g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767529767; c=relaxed/simple; bh=K+EU/S4XNqCczE5NOitx3rx5MF3vZYRuMMv9sYvUq2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MZvYzppAx17Vfb9rEucpMNrlS8yk0GYZepEZegaKKBcB/7o0HCKeP64GrBnCSxMYP2+kWBtLEnGnIhQit4qSUlFKbrl+aMacOD1kt4bPYl1yxvtakdtO2XY3BXK3bCtMih2nALMPnvCr9LFY9vG7b9naB3V7sUQuZVNnN9gzsE8= 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=N0hXhPKU; arc=none smtp.client-ip=209.85.128.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="N0hXhPKU" Received: by mail-yw1-f193.google.com with SMTP id 00721157ae682-78fc0f33998so86383387b3.0 for ; Sun, 04 Jan 2026 04:29:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767529765; x=1768134565; 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=SjpuND+cM6PNH+whys9cSmd7/ZmHiaSR1eTVw3ZGpU0=; b=N0hXhPKU+Zvo86icqIHMAyNtmKE7TtNoWxwL/q/NsoxL/7FLD0rbGkJe7omVMM2SGf 9GD3UKC8eIeS4abKhMjRGHtt11ZGU+Azww9nE0y1/myFg9GV6id79lhO8OcPgzPM6K9O z5oNsL/2BGBLzUq1nzki27GxRostnAY6UEs1WE2MoxATFkGJjbIjUm2EJAQL1VMW/Ljn 1+24lMPYmZ1vSTacISW7ob1/FpP5zGNd7Gkct+do6zxQQqkj/CeMyJvAqpgX3Ix+kPQJ JSgd2F1Ha+5ptpWmmY0xOOpxZmQf4P5hMVlqpr1B2bgS8jZYfHi0XJ+zPwKBqvz4NdeV JBLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767529765; x=1768134565; 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=SjpuND+cM6PNH+whys9cSmd7/ZmHiaSR1eTVw3ZGpU0=; b=LzNO9hl1L/L5f4Z415xJjK4VPet7H2bIyNq22AqJTifnIbOXEx23Iy72osZBzgnVGl knjAIF3wgDKx58Hf5Becb07i0IrZMDJ/4pO5UDt6vEIKB+xjPwy1Omiq4gQJGxvJBzmW uSCmlkUZ6SK9OOio4MzWWGEcJd70bH4J+BW9M2vosa0BxEiXPkFV+LMznrXnAU3EW/Vo Ob/DEL5mxIleNcoQdDB8L0fBVHu1HkvPODCjU7b908iLN6PNcwkJKdxbjmrb8k8LSLHm /OyvqXYM/FGU3mnU4p45PjO9mw05b/Z/etx9vTObeijyLMuVwtMMPW0agwizs0svQOv8 i2kg== X-Forwarded-Encrypted: i=1; AJvYcCVBzJ3Yb8xmxhgqkGveyM/epxFativHoI21+DRKrU//DS2Fj9HoUHxXO1lWbqHFQ7AFHJHJIU39cVGzNTA=@vger.kernel.org X-Gm-Message-State: AOJu0YxELZ+YYqAhUtOWVHvYOsoPl420DHtkweCgjvhJ/GALwUUSOsTl Gu9S6e7/CHU3QC47vv4odKft1rjpBa6N0HNoiyf93hsi4zGoBZwi4CK8 X-Gm-Gg: AY/fxX6xHpqSCDN88wSrfztNm9qia9qu5s+ay9IKM9BD/537QWozVFmtNVfbTLiyeC/ 2ivyKKemYOz1vbg1ZouQRY7EIunbLqbpyMB8WO+jvrjprk0ZA26AV/++liAH9mESPn8BR2ANA6P CL/9PSYtZO6psJ1TJOi195FWuGASJpdJ+qf1dTa4xxEFGDkLEXI2FehSN7i6nJQ8aA7PMB+xwTk H4LEHYARinO9X81Hw+gOMpICwvWGebVO48x4BfQUxboIYiffNA11O52zT6L5T6DkgbJnHi/+foG qe+VQuFfGnusgnnyMboZd/2LGUw6Pg2XzdYv9phTMjMdys68mvO4tazJep0EWUJrE4DqZlkTm7d lI+qCD2klhwJBOxnYQqHltPFpa7FFWas0tt1n+r9LcL83nwVxAZJvpPpVdeowhrGQ0HOFM8eSAp mpEpWMi6JG5blA7y55Aw== X-Google-Smtp-Source: AGHT+IFE61D8Ekii1BgyPXdmbHdTo+gvI4aNQG4564OpeAhpj2Qrl+e5Fy8EIIPd4zle35knweXVow== X-Received: by 2002:a05:690c:7309:b0:784:88df:d9d with SMTP id 00721157ae682-78fb3f040efmr784710007b3.2.1767529765001; Sun, 04 Jan 2026 04:29:25 -0800 (PST) Received: from 7940hx ([23.94.188.235]) by smtp.gmail.com with ESMTPSA id 00721157ae682-78fb4378372sm175449427b3.12.2026.01.04.04.29.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jan 2026 04:29:24 -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 v6 04/10] bpf: add the kfunc bpf_fsession_cookie Date: Sun, 4 Jan 2026 20:28:08 +0800 Message-ID: <20260104122814.183732-5-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260104122814.183732-1-dongml2@chinatelecom.cn> References: <20260104122814.183732-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 --- 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 de6f86a56673..988ec1e34e83 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1231,6 +1231,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]; @@ -1783,6 +1784,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 */ @@ -2191,6 +2193,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 11e043049d68..29b4e00d860c 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 0a771be6cb73..e3d7a0fbf4c7 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -12373,6 +12373,7 @@ enum special_kfunc_type { KF_bpf_arena_alloc_pages, KF_bpf_arena_free_pages, KF_bpf_fsession_is_return, + KF_bpf_fsession_cookie, }; =20 BTF_ID_LIST(special_kfunc_list) @@ -12450,6 +12451,7 @@ BTF_ID(func, bpf_task_work_schedule_resume_impl) BTF_ID(func, bpf_arena_alloc_pages) BTF_ID(func, bpf_arena_free_pages) BTF_ID(func, bpf_fsession_is_return) +BTF_ID(func, bpf_fsession_cookie) =20 static bool is_task_work_add_kfunc(u32 func_id) { @@ -12505,7 +12507,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 if (argno + 1 < nargs && @@ -14000,7 +14003,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; } @@ -14284,6 +14288,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 @@ -22557,6 +22564,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 d6f0d5a97c4d..b4914ceed8cc 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