From nobody Wed Oct 11 19:06:33 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 4S5Mgt05WMz4wZ9c; Wed, 11 Oct 2023 19:06: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 4S5Mgs5GBTz4bst; Wed, 11 Oct 2023 19:06:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697051193; 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=mk+ujqFui3HPhlDwAc4p3buUlogGeEbBjB/aUxTR+fA=; b=R6HFqgxy7FkOl/PcMKWToO8tcPrTpxsYLQhy5QqG6GIRJtvhirrlL6Bs74Z9+oOpj+Vm3+ /gbXsnFMIYe8aBaWIsfKgSd/6yXcx50WM5CNgKmaKEoaz6GJsq0i9tDjI0iuWhQcjsIuo5 K9RG6InXHG0oXplAEudHUYJmpzVkSnUwBFXx6NAfZ+b5WZutoP6pnBuc0DYKQCLHJGLvWq mQI1iaARiGJWi5ZjtN5x4KKn9ijD+JI8VlHjIt9wQ1ElJFl5oD1qudTJheFTV1xMfmXvVf 9mRyu2M42cAJom31HBqAO8+iLrNfpF1oDKBnj90EwW8juweDJ0Ift0wmGkpVvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697051193; a=rsa-sha256; cv=none; b=UueZFca9IWOytc7Xx0T95YajFvgT/VRcvpQjZo/W5gxF9RUK7IFhVRPTVN8m+oDlor73u2 5hPbwXYm5BQWM0dXLHOscpAsTtelqhBMErzT5DrHmue5QDS3aWyiU5ENKJm98wCLfRX0La bYDuYTuAqf6y6wPxkShHb+hlV+c5DjR4rgbS3+ufait9blPY2SgDw6YEaswjg5RiMc+O5O Zky9rY582XuOkGbqLDwBYnu4sJxg4lI1/q/HHnCkJbA2TzFEfrEPZT87T1JVMzJekrSZ4z 6hf624XaDkMYqvzcDUtr0AuK8g2Myxe9w+uHY0p7Ejr7nwyqsvOSpHEHAoLHNQ== 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=1697051193; 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=mk+ujqFui3HPhlDwAc4p3buUlogGeEbBjB/aUxTR+fA=; b=EE9ltoRglEa3/6R81vmW3g41XKu2V2cqhZgDjrvpi+wZlb6wrgnOQHnmaCemAlb4OdIzP0 GTdxw4aNCFtsWTAX7C90X03KAr/pkeXQPp4wIV62jLt6aU+ujXZ9JP/4AxbUk6dF2MZBbe zAPh6dsQQN/6LSnh1Nso2d+qxOgPSQFppnykVYZiPqmQwMfuBvIFr+9MNDXM6VHlwcyG8c 9QlnGz59VW66uGZflBovXp1dDgXkdGHksL+sMSlMV/BRaiH6HsNyoRPgQUJlAAvx+6tFjr 7SdO4qfAfeucvdixpdGMY+NVLmlnMmL5QhTbqb1/LUtMfbjhU0yDbKlLz9Fm+w== 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 4S5Mgs4LDfzYWF; Wed, 11 Oct 2023 19:06:33 +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 39BJ6Xba059051; Wed, 11 Oct 2023 19:06:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BJ6Xde059048; Wed, 11 Oct 2023 19:06:33 GMT (envelope-from git) Date: Wed, 11 Oct 2023 19:06:33 GMT Message-Id: <202310111906.39BJ6Xde059048@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: a2128fd12d6e - stable/13 - cxgbe tom: Call t4_rcvd_locked from do_rx_data to return RX credits 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/stable/13 X-Git-Reftype: branch X-Git-Commit: a2128fd12d6e3cf506541429ff3e4c29994c7c80 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a2128fd12d6e3cf506541429ff3e4c29994c7c80 commit a2128fd12d6e3cf506541429ff3e4c29994c7c80 Author: John Baldwin AuthorDate: 2023-09-08 23:30:35 +0000 Commit: John Baldwin CommitDate: 2023-10-11 15:09:52 +0000 cxgbe tom: Call t4_rcvd_locked from do_rx_data to return RX credits In particular, the kernel RPC layer used by the NFS client never invokes pru_rcvd since it always reads data from the socket upcall via MSG_SOCALLBCK which avoids calling pru_rcvd. As a result, on an NFS client connection managed by t4_tom, RX credits were never returned to the TOE connection to open the TCP window resulting in connection hangs. To fix, expand the set of conditions in do_rx_data where RX credits are returned to match those in t4_rcvd_locked by calling the function directly. Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41688 (cherry picked from commit dcfddc8dc091e7688abc8488a0307eba425fa7a2) --- sys/dev/cxgbe/tom/t4_cpl_io.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index 37470c1fb007..fe9dd4477ab3 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -1676,7 +1676,7 @@ do_rx_data(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) struct socket *so; struct sockbuf *sb; struct epoch_tracker et; - int len, rx_credits; + int len; uint32_t ddp_placed = 0; if (__predict_false(toep->flags & TPF_SYNQE)) { @@ -1808,12 +1808,7 @@ do_rx_data(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) } sbappendstream_locked(sb, m, 0); - rx_credits = sbspace(sb) > tp->rcv_wnd ? sbspace(sb) - tp->rcv_wnd : 0; - if (rx_credits > 0 && sbused(sb) + tp->rcv_wnd < sb->sb_lowat) { - rx_credits = send_rx_credits(sc, toep, rx_credits); - tp->rcv_wnd += rx_credits; - tp->rcv_adv += rx_credits; - } + t4_rcvd_locked(&toep->td->tod, tp); if (ulp_mode(toep) == ULP_MODE_TCPDDP && toep->ddp.waiting_count > 0 && sbavail(sb) != 0) {