From nobody Thu Nov 19 15:42:35 2026 X-Original-To: dev-commits-src-all@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 4jVjQg2ZG3z71GJY for ; Thu, 19 Nov 2026 15:42:35 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVjQg1WYfz3CHT for ; Thu, 19 Nov 2026 15:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795102955; 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=KB9/rFo4TwoH8gnEx/YaSZYEFZieqNbMmJEbc/PWnio=; b=CiTDgq14hmszMbCReEF5G4D0ymLGQT6O0Jwldy7LWGqDj9Oo0TpoyvlaAiTWnNruytY30+ fwyBc3m7KbZeKg3JbzetGZRkgq26s10D8MuVSbmxB6Z8v0CxeOUcBeuqCGQbFxkyP1EfVB vVnJCs7t9D+vG5LT5rh9ZfQNHISPTXqPFRdBVvx40TQnoZM+CAc5z08zhmKgEwkuur11k1 Syl410czChmm4hzimGyZkqs7HU4+ayHvztMjNx2IbXP15kwrVhSPCWcGehBPvP/ZD1A/Lo eUV+fLmjRIvgAEIdnopqvBOgnOCQMVWqga5DAZXHyFKQMMLso5vKwXCnZak0hw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795102955; b=SSwmZHrdmHSGil3873ehUBcxv0avm60mdxHIAV4rFC/LoAxxyqMc0w4SuGm4mY7BBW/OxV 2xQsApesMGiZcf4onyVeEMgb+nHLIvzAPztFdzZr7o/eRmnzcthhTnHpM7YtoxOwfUbfPk ADRKAsHI182xfbBbp3dZUIH40v5G3kdVMhY8na+XGBmIf7ZbVOqpcDjv2FDgHxThXWgV1h pXWT3sJs3kPes9a81rNpXudaH9V1Ju+ol3NEVNTwJv+xWJMEOOmzOdLD5v6pCerWG2Y7eG t3vp1OfDPw2MR0eKBySOVyn1Qr8n+fBWWE+jnE73N8GgubDgx72WMlHu4c/kxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795102955; 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=KB9/rFo4TwoH8gnEx/YaSZYEFZieqNbMmJEbc/PWnio=; b=y12wFWuBrtdEnEuDQTEoGCx1MKvKxwpK8BKNtF0a0zj5pSK5D09K3PXeIwci/klt1n2FiR nDRE0Ml/qJfjdS7JIeUn8GVWbPaps7+FkIL4ZnPbKb71xCCf4BXXb9jmCywvb66+SeNg82 FRKXkomoX0B45DgrxrzdyCrfnN7u23F9+ZBiNREzxy6Zhn8tamx27xchfbozHacBzKibY1 aLdToUssuYteQRzilPkUbC5dT2kAEwnz25cJ3LACpeJ7LG5aAuObCvM2VDQU0tr/QinyNp fL5lip1NkyEJ6oIdLB7QylkXioBmHr8ALtfEXyaYH4iJHBR971vD0FK/G+5k7A== 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 4jVjQg190Kz16Ff for ; Thu, 19 Nov 2026 15:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e901 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 15:42:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f77e35a8e452 - stable/15 - cxgbe: Various assertions for lengths in KTLS work requests List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f77e35a8e45290515591a6b9bb165d571c42b4c7 Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 15:42:35 +0000 Message-Id: <6aff18eb.e901.226df84c@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f77e35a8e45290515591a6b9bb165d571c42b4c7 commit f77e35a8e45290515591a6b9bb165d571c42b4c7 Author: John Baldwin AuthorDate: 2026-09-30 19:19:11 +0000 Commit: John Baldwin CommitDate: 2026-11-19 15:42:19 +0000 cxgbe: Various assertions for lengths in KTLS work requests The construction of KTLS work requests is quite fragile, and these assertions ensure that the constructed work requests match the length fields encoded in some of the WR structures. Sponsored by: Chelsio Communications (cherry picked from commit 17126d54c40a2e3f3e2a81e31a07c299416ddf4a) --- sys/dev/cxgbe/crypto/t7_kern_tls.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/dev/cxgbe/crypto/t7_kern_tls.c b/sys/dev/cxgbe/crypto/t7_kern_tls.c index b1f53c06f79c..8e54adacb368 100644 --- a/sys/dev/cxgbe/crypto/t7_kern_tls.c +++ b/sys/dev/cxgbe/crypto/t7_kern_tls.c @@ -1933,6 +1933,8 @@ ktls_write_tls_wr(struct tlspcb *tlsp, struct sge_txq *txq, panic("%s: failed to append sglist", __func__); #endif } + KASSERT(txq->gl->sg_nseg == nsegs, ("%s: sg_nseg %u != nsegs %u", + __func__, txq->gl->sg_nseg, nsegs)); if (last_ghash_frag) { if (sglist_append_phys(txq->gl, zero_buffer_pa, AES_GMAC_HASH_LEN) != 0) { @@ -1943,6 +1945,10 @@ ktls_write_tls_wr(struct tlspcb *tlsp, struct sge_txq *txq, } out = write_gl_to_buf(txq->gl, out); + KASSERT((char *)out - (char *)(wr + 1) == roundup2(txpkt_lens[0], 16), + ("%s: txpkts_len[0] mismatch: %td vs %u", __func__, + (char *)out - (char *)(wr + 1), roundup2(txpkt_lens[0], 16))); + if (request_ghash) { /* ULP_TXPKT */ txpkt = (void *)out; @@ -1991,8 +1997,18 @@ ktls_write_tls_wr(struct tlspcb *tlsp, struct sge_txq *txq, m_snd_tag_ref(&tlsp->com); txq->kern_tls_ghash_requested++; + + KASSERT((char *)out - (char *)txpkt == + roundup2(txpkt_lens[1], 16), + ("%s: txpkts_len[1] mismatch: %td vs %u", __func__, + (char *)out - (char *)txpkt, roundup2(txpkt_lens[1], 16))); + } + KASSERT((char *)out - (char *)wr == roundup2(wr_len, 16), + ("%s: wr_len mismatch: %td vs %u", __func__, + (char *)out - (char *)wr, roundup2(wr_len, 16))); + if (using_scratch) { out = dst; copy_to_txd(eq, txq->ss, &out, wr_len);