x86/time: do not kill calibration timer on suspend
PATCH 1/1 x86/time: do not kill calibration timer on suspend
A killed timer will ignore further set_timer() calls, and hence won't be re-armed unless it's initialized again. Use stop_timer() instead of kill_timer() in time_suspend(), so that the set_timer() call in time_resume() successfully re-arms the timer. Otherwise time calibration is no longer scheduled (and executed) after resuming from S3 suspend.
--- xen/arch/x86/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
xen/arch/x86/time.c +1 -1
@@ -2728,7 +2728,7 @@ int time_suspend(void) { cmos_utc_offset = -get_wallclock_time (); cmos_utc_offset +=get_sec (); -kill_timer (&calibration_timer); +stop_timer (&calibration_timer);/* Sync platform timer stamps. */ platform_time_calibration ();
Signature · 1 line
2.53.0
Quoted 18 lines · Roger Pau Monne
A killed timer will ignore further
set_timer()calls, and hence won't be re-armed unless it's initialized again. Usestop_timer()instead ofkill_timer()intime_suspend(), so that theset_timer()call intime_resume()successfully re-arms the timer. Otherwise time calibration is no longer scheduled (and executed) after resuming from S3 suspend.Fixes 6d90db1a2ca1 ("x86: rendezvous-based local time calibration")Reported-by Marek Marczykowski-Górecki <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>--- xen/arch/x86/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)xen/arch/x86/time.c +0
-0
xen/arch/x86/time.c int time_suspend(void) · line 2734
Quoted 8 lines
xen/arch/x86/time.c +1
-1@@ -2728,7 +2728,7 @@ int time_suspend(void) { cmos_utc_offset = -get_wallclock_time (); cmos_utc_offset +=get_sec (); -kill_timer (&calibration_timer); +stop_timer (&calibration_timer);/* Sync platform timer stamps. */ platform_time_calibration ();
This should definitely be stop timer and not kill timer.
However, the fact it "stops" drift after S3 really does concern me. There's clearly a different issue here which this is covering over.
The systems which we've been testing on all have ITSC so the TSC doesn't drift. Whether there's a step or not is a different question (I'd expect firmware to arrange to avoid a step being seen), but a step would not explain our symptoms.
Given it's only once a second, can we dump the scale/offset which the rendezvous produced each time?
This feels suspiciously like we've gauged the frequency too fast, and are relying on micro-fixes every second to keep time looking normal. (This is pure speculation; I don't any evidence).
~Andrew
Quoted 9 lines · Roger Pau Monne
A killed timer will ignore further
set_timer()calls, and hence won't be re-armed unless it's initialized again. Usestop_timer()instead ofkill_timer()intime_suspend(), so that theset_timer()call intime_resume()successfully re-arms the timer. Otherwise time calibration is no longer scheduled (and executed) after resuming from S3 suspend.Fixes 6d90db1a2ca1 ("x86: rendezvous-based local time calibration")Reported-by Marek Marczykowski-Górecki <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>
I confirm this fixes the issue, thanks!
Signature · 3 lines
Best Regards, Marek Marczykowski-Górecki Invisible Things Lab