From nobody Wed Apr 17 14:19:44 2024 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 4VKNMj1zyWz5H0HN; Wed, 17 Apr 2024 14:19:45 +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 4VKNMj11Ckz4wVm; Wed, 17 Apr 2024 14:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713363585; 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=T4Hrcc6PrUhGlNsQv/C4i39xggQSpOz9FuEvlu1GTUI=; b=DN6S1ayRCzkmFf430IovT1DryXxnTR7dRse4vPf4KhN1j18/8YaSqEbJI1SCNnDYxIVaYb v5DciTKLW8AmjD1HG6+lmu3mui736h6OMj5X9keSorA9wzsAgSIEzASfG3hNgcZyeWX1SR CiDp9KmtN+9OQc9/vrSL2ExZTtKMLrtI3RmfokyB429U76kdrRrMz91LKIxlsIdrmsRG3F KbsXQtgqhgI2HSIVOIaQ8HAcQnsfUNuSMiCGOpCTdtgJLesGBedPyf5Gmjjk1GjC1ZSIsB gcxQMB6WZkW1da/IgcBOeyCpz0BAsTvN+FU1cV3X8X4myIsFfODspLUs5CktrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713363585; a=rsa-sha256; cv=none; b=Bb/uoqcHbVA325GW324gpDB12ZRIsH5COUeM25iXHNa2JyH2hd4oSTd30ZQs68y/XC8zbB xfNOvzOKok+manuUwZpVzcgJNtiNVFwW4rvPSQVmunmXvQ7iGzSxQtuR9JxuMNDrb0KNQV j3DAxbscBAEp13DDgwzujHDkyYVHOJqbOsrPfb559QT0CiBgZfJF6IIctjl427X1gw3bhG 4Uzk5CTgo8Yr1/bIeYz7q3/zXtl1xMKYdzIm7VH8piIr/aIwProZN7oOxTF6CDxJTNfhxP e3ctN7fhWz2t8pVJMXKVcU/p47rHAYhc+nC76jcNew3gzfhoROD3cIOaW1/KzA== 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=1713363585; 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=T4Hrcc6PrUhGlNsQv/C4i39xggQSpOz9FuEvlu1GTUI=; b=bpafaR/vhffmcZcUDWHADUiPXSudSFqn7S8imct3fFPyM7vjODc3pcR/fMSvImC1hPMTpW NhCGB7gEmXKMtJ+psP5mRrAJpK0f9ooIAvnc9PYsucndnzg1E57uC3H83+s5noPY2C19Nj FAxyLxX0P9hqyV4itcWI2PbrDRVzMEzUgYShSKRtfPtlSqtR6aVRPc/6RDhRUfhRMesYFo IAVfg5pnJKGAuZJ2hk2cHhWgGbpANtxhUJJYN2GAVs1bdinJXE1dwKzJ8nxs67QJFJtuf6 /0emZ55qFuhOFCu/jfi/Xvq9IxDYDUBMrvxn41xguIwiE9VkqjxI/55RSCLgHw== 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 4VKNMj0cdNzVGd; Wed, 17 Apr 2024 14:19:45 +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 43HEJiKU073129; Wed, 17 Apr 2024 14:19:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HEJin8073126; Wed, 17 Apr 2024 14:19:44 GMT (envelope-from git) Date: Wed, 17 Apr 2024 14:19:44 GMT Message-Id: <202404171419.43HEJin8073126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 994f9c9e3c2c - stable/14 - tcp rack: fix sending 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 994f9c9e3c2cafc2182703c4a43580a2bd390f30 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=994f9c9e3c2cafc2182703c4a43580a2bd390f30 commit 994f9c9e3c2cafc2182703c4a43580a2bd390f30 Author: Michael Tuexen AuthorDate: 2024-04-05 15:47:03 +0000 Commit: Michael Tuexen CommitDate: 2024-04-17 14:19:20 +0000 tcp rack: fix sending In rack_output(), idle is used as a boolean variable. So don't use it as an int and don't clear it afterwards. This avoids setting idle to false, when it is not intended. Reported by: olivier Reviewed by: rrs, rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44610 (cherry picked from commit 7df0ef5f48e1c67b3f1df7c7964bfa59bc56f4e4) --- sys/netinet/tcp_stacks/rack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index fa3cd2f4f698..889622b7ff90 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -19927,6 +19927,7 @@ rack_output(struct tcpcb *tp) #endif int32_t idle, sendalot; + uint32_t tot_idle; int32_t sub_from_prr = 0; volatile int32_t sack_rxmit; struct rack_sendmap *rsm = NULL; @@ -20164,8 +20165,8 @@ rack_output(struct tcpcb *tp) if ((tp->snd_una == tp->snd_max) && rack->r_ctl.rc_went_idle_time && TSTMP_GT(cts, rack->r_ctl.rc_went_idle_time)) { - idle = cts - rack->r_ctl.rc_went_idle_time; - if (idle > rack_min_probertt_hold) { + tot_idle = (cts - rack->r_ctl.rc_went_idle_time); + if (tot_idle > rack_min_probertt_hold) { /* Count as a probe rtt */ if (rack->in_probe_rtt == 0) { rack->r_ctl.rc_lower_rtt_us_cts = cts; @@ -20176,7 +20177,6 @@ rack_output(struct tcpcb *tp) rack_exit_probertt(rack, cts); } } - idle = 0; } if (rack_use_fsb && (rack->r_ctl.fsb.tcp_ip_hdr) &&