From nobody Wed Oct 15 22:47:24 2025 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 A7F04219533; Sun, 24 Mar 2024 23:35:46 +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=1711323347; cv=none; b=fKtHDCv+2oScg3N0EYFJBRJUJ5CLdW/yKnVASv9yjhGRxxMniYyO896RU2lN3xxns7XG35BB5IY7CWM+VftVKBMhWnikGYy2mYFBzTnvPhqO2y0fly2Wo+HEEAC+6keOz9y4KXlZ7I9IGUVPAUYaAU1+8UEkhM2VXxRRsawGdWI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323347; c=relaxed/simple; bh=cNs+3/cbxq/GxMxjAmY9I2UQAXHhTV2V/4AaQn7m6nI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KOodsMW+KgPRgEX1qSqvl7WbkU+WIcQdSVUWTPkcCD8dZNr53AonnultiT+3ZrgPgMQ7SDQoLxK6LXTH7q23rPggKN8vTmGkFWWlN5zwLtsL38TqQVW8q8plMhpdz1tUmKzJr7jO2VsIe2RIC9+04HZscwE/HN6Ov8C8NwGLD54= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VElcKbyE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VElcKbyE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB04FC43394; Sun, 24 Mar 2024 23:35:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323346; bh=cNs+3/cbxq/GxMxjAmY9I2UQAXHhTV2V/4AaQn7m6nI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VElcKbyE7RgO/NCEzTdIhsGmsPxjqw3jhfjY2291cA9deAyv9k0RHmGQ6rnGNWziH cktP1/6THbhnHZLXqYCClPUOqwTofMOARNtuAeuV/BQTJttdnrub1TMLPrfnhilul4 oM32gC6Fzi9Aun6+oP8j1K2FwRsDblAaCmnah78WEyh4dEOzXhVBvPHdESr+43ybLJ 2R7q22TiLRpzmpRsQDSKZYcU4aHMBJu+jmdpcLuJNyFO8veyyEhdSBsUvL4fV8ahmX 2GE28qvrJkobmpMJrxYXC5I4civq/bb2Ne0KNEgik9eFcyjoaqkGfvA/6nwY2voBs4 cdoauM7u34GKQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peter Hilber , Thomas Gleixner , John Stultz , Sasha Levin Subject: [PATCH 5.15 046/317] timekeeping: Fix cross-timestamp interpolation on counter wrap Date: Sun, 24 Mar 2024 19:30:26 -0400 Message-ID: <20240324233458.1352854-47-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324233458.1352854-1-sashal@kernel.org> References: <20240324233458.1352854-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 suppor= ting 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@opensyn= ergy.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 d921c1b256cf5..985aa75eedb24 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1169,7 +1169,7 @@ static bool cycle_between(u64 before, u64 test, u64 a= fter) { if (test > before && test < after) return true; - if (test < before && before > after) + if (before > after && (test > before || test < after)) return true; return false; } --=20 2.43.0