From: Igor Druzhinin Date: Fri, 17 Jan 2020 15:11:20 +0000 (+0100) Subject: x86/time: update TSC stamp on restore from deep C-state X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~876 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bbf283f853f8c0e4d29248dd44d3b0e0abc07629;p=xen.git x86/time: update TSC stamp on restore from deep C-state If ITSC is not available on CPU (e.g if running nested as PV shim) then X86_FEATURE_NONSTOP_TSC is not advertised in certain cases, i.e. all AMD and some old Intel processors. In which case TSC would need to be restored on CPU from platform time by Xen upon exiting C-states. As platform time might be behind the last TSC stamp recorded for the current CPU, invariant of TSC stamp being always behind local TSC counter is violated. This has an effect of get_s_time() going negative resulting in eventual system hang or crash. Fix this issue by updating local TSC stamp along with TSC counter write. Signed-off-by: Igor Druzhinin Reviewed-by: Roger Pau Monné Acked-by: Jan Beulich --- diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index e79cb4d019..f6b26f8883 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -955,10 +955,16 @@ u64 stime2tsc(s_time_t stime) void cstate_restore_tsc(void) { + struct cpu_time *t = &this_cpu(cpu_time); + if ( boot_cpu_has(X86_FEATURE_NONSTOP_TSC) ) return; - write_tsc(stime2tsc(read_platform_stime(NULL))); + t->stamp.master_stime = read_platform_stime(NULL); + t->stamp.local_tsc = stime2tsc(t->stamp.master_stime); + t->stamp.local_stime = t->stamp.master_stime; + + write_tsc(t->stamp.local_tsc); } /***************************************************************************