]> www.infradead.org Git - users/jedix/linux-maple.git/commit
xen/x86: Do not call xen_init_time_ops() until shared_info is initialized
authorBoris Ostrovsky <boris.ostrovsky@oracle.com>
Wed, 3 May 2017 20:20:51 +0000 (16:20 -0400)
committerChuck Anderson <chuck.anderson@oracle.com>
Wed, 13 Sep 2017 04:38:00 +0000 (21:38 -0700)
commitae89ba3f3a3b0b68aa29c6c09361d32526b01fc7
tree813939ef3c43101c0a92666a9d74cd5966865ec6
parent6e8f20b9d82dabb4bd4adf93258bf609412bb225
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>
OraBug: 26662731

(cherry picked from commit d162809f85b4f54ef075517ffa2f3d02e55d5a53)
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
Conflicts:
arch/x86/xen/enlighten_pv.c
(No enlighten_pv.c in our tree. Note also that
         we don't have dd759d93f4dd. Still, this fixes a
         latent bug).
arch/x86/xen/enlighten.c
arch/x86/xen/time.c