From nobody Mon Oct 16 23:05:15 2023 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 4S8Xkz6NMBz4xv9b; Mon, 16 Oct 2023 23:05:15 +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 4S8Xkz5zGMz4dkZ; Mon, 16 Oct 2023 23:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497515; 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=NxCGW+PA8SsjQvzgpF486538AqlLlJmXJGw2VeaRo24=; b=BuUijGRPkKcH0LAV+MkuU/py3l00vm8HkKWYIqdFdDhXPxNarL1V4ZVwxJG0fqzBX1I3Af 2y+KIqmtbK5LSuY4JJ1fkwuaKPR3bS1dck8VS/B1cqWDF0X2vawrWPEGS+fm1Ugz62/mmJ n+OxvUAomQTq5RjSjAItnFckcgvuLNth34h5DinwMrQWs+MdM62uMdoCcLDJfuxMbWBuxd ijt+B4ZeuYb5o1f65Jl/g9QEeeVDUBrJuyKIcXTv/akFXzDB3TqgzDLnIFd9iIQmblOzIW +NC/bCtKGzFsb54nOb1U2O2hZnz1u3m8VVH56635vYX7barmXszpAjsimzrsaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697497515; a=rsa-sha256; cv=none; b=UWU0NfMhvuy7PgzM8aU8hNUNn+jzcvlIPxmxlZolvbASKpwy4fHDayhv70G5eFlMZhgQ5m toUtuBT38u7qkLbuQsUB2n2Bk+PR3f5IdnuJ3XSiSJ1DpoVVpYvl+5SmVDtv3z3iWYC+yl AeXMMcjP8AZEl1wcYBjCLm2a+Px+nS4OoDbD1WEZpiSDmWz50OvvNyrToEGCc+Z9H+bNbX hNAmMpTazRjmoqWd7c7olPvuhqi0APabYZitLsnvcR3OWKWXEVKIuHdypO3bWYFzXu4a+J qTph65kdjiGScgutCZNtv/SglDgZho5DcwIoH0IL3wk6cB8QVio2XVgRr66c9A== 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=1697497515; 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=NxCGW+PA8SsjQvzgpF486538AqlLlJmXJGw2VeaRo24=; b=iHg61V9u6jlXFwHs13OSYbwMD4+gq6BIuVx+CUZDqo37EbMQBBa8J02xHBeyaSNn/37SnQ bUqha+a8tYQ9fD5WFGb1AsRxF4c6BST0D7WYcJ70OEEbojD8WCvNpITsiMcCpxHFKMRrgg zG+qVtcwjMU5u46AWZr91bE13NfSITmKaU67q/kIA/7cAKp//cIAeIIdbhB6WOu1+Qfb/W Jy4YE61QsXbBQkA8NnQeJG23pw45lsCBGe2tIYtgucngbchyknINiwtuk25Sm60O3/Acxd hWB6pj0+9dgEKrV+3HghrbQ0Bgi6BddZStAZGJ6jkgWFPDmFeBHtWOilazVa5g== 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 4S8Xkz4r4Vz100f; Mon, 16 Oct 2023 23:05:15 +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 39GN5Flb046761; Mon, 16 Oct 2023 23:05:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GN5FnP046758; Mon, 16 Oct 2023 23:05:15 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:05:15 GMT Message-Id: <202310162305.39GN5FnP046758@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: f0441866442d - releng/14.0 - cxgbe t4_tls: Don't bother returning RX credits for a protocol receive error 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f0441866442d00aeb6a2e834b572430d679a5ca7 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f0441866442d00aeb6a2e834b572430d679a5ca7 commit f0441866442d00aeb6a2e834b572430d679a5ca7 Author: John Baldwin AuthorDate: 2023-09-08 23:30:52 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:04:33 +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) (cherry picked from commit cb2cd58dbd56f734f4346ce4db3d0412b2809667) Approved by: re (karels) --- 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);