From nobody Wed Oct 11 15:44:35 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 4S5HBq4n9nz4wK8q; Wed, 11 Oct 2023 15:44: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 4S5HBq4CLCz3dgl; Wed, 11 Oct 2023 15:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697039075; 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=ePc8rKRhhwG74becQ0MD08rBZJ9nlE3H14lRi7P59yw=; b=CZ+EC0wzlC3fCZpfdfsIPPq05Dn3+o0eNYZAseX4TzGyegWEKClI7zHaiKdesq1R6regRr 9p/G3x3WZ/BwY49ueM03O70lCRv2tZy6HhSBx1eXYGKHP+/aDpMfgvxjlLxAqtdXccobVC 5+NImw5Pr75KyNw2FW+8/QLfyrPn6Vz2w/JhFpW5QGS3n+1XANTHdwHhRNoPMQGzwt9EQo UyunVAujVlTMAI5E1FwDuUzRC/wvnnyNHVVa8vZbUCvetXfmNoX4+g+AngSLru3SexbleB +U7SOPkde1JQipu2uabqrVXYWzjcdTBO+RkyXWs3TPBCCpe9evRI+OrD7/KCNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697039075; a=rsa-sha256; cv=none; b=oGZgfnwuuQHuYQ2p/Q4JUL9Sx3ZvXQhi06N/rjiWIXdUFGHoMbjur01w6LGV3E+zcA5oGg hFdgPsbO3/x+L3uWKV9MX0XZNLV0rn9868ab+V+T0jMw9EuZICVZ6aZfotcgxKL9KOiu00 vgNdUMkdLRlvQvWqgxlOkXy9SDzqUujjHtHJw6raVPBvsKobphj/faOz8sBwqcyhWeqbAj lwxD4H/oOj5U3ZFSP8m70vDwThsUAScrWCYJbW1HBWSZkBhD8T7uTz18Vx+abi1awhkvxi UDMz8W7OnAxDILPyVHecwvrNqxL+V7uCG1wi1zaRGxXudivLi3/+ltZ59xxmPQ== 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=1697039075; 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=ePc8rKRhhwG74becQ0MD08rBZJ9nlE3H14lRi7P59yw=; b=plGB4QxcVAM2o6pfk6UXBBsbrVbxw9suJqVTRLbyq2W5QQ1jdZF2zHTiQJW7ANJCO1N65h 7rUgZquTNR4Z/zyPZVP55hxQaj2whBhpyNwuyZ+NRMjet+mCa3/TOuAMpd2doKPzGTwumB Z0QRC0wHEr4Xu4Akq9hEvvErP1/MeBsyjIIb+0eLxU7oo5rQ8PgfICLvdOddOEI8q6VooL PcmRIo5VaUBsH+z8KdfNFEphmocaXJdeMCeqoangryVhyncWca0/KirkGFLDXpvow0qapW Ghjhh1FF+qfvWp5HMYXsSe5RC6fXQc1zJkrK7EtCVrCrNZf8VB+uuWL7wTdIUA== 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 4S5HBq3K0NzC7F; Wed, 11 Oct 2023 15:44: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 39BFiZIF024357; Wed, 11 Oct 2023 15:44:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BFiZMl024354; Wed, 11 Oct 2023 15:44:35 GMT (envelope-from git) Date: Wed, 11 Oct 2023 15:44:35 GMT Message-Id: <202310111544.39BFiZMl024354@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: 969dc06e919c - stable/14 - cxgbe t4_tls: Call t4_rcvd_locked from do_rx_tls_cmp 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/14 X-Git-Reftype: branch X-Git-Commit: 969dc06e919ca135fdbf5c9a760684c357ae9310 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=969dc06e919ca135fdbf5c9a760684c357ae9310 commit 969dc06e919ca135fdbf5c9a760684c357ae9310 Author: John Baldwin AuthorDate: 2023-09-08 23:31:38 +0000 Commit: John Baldwin CommitDate: 2023-10-11 15:10:32 +0000 cxgbe t4_tls: Call t4_rcvd_locked from do_rx_tls_cmp Similar to dcfddc8dc091e7688abc8488a0307eba425fa7a2, replace the simpler, inlined version with the full version. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41690 (cherry picked from commit 897e564361624411c4e557e0817642e1477f0af4) --- sys/dev/cxgbe/tom/t4_tls.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tls.c b/sys/dev/cxgbe/tom/t4_tls.c index 29a840067c62..3a0c1a392e6c 100644 --- a/sys/dev/cxgbe/tom/t4_tls.c +++ b/sys/dev/cxgbe/tom/t4_tls.c @@ -794,7 +794,7 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) struct mbuf *tls_data; struct tls_get_record *tgr; struct mbuf *control; - int pdu_length, rx_credits, trailer_len; + int pdu_length, trailer_len; #if defined(KTR) || defined(INVARIANTS) int len; #endif @@ -975,16 +975,7 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) sbappendcontrol_locked(sb, m, control, 0); else sbappendstream_locked(sb, m, 0); - 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__, tid, rx_credits, tp->rcv_wnd); -#endif - 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); sorwakeup_locked(so); SOCKBUF_UNLOCK_ASSERT(sb);