Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
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 v2 3/6] timekeeping: Fix cross-timestamp interpolation for non-x86
Date:   Fri, 18 Aug 2023 03:20:09 +0200
Message-Id: <20230818012014.212155-4-peter.hilber@opensynergy.com>
In-Reply-To: <20230818012014.212155-1-peter.hilber@opensynergy.com>
References: <20230818012014.212155-1-peter.hilber@opensynergy.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2023 01:20:25.5680
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: a31d7ae5-7591-4dc8-b0e3-08db9f894d26
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: DB8EUR05FT061.eop-eur05.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: FR3P281MB1888
X-TM-AS-ERS: 104.47.7.170-0.0.0.0
X-TMASE-Version: StarCloud-1.3-9.1.1011-27820.003
X-TMASE-Result: 10--4.470100-4.000000
X-TMASE-MatchedRID: HRakA6U45i9eKR/wKUhyN50UyaWO1QCnDNB/jaV2d3ufOd3yw6VkrA9M
        5f/N3N4Qthzaop7IM7sxRT5xs1+q/LIfFXYUihhJ9uL5hOvaG1KVmuhG06IIbTji23k3pyJLKLe
        iMOXj8x0HZRiBZseHrIiu7wRb1ji7rddi2w4fb9BFg2HO5lmNEA2LmwHT7i+ne+Z7fwZVhv9PQF
        Fk0j5jBsA2iDfbpfy+AVpeDm8nJoLwnQHFZbUP3moEkqixPwVYOfEmq6feyfNuRXh7bFKB7qQ26
        IlKH7c99wtnettYUaDtgUD0+uDQG1nQn7qOr8tPNkUSDDq742k=
X-TMASE-XGENCLOUD: e2ac47e1-4214-4fde-b2d0-063730e78a74-0-0-200-0
X-TM-Deliver-Signature: A7B208B6AAAB52DBD0A04F13F3AC00D0
X-TM-Addin-Auth: CXU7HUe1WK1YFSwPgWyLeJJsk3RoZcyP2ZBBlU7eRkCSvHtln92GVzdlCGq
        BkfYniX47G2+5yM0uRroQOZgyOyuXoW4AJ4T0tDBm8Eu13f/h8AQIG1kdVVtIk4SqVppmQeQpkN
        Nz1INeJ8YxxY5EBb489ry4ab//WOPuZl5m6W/lBREZq4ntik3HScDiRR8lLqF+uOgDT/z3NpBWw
        4SwWijz2tMgYpnxGAxidiEB0uMOEf85BD9DpeV99Qg9OYEbtGZgnvEFXcHEvWT91sQhh92i1fW6
        cuWIAoGusDe0d14=.QrafzPfSytMbMiZ+kwA4Gl5AookW0vjOzWqbTwaya8cMHCedNT3zgzgl3m
        wQmgzEvhCiSluZhSJ11AyKVAhJuABfGIHPblySJZFfu00z9Z/gNK9PNzfoVACYBBhJEi8pf6ib/
        YBcjmPzmZyCUXHqx9Z59tcP+ZFH4cQKtEgJSkGyfxOeUl6jSAg/Y4U43BY0hZWm+gTbVlOR3r9d
        iiuqK2k6hQadGPRenr0kLHjh1GnCiDbsPJl0cWbgeZVAr+leES8N0ihCkWDfEHJx1E/2efjfDF6
        QOOuqacxjmYaxYpiyLcLTwFul3Bevf3LBaOl0xtOksL2/GalYI7GvvuL8BA==
X-TM-Addin-ProductCode: EMS
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=opensynergy.com;
        s=TM-DKIM-20210503141657; t=1692321627;
        bh=Be7mQghh9edYjnOuv6vxfkJN9HfA94k/Ssk/X4OjkkI=; l=2083;
        h=From:To:Date;
        b=ZQ4SWX6JjSnpWr4cLSqK90fLLDqcw5P3Bz+b7sMNqME4bcPdvR+spcW3tfIBP8oks
         bOHHctV+EN0Co+w0B9U8+VBWXpsgbx70Ldd9pexV5KkEEaJWFwWQBw8sESt+9tn4gp
         SSm0u6MOcyh5GUrkQIL3QS8OZD9NYFjI0kI7G1G7Y7R9/C9LnZWS+pyyj1BHkYF98s
         oWV4um5UuyNkDzungFlqwIetaGZovb6DQZkzUyclA2YlQBrhzskj8A5hB7oCkfrBD2
         temt6/6FDhnB0IH2irjKk1wU6BkQg5cI+H7Ft3/m+WNwomVP2lCVQ+QmjZ4vd6Rvs2
         DFpo7TJssiPXw==
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H4,
        RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,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

So far, get_device_system_crosststamp() unconditionally passes
system_counterval.cycles to timekeeping_cycles_to_ns(). But when
interpolating system time (do_interp == true), system_counterval.cycles is
before tkr_mono.cycle_last, contrary to the timekeeping_cycles_to_ns()
expectations.

On x86, CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE will mitigate on
interpolating, setting delta to 0. With delta == 0, xtstamp->sys_monoraw
and xtstamp->sys_realtime are then set to the last update time, as
implicitly expected by adjust_historical_crosststamp(). On other
architectures, the resulting nonsense xtstamp->sys_monoraw and
xtstamp->sys_realtime corrupt the xtstamp (ts) adjustment in
adjust_historical_crosststamp().

Fix this by deriving xtstamp->sys_monoraw and xtstamp->sys_realtime from
the last update time when interpolating, by using the local variable
"cycles". The local variable already has the right value when
interpolating, unlike system_counterval.cycles.

Fixes: 2c756feb18d9 ("time: Add history to cross timestamp interface supporting slower devices")
Signed-off-by: Peter Hilber <peter.hilber@opensynergy.com>
---

Notes:
    v2:
    
    - simplify fix (John Stultz)

 kernel/time/timekeeping.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 70ecd44fdd9e..c145601ea062 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1261,10 +1261,8 @@ int get_device_system_crosststamp(int (*get_time_fn)
 				      tk_core.timekeeper.offs_real);
 		base_raw = tk->tkr_raw.base;
 
-		nsec_real = timekeeping_cycles_to_ns(&tk->tkr_mono,
-						     system_counterval.cycles);
-		nsec_raw = timekeeping_cycles_to_ns(&tk->tkr_raw,
-						    system_counterval.cycles);
+		nsec_real = timekeeping_cycles_to_ns(&tk->tkr_mono, cycles);
+		nsec_raw = timekeeping_cycles_to_ns(&tk->tkr_raw, cycles);
 	} while (read_seqcount_retry(&tk_core.seq, seq));
 
 	xtstamp->sys_realtime = ktime_add_ns(base_real, nsec_real);
-- 
2.39.2