From nobody Wed Apr 17 13:53:51 2024 X-Original-To: dev-commits-src-branches@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 4VKMnq2VpVz5Gwpy; Wed, 17 Apr 2024 13:53:51 +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 4VKMnq1bj9z4qny; Wed, 17 Apr 2024 13:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713362031; 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=LwxVwLEqYWbzYiHcGCNkSZHSxs7xjvSmu/PEdujKQSc=; b=u/I2jrqzUZp5/mm/ko05KNESDW/7aarwJz03/fNKcavuePYiX6AXSakI9bJdhsacUnV9rD jJA/YJrjxgDGIsN9oua6RdUKm3xtXbKQVOQlLywVBmjfajEaf9HcHOTSkmnS+noA+6X+gb o3QT9AzRFjtShreN2gSD6kvgvy90tfB9rtlmELh9mRLKWiZceOwc6YrziuSu8vDRoWthh/ eowUzG1m2eVNgu07mnW9LDjIXfYdnFPL5gGf+la6WZKN1DrQR6qYgRmRiy3dXAMQf4Bf1y eql4GRIVtUUc/Gkta/UicLX/ggnYTqtGW1Ag3nc7xJAclA4GLjcBCkoRVtoAFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713362031; a=rsa-sha256; cv=none; b=nHhnMCO09qTiNaAZPVKxyAX1sdabBNzo2kWEvNQudUv0ByiF/Y/+HiqAHkHzWnjKBaF1bB 7Vewk0BGnKPspeqM/CH3PvNOAZtjzB6ni+kunf3sQJ8Hc7/7+W90FVlpXJRDjxVnT6EVmX E07D4WlbGNZ/yV16XipUDY2qrbPhad/fFUm6CISX7JZkEmy6hZJlKNmDlANqPJXAv+bDaU BPpl8zcWifGmVbYmSf4ycJmeEwrB6b4FLWaxHHze7JRKBH3ZSzRd4l2o0ftSl6q5hU35h9 QfYVMmzXLmlXef7ZzZHc+oyE0rJ5P8fH2NMuNvOXt8M/jjlcLuTz+OY96MzRWQ== 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=1713362031; 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=LwxVwLEqYWbzYiHcGCNkSZHSxs7xjvSmu/PEdujKQSc=; b=jhuQmm2sQI3ppXUC74yoAWdz7pTtxbbeYY0SxqbiHrTG+fibsB0Wf2efkv2C4vsk9yF5CQ 3hwxtRsrFufFVRZZtAiK6f/4QZZLhyZoj+sd8cdUc6qPUckFQSKDGn2YTZAqJVN7YrNFez gC9aDAUpddMWBcMnmSYrKjw7XZ2y0DiGI4LwNNz+8qySYbJfM48OomoM6aguAEc+eLN/vf ZcT0SaWiknhPCXb/LU80jgOwGw0ptMlPhWPMDB46+wL00evPeYx8RlVBM+YXRGDQP6Y58y sqFvEopkAM1GUXk6stEjaBIr6UVuGhGeAsOJRzGv2gorHra7RB7NZIwVRkAspA== 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 4VKMnq1CrFzTC8; Wed, 17 Apr 2024 13:53:51 +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 43HDrpRY036944; Wed, 17 Apr 2024 13:53:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HDrpD6036941; Wed, 17 Apr 2024 13:53:51 GMT (envelope-from git) Date: Wed, 17 Apr 2024 13:53:51 GMT Message-Id: <202404171353.43HDrpD6036941@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: 7ebfafa813ce - stable/14 - tcp: fix conversion of rttvar List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 7ebfafa813ce89b2082647eb1c9e136b527ce653 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7ebfafa813ce89b2082647eb1c9e136b527ce653 commit 7ebfafa813ce89b2082647eb1c9e136b527ce653 Author: Michael Tuexen AuthorDate: 2024-04-03 16:39:31 +0000 Commit: Michael Tuexen CommitDate: 2024-04-17 13:53:15 +0000 tcp: fix conversion of rttvar A wrong variable and wrong scaling factors were used. Reported by: Coverity Scan CID: 1508689 Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44612 (cherry picked from commit e0bd180130b8c95f568483d0df6abff00d7d2153) --- sys/netinet/tcp_subr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 34150707072e..c11bfce889e6 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -4201,19 +4201,19 @@ tcp_change_time_units(struct tcpcb *tp, int granularity) uint32_t val, frac; val = USEC_2_TICKS(tp->t_rttvar); - frac = tp->t_srtt % (HPTS_USEC_IN_SEC / hz); + frac = tp->t_rttvar % (HPTS_USEC_IN_SEC / hz); tp->t_rttvar = val << TCP_RTTVAR_SHIFT; /* * frac is the fractional part here is left * over from converting to hz and shifting. - * We need to convert this to the 5 bit + * We need to convert this to the 4 bit * remainder. */ if (frac) { if (hz == 1000) { - frac = (((uint64_t)frac * (uint64_t)TCP_RTT_SCALE) / (uint64_t)HPTS_USEC_IN_MSEC); + frac = (((uint64_t)frac * (uint64_t)TCP_RTTVAR_SCALE) / (uint64_t)HPTS_USEC_IN_MSEC); } else { - frac = (((uint64_t)frac * (uint64_t)(hz) * (uint64_t)TCP_RTT_SCALE) /(uint64_t)HPTS_USEC_IN_SEC); + frac = (((uint64_t)frac * (uint64_t)(hz) * (uint64_t)TCP_RTTVAR_SCALE) /(uint64_t)HPTS_USEC_IN_SEC); } tp->t_rttvar += frac; }