From nobody Fri Aug 1 19:24:53 2025 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 4btwrP6H5zz631LX; Fri, 01 Aug 2025 19:24:53 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4btwrP5K33z4L2Y; Fri, 01 Aug 2025 19:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754076293; 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=vn+4EQ0BwrMMTtD/d3FcCbFAtZ6drGNveAMnTYCn0V0=; b=XfWe7fQ/OcQSieSbK2CFNeKO/D4pRdEyT7y2Rkf8/0SIH5HTYI4OwCjGl/oSxlz/vq5hZX vkbbwnOu1GlxNeC35bMbN6LLfb3QhqOaNnhPXhSMQoOW7BXyCjBHgCM9VEH968hqtn0CFt mr3GwGUGSM/WigGZfXkU2shHuZnSjox60x0b7zd5aqn8CUnTBJjexi3cGShZnDcn+0huUh ZOinXDELXqE/jTll+zGmweob0OQKwv0RIjdpujpLXW2ptxRI/wASYuyev4zvZ4Pxnr0beG oy6Lz3IMvKwplL2h0izszHOb8bOupEsFeqnL7djdikw9SfWNmfHCNrXZ2Ag4gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754076293; 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=vn+4EQ0BwrMMTtD/d3FcCbFAtZ6drGNveAMnTYCn0V0=; b=IAgsNBf3mrq+u6RGCNYYkDXWIfydeH8jmYUZXsiLmHqiKS1FZD8XNjZF8Xmj4Kcsb55MqD Zb2gmtjoH+Yrje5ED4p9G74FEQiaeWP+X2JyGyZxUwpbH+dHS6ta6K4r+6T0AsBzTmFH4m oIdAdzKrsjIzaEpp/3s/h1DtTiSFixIDp4nbiVbX5pe3cnKgJO8vCkdw961pfxZ0hyST1w Rx0k9FBT4IYP3wdTD2EJZWVv1KXdSvhGui53GPWE9cHHGOqrmU80k5UiUJcAedFe/lpaTt 0ujOUWJey9v15HzIJPLQtKRoacC8fpeI/K+w4jWTd+03dvji9a2Pc80IEvx1hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754076293; a=rsa-sha256; cv=none; b=jJiN7m0Ju8Fz3z6ykZ4NP1rBs7GAigS8i7EhFOGny+B2Zws78BRbe77SlKag6fu02/bHi6 SR/tVsMSIShMYtME7O3CDqsqCEyRKCXxM+oWTOxbY/EtiP3csrwwvj5QwuOdMQg89LIs7H DdKN+tTWf4E78kL6JVCT3Nw1gf6i6zBFpo2rdVj2CvPUFNJne1s+YJaYBOstRgP9+tKaTV +s8c+SibdY6kLub81J2/jY5TUwniMPMxHkcs3bn8Yacpk9f20nsycXe7Mp1kkUkVJOSw4y AWN8y9Lf1NqKn0yLo6/oh7cZM4S9DMZVIhHP2x+7NB+EFgz5A7B7EFQX6SnCFA== 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 4btwrP4NCnz11HM; Fri, 01 Aug 2025 19:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 571JOrgl020472; Fri, 1 Aug 2025 19:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 571JOrg3020469; Fri, 1 Aug 2025 19:24:53 GMT (envelope-from git) Date: Fri, 1 Aug 2025 19:24:53 GMT Message-Id: <202508011924.571JOrg3020469@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 79059e0ec9b1 - main - tcp: Fix wrap around comparison bug 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 79059e0ec9b1d3273ce32fdd028802fcad4b85ab Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=79059e0ec9b1d3273ce32fdd028802fcad4b85ab commit 79059e0ec9b1d3273ce32fdd028802fcad4b85ab Author: Nick Banks AuthorDate: 2025-08-01 21:21:42 +0000 Commit: Michael Tuexen CommitDate: 2025-08-01 21:21:42 +0000 tcp: Fix wrap around comparison bug The variables p_curtick and p_lasttick are not in usecs. Reviewed by: tuexen MFC after: 1 week Sponsored by: Netflix, Inc. --- sys/netinet/tcp_hpts.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 22fc99496d34..b77ebc928809 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -1163,8 +1163,7 @@ again: hpts->p_wheel_complete = 0; HPTS_MTX_ASSERT(hpts); slots_to_run = hpts_slots_diff(hpts->p_prev_slot, hpts->p_cur_slot); - if (((hpts->p_curtick - hpts->p_lasttick) > - ((NUM_OF_HPTSI_SLOTS-1) * HPTS_USECS_PER_SLOT)) && + if (((hpts->p_curtick - hpts->p_lasttick) > (NUM_OF_HPTSI_SLOTS - 1)) && (hpts->p_on_queue_cnt != 0)) { /* * Wheel wrap is occuring, basically we