From nobody Wed Oct 11 19:06: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 4S5Mgv0cp8z4wYs2; Wed, 11 Oct 2023 19:06:35 +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 4S5Mgt6f2fz4bqc; Wed, 11 Oct 2023 19:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697051194; 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=CwVwy/lqXj9QfhJlLlxcgCwb2XVFlY08QUq1Dbu1zeU=; b=STCOj1CErQz8v1AP+//tfqj6TudbbRbGw4SOtwtGC8vaw3+68u0HeSPGD76068t2ajm5nq nsjcZ/U4BqzWSY921KgNjHSysd2589Zwa5ozy7emlBIlZs+imdKmzAL7bcBeyIiISnNxl9 7DBMAnj/Z+18JdKyUSa1vflZP0JPaEifK4S0kNMUjOAs/fw42JE1OomNQdLtUJktOW/MhZ H9X+3ubbOf22YvkEZJX9Hf5WDQJY0JPRREIGyGtxUl1Y1dWUulqop4idBRWFPxzFP5qmT7 mbVhP99UIy6pvGSgaH0JTUtGrApS3O5eSI8qKzO9gbmuUZC6q1g1lJJWfR3IvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697051194; a=rsa-sha256; cv=none; b=o/tovPxXloPtAOKdeLUF/O0IlPfe06Mhou3ROJwZMxbpIt8CeGIRfi+aPLWi4bVq5a2fQX z4C2A26sAXuFX8wGbGvrenG1zgcwKcWdbaTFsNQ/zCXlbfbJw82pA9R19Y/2Ib4Mdj2lFZ ilt5o4INRID0dRbvo6itzXjGP9H3IGiy2+2NV3BEYJZnTtLzp0cu8hozIt32Am9Mz65Awc oZDeSsNKGHDZAyh1ZO0RLHxgCrHQYBKjZeYBSF2w5Q5EnqOPJ5VRG4Zbavd5hg/qlpHILy VfnxckDx5ip+SajAF6RrW3fv/2i2hMdsePFffHMeO3PgR66bruu0sUL0qo4olg== 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=1697051194; 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=CwVwy/lqXj9QfhJlLlxcgCwb2XVFlY08QUq1Dbu1zeU=; b=D+DQRBGSWJnw7yeRDQ3ZomRSodkMMPa/BQmogxK1SpCiEd9Mp0SS79MnFpOyEubvdTJFae vLpbTpCJWCyK6NvYDWyNZqe16E+miBlM9ipYmpAQ/gK1K6ji/02sSCsHvjw2gS2GjupiNq 4XWh+p+7gyxsqaeLvG582NzPK/UiN2EleU3Ub8iXJLiQBXGrO1PLBzsu0PVxTwdNl8o2tH +Lw7u1XTCVh/QDiaY66t1bF0XVA8TO7O64psmlX+jaMIphCxGAiARH+den758LV2gn8lLn 6o9LfBPLZ1PMQWJ94BA8SFBbvzo7pRr3vVy+rq4Qn9GNTRVP6BPIVAlr2/KhjA== 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 4S5Mgt5lXyzYMH; Wed, 11 Oct 2023 19:06: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 39BJ6Y9i059114; Wed, 11 Oct 2023 19:06:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BJ6YCi059111; Wed, 11 Oct 2023 19:06:34 GMT (envelope-from git) Date: Wed, 11 Oct 2023 19:06:34 GMT Message-Id: <202310111906.39BJ6YCi059111@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: dcb793989863 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: dcb7939898635424daf4c65179bbac75fcb0b09b Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=dcb7939898635424daf4c65179bbac75fcb0b09b commit dcb7939898635424daf4c65179bbac75fcb0b09b Author: John Baldwin AuthorDate: 2023-09-08 23:30:52 +0000 Commit: John Baldwin CommitDate: 2023-10-11 15:09:52 +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 3640ef410ca8..dcdbccb4fe7e 100644 --- a/sys/dev/cxgbe/tom/t4_tls.c +++ b/sys/dev/cxgbe/tom/t4_tls.c @@ -1125,7 +1125,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; @@ -1196,22 +1196,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);