From nobody Mon Oct 16 23:05:16 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 4S8Xl10BQxz4xvK0; Mon, 16 Oct 2023 23:05:17 +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 4S8Xl06ZFbz4dn8; Mon, 16 Oct 2023 23:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497516; 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=gXp1aXif6v9zYUc0GdQfAmX3g27kkoZS+IYLgvyNFRM=; b=yN8/XaWHMouY1O0dV9g7QI3SjXvrKAYdRNj/15R8X6bq1BacJZ0fPzf+NyH1QnoLfs7D1I 7Fsjnt+fg+8HW4jUPofrc1Yq/EACGt92P6CGgf7u9GP6GRU1Amm1dWGWwERX2OkVecTlc4 jIHLNBQ2PAgyu3crYBUHq0law2rIPLa+uhAJB/6FHzZc4IbrEr7AvIv32ke5X9WuOGHeZs QQ4IT5M1KVfIhU1CDKkYCcASFpki7xi8A+tPB4R4vaKgJEQbs1InOoCpwikZ/nqRqRuPVM q4cOQO3V3sEDOlch/gQM4qgn6wV2Poz/PlhyPvf1PYHJkewuNP+SgEGIIv93Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697497516; a=rsa-sha256; cv=none; b=huAkW07PHpiWaKwD1WsL26r+aga4koVOKHs9kBszlnVYenAawehd694nHyUFg4ilrkt/Y1 S3JgJWAIIfI9AheMukLw7F7wi6rYqKzULeHww+Ewz+mdWWhat5iBlqx4XTBfjPnv5HbiaM Byd4Udxze9JBWTU2TA9Lq5Q0oNXIHXwP4+pbImUYbNzIVXWDZlP79PfVZyf61XedDkoEbc eq7WLg2QsDkG6kx0UrfLXK4oMPlTvLkI2ZOHJSvGD2PmPDdXw9a5DQtM6YcFhvCt6MV8mK nN6o+czDzFTCXUQKVF7OlBuMl8O6f3LA48c6s+FUKz30Td0buOBSwNo8QeKaKg== 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=1697497516; 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=gXp1aXif6v9zYUc0GdQfAmX3g27kkoZS+IYLgvyNFRM=; b=XhA+C1T8Dh5XttPcNJELHINAeVzXT3/3itlZ8UsTxMFmhqasRIZ71EbEYRJmaAA1KhUxWL w6QFjDZyYb4/nSqtU82PX2j95L7lBledWweA5dUYem5O66cfH3/EnXreiwznP5oaYbRbzm 1u33Puqt/E9BiqTpVanHPQw9aE6Q3e6+jjf+0vnziauy8w315xHCHsQIi25S8Ruf/35/9D Xn1yl+qjal7TGaV0dv6fwsz7NH++XEYD/gAUo5B/1fV0o7LW6oqXv8COhvoj4HDEVRnH7j NV9uPESL/m7gHm9Q+J+9758Hzif+XObb/mtbtHsAtJ8evB0+OH6OrRTfq1HPPA== 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 4S8Xl05bmPz10MF; Mon, 16 Oct 2023 23:05:16 +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 39GN5GDf046813; Mon, 16 Oct 2023 23:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GN5GnP046810; Mon, 16 Oct 2023 23:05:16 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:05:16 GMT Message-Id: <202310162305.39GN5GnP046810@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: 5c855665a04e - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 5c855665a04ea950bc98e92f3a78f2a4d9988a3d Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5c855665a04ea950bc98e92f3a78f2a4d9988a3d commit 5c855665a04ea950bc98e92f3a78f2a4d9988a3d Author: John Baldwin AuthorDate: 2023-09-08 23:31:38 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:04:33 +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) (cherry picked from commit 969dc06e919ca135fdbf5c9a760684c357ae9310) Approved by: re (karels) --- 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);