From nobody Mon Apr 08 19:04:21 2024 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 4VCz6F6FTWz5HYSP; Mon, 8 Apr 2024 19:04:21 +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 4VCz6F5dG1z4g3H; Mon, 8 Apr 2024 19:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603061; 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=S4N+6e66IAPneWc4469NaPdoiaakTpV+fgdDEeyP6SU=; b=EqXG9D9uEqZT266TPUFGa2WwydGMGKdzAUqUyXBVqdcfVULFeyLQBRaM7Hk3xQuflY0gvV gRajLotOM04CxVSLVE10Iq/pPM9S4zMI7E3NXVHKZmPPr7dyniHP1JpZDKgxscQRwZnPyw crtwBnyvDX4UN6HYdCH6UbAdNLeYL9ip+I3GRnV4ZVOc6rg9vy8JpEE/4Pj1+Flyj4fRl2 KXODpyzmsbLw4fZP2qrZfR3/YEdR5IwcsW2ygiOcf6L4wewQe/BDQstZetzNuMW/F1cXVT tKY3kTLOOWvBG5fs9y3zmBNJX4isvq4jC7LS+M4CFS5QtxPz9JSmn4JQ41UJWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712603061; a=rsa-sha256; cv=none; b=RXO3Lw9EvQJy/fGn9J0KE04e+JBfxGBT3hRjPjMgCGEonVOsY5m8S0M68OwuvVrZbh0euV Z70qxmoE9tyhMfc2L1idne1FnicLDED3D+rrZn0uYGLENDQTBdztFe5EZV39JQa0EwmNTw kVRhNPpZga7Ti3sXY+kFLXFCCyPJ/en1ahoYObiD3KZkRnEy0Ey63b3RjmwVGCWOGNjY6/ 6bGPe+QQ+OMBe/1aKIVpnG24N3y9LoNEN1a75ThPvWRuryZvuiYfzgD/3C8ZgweqUQ6XLR KnYNkAte3U3+6veos1IRfe6S2QXr6Ib7Zi1MJC5X0BFqbG+vUHXunNVox570tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603061; 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=S4N+6e66IAPneWc4469NaPdoiaakTpV+fgdDEeyP6SU=; b=bh2eHgB5i/gZojusxI/Sr5P4fjL44VHCKgtkOHnjOcJjYBF1gZlJTssK8qZN9k1Lu3dqZN vPAuFTK4u9SThBE6nIsC2r9J2d6KVa5DSRwtjfz4lJruLuGZmpKFow+Sn0g7U8T5FUs878 1P0gmf6iRMavBTgTP2CAmSM0deLmItcmDnzsgmnRdFrqaUzyJlwvgiA2QdDs3THFH1SWsn pPyGsYCH55Aung/uBX0RwyiKJY2zODyz9NaSCMy8ED6wHtAvQefB6UQ3W55lble30piwZO +cDxOjEhjn33ZW1xxJy+cSnFOrzBnd4N9U4xhkWaZrTbdWyORD/LMYm6hRdTgw== 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 4VCz6F5CSNzMx6; Mon, 8 Apr 2024 19:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 438J4LdJ093912; Mon, 8 Apr 2024 19:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438J4LO2093909; Mon, 8 Apr 2024 19:04:21 GMT (envelope-from git) Date: Mon, 8 Apr 2024 19:04:21 GMT Message-Id: <202404081904.438J4LO2093909@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: 2b410bace4a0 - stable/14 - cxgbe tom: Limit TOE connections to 2 reassembly islands always List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 2b410bace4a04941b52887539ac0eed8c97b0a7e Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2b410bace4a04941b52887539ac0eed8c97b0a7e commit 2b410bace4a04941b52887539ac0eed8c97b0a7e Author: John Baldwin AuthorDate: 2024-01-31 00:41:23 +0000 Commit: John Baldwin CommitDate: 2024-04-08 17:39:31 +0000 cxgbe tom: Limit TOE connections to 2 reassembly islands always Previously this was only limited on T6 cards to support switching from ULP_MODE_NONE to ULP_MODE_TLS. To support switching to ULP_MODE_TCPDDP, enable this for all adapters. Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43669 (cherry picked from commit afaefb7737994293f9264953e361de095c666c18) --- sys/dev/cxgbe/t4_main.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 4fbc45e16464..e20c697d2865 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -5726,18 +5726,15 @@ set_params__post_init(struct adapter *sc) } #endif -#ifdef KERN_TLS - if (sc->cryptocaps & FW_CAPS_CONFIG_TLSKEYS && - sc->toecaps & FW_CAPS_CONFIG_TOE) { - /* - * Limit TOE connections to 2 reassembly "islands". - * This is required to permit migrating TOE - * connections to UPL_MODE_TLS. - */ - t4_tp_wr_bits_indirect(sc, A_TP_FRAG_CONFIG, - V_PASSMODE(M_PASSMODE), V_PASSMODE(2)); - } + /* + * Limit TOE connections to 2 reassembly "islands". This is + * required to permit migrating TOE connections to either + * ULP_MODE_TCPDDP or UPL_MODE_TLS. + */ + t4_tp_wr_bits_indirect(sc, A_TP_FRAG_CONFIG, V_PASSMODE(M_PASSMODE), + V_PASSMODE(2)); +#ifdef KERN_TLS if (is_ktls(sc)) { sc->tlst.inline_keys = t4_tls_inline_keys; sc->tlst.combo_wrs = t4_tls_combo_wrs;