Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2516283lqp; Mon, 25 Mar 2024 00:41:49 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCX0l+66mgucLHyYoqQZG+9FrR9M4Z6L8n/qgijoZVaEAAGvvH42GyNOyD+vDEkW/Vbg145Zb2melIGPE/O0Z+RGFsj80yggTJLQ/roLFg== X-Google-Smtp-Source: AGHT+IGX5lmwe8ecXupal0cICTygS8JzakGwdg6sx1Z9IINStmqkHXD+gavUebyGg88E8hsVKOrd X-Received: by 2002:a17:902:e881:b0:1e0:a5bd:40d with SMTP id w1-20020a170902e88100b001e0a5bd040dmr6044475plg.64.1711352509586; Mon, 25 Mar 2024 00:41:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711352509; cv=pass; d=google.com; s=arc-20160816; b=zU7RTP+EyqWW+pxPHsya7TtZJfUYEJBWcl8RPtLyhHF+9PEt0GPAsL+GmfyW+0Lng8 JWv+n8aDMKa7sAWMmQSVjTpEWUbpG+/VkD40FGQHV0926eQ0CprCNNCzSukBDzlSHoc1 wJmwn8TL4qPottDEoWc1eOWMyVojvBNU92qhO+XiQXhh9EBAMkBh/Vtr2QBkmwS6+2Qi cGYOxuxv5uRaMN9FabSYseV3dr9LySDX7sHeT2xcsOHYIU7eoLFfPo7J/fydGa8/Jrkh 65GqXbFbrN9Gtty0+KOBaY87mJUKMf7jeG9FnCVwu4p/4v9KcWKHLwIluwxpChgWoVHK XyPg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=fFhG/d8OO7wetEcHcV61150P4W9P9MWYQ3NBmARbLtc=; fh=Kup36vPmDrRX/ZED4HiLo7D05zuBWldEjkgKP/N/E5c=; b=RdPFw0bQdN0IDC2vtHdMUtYigY6g6lv7I7lEjY9cPMLXxfAK/I19CWcGIt+6TLWf82 Q1FFPxEY4iWAoFGvyJ9oTzibjtxOkzZmnSTk7PIFbrwPfgRRG60jld6mu3ng/ROCa9Ok ertTaXl6iXQi81nkTHjOzVVR1xSsqNhMW8396GHpF3CwgbVEyVNrWskuaOB2xZyXySMc LmTFM5B2A0ny+caLme51bRx+DjA/Pdb69T1XrWmKJfAiel87jSDMJ91JpOhAQ8rmyf4b AJMs+3nFy4DocgoPtDkArZtv1UsKhrUI3Gm//mXrLsH/HU9+bxpQel7+ielfaeP+n7dj M/dQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bWlK7JTt; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115350-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115350-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id s9-20020a17090302c900b001dbcfb509fcsi4746097plk.63.2024.03.25.00.41.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 00:41:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115350-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bWlK7JTt; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115350-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115350-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 7B50429AAEA for ; Mon, 25 Mar 2024 07:35:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CA13813FD6A; Mon, 25 Mar 2024 02:33:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bWlK7JTt" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79CCE1D5651; Sun, 24 Mar 2024 22:49:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320566; cv=none; b=s1jVuuyO7WjGE3+uK4wzxcDRhVBeo4N2QBZ7q1VdlnaRg6/q9Ue1ex9fHW2+IB7OTYD/bURRJgEmOOaaasniIMK3a6nYmSa5zw7OEfVsBypF70nCs/vvrTHeX6S1G7YXdAE0p3g1E33GAkbGLbVVYzTdr0TjOFifo/lpdZxadjk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320566; c=relaxed/simple; bh=23eHHuh/DV2k7PZWl6XBVkeG9jJGgENpTKhIC6FWxGs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qC8/1oYj92nXSSipLDmm8g86ouNQ+Er3V79djzonXgJLJqpWo4IQg5jFFnMypTpqyiWOcjTK7ghI5E496TsdTHdEOkx4JHqKZMRZYCUxp84B7qV+c5oPri27f1apQMiOK8McJJ5/TQFARzfWaHty8AyjWODSfXQ0CekkGhJAYNs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bWlK7JTt; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4EC6C433C7; Sun, 24 Mar 2024 22:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320565; bh=23eHHuh/DV2k7PZWl6XBVkeG9jJGgENpTKhIC6FWxGs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bWlK7JTttHO9pKXqf3wVykt7L6l4JwkCRD9PUyZV1su7sWk3uf25e1lH7pBLkLIJP YfqwiMPU+sRNPDup7d0RYHrM1miVNWPWShmsl2fYO681fWXOBQSGk8SK6omeMWZuel f03mvHKoChbFgTx53CDd1RF92g88nan6tkdP+3EHlxP0znGO6BxEtnsliKoLYrBu6p DlXejO5v/R7aTCOtrhfWMsdTunQTrKjBsVTnApEQRNkeCP9xXI0M65TebX/68Th12P qCwKvIrSeyC9L1/RK0mOReBkYEHdaeyH52nIJ6Ee/E/d8imoTsFe+e7nyArv77jcMz 7/YC7ylQ7zptg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peter Hilber , Thomas Gleixner , John Stultz , Sasha Levin Subject: [PATCH 6.7 126/713] timekeeping: Fix cross-timestamp interpolation on counter wrap Date: Sun, 24 Mar 2024 18:37:32 -0400 Message-ID: <20240324224720.1345309-127-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Peter Hilber [ Upstream commit 84dccadd3e2a3f1a373826ad71e5ced5e76b0c00 ] cycle_between() decides whether get_device_system_crosststamp() will interpolate for older counter readings. cycle_between() yields wrong results for a counter wrap-around where after < before < test, and for the case after < test < before. Fix the comparison logic. Fixes: 2c756feb18d9 ("time: Add history to cross timestamp interface supporting slower devices") Signed-off-by: Peter Hilber Signed-off-by: Thomas Gleixner Acked-by: John Stultz Link: https://lore.kernel.org/r/20231218073849.35294-2-peter.hilber@opensynergy.com Signed-off-by: Sasha Levin --- kernel/time/timekeeping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 266d02809dbb1..8f35455b62509 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1186,7 +1186,7 @@ static bool cycle_between(u64 before, u64 test, u64 after) { if (test > before && test < after) return true; - if (test < before && before > after) + if (before > after && (test > before || test < after)) return true; return false; } -- 2.43.0