From nobody Mon Oct 16 23:05:14 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 4S8Xky5RRvz4xvcX; Mon, 16 Oct 2023 23:05:14 +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 4S8Xky4sx8z4dKH; Mon, 16 Oct 2023 23:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497514; 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=+7BMO+YrsyWj3OqzA1fQFt1V77Dvs5Ub6O5tSde5Ezk=; b=mfEKv07ZBjtQFaFq8RtL/5sdf782vqg6TidXjDA951LCjYkFUalUsXvyUOkgVCRDThELaE TzyTuOHhj9dr0euMl1CK/d0ue3P+sW06jeo6t6fvewAqxIPgg6/qLTMpcnVg210RB6mezi +R4z3R0UeeVrJ/JfkE66LgnYIDCqxncv9JEVhS9ER++wah97mUJP6tBP6poXojT9eXGPhm 3pzRAH4mdcM+aNd2XnRM8yHtor4jV3VPdwAINUuL35aAKTLYwhbL3MCSrGapFSltCIBnyx ml+ouOyFxytc2U8PWwa16EqvLX3RPTJo6AH5LWCK6ttY/A3GvLGfHas2voiH7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697497514; a=rsa-sha256; cv=none; b=lY7IdKv4prhquENUZJar1puS/D0f29Lc5LZIMvVT2/vQu0CP7UuirHzaLjj/BG1uys6Lh2 ytFQum/sJkycWKzNcahvwpJAUU5qh6vZNbnFGfaSLk8FlRLU3iIAN7YZ77FDuGN+11FRpp 8jXo3jyBODCYPRDk1cBitr0JW+T2LiUzfG01cXDn5NVKqhCi9yZ0wZZ59PaklEwKBS6hBe gCu9ozI50d4xRlkHypo2erDJF9lHw+GkASjQLVvO1zj/EA+zvm7qupNZJCzYcL20zDJVWT UaWjWctsPwvNlkpw31p3L4kT2LeQmx2u1wcZLOhMJSkGSCQ0Dr74eo5kHbnGzA== 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=1697497514; 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=+7BMO+YrsyWj3OqzA1fQFt1V77Dvs5Ub6O5tSde5Ezk=; b=SHxSOTNnHUPPkN2hvsL8DpR90nkcO2t1eIvlHJku6qjcKjGjMxMI7llOkhE7adi11QplbN RYY9Y0r1R0yyGxbWnoCt+sq3zLENBlb66WXrmumTp1r+Ilc/ljlfHtBzFXaZwhbTpVcthM BZfzebSaPaFn1ZRagoQwX8gqNjD6Equ1rMCTXteHLqZBZg21IXd5Sq0I9lJfBBIFZt0gS3 sqI1Pj5Z0sbgxWTHMzC9L8wPEOGguMVItWZAQa26BlnYKXHaxatUs9O725av/qQmTrMk/D /4edZt1HqMlVFGAQerwlfAmNNnnqKleJ4md1Ce6fBFr4s79e8XP2LgKeqdwu5w== 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 4S8Xky3yn6zyx8; Mon, 16 Oct 2023 23:05:14 +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 39GN5ERb046694; Mon, 16 Oct 2023 23:05:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GN5EGp046691; Mon, 16 Oct 2023 23:05:14 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:05:14 GMT Message-Id: <202310162305.39GN5EGp046691@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: 7916bb5cdf86 - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7916bb5cdf86d01f4e4c5049260af64ac02534d4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7916bb5cdf86d01f4e4c5049260af64ac02534d4 commit 7916bb5cdf86d01f4e4c5049260af64ac02534d4 Author: John Baldwin AuthorDate: 2023-09-08 23:30:35 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:04:33 +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) (cherry picked from commit bd8cecc466adeca0763cca674f83bfcc3a751356) Approved by: re (karels) --- 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 9b48b2891f64..235d4196226d 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -1647,7 +1647,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)) { @@ -1779,12 +1779,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) {