Received-SPF: pass (google.com: domain of linux-kernel+bounces-3113-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Received-SPF: Pass (protection.outlook.com: domain of opensynergy.com
 designates 217.66.60.4 as permitted sender) receiver=protection.outlook.com;
 client-ip=217.66.60.4; helo=SR-MAIL-03.open-synergy.com; pr=C
From: Peter Hilber <peter.hilber@opensynergy.com>
To: linux-kernel@vger.kernel.org
Cc: Peter Hilber <peter.hilber@opensynergy.com>,
	John Stultz <jstultz@google.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Stephen Boyd <sboyd@kernel.org>,
	"Christopher S. Hall" <christopher.s.hall@intel.com>
Subject: [RFC PATCH v3 1/7] timekeeping: Fix cross-timestamp interpolation on counter wrap
Date: Mon, 18 Dec 2023 08:38:39 +0100
Message-Id: <20231218073849.35294-2-peter.hilber@opensynergy.com>
In-Reply-To: <20231218073849.35294-1-peter.hilber@opensynergy.com>
References: <20231218073849.35294-1-peter.hilber@opensynergy.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Dec 2023 07:40:43.0856
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 087fe7dc-401e-4737-4e77-08dbff9ca3d4
X-MS-Exchange-CrossTenant-Id: 800fae25-9b1b-4edc-993d-c939c4e84a64
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=800fae25-9b1b-4edc-993d-c939c4e84a64;Ip=[217.66.60.4];Helo=[SR-MAIL-03.open-synergy.com]
X-MS-Exchange-CrossTenant-AuthSource:
	AM6EUR05FT008.eop-eur05.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: FR3P281MB1645
X-TM-AS-ERS: 104.47.7.168-0.0.0.0
X-TMASE-Version: StarCloud-1.3-9.1.1015-28064.005
X-TMASE-Result: 10--3.038700-4.000000
X-TMASE-MatchedRID: vveLpsopuKu6TyUO/xKZhTakEkBtr136rutCeVh17xk7dRmDCUrvToyD
	IPOAt5xjKy3tE1HfkQHDxsdOfchH340cVCEiK1Pf0pUa1RtpyoMqq8hD1DGRIIloy91GB/ZEZSL
	4AKI4WH7m9Tc/GgfFJwFtWueZlMH03IFzQVLcaPdCPQBD3xA/3aODSWu0oxbK6gfKtA7Yhlrtmy
	EvxwC5ZFJxK/8gkcZzWa6vTkKxwrI7AFczfjr/7B2U/axB/TLSZg2qO/0BslMgcB+ImoL5a58mJ
	NfsSlkN5p04fCrux4g=
X-TMASE-XGENCLOUD: 51bae1fc-2e60-4c2b-9b45-ff59488cf4c5-0-0-200-0
X-TM-Deliver-Signature: E16FEFEA6210024852D0EE0425D7112E
X-TM-Addin-Auth: ZPVWLL62/fzzzd0bATplIpZhl03WZCSHU20WzbaPASPU5j/ThOZtcJHMfvd
	F4VlYOHPLYZqQi7TvzL4NrS7LCs3yv2sM8UE5rN5Ac92EROWYbOtUqHdu6kkCZQCCrNe5IOteXs
	0TsiMpNtZq0Ss3rW8UGz0BCY0M8mQVeow4zvVEgzGpFsj/Omm2GuIViGy8LhHAdTYtDG5ynMNlm
	8Z4GpL/MoZew3CtcFgKMzMwcy2L0gILrGfTSLeGx31MxKElm+4aUsZDG3tP8dpBQ57pj1DRdJ1W
	HoT+g2Hsyy5x+OY=.O9VHbA09UEFmyI6WFOXuvj8vpZtKIrPARbfEDNoK0mioq3+d3qAKIIzdWr
	NW5cs2rEj9gxl99HYSwSipOaGrN/WQmRV9VTW/2CDsF23C5VdZ9KlADDPRi/AsAVZAC0eeNBf2d
	qx3sTCpmJph2+X1Xnua0cYDCbuPwJ5qwEUhUgLu3kbprr6/m2p5LKA60B5j6uXUItDahSnmxi6Z
	OFsR7ASzRRN14Lj11FnwFDHmq7m1Bd0r7j6RkEp9eQARyqb0SajOIqYlUBGsoX1IptB56q8sOia
	saa7TnKjeTRRQMtgphhyUoLIq+rxJxDrndVSvm9WTSN7SIS7WTNXXNcP+Uw==
X-TM-Addin-ProductCode: EMS
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=opensynergy.com;
	s=TM-DKIM-20210503141657; t=1702885244;
	bh=hUtsQVX0BvNcE4vhtfv+v3MQv6zXnNikIBucovKIXa4=; l=1035;
	h=From:To:Date;
	b=PbudoPQxf6xth7tuhoEt7XigszKLgVrXdPxemE63cX/xSEJ+DUzSTqfTyWztxASUe
	 nInMvkdXEAK+Wa2uQHXrtCDM0SUW6bleh6FukQYNKTql73+GonlVJsf4AWfsTF+RTt
	 DazzSURXix0/mNL+GQq+GsNwH6gHoMr7cHjcVylCp24GDoDjB6uA/hw5b4dY8SZBdN
	 B1NgSp0LkPKSPQ9kTTC0cyIzaqEnNmED4SejKkSitZDYenad4hZtS84+MTrMa+akLW
	 4IXz1+dTpV+uFdCm3uQ4JW5GLI32DlAquwCsuCyebK2rCYiVyoPpJ7NrPE16k17+m4
	 L1Legpd4l7JJg==

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 <peter.hilber@opensynergy.com>
Acked-by: John Stultz <jstultz@google.com>
---
 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 0ff065c5d25b..08a3d0052baa 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.40.1