From nobody Wed Oct 11 19:06: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 4S5Mgw0zW2z4wZDJ; Wed, 11 Oct 2023 19:06:36 +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 4S5Mgw0Dnsz4c8f; Wed, 11 Oct 2023 19:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697051196; 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=ObGBSVLw6OZjQoSSRIpiFsQuz6nyzuBRPQ8Ujke4ClU=; b=gLCr6NQv4lbkNu8dxvU9mZJDQcZJYxWOtBUCkYusLo4EchH7CA+MFzagK8dbHd/yjI8+YE EsGdJODGjk96h+gZ4wAfZyQR+2PIaQuwTB1Xow8WMhnTL6pd6msQF/rcszhMRpzcn6bYRv atrLByqHCjFY2UyG7jKTX7t/a36zAcRrWS0dqq4jvRdJmjQ2oCm/UYshqi13mBHSIS+K89 hCe4cLec0TdG2zL9D0qyF3/TAAh3ShOmrqF9PXKzjGcmYIhbcFb+rMRaVgtWKDrwBzO3bo nDkxv0Th7aFRTgCyv+v6fxeEVELiHVajY/HUUdtgp4Ld2BSiIqJnVVrk3hhE2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697051196; a=rsa-sha256; cv=none; b=Lc2fahp99nzDe3NJtV+Mbqxp1TxWvanYiIEQ165rjR0UTuXJVFxdapHNKxAerzjjBO+zj2 +cOkyriLxD2IvN9YwbrNApYuDl/tqQ1UBcioQ9Q58BMvAHhZ0UE9UiiNF0dxT7htwKwfV5 rS+ZWX8Xm2Ovn3gKOH13hHyyOs0W7dN1/miY0WQVxTYQHnmMJj7yaOXEyW9Ou193ieJSvJ jIYAPbB+Mcb4pvHBWD6vKkHyjFwgclnZtIVQSJ/SXFbB3sUiFwj5rs3TIQ+3owjuZXbT+X kRkm+HDvgmVepbu1hdZk4UBKUE/tQJ8NdP13OEsU68EyvUjg2Nz/fDhGB4Akqg== 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=1697051196; 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=ObGBSVLw6OZjQoSSRIpiFsQuz6nyzuBRPQ8Ujke4ClU=; b=nUqiKwiuI8wdvsp+/n+Uv7N/MpUJv9d/9593yyOkdcB5sfzsMwTDgUpKeRxQCN3qJPOlow ZPNbUbekl7MOrvYRmkXgGLBKQ9i3HOTT8kLdnJvSeyC23zfpvBniLwtwme58X67V0OWOCR iJj+3XeBCnKVEuzX9cZg5UDG+l6hLZsGl974k6y2K7ddgboGU6mv1+cHNJLf4XLmu7oHkR JMGnTfXwUYKpFKfQxE7UKdVSwqbyKrD02X7DiHxkzZZBgJzG7Q+rWMnk/kpeEMjqeMNbMb 3EtRPQILchNxIfpqTlzm6psLWMyYNi7DP6sLaSmNP2Whi9c2wzHrVBzFQV3MmA== 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 4S5Mgv6RLwzYjJ; Wed, 11 Oct 2023 19:06: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 39BJ6Zn3059164; Wed, 11 Oct 2023 19:06:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BJ6ZYF059161; Wed, 11 Oct 2023 19:06:35 GMT (envelope-from git) Date: Wed, 11 Oct 2023 19:06:35 GMT Message-Id: <202310111906.39BJ6ZYF059161@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: 91086ed84b68 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 91086ed84b68d6ce44458f9ea8a4a4a3f8347584 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=91086ed84b68d6ce44458f9ea8a4a4a3f8347584 commit 91086ed84b68d6ce44458f9ea8a4a4a3f8347584 Author: John Baldwin AuthorDate: 2023-09-08 23:31:38 +0000 Commit: John Baldwin CommitDate: 2023-10-11 15:09:52 +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 dcdbccb4fe7e..404c6c04eb5c 100644 --- a/sys/dev/cxgbe/tom/t4_tls.c +++ b/sys/dev/cxgbe/tom/t4_tls.c @@ -941,7 +941,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; + int pdu_length; #if defined(KTR) || defined(INVARIANTS) int len; #endif @@ -1096,16 +1096,7 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) } sbappendcontrol_locked(sb, m, control, 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);