From nobody Fri Sep 5 18:51:38 2025 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 4cJQRt2P8Bz66Dty; Fri, 05 Sep 2025 18:51:38 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQRt1wN3z3Jmy; Fri, 05 Sep 2025 18:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098298; 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=zpg5YyZNsSGHjMCLA82UWxKvfExCqVrIxsPTj+mcces=; b=N24acqmvD/n2VQFJzVERHYnbayD+XfUtV2JhpVcgIjcNiiK+XxZmC+RxDvz0YmiLqqDQfJ qhFJkAmH8FlR+VL8ZFnXDqMneZV0MeSYMpGyA7QXrte2D/hx4xAO2mQJGNOSVT/2Q5Rt3P bmglVnsaJg8hXGR+lCf9CUTXocmTvJJ37ETxjVEQpJimAEtEf8YKZjMjnDx51h/98E6Rmv mvYNGQ8JGdDekd0dhlEzMq2R7iQCCe6jyHQfUA8NCf8qWG6l6VPChyLEtRx3B6isHY81Q2 Nx7bq9Zoz6U1HzoQxWnHQqtYWE6FkMN1Gop8zZf0rM2WRBO8LSk/rbUf8oVNwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098298; 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=zpg5YyZNsSGHjMCLA82UWxKvfExCqVrIxsPTj+mcces=; b=ytTqTH4Oz9gv6VYN/rUPalTz3EcV9OgI9DrU5MwJeRNgkomDCPf/fotc4EVvRY5N4oULJg G69v5hka/E5urLDeAsyEIkRwnCwimiK5t+eFYU72hPvPwxPG0hfG35huUw7R9xUK9VLgx9 789wiq3nv7wP+HWXco5HpqbiMow35p+GYj7RBS/1/U8l2jGRJM3hSzf2eT8ZlfMLqmEs3/ bBunS9D2qLegcP15olqUqGQCQBS7qTV4Sr1lJbz+i3R/iRWROPlleDIfWEG3isc5tG8zaB xkn6CLUJH3Qf4xTtA6szl25aWZgIjEMy2G6kBrD0HbSZ4lVoyQohokbHqTzKug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098298; a=rsa-sha256; cv=none; b=BAdoHuObz+YGGjfS04slnI5MBMojbqZsYRAEnAmtvnGm5yamZRPvXEeF15q/3wQsfXzIMp sspPO2FucnQlMf1E1CV3LKzhz19n/DnrKdRBWAX7a3KjC5G+uttWgiVLyDzb0Q+ztzlxxu kHky2GjaAj/mB18fvyfgVp53zMyuILRydCOk774hEOCnPcVyZgUrVXFbs4RH+T6HniUojy LWLoAm8GN9jfowB4mh9sEMwh84wC9ndWTr9Ph6Eo3LVMv+qMEZ8vIxoIyq3DVK18y/8p2u 0+ChCnU22eIFm3LWWw18tVHLkzeefebrTx0HXocqCR8TgA/HTSVkX5N8+vUgkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cJQRt1Ts1z11RG; Fri, 05 Sep 2025 18:51:38 +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 585Ipc3Y014555; Fri, 5 Sep 2025 18:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IpcFq014552; Fri, 5 Sep 2025 18:51:38 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:51:38 GMT Message-Id: <202509051851.585IpcFq014552@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: 163e06ec64ea - stable/14 - tcp: Fix wrap around comparison bug 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: 163e06ec64eacedacacbbd99fa6088a9968ed337 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=163e06ec64eacedacacbbd99fa6088a9968ed337 commit 163e06ec64eacedacacbbd99fa6088a9968ed337 Author: Nick Banks AuthorDate: 2025-08-01 21:21:42 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:51:10 +0000 tcp: Fix wrap around comparison bug The variables p_curtick and p_lasttick are not in usecs. Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit 79059e0ec9b1d3273ce32fdd028802fcad4b85ab) --- 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 2a8746167c6d..f91fe0a640f6 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -1116,8 +1116,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