From nobody Wed Jan 31 00:42:11 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 4TPjsw2Sglz5800q; Wed, 31 Jan 2024 00:42:12 +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 4TPjsw167sz442t; Wed, 31 Jan 2024 00:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661732; 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=eqcG5yRYQu1caLJngPCITrod1CI3JlKzKFnb9LIUboI=; b=qSfsnF61b+Y6sJ1pjULyKSKKK1jiVd5VxBYttnjXBALKbWb4hrl1xini4GgP77E3L0/x8+ uRQMqglR8wl7DnM4f017wktIndwvltVUHfFXv9FULa0HmFqgtCcIZiQdoCzdsKnXZqSd5N TzbcC2zeJWgnTWunG1LAXUn14MEmAVi0zU4PrWeDs/Jred/J6qGneh9MFq2q8VWObOReeW Aue8L4eJ6Pbq9sx4ZJnt1Sevy28lKHG+D+2vIirocp/RWLw8n6wSssD1eTmS40VhraFg2g nWJiQ3Dj958QCUcnntEWLr8FmrpXYhPYnJblxlZk8qQzfei6AB3kY5FtkuyyKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661732; 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=eqcG5yRYQu1caLJngPCITrod1CI3JlKzKFnb9LIUboI=; b=vRg73b7xhVf+I6Afrr8TfdvAnsdgfcXohHPGmZwqnn9laKpt5909QItvPhifEcVwAWujd2 wU04ZW+p4Z1n0QzrBfC7yR9vsdd1CV5jPY423eh1ROCjK/V4h9Yb7yM7j4pJqpnov0tGHu crOjnqeDgsoeL56N2L+3FSbvrKjlEKzolKgwXyaMBtGXxt6cKJPyakcY12O/9jEU8jcW7k kP7AkxwYClttiedcEmaToCvuOLdHNM3w1/G1Zvgzvw1DcT8MKd0AK9Hxh5aTMIRpGMKqZH uVP+vuk1Ut1LZwiXFUjLtZkd9G1pbhKIqVU4Cr+aOJ4jWrS6t0SWYiWMeccvjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706661732; a=rsa-sha256; cv=none; b=ZjAd8+CJHCxT4T8A7/oKMWGWJzA755/pi8ml8Ye9lI1XgzVcl70f81ETA58mW5y18OE/ow h/f5/NwrXY5+GKxnZBDArWQ1w0w4rOxQFsPV85X8DbW/6XHmdKxGHnnRgB4uhNlVu2wfo6 2MvCnN/KaplYPbmKFoEcdW/VRcQPyfAlkfTzqJBBQqtIxMDlgEcTW4DTfwdIIIBsuTRKSx G5VnGxpRTgykdKok3ZFN4iJpJ0oZ++2NiEIqFdW+qPMe2Ae3q15qFs0JaEouSu68s2kRdc kfY0zQpjr897UJdfVXmFdWrzrZ6XLLprXoUMkOXob9RU7BlRn3FFbvQe4Se8cw== 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 4TPjsw0C8HzxYw; Wed, 31 Jan 2024 00:42:12 +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 40V0gB1o059413; Wed, 31 Jan 2024 00:42:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V0gBLR059410; Wed, 31 Jan 2024 00:42:11 GMT (envelope-from git) Date: Wed, 31 Jan 2024 00:42:11 GMT Message-Id: <202401310042.40V0gBLR059410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: afaefb773799 - main - 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/main X-Git-Reftype: branch X-Git-Commit: afaefb7737994293f9264953e361de095c666c18 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=afaefb7737994293f9264953e361de095c666c18 commit afaefb7737994293f9264953e361de095c666c18 Author: John Baldwin AuthorDate: 2024-01-31 00:41:23 +0000 Commit: John Baldwin CommitDate: 2024-01-31 00:41:23 +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 --- 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;