From nobody Wed Sep 30 19:25:08 2026 X-Original-To: dev-commits-src-main@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 4hw4kY1l5Xz6v432 for ; Wed, 30 Sep 2026 19:25:09 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hw4kY0t89z4L0Q for ; Wed, 30 Sep 2026 19:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790796309; 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=X0ki3zHTpmmbpsBTMBHiBRuv57iqtolSH+55eamAkKo=; b=vLjm67oU+/TwkRjfkidR/008UoOEr64sCNDvTqoDMUYz0WyKTr6L6ESJB+zNXeYzxM8TBw 319dpfApKuZOG/VoBmQRRHIw8w2TGJTxRleeaKK7EUSp7IHWDuWVWt9eCrps3ofFEt0jYa DHFkKeeCOXROP5ZuFpZeVSH6p0yRUG12FI0DQDxDZ68ZiSM+hfxjmK6ld4VK7YQBIYZvdd LksdXFu5pLW30FeL5xImSWA7FjW1aROZF+5sbKZRyRzBWD0TMFGtIq0F+9vzxmX9I0ncVb 5BYEDBSVcB/rbbcw/pU0LIgdYbF+u0LLO84GYe8Mq05R6NOX3mhSWMJuBe7E2w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790796309; b=FnJV2h7vn3ZqDdUhRcYXqPVCiGqh9ItFG/2WHJzUH2r9zTvGIaBjOYnVeSeMxTEp6OWGfw EOw7rHn+tPN3ArDt1GAjhjgBQWcYtlhr3sUkAEE2ZdBYjGXr5M+EBlq7iCUsLAsYeVuo8B eEo9+7oQ4J5GBRtwIkwJV9zQEzFRwaM0QD8GbMlKF0Mfbdc7ITY3DIYRXzN6AplHeW0jub VJu7s3EoGHsG/PQ+451QOA7RuhErGLDmEzpFBqUe5ttfADI6u5YAl5Xw+B/JVgzotkKmsu zB1GOxZUEDteD00MOi2IjTPaZAPsSC33tgBU7IEqetCD0li+Ees+cbKAnKbZ3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790796309; 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=X0ki3zHTpmmbpsBTMBHiBRuv57iqtolSH+55eamAkKo=; b=GfXpSRFxC+jai5335Tkt0XEZgQsFA98vfLuPStYEipkP09e1MhlR12JyvrI3dt9r1yOyFB 9ok/vWTM8QGMLT//mE/svQdAZ2pXCBrJLg3IKWuRII64cTbXG09Shi6WKTJVPX9MbknIwp wu23vhZGgKkkMbmjtcz9HPtZk85dCb3sHx4CD978/ELQg2TDEVXJPHz2PwHKQkVt482yPn usDTCQBrP5T85QQDGR69S+9rLJ5/g8bJUFSm3O4U4IV+jViZj/SKpwSAYUv5lPY2qfTJ7K pl3ZSNY28Fgjx6Z4VF7GbGiktEtAUNvhi7QYV3mLX/nokQp8OrMgo1i1cbkExA== 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 4hw4kX737czyyK for ; Wed, 30 Sep 2026 19:25:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20860 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 19:25:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 17126d54c40a - main - cxgbe: Various assertions for lengths in KTLS work requests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 17126d54c40a2e3f3e2a81e31a07c299416ddf4a Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 19:25:08 +0000 Message-Id: <6abd6214.20860.9814e37@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=17126d54c40a2e3f3e2a81e31a07c299416ddf4a commit 17126d54c40a2e3f3e2a81e31a07c299416ddf4a Author: John Baldwin AuthorDate: 2026-09-30 19:19:11 +0000 Commit: John Baldwin CommitDate: 2026-09-30 19:19:11 +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 --- 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 a9f5a042b895..a539a6793f16 100644 --- a/sys/dev/cxgbe/crypto/t7_kern_tls.c +++ b/sys/dev/cxgbe/crypto/t7_kern_tls.c @@ -1930,6 +1930,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) { @@ -1940,6 +1942,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; @@ -1988,8 +1994,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);