From nobody Wed Sep 30 20:53:46 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 4hw6hq0mKpz6vBJ3 for ; Wed, 30 Sep 2026 20:53:47 +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 4hw6hq0Bfgz4gcY for ; Wed, 30 Sep 2026 20:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790801627; 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=LDcimup3cYfkLLXmLVLlIRHlGO1YFzBjS8zy0iHgtDM=; b=H3BLpW/a4skHy2yb83xtKxvKzzWTckp0FlHZeoROmaeuoBk9gUhxKoqoKa7F96la7cP3FH pGIFi0HeKbAijApXoEdJimFV4W7la+8bjD4i3kT3ITcYHOaj5U/7fY4WML2tuHcddHylGe +WcZ0R0RFEU+uPXc16uHLkzw4EVrQ9h81r58e4cfluNvu+v4D8cKNOWj6NJGK5BC+ZP0Ye yhYDnXfhz+bq27QwNiX637tq6E+9LfGNIn1hwg8zoT1PsFo/tKmQIsSdIPwpvI+9lDplEP LjNDCHzh7JokZ3xvBkKsSnmaZQNUl4oJ2P2ygRQkpC4YOnHyu21vZJ2/rtMwrA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790801627; b=BimzW0oyt/5x5qa/USQ6y6JfgnqUOcyWq+VgZMZlWDDHhGHQWMguqLVRtVUCO4a4z8tGmN i7JyDdL7rhyNKH/R+0mfH9vxnzxCq5F/hr0l7oJjiTeKxDrmjmrUEeRgdY8hAyQ7qVkcCX dKh2wxqZZSj4ViYk4bG6Er3SfSftxQMxpfPeU6Jyu8czqNAKaSK2sXLsnhxxFgGAUvI0H0 psCrSY/sOXJ0ULaj+11Bg+Zxdqd18JVF56E3ERJL0MO+SyM5xvyX1UcsCUUvxwtha7D+E5 7JwT6nK2jiHdr2BoBNZ0vpqlxqoRc1PyzsixBPlfwUd/Ciu0JgE2jcA5QLjKqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790801627; 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=LDcimup3cYfkLLXmLVLlIRHlGO1YFzBjS8zy0iHgtDM=; b=dcaQW8mSXxyZAUIJvB6J3sLx/m0wS+Vnj+MaAMTg2vnDrChUCcH+2izLBVUAdBLsuSpnpx WrxqhwiY8jaamtVQBguezdHOfyBCHCHpUMSYBbgQpShOv8pXoa7im18G0N6BXHzDMjZb08 +6AIZY1iATxXy0sQ2GcahzA5pzMsw2JUM6rx173XeJ3hhYz3TeHLzECHWSzFkHSKzKaobn 6rplhSBEG0qvxyQN60xdkTDLMcBz8sNd8PJU1CfMAsgaJPT9+6xwGuLVhjw6/AoAZvRZWI 9Dwpg0jIfO6w6KPwloptv0njvmicYc2oWMPuuwXANbT81peOK7vGq6UJzwaytg== 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 4hw6hp63YSz1263 for ; Wed, 30 Sep 2026 20:53:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34529 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 20:53:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9cf774a577ab - main - cxgbe: Add a sysctl/tunable to control KTLS offload of AES-CBC cipher suites 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: 9cf774a577abbe28e03a849d1ec25f47827f07e6 Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 20:53:46 +0000 Message-Id: <6abd76da.34529.2e687186@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9cf774a577abbe28e03a849d1ec25f47827f07e6 commit 9cf774a577abbe28e03a849d1ec25f47827f07e6 Author: John Baldwin AuthorDate: 2026-09-30 20:50:12 +0000 Commit: John Baldwin CommitDate: 2026-09-30 20:50:12 +0000 cxgbe: Add a sysctl/tunable to control KTLS offload of AES-CBC cipher suites Disable these by default as they are less efficient and rarely used. Sponsored by: Chelsio Communications --- sys/dev/cxgbe/crypto/t6_kern_tls.c | 7 ++++--- sys/dev/cxgbe/crypto/t7_kern_tls.c | 7 ++++--- sys/dev/cxgbe/offload.h | 1 + sys/dev/cxgbe/t4_main.c | 11 ++++++++++- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/sys/dev/cxgbe/crypto/t6_kern_tls.c b/sys/dev/cxgbe/crypto/t6_kern_tls.c index 584e5015acfa..1ebe536b4a43 100644 --- a/sys/dev/cxgbe/crypto/t6_kern_tls.c +++ b/sys/dev/cxgbe/crypto/t6_kern_tls.c @@ -383,6 +383,8 @@ t6_tls_tag_alloc(if_t ifp, union if_snd_tag_alloc_params *params, int atid, error, explicit_iv_size, keyid, mac_first; tls = params->tls.tls; + vi = if_getsoftc(ifp); + sc = vi->adapter; /* Only TLS 1.1 and TLS 1.2 are currently supported. */ if (tls->params.tls_vmajor != TLS_MAJOR_VER_ONE || @@ -410,6 +412,8 @@ t6_tls_tag_alloc(if_t ifp, union if_snd_tag_alloc_params *params, default: return (EPROTONOSUPPORT); } + if (!sc->tlst.cbc) + return (EPROTONOSUPPORT); explicit_iv_size = AES_BLOCK_LEN; mac_first = 1; break; @@ -431,9 +435,6 @@ t6_tls_tag_alloc(if_t ifp, union if_snd_tag_alloc_params *params, return (EPROTONOSUPPORT); } - vi = if_getsoftc(ifp); - sc = vi->adapter; - tlsp = alloc_tlspcb(ifp, vi, M_WAITOK); atid = alloc_atid(sc, tlsp); diff --git a/sys/dev/cxgbe/crypto/t7_kern_tls.c b/sys/dev/cxgbe/crypto/t7_kern_tls.c index f01a346644af..35342399b468 100644 --- a/sys/dev/cxgbe/crypto/t7_kern_tls.c +++ b/sys/dev/cxgbe/crypto/t7_kern_tls.c @@ -160,6 +160,8 @@ t7_tls_tag_alloc(struct ifnet *ifp, union if_snd_tag_alloc_params *params, uint32_t flowid; tls = params->tls.tls; + vi = if_getsoftc(ifp); + sc = vi->adapter; /* TLS 1.1 through TLS 1.3 are currently supported. */ if (tls->params.tls_vmajor != TLS_MAJOR_VER_ONE || @@ -187,6 +189,8 @@ t7_tls_tag_alloc(struct ifnet *ifp, union if_snd_tag_alloc_params *params, default: return (EPROTONOSUPPORT); } + if (!sc->tlst.cbc) + return (EPROTONOSUPPORT); iv_size = AES_BLOCK_LEN; mac_first = 1; break; @@ -212,9 +216,6 @@ t7_tls_tag_alloc(struct ifnet *ifp, union if_snd_tag_alloc_params *params, return (EPROTONOSUPPORT); } - vi = if_getsoftc(ifp); - sc = vi->adapter; - tlsp = alloc_tlspcb(ifp, vi, M_WAITOK); /* diff --git a/sys/dev/cxgbe/offload.h b/sys/dev/cxgbe/offload.h index d63accf86e2a..d0508ada2fcb 100644 --- a/sys/dev/cxgbe/offload.h +++ b/sys/dev/cxgbe/offload.h @@ -229,6 +229,7 @@ struct iw_tunables { }; struct tls_tunables { + int cbc; int inline_keys; union { struct { diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 27aa2c56d9ec..c91120c85e07 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -748,11 +748,16 @@ TUNABLE_INT("hw.cxgbe.cop_managed_offloading", &t4_cop_managed_offloading); */ static int t4_kern_tls = 0; SYSCTL_INT(_hw_cxgbe, OID_AUTO, kern_tls, CTLFLAG_RDTUN, &t4_kern_tls, 0, - "Enable KERN_TLS mode for T6 adapters"); + "Enable KERN_TLS mode for T6+ adapters"); SYSCTL_NODE(_hw_cxgbe, OID_AUTO, tls, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "cxgbe(4) KERN_TLS parameters"); +static int t4_tls_cbc = 0; +SYSCTL_INT(_hw_cxgbe_tls, OID_AUTO, cbc, CTLFLAG_RDTUN, + &t4_tls_cbc, 0, + "Enable offload of AES-CBC cipher suites."); + static int t4_tls_inline_keys = 0; SYSCTL_INT(_hw_cxgbe_tls, OID_AUTO, inline_keys, CTLFLAG_RDTUN, &t4_tls_inline_keys, 0, @@ -6274,6 +6279,7 @@ set_params__post_init(struct adapter *sc) #ifdef KERN_TLS if (is_ktls(sc)) { + sc->tlst.cbc = t4_tls_cbc; sc->tlst.inline_keys = t4_tls_inline_keys; if (t4_kern_tls != 0 && is_t6(sc)) { sc->tlst.combo_wrs = t4_tls_combo_wrs; @@ -8251,6 +8257,9 @@ t4_sysctls(struct adapter *sc) CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "KERN_TLS parameters"); children = SYSCTL_CHILDREN(oid); + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "cbc", + CTLFLAG_RW, &sc->tlst.cbc, 0, + "Enable offload of AES-CBC cipher suites."); SYSCTL_ADD_INT(ctx, children, OID_AUTO, "inline_keys", CTLFLAG_RW, &sc->tlst.inline_keys, 0, "Always pass TLS " "keys in work requests (1) or attempt to store TLS keys "