From nobody Fri Sep 8 23:34:36 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 4RjCBP27PQz4sbrN; Fri, 8 Sep 2023 23:34:37 +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 4RjCBP1Kxvz4X9R; Fri, 8 Sep 2023 23:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216077; 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=iEC0+O/Zz61Wlky+QDMdBc8dPvCdVoDrafZVdJj5vzw=; b=donaxBpt+sVN+c/NJkxT9LxPfiLRf75VPNWHue6Y1uMcs/HyjyGxBoT9tR1MPxoOskAF9F acTOWSOj2n8bCZ7Vv2CLg5MQ9yxrGMMlIXE6hCsMjOVTdKLyLh5RIMFrBS7T9tZomCzhNm AnRoScHZ8hcxw4AgmkW2txxWpFBkqgkZtbGUoOg+DJ1w7eTqgbytfawVKFPxFEQRc/IseC LtTuq3LStU87oVhBdLeOn28m/sCTidjIcy8gcQxFVXCxKNf3RguJedcTlDhS3edbwGitTI EelsenR3WpaS4rz8aGj/XU8Bcgx4zzAv2rCRhXwmH33yq/nwGkbEoPCaaTiIwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694216077; a=rsa-sha256; cv=none; b=c8OymvFtYKNidJhNtC/RontZgCeZ0PUpZbmGsi+RYZpXGDtgxxkJx0C8DDvbMJPMi5V2Xm iCdlPW9O+gEJLRnfaoZUzUr6pddX1a9J6Xb+8yOIk0sbT2TFAvNfS0JXzZv7KaE/BVvb2a ZJCkg7psC89RUbwgkl0NvYZi+uTir/uwOzXYGspmp8yDoRPUDwjDYUltQ6VC/Lx6UuAFfn cVenVWDhnKYDVq700pc9CRVzEGEiEwvbYrn3bUv+tfVWSjInR+E1PBmdiZ4vn8lGSmyLWK EigrZFasEPurji94M3+0F2tdRKscwcttf6kwirIN1rWkDrKfFLFCyNKRkQ9NcQ== 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=1694216077; 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=iEC0+O/Zz61Wlky+QDMdBc8dPvCdVoDrafZVdJj5vzw=; b=MeR/+a2WCDZXhFyKkZAUWgRXJtPnr5Z/Dx0etZuxsqqgh3VSWQ+9+/F8ca8w8UeGgV9NxR nYEWDJTN5EBpP3BIJDGAy7skTDlx/ftKRRZ3GYPaTojSWrulAd9xRWGaocRRPI9RLfCRR3 uEkV8CrbBQwa7GN5em/x+TQ91VEXWdqUM7x0FNZ/Pihdm1RZPiME8mw4j9FOu6mC90xVvZ zsi3y7up6RJ0jQCkOJWGdSKeh+ZijQxaGmoxyf+gyBAJYlvP8vZPc/ucWDrF3EKdBfd21s +ffJIvQK2WGFlZRtSXPF85xIZli1OEMUReSxPy8HBeKx7wFHiTYBulRGmtv3YQ== 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 4RjCBP0K9Cz11mh; Fri, 8 Sep 2023 23:34:37 +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 388NYa6u072601; Fri, 8 Sep 2023 23:34:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388NYaCl072598; Fri, 8 Sep 2023 23:34:36 GMT (envelope-from git) Date: Fri, 8 Sep 2023 23:34:36 GMT Message-Id: <202309082334.388NYaCl072598@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: 897e56436162 - main - cxgbe t4_tls: Call t4_rcvd_locked from do_rx_tls_cmp 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: 897e564361624411c4e557e0817642e1477f0af4 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=897e564361624411c4e557e0817642e1477f0af4 commit 897e564361624411c4e557e0817642e1477f0af4 Author: John Baldwin AuthorDate: 2023-09-08 23:31:38 +0000 Commit: John Baldwin CommitDate: 2023-09-08 23:31:38 +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 --- 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);