From nobody Fri Jan 23 18:19:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyR6P6N1Qz6PZ2T for ; Fri, 23 Jan 2026 18:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dyR6P3sr9z3LwC for ; Fri, 23 Jan 2026 18:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769192381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kIIgTo3DjbPT4TYNKavVJE23Tovcihc5K1/wVSOZI8w=; b=pGqamLMZ2L1N/PuxnGJaTbXFpyuZ30al2vbDLMOD2jqbdKDJcvHdhs8jn8T96NEPpbYDQq m+kLi37wEvjY2MaoVLK/+m2nJppfaYn86hyZ9772WzsyxKvoQEdchOjbtT0ykMQh26uTIL Q7KjYQJ4Oru4IjbcmGgDF73YWgZo22vjTrozoAi84gc1dzndDbSj3ZHN1pEbYistY4Glj7 NBuKU4ESX2nDWxkQ85t/QiH1UvL5lC/YQXQ9XQNjkwrZyGKSEYXaFTPUiH5jnZBpTnuH2Z uY3qFnlleMUIZPX8TMEw7fRT07HaMOOoCrriKbII3exAfvXHHMkQFEKSzsAoQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769192381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kIIgTo3DjbPT4TYNKavVJE23Tovcihc5K1/wVSOZI8w=; b=YaqNyAeZlSREFeX3CSVoFBnf94L4dGv9IvdklXf79sW0KxXyeHLFfZuff2+4ImzukKUTlp 7N3R1WkKMyEIsGy2OFLVUl1TXvACQ6OZa/dY8Vtx8IWolmrkuzmAFzi6Rg2vF4MwD5hcbj up3p7fB90Bj0DLVC6ja7hxuLA0QFQmxiGB/dabm930O8xVnTqzRMA1oWwd8ElQWLsk6oOq Qd71JX5o8qgMBsfhsGC0yA/CTjNF8yumjvhF21RspefnwLzK15GAClGyojL9LRMk8RiqtO CrunGB05Ph6LbuEWeO7hyJYXncIgGWJn9MZdHNM01MjjvEZZgFCngMj5ND/siw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769192381; a=rsa-sha256; cv=none; b=ILgefO07SrG+YofQxcFNocWQon0Y454f6fR1ShH03tqbAfKFuR5NjykVV5co7OtJVpDB/r /nT+DT94Q0HogE6FCxXKOzlvGc5Z4sJRUwcaZkxU09GLz4x3RhT/681AT5eHkpSu2DhnLJ YjAyzrhgPJU044yhVyy0fn2NxUTfLMYZJ+j67p5Jr3sl0VYqznPfuEtEbcvoG7vLGi68FL BGCvoa5qa3Q7AeXpYEcyUc1u0KaR72vCyoLE6FgVXB1Wkqa5bEJakPIjHHuoudxHS+d0qW hbsagC0hfj+CzI8aMUK1a++d4D8V0/FWAI81QwPDyNdWll8MbmUpipo/aGFX6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dyR6P2z0xzTp9 for ; Fri, 23 Jan 2026 18:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e1d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 18:19:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Gallatin Subject: git: 72326db3c0e3 - stable/15 - ktls: Capture initial tls seqno at time offload is initiated List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 72326db3c0e372883f27144b96f2d4f8388889d6 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 18:19:41 +0000 Message-Id: <6973bbbd.3e1d2.6e02a4ba@gitrepo.freebsd.org> The branch stable/15 has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=72326db3c0e372883f27144b96f2d4f8388889d6 commit 72326db3c0e372883f27144b96f2d4f8388889d6 Author: Andrew Gallatin AuthorDate: 2025-12-20 21:10:12 +0000 Commit: Andrew Gallatin CommitDate: 2026-01-23 15:00:53 +0000 ktls: Capture initial tls seqno at time offload is initiated Some drivers want the TLS seqno when offload starts. Capture this for them by adding a union for initial_seqno, sharing space with the TLS 1.0 next_seqno. Reviewed by: jhb Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54275 MFC After: 1 month (cherry picked from commit 4d692068f6850282dabde9e35b3098a4ebec9592) --- sys/kern/uipc_ktls.c | 3 +++ sys/sys/ktls.h | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 66ce1b5a081d..35009ad77722 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -1406,6 +1406,9 @@ ktls_enable_tx(struct socket *so, struct tls_enable *en) if (error) return (error); + /* some ktls offload NICs require initial seqno to start offload */ + tls->initial_offload_seqno = be64dec(en->rec_seq); + /* Prefer TOE -> ifnet TLS -> software TLS. */ #ifdef TCP_OFFLOAD error = ktls_try_toe(so, tls, KTLS_TX); diff --git a/sys/sys/ktls.h b/sys/sys/ktls.h index a940bcfaba25..6c7e7d3c5ee3 100644 --- a/sys/sys/ktls.h +++ b/sys/sys/ktls.h @@ -221,9 +221,12 @@ struct ktls_session { bool tx; bool sync_dispatch; bool sequential_records; - - /* Only used for TLS 1.0. */ - uint64_t next_seqno; + union { + /* Only used for TLS 1.0. */ + uint64_t next_seqno; + /* Needed by some ktls offload NICs */ + uint64_t initial_offload_seqno; + }; STAILQ_HEAD(, mbuf) pending_records; /* Used to destroy any kTLS session */