Received-SPF: pass (google.com: domain of linux-kernel+bounces-3114-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
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 3/7] timekeeping: Fix cross-timestamp interpolation for non-x86
Date: Mon, 18 Dec 2023 08:38:41 +0100
Message-Id: <20231218073849.35294-4-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.7557
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 2447cebd-93e8-4ef9-8df7-08dbff9ca43a
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:
	VI1EUR05FT064.eop-eur05.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: FR3P281MB2203
X-TM-AS-ERS: 104.47.11.168-0.0.0.0
X-TMASE-Version: StarCloud-1.3-9.1.1015-28064.005
X-TMASE-Result: 10--4.970100-4.000000
X-TMASE-MatchedRID: t1u9etd7zexeKR/wKUhyN50UyaWO1QCnDNB/jaV2d3ufOd3yw6VkrA9M
	5f/N3N4Qthzaop7IM7sxRT5xs1+q/LIfFXYUihhJ9uL5hOvaG1KVmuhG06IIbTji23k3pyJLKLe
	iMOXj8x3VCWoGLJ7oTkLgBLH/nEyhKI9YY0txdTpSU7TOghylToHV87ajhAZw5LGd87xcOHdwLp
	z8B01lud9cNTZyIRQywqMZFCdDzWHPE8gn5ga5qlvIId8M26gTcEVHZ4vVAlhmrG+H0FSHunGDu
	y8y1qkuSOzJLIeTZAaj45JdBik2YvV6Jv37/R3WO5nVDm0S/sD25GFUd8k/Fw==
X-TMASE-XGENCLOUD: 96cd9daa-7b3c-4ac2-801a-e6e48ee1ddd3-0-0-200-0
X-TM-Deliver-Signature: 928184199E900A744B7BBEB1C3B61368
X-TM-Addin-Auth: D+SUBOckl6OjIKaLJA0rQHc0X50yKi5HY80Iici+0iapvjj18OcDxWHQv8R
	IqRKegDLglAreiv1SAHJOupQtQuWZhPbmRqZx+y/Yl0ci7oXrhmcCbkvivbxXgzpZ3kGYIIf/OF
	LHsCCQCiFhthJQSlN41U9EIy8fIX5PTapcAxBByfBfYnvJfSwIOwY1xaix7rzRoi3Vue920ygwy
	9kE8aE47mAaQQJ1fT/JEh1XdAjxKVe3qDmShFY/1K+FFLQaoqL3XYG/bkt7FvJDi++dRBZIz0CX
	/4Le3U7PHYvWtgM=.gnmt3d8QzuNc/gGm2gBBuJmGrq4UyAqlTuplSuT9ETxP9cYxRF9rDLPvKS
	l/MjrSnT+M6+5rCHEqTgqTorWOMRXpQmuwMAXkUKP2kjQ2RQKYVdSxFgwPi/EW1DfWpcdd305CD
	HaT51J47yR0hasdTHELwRtTmE+ksAdnqaZtfmJijOmj6/iO8a9EFUgaxIa1B3t7Z4rlOEeflTbL
	OeR+0Z9qOX1EAm9VgyNColBcZqQn3PbHRbMnIJb3FG228g5z9uydBHP/5mXILkm3oN3nQNSVWMd
	9wAyvZKa7aIR0yC0MODzB++u69tsKZUFUUj7CIyEd/iYZKdNNZ4K8tDtnBg==
X-TM-Addin-ProductCode: EMS
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=opensynergy.com;
	s=TM-DKIM-20210503141657; t=1702885245;
	bh=4Y3l9rtDRj9fZtWY1TyW5Z1YIMRN5Dq13DtOFcxl4/E=; l=2127;
	h=From:To:Date;
	b=I5mFNRgUgKybw+zW7adHWb3URb4DQrNLOfpi9NS75s9xOFBpA0vjvxocmAR7ubbiB
	 y4tcRZL8zHyHirIv2C440HJtQ26Pt3ZnugoEvtMDiPVyj/IedB2sjiJs+pBufYQOXJ
	 tFPza2l8xegk1vL8vPv4ff8PtFYkX1pddqhY1b4bUJISviNEiyNp7TfV0TZWvc8nm6
	 zSoPjLsyOIxNv3m4EZQSkr/A+85vBGKII+JGccCVSELgXHZfgUOD0ZXK6ppZjJXX9B
	 +YGYtLR/zXZ114tyUmv8rd9aHYkGS98VB8DV/GPUIutQ9kqXFNTr093JU46UJB2YBO
	 QU9tVVMkMjj0w==

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>
Acked-by: John Stultz <jstultz@google.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 24ffd681aa23..b58dffc58a8f 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1262,10 +1262,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.40.1