From nobody Fri Nov 11 00:39:04 2022 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 4N7fw92Xtkz4dbL0; Fri, 11 Nov 2022 00:39:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N7fw91lfpz4cf0; Fri, 11 Nov 2022 00:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668127145; 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=YZTWj9uxyxO5YswD+ctarTbCqiNHdPRSZWP9e8I0fy8=; b=SzvR0b2vGDnTvzNW1ik34mCT8uEWAHtho4e4LNZW4RT2ovM8kTS6rtkDwy3gdgEo3M52IK PrjB4pRcPN0JHE2yeLqY7dhuVqLqUprQDLzeJI8zvbeQhntCfbhvvFOpQolN5Gojg5IO+c DJ+HaMBOYkwDU4o/iRAKlsu9E2kA/wMvn1nt3STzjml44G32zO/GGyvuGpri6gEbN54Q9S cs3TCFdK3WqNFroJRHk1jijLZvtPntz7hWdBT4FlNYQlQf9y2sI49FFl4YeO2tK3BRFi3R G/hiDlDhIoiX9SjG6H2YVgsLo2YPdPus3npkt9rPOblu4BxpCvnCd3A5SlA5iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668127145; 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=YZTWj9uxyxO5YswD+ctarTbCqiNHdPRSZWP9e8I0fy8=; b=OBRoUJYAeqWensSwIV6LPSF3JfaSrCTMK3Zgz57YvuB3LskqivZGyBFkymPosZ+nv8zil/ aVjCuL6Tv8vXcMdm3xCwTzLENKhlSJJU3J6C/t+H3UefrnCq8tYK2lXG3858iPOOrdwz6i yvgePATyVI39pBiwL7Dd7hI/j7gdmwHuWSJvwGktlO4pxtQ5nmVfsQ6FFkV9YpM7IwriFO uzGlVvkwwiKA5LlUvRUITaF2TbGN3AwKlsVKqaXTmTqZUHhzLeet0saOSR9SFnV8pQwBRS Y2lRPWBf4eS/pOF7O9R+iRWJOYyXSSvPVhqbCtAEHb/A7D/7giWGqXkDcufA2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668127145; a=rsa-sha256; cv=none; b=S3Fuo5hy64SqUZb2QBrr5Jq/Ldf0FDaEAIKtg0Rc/7TbnAF7UKEbWIgi8qeRkxgN6EDDah l1our+sR3/gRrGscUe4Zbt15YEJTjo52C2k2WzSVGai2Ihbennw4O1wtLpVzSoiUnH8JEX G1qjNBxPARmewDP3IeOeLRPIw6OsMLbhEyK9eu/FvqpYtx/X12bWsKkl9Xswgz3vlE9GSc NNnbf4WKFkaw2AF07V4+Rcub3EPKPBcPq5p6wqqcQ8jKe7houNy8BQgHdozEBT+R7kgjlE EKYKvuoJ8jj3SmIi0vZWPR2zltFDwOpWIfS3lC/Nplubd6mc7pCyN4LT+jWqNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N7fw86rjjzM9Z; Fri, 11 Nov 2022 00:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AB0d4Sv057330; Fri, 11 Nov 2022 00:39:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AB0d4RM057329; Fri, 11 Nov 2022 00:39:04 GMT (envelope-from git) Date: Fri, 11 Nov 2022 00:39:04 GMT Message-Id: <202211110039.2AB0d4RM057329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 38168ab37f25 - stable/13 - cxgbe: Rename t4_kern_tls.c to t6_kern_tls.c. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/13 X-Git-Reftype: branch X-Git-Commit: 38168ab37f2549703e4678814e74fc0300fc0bff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=38168ab37f2549703e4678814e74fc0300fc0bff commit 38168ab37f2549703e4678814e74fc0300fc0bff Author: John Baldwin AuthorDate: 2022-08-08 18:21:53 +0000 Commit: John Baldwin CommitDate: 2022-11-11 00:35:35 +0000 cxgbe: Rename t4_kern_tls.c to t6_kern_tls.c. This implementation of NIC TLS is specific to T6 adapters. Sponsored by: Chelsio Communications (cherry picked from commit bbb2f537156b663560cb0a45933c0fafdd2525a3) --- sys/conf/files | 2 +- sys/dev/cxgbe/adapter.h | 6 +-- .../cxgbe/crypto/{t4_kern_tls.c => t6_kern_tls.c} | 8 ++-- sys/dev/cxgbe/t4_main.c | 52 ++++++++++++++-------- sys/modules/cxgbe/if_cxgbe/Makefile | 2 +- 5 files changed, 43 insertions(+), 27 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 2af31ca3dc44..ab20cea43699 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1481,7 +1481,7 @@ dev/cxgbe/common/t4_hw.c optional cxgbe pci \ compile-with "${NORMAL_C} -I$S/dev/cxgbe" dev/cxgbe/common/t4vf_hw.c optional cxgbev pci \ compile-with "${NORMAL_C} -I$S/dev/cxgbe" -dev/cxgbe/crypto/t4_kern_tls.c optional cxgbe pci kern_tls \ +dev/cxgbe/crypto/t6_kern_tls.c optional cxgbe pci kern_tls \ compile-with "${NORMAL_C} -I$S/dev/cxgbe" dev/cxgbe/crypto/t4_keyctx.c optional cxgbe pci \ compile-with "${NORMAL_C} -I$S/dev/cxgbe" diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 9efad088cdfe..db72a7baf189 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -1297,10 +1297,10 @@ void cxgbe_media_status(struct ifnet *, struct ifmediareq *); void t4_os_cim_err(struct adapter *); #ifdef KERN_TLS -/* t4_kern_tls.c */ -int cxgbe_tls_tag_alloc(struct ifnet *, union if_snd_tag_alloc_params *, +/* t6_kern_tls.c */ +int t6_tls_tag_alloc(struct ifnet *, union if_snd_tag_alloc_params *, struct m_snd_tag **); -void cxgbe_tls_tag_free(struct m_snd_tag *); +void t6_tls_tag_free(struct m_snd_tag *); void t6_ktls_modload(void); void t6_ktls_modunload(void); int t6_ktls_try(struct ifnet *, struct socket *, struct ktls_session *); diff --git a/sys/dev/cxgbe/crypto/t4_kern_tls.c b/sys/dev/cxgbe/crypto/t6_kern_tls.c similarity index 99% rename from sys/dev/cxgbe/crypto/t4_kern_tls.c rename to sys/dev/cxgbe/crypto/t6_kern_tls.c index a20c3045b5b3..f34da07903c8 100644 --- a/sys/dev/cxgbe/crypto/t4_kern_tls.c +++ b/sys/dev/cxgbe/crypto/t6_kern_tls.c @@ -367,7 +367,7 @@ ktls_set_tcb_fields(struct tlspcb *tlsp, struct tcpcb *tp, struct sge_txq *txq) } int -cxgbe_tls_tag_alloc(struct ifnet *ifp, union if_snd_tag_alloc_params *params, +t6_tls_tag_alloc(struct ifnet *ifp, union if_snd_tag_alloc_params *params, struct m_snd_tag **pt) { const struct ktls_session *tls; @@ -2072,7 +2072,7 @@ t6_ktls_write_wr(struct sge_txq *txq, void *dst, struct mbuf *m, u_int nsegs, } void -cxgbe_tls_tag_free(struct m_snd_tag *mst) +t6_tls_tag_free(struct m_snd_tag *mst) { struct adapter *sc; struct tlspcb *tlsp; @@ -2113,7 +2113,7 @@ t6_ktls_modunload(void) #else int -cxgbe_tls_tag_alloc(struct ifnet *ifp, union if_snd_tag_alloc_params *params, +t6_tls_tag_alloc(struct ifnet *ifp, union if_snd_tag_alloc_params *params, struct m_snd_tag **pt) { return (ENXIO); @@ -2133,7 +2133,7 @@ t6_ktls_write_wr(struct sge_txq *txq, void *dst, struct mbuf *m, u_int nsegs, } void -cxgbe_tls_tag_free(struct m_snd_tag *mst) +t6_tls_tag_free(struct m_snd_tag *mst) { panic("can't happen"); } diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 6c1a8162b477..3d4e2f3a7a71 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -691,7 +691,7 @@ SYSCTL_INT(_hw_cxgbe, OID_AUTO, cop_managed_offloading, CTLFLAG_RDTUN, */ 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 all supported 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"); @@ -1846,7 +1846,10 @@ ok_to_reset(struct adapter *sc) struct port_info *pi; struct vi_info *vi; int i, j; - const int caps = IFCAP_TOE | IFCAP_TXTLS | IFCAP_NETMAP | IFCAP_TXRTLMT; + int caps = IFCAP_TOE | IFCAP_NETMAP | IFCAP_TXRTLMT; + + if (is_t6(sc)) + caps |= IFCAP_TXTLS; ASSERT_SYNCHRONIZED_OP(sc); MPASS(!(sc->flags & IS_VF)); @@ -2563,7 +2566,7 @@ cxgbe_vi_attach(device_t dev, struct vi_info *vi) #ifdef KERN_TLS if (is_ktls(sc)) { ifp->if_capabilities |= IFCAP_TXTLS; - if (sc->flags & KERN_TLS_ON) + if (sc->flags & KERN_TLS_ON || !is_t6(sc)) ifp->if_capenable |= IFCAP_TXTLS; } #endif @@ -3171,8 +3174,15 @@ cxgbe_snd_tag_alloc(struct ifnet *ifp, union if_snd_tag_alloc_params *params, #endif #ifdef KERN_TLS case IF_SND_TAG_TYPE_TLS: - error = cxgbe_tls_tag_alloc(ifp, params, pt); + { + struct vi_info *vi = ifp->if_softc; + + if (is_t6(vi->pi->adapter)) + error = t6_tls_tag_alloc(ifp, params, pt); + else + error = EOPNOTSUPP; break; + } #endif default: error = EOPNOTSUPP; @@ -3222,7 +3232,7 @@ cxgbe_snd_tag_free(struct m_snd_tag *mst) #endif #ifdef KERN_TLS case IF_SND_TAG_TYPE_TLS: - cxgbe_tls_tag_free(mst); + t6_tls_tag_free(mst); return; #endif default: @@ -5556,7 +5566,7 @@ ktls_tick(void *arg) } static int -t4_config_kern_tls(struct adapter *sc, bool enable) +t6_config_kern_tls(struct adapter *sc, bool enable) { int rc; uint32_t param = V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) | @@ -5702,12 +5712,13 @@ set_params__post_init(struct adapter *sc) */ t4_tp_wr_bits_indirect(sc, A_TP_FRAG_CONFIG, V_PASSMODE(M_PASSMODE), V_PASSMODE(2)); - if (is_ktls(sc)) { - sc->tlst.inline_keys = t4_tls_inline_keys; - sc->tlst.combo_wrs = t4_tls_combo_wrs; - if (t4_kern_tls != 0) - t4_config_kern_tls(sc, true); - } + } + + if (is_ktls(sc)) { + sc->tlst.inline_keys = t4_tls_inline_keys; + sc->tlst.combo_wrs = t4_tls_combo_wrs; + if (t4_kern_tls != 0 && is_t6(sc)) + t6_config_kern_tls(sc, true); } #endif return (0); @@ -7588,9 +7599,12 @@ t4_sysctls(struct adapter *sc) CTLFLAG_RW, &sc->tlst.inline_keys, 0, "Always pass TLS " "keys in work requests (1) or attempt to store TLS keys " "in card memory."); - SYSCTL_ADD_INT(ctx, children, OID_AUTO, "combo_wrs", - CTLFLAG_RW, &sc->tlst.combo_wrs, 0, "Attempt to combine " - "TCB field updates with TLS record work requests."); + + if (is_t6(sc)) + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "combo_wrs", + CTLFLAG_RW, &sc->tlst.combo_wrs, 0, "Attempt to " + "combine TCB field updates with TLS record work " + "requests."); } #endif @@ -12428,7 +12442,7 @@ toe_capability(struct vi_info *vi, bool enable) if (enable) { #ifdef KERN_TLS - if (sc->flags & KERN_TLS_ON) { + if (sc->flags & KERN_TLS_ON && is_t6(sc)) { int i, j, n; struct port_info *p; struct vi_info *v; @@ -12455,7 +12469,7 @@ toe_capability(struct vi_info *vi, bool enable) "trying to enable TOE.\n"); return (EAGAIN); } - rc = t4_config_kern_tls(sc, false); + rc = t6_config_kern_tls(sc, false); if (rc) return (rc); } @@ -12698,6 +12712,8 @@ ktls_capability(struct adapter *sc, bool enable) if (!is_ktls(sc)) return (ENODEV); + if (!is_t6(sc)) + return (0); if (hw_off_limits(sc)) return (ENXIO); @@ -12710,7 +12726,7 @@ ktls_capability(struct adapter *sc, bool enable) "this adapter before trying to enable NIC TLS.\n"); return (EAGAIN); } - return (t4_config_kern_tls(sc, true)); + return (t6_config_kern_tls(sc, true)); } else { /* * Nothing to do for disable. If TOE is enabled sometime later diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile b/sys/modules/cxgbe/if_cxgbe/Makefile index 7210d4e8835e..723029264bac 100644 --- a/sys/modules/cxgbe/if_cxgbe/Makefile +++ b/sys/modules/cxgbe/if_cxgbe/Makefile @@ -24,7 +24,7 @@ SRCS+= t4_hw.c SRCS+= t4_if.c t4_if.h SRCS+= t4_iov.c .if ${KERN_OPTS:MKERN_TLS} != "" -SRCS+= t4_kern_tls.c +SRCS+= t6_kern_tls.c .endif SRCS+= t4_keyctx.c SRCS+= t4_l2t.c