Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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 1/7] timekeeping: Fix cross-timestamp interpolation on counter wrap
Date:   Fri, 30 Jun 2023 19:10:44 +0200
Message-Id: <20230630171052.985577-2-peter.hilber@opensynergy.com>
In-Reply-To: <20230630171052.985577-1-peter.hilber@opensynergy.com>
References: <20230630171052.985577-1-peter.hilber@opensynergy.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 17:12:27.4554
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: a56cb0b6-6348-47c2-3cf9-08db798d2e35
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: DB8EUR05FT036.eop-eur05.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: FRYP281MB2106
X-TM-AS-ERS: 104.47.11.170-0.0.0.0
X-TMASE-Version: StarCloud-1.3-9.1.1011-27724.001
X-TMASE-Result: 10--2.538700-4.000000
X-TMASE-MatchedRID: SVm/7o6CSMO6TyUO/xKZhTakEkBtr136rutCeVh17xk7dRmDCUrvToyD
        IPOAt5xjKy3tE1HfkQHDxsdOfchH340cVCEiK1Pf0pUa1RtpyoMqq8hD1DGRIOU0ANNKseCVi8+
        IGr+Jb3Uyk/Hw4XN9jTDfSGFUeim/x10k8QqyoAwRLjqoJJt/9Ye8/oJiio9KA3+iPIxcfrY69F
        U9T760azOhN3RGo1v1NMyO/nomWfCAp+J3UCS7tJfmvpdxWEjowcHhVE1atjtxZskk+1rr0wD2c
        Tn+TrXw
X-TMASE-XGENCLOUD: 04980225-2de2-4c51-a9ba-2ac3d94fe891-0-0-200-0
X-TM-Deliver-Signature: 8A49E00382A2AA2D967A2786A772B5E2
X-TM-Addin-Auth: R5IOi/pDqqAVg65gh0FlFR2xaV1lHVp8faf0lFZ1rN5Zer5q7PeLxG8r1pu
        0sMKwNZ/xEGe5kuSsll6h4+tUMi1c1H1RnKvLMjGZ0w8v3y/tkx9svkJASeEmkQKBnd4zo8dIEs
        DzJPGq3QgEjNlOjFaqtWMtui2/LOB0EpMAVPsQ+KtRVYgISrVLnx/EMVJuq6FkbEg7NuVgUbvi8
        ALBRk3L5TtuW1T6S8OXaIdoLWTbDo4fSfKwIycDJnxrlLylycFbnqlGbsE9kRZXUm5TE+FIIt7R
        CHRNq4KhHmj0CRQ=.gAHxG/GY+BbIZvt/xoHYcRtWP2oBWhH/QBlvxnoo13JFOmMR1/bnB8madT
        +/NN82fHG/rAGfOGUi0BFqSUxCC6iY6uR8QpRAVWORhwt0JWVKvBpGW6O4P+gMrxIM2Y1lulCDx
        maGZlp3TY7sZ8zylMzWrpSx/p/k4rnanudhPW5pOwL6xfqbnfHaKc6C4Zk7H938zUgCi/zeFdYm
        RfAUIBfBu/C1kwHx8NDqed4bo/ScVfvm+g9jYEiN4TyZVntSnJGGGCjViV0MHgJk6K5+qEoB6yF
        sJEVCbXgexFGLPGGWbG91oNvRviFQF9beGBl1iSgj1NgEMRBubC0WpI6Cog==
X-TM-Addin-ProductCode: EMS
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=opensynergy.com;
        s=TM-DKIM-20210503141657; t=1688145148;
        bh=KJ7jdUAF6nQwrGeh3TA5XMiM4xrWxyEC0N2xmTiFGAg=; l=991;
        h=From:To:Date;
        b=t3mhNt+7SLp07gRdKR5fSDttFdItnUSqNJxsBl1dY3kmyVSMnllDRvtu5mCWRktUe
         8Fbh7XgsvH0JyXKB0sKSs7O6AEiYJBA0pzKyN+8Bvs6pRglvjerRRPL9j6aJvmAnae
         F2B64CK2d+65P/GxAJOjjLLLF6nf7Vk1w2g6x8P3wErQwJEcPKK2d+rBQprSNNWFxi
         CPOauH/E810SF0szXxv6YZIdCKdQvUxnSSWJX5bp5tRgw2aSWIiq5D5oQDFBXWeT6V
         Abk2fUBaxRkSKjXMfY7QOTqcbDdsHaZzdZf+Ig24bP/3skjUziZhd4qR8pa3ECTMJn
         hDpGnkkniAhvw==
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,
        SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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>
---
 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 266d02809dbb..8f35455b6250 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.39.2