diff options
| author | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2017-05-03 22:20:51 +0200 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2017-05-05 10:43:15 +0200 |
| commit | d162809f85b4f54ef075517ffa2f3d02e55d5a53 (patch) | |
| tree | 3305107f1087882cb77f1db1c713cdfe24a44154 /arch/x86/xen/enlighten_pv.c | |
| parent | x86/xen: fix xsave capability setting (diff) | |
| download | linux-d162809f85b4f54ef075517ffa2f3d02e55d5a53.tar.xz linux-d162809f85b4f54ef075517ffa2f3d02e55d5a53.zip | |
xen/x86: Do not call xen_init_time_ops() until shared_info is initialized
Routines that are set by xen_init_time_ops() use shared_info's
pvclock_vcpu_time_info area. This area is not properly available until
shared_info is mapped in xen_setup_shared_info().
This became especially problematic due to commit dd759d93f4dd ("x86/timers:
Add simple udelay calibration") where we end up reading tsc_to_system_mul
from xen_dummy_shared_info (i.e. getting zero value) and then trying
to divide by it in pvclock_tsc_khz().
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch/x86/xen/enlighten_pv.c')
| -rw-r--r-- | arch/x86/xen/enlighten_pv.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index a1af4f68278f..b5c54ab0e195 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -974,6 +974,13 @@ void xen_setup_shared_info(void) #endif xen_setup_mfn_list_list(); + + /* + * Now that shared info is set up we can start using routines that + * point to pvclock area. + */ + if (system_state == SYSTEM_BOOTING) + xen_init_time_ops(); } /* This is called once we have the cpu_possible_mask */ @@ -1272,8 +1279,6 @@ asmlinkage __visible void __init xen_start_kernel(void) x86_init.oem.arch_setup = xen_arch_setup; x86_init.oem.banner = xen_banner; - xen_init_time_ops(); - /* * Set up some pagetable state before starting to set any ptes. */ |