From nobody Thu Nov 19 15:42:39 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 4jVjQl6PFHz71Gcg for ; Thu, 19 Nov 2026 15:42:39 +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 4jVjQl3Fcyz3C36 for ; Thu, 19 Nov 2026 15:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795102959; 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=l7meRm6X8jHtjmg5G6R6Opx95mnTleFM5EhpN1+mrQg=; b=YNJbh6hfnDIAXPkKaeT0CnGaRtp1ekzSCcX+LWBEWgAi/sElo+M+Nic1HaSE+ZWLRhaHML TmDl/GKbgME1QJ1ipGSQfFcGsMkvy+gbGTPoAb52UUjNL8d/fQkHg31Id4PdeATq42Q+vX GQB6GVJhtFu6J4T5lxJE+dp2p7fzwjKZ/P2V4n/6GCpjisywdSR2tY/YTsqQ0V4FkuScbK zmoWzeVpxdqdClT5HnncKAJUNpADvXTSPlcROgfaotNuxTBNM7WW9ppFt5a+drtTXv6fMM d8Gbo0RX1RUrCxfaVdw7Vi1Igm6RDGX6P+cwqUe/VKaBstkFqE6I3myjaqoGtg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795102959; b=TUzhoJYANhp5An/TzdqMhcdbcpsU3Tsk9arWBlYCmvEC1m0WVIiAdOruiKkf/66E/1Il+U EozPYVK2QQ+FWZGuOrGYfgE9H1P6N63xj/7uJYVS/SdIkXtkqlg8eA9GeOMiiFdZpzvSx3 n9E5yt5/uctg3FbS/fQBCjhHgOsZGvxoOuBwRJJJB3B+GwRPerbeWCMucSTugZFROYDs3E bqHMsImuW6kyNxJ4PiEBFf1G5AvIPv2/O6hg4OhTMcoOdCQM3IClRkyaWbJAIBz6QShuYC Wx0c+ZITDITbsIROS1E/m8aV/oAzZ7/bCU7wLH2wR4O3WtEmjdawY1nWpJBGfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795102959; 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=l7meRm6X8jHtjmg5G6R6Opx95mnTleFM5EhpN1+mrQg=; b=Chz5/w5nj32dW8NKjzVif/lf+wRx4z9DxxM9sPmp8FV0gRInA8ykEt3az3dhEYrgkcoX+N Cddxo+yPxNXT97eVjiAyTa+2JgPH4ko5H362qmWLE4TcDa3lKgMtBZPnHSK97bs1yfNru0 5qwnlYXQXL6QroYoNLSl77zfSjlFbocH/dNUAcnHaf5jCsv1ZPJhq60m3MjNV2T3/36zqW kDBaamYOXQPg6AvIYHDBjip4TEtGHClfgNxlCVcvyoJcTcIZyZgawcAM0cphw9B0TyQq4q Y3+AN1y5VX2SSPQ/WiySvB+fAXRub59S5nzUS0d/b15Gpy6sIVZ1/WmAeU1oaw== 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 4jVjQl2smzz15N9 for ; Thu, 19 Nov 2026 15:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e981 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 15:42:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 5afba7724de6 - stable/15 - cxgbe: Add a sysctl/tunable to control KTLS offload of AES-CBC cipher suites 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: 5afba7724de6d1585f802e2be6652030fbb85595 Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 15:42:39 +0000 Message-Id: <6aff18ef.e981.5f526f7a@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5afba7724de6d1585f802e2be6652030fbb85595 commit 5afba7724de6d1585f802e2be6652030fbb85595 Author: John Baldwin AuthorDate: 2026-09-30 20:50:12 +0000 Commit: John Baldwin CommitDate: 2026-11-19 15:42:20 +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 (cherry picked from commit 9cf774a577abbe28e03a849d1ec25f47827f07e6) --- 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 454b2e264a0e..bf800496cb8a 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 ef0d0f577ffa..ab1bbc3a1b2f 100644 --- a/sys/dev/cxgbe/crypto/t7_kern_tls.c +++ b/sys/dev/cxgbe/crypto/t7_kern_tls.c @@ -163,6 +163,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 || @@ -190,6 +192,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; @@ -215,9 +219,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 91a43785aaca..0c999cf38455 100644 --- a/sys/dev/cxgbe/offload.h +++ b/sys/dev/cxgbe/offload.h @@ -228,6 +228,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 3cdfbc15ceec..c49a152fcd0a 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, @@ -6201,6 +6206,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; @@ -8160,6 +8166,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 "