From nobody Wed Oct 11 15:44:34 2023 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 4S5HBp3tZ2z4wKKl; Wed, 11 Oct 2023 15:44:34 +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 4S5HBp3RV6z3dp8; Wed, 11 Oct 2023 15:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697039074; 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=G/mxJxQJeitJ7uOFF+AHmJIYzrvpQrZxvdrLYNuNs1s=; b=lv2AaearY+HC3Vv2nfoPViQi97rCDbYLo92Moj6aWA6Qe+cJwLFCEp+b53vjGEypp8Hxs4 Ux7Sf5WdO7YiHSbtJXeIicMWi+cH49RcqFS80CFyExbLpoYPmpriYjobQIemwJwWjMJ6eX ScR029QoOmi9npZPm9g6bkuVHjbZA9fCTPRxpI624hxqd38+GbZZKdmzftZ+5Zj6l9cac9 iMNiZWb3GHU+P/tRJIU9u0jvYzxrMF4y3v7xpqn7uXnCkzU3rTPnAU4ZEf6UZ2ETtbTSzI mI1ry60zRddosGIM4kwzxTVkkIdeWMsfbiT8p44iO7foGyf/+Ax+hb0qO/IUGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697039074; a=rsa-sha256; cv=none; b=wCMz1MUPqqde8w5yFNPBrlAaTP/uO0cdFIlAWBgTCtUbL3Qnb+HFNRvMkXI8qYanzeRBQ8 cFux3XYs/qTsuYi/0LKVEjrSOmq/gCn6qAu3gvV8DaS2P2MfR4E4sY1hP1VpRO3xbA+Huv PDPugvcTga2DuFHuFfY6rFZ5hgg530LcpTqyyULs1vgimDtkpiVnXtP/vFrieDt9qOZMAs kikML//sofq1sbWBwJd0m6veViTxfgc4WtLtgOWDqrWIApf3qy0dVfl9/GTFhpqE19BinF L+o+/i3zjICVx+eJbcWALsH5SdnOU9ieH7b5FdLZPViouIHNJHmeR50wMFqMJw== 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=1697039074; 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=G/mxJxQJeitJ7uOFF+AHmJIYzrvpQrZxvdrLYNuNs1s=; b=tOUYTVy0lz2pbnOzvthpTgnARLziJdrZinwFNq+cvGIyVv7c2jlnvi/djDzZ58Pc+Kms32 VqklsS7mo77aKTQGRYj2lzBHLfTRMyWKdfeQnh3ybZ2nSaX2fJgaXpm/VDNM63AxBtLkbP SRBeojqJZjtLZn2oW+OvTlP5jgaR58tIX7o1NExxqueXaqoR/To97+wn86QGmFMnllnGjk iu+P+/DC5mzGHolXQtW0Pu49fFRnHlBf14RZfFYfmF+BXTknHEydOSYZXqBYsYHiVmwL2l vEDziBx2GtQRI9yr/N7TNJfO0P4nTs/m8ZeHexbHwDyU459ZHTo90JYYg50HLg== 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 4S5HBp2KflzBx7; Wed, 11 Oct 2023 15:44:34 +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 39BFiYHb024312; Wed, 11 Oct 2023 15:44:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BFiYBG024309; Wed, 11 Oct 2023 15:44:34 GMT (envelope-from git) Date: Wed, 11 Oct 2023 15:44:34 GMT Message-Id: <202310111544.39BFiYBG024309@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: cb2cd58dbd56 - stable/14 - cxgbe t4_tls: Don't bother returning RX credits for a protocol receive error 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: cb2cd58dbd56f734f4346ce4db3d0412b2809667 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cb2cd58dbd56f734f4346ce4db3d0412b2809667 commit cb2cd58dbd56f734f4346ce4db3d0412b2809667 Author: John Baldwin AuthorDate: 2023-09-08 23:30:52 +0000 Commit: John Baldwin CommitDate: 2023-10-11 15:10:32 +0000 cxgbe t4_tls: Don't bother returning RX credits for a protocol receive error Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41689 (cherry picked from commit 75af2d951cce7d51d2033405f96f083c01f39f04) --- sys/dev/cxgbe/tom/t4_tls.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tls.c b/sys/dev/cxgbe/tom/t4_tls.c index b8005e213621..29a840067c62 100644 --- a/sys/dev/cxgbe/tom/t4_tls.c +++ b/sys/dev/cxgbe/tom/t4_tls.c @@ -1004,7 +1004,7 @@ do_rx_data_tls(const struct cpl_rx_data *cpl, struct toepcb *toep, struct tcpcb *tp; struct socket *so; struct sockbuf *sb; - int len, rx_credits; + int len; len = m->m_pkthdr.len; @@ -1075,22 +1075,6 @@ do_rx_data_tls(const struct cpl_rx_data *cpl, struct toepcb *toep, so->so_error = EBADMSG; out: - /* - * This connection is going to die anyway, so probably don't - * need to bother with returning credits. - */ - rx_credits = sbspace(sb) > tp->rcv_wnd ? sbspace(sb) - tp->rcv_wnd : 0; -#ifdef VERBOSE_TRACES - CTR4(KTR_CXGBE, "%s: tid %u rx_credits %u rcv_wnd %u", - __func__, toep->tid, rx_credits, tp->rcv_wnd); -#endif - if (rx_credits > 0 && sbused(sb) + tp->rcv_wnd < sb->sb_lowat) { - rx_credits = send_rx_credits(toep->vi->adapter, toep, - rx_credits); - tp->rcv_wnd += rx_credits; - tp->rcv_adv += rx_credits; - } - sorwakeup_locked(so); SOCKBUF_UNLOCK_ASSERT(sb);