From nobody Fri Sep 8 23:34:35 2023 X-Original-To: dev-commits-src-main@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 4RjCBN3qkNz4sbdP; Fri, 8 Sep 2023 23:34:36 +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 4RjCBN0Dtpz4X3G; Fri, 8 Sep 2023 23:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216076; 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=JVcB7jCAlKnhJBUuH0jNLK0cTzOjMBrFkjSZoXRKmLc=; b=ZDSXWHFPG4kenwFCxICOyk/yGVZ/yns0jwUnsL+uW/H9pHjqNVFw1oCOTsz3eDvi4GRW70 0G/t8p82qZ1c7mg8cb1uqgZFbxFpygWSylZmXja7tVfxO9VXnkmfMM3WXJaV8DI0NYRiBY qQWxKhQapi3mACdJey8BkvxdHDw1swso1AGlA1y7DXKslaT25aWVoiFH1gUEYlZQ9ov10d RPuAIENuBrLu9VFErCYeRAGgZzGdaoSB8ys5W0wb97PzJQ5ldQsj2VovHc2ETtTsi5AL9p LPtcOKuE1clCamoG/i6P4YJqiA6Cw61IwHBivkSsw/Qw6nzhQ3HgCk3yb4ZT9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694216076; a=rsa-sha256; cv=none; b=bWNAVby/rLo7dMJSitnEq1UcRuvLGMZ7BM9OIuKIY4E2+UpSjElk4wRhDgGC0b2hOBBCkC nzOCUrPNXDnax6PCOwC9gdC2IC04s9BJHmqc+A3a8iSRmuK+EFTvfAKgTQpMeq8yWM5ctu BNmdS/HIEoL/fGhe5LhwgRUT2Cqy4EhiR0Zg1eTUTV7fwmQHMjW0o4rlJP1M2aujILCgoE GBgLh4gkjdeWcpCTauE/xkWH6cre+EGUtjP4k63rMTrRE6Fvxsd+wRmRsRDFh91gR/yK82 alM6xWg8ZtmM9G4m3KBFxWkEAc9YbWtJX4PUZLaDl97QUg0VEubfO2dZD9JrKA== 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=1694216076; 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=JVcB7jCAlKnhJBUuH0jNLK0cTzOjMBrFkjSZoXRKmLc=; b=utcHnTFwnuUxO4fpsi8I98XRnAUEfoUo3LrFIhnMiktdRBVeZxomMiQtF4kZar5H+u5O4c Cp80BxN7s+mfFvSDnjpiOD0OSyG0DmHYnuMluNCFo2qRIFrjV9rYpu38mxeGw+/ZI/Ne7N SQcyQg2iuD0ZoFMbsHF8pEEPIlCcG9oW7XS8on7x0vQ/onuXLTyd0YIohzpVFWToaudOmG /zQa04/Duqd1bsoo4oyBiKV/QnubgoLZ4wdwLgrk7p4z2f7bgzMtSvbtwVvOhkaIYFpbmF KEVY5ei/3rVxssK3N/gF9LD79n6jJ+fccmzmTMTbSj1qmVy7TmQx19Npx0Z/lg== 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 4RjCBM6SW5z11xt; Fri, 8 Sep 2023 23:34:35 +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 388NYZmT072551; Fri, 8 Sep 2023 23:34:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388NYZC8072548; Fri, 8 Sep 2023 23:34:35 GMT (envelope-from git) Date: Fri, 8 Sep 2023 23:34:35 GMT Message-Id: <202309082334.388NYZC8072548@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: 75af2d951cce - main - cxgbe t4_tls: Don't bother returning RX credits for a protocol receive error List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 75af2d951cce7d51d2033405f96f083c01f39f04 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=75af2d951cce7d51d2033405f96f083c01f39f04 commit 75af2d951cce7d51d2033405f96f083c01f39f04 Author: John Baldwin AuthorDate: 2023-09-08 23:30:52 +0000 Commit: John Baldwin CommitDate: 2023-09-08 23:31:25 +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 --- 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);