From: Andrew Cooper Date: Wed, 19 Jul 2017 09:28:03 +0000 (+0100) Subject: x86/vvmx: Fix handing of the MSR_BITMAP field with VMCS shadowing X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1766 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=930f7879248edc05d9cb812e692eee6eb3b70eac;p=xen.git x86/vvmx: Fix handing of the MSR_BITMAP field with VMCS shadowing Currently, the following sequence of actions: * VMPTRLD (creates a mapping, likely pointing at gfn 0 for an empty vmcs) * VMWRITE CPU_BASED_VM_EXEC_CONTROL (completed by hardware) * VMWRITE MSR_BITMAP (completed by hardware) * VMLAUNCH results in an L2 guest running with ACTIVATE_MSR_BITMAP set, but Xen using a stale mapping (likely gfn 0) when reading the interception bitmap. The MSR_BITMAP field needs unconditionally intercepting even with VMCS shadowing, so Xen's mapping of the bitmap can be updated. Signed-off-by: Andrew Cooper Reviewed-by: Sergey Dyasli Acked-by: Kevin Tian --- diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 0d08789659..f84478e54e 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -98,13 +98,15 @@ int nvmx_vcpu_initialise(struct vcpu *v) clear_page(vw); /* - * For the following 4 encodings, we need to handle them in VMM. + * For the following 6 encodings, we need to handle them in VMM. * Let them vmexit as usual. */ set_bit(IO_BITMAP_A, vw); set_bit(VMCS_HIGH(IO_BITMAP_A), vw); set_bit(IO_BITMAP_B, vw); set_bit(VMCS_HIGH(IO_BITMAP_B), vw); + set_bit(MSR_BITMAP, vw); + set_bit(VMCS_HIGH(MSR_BITMAP), vw); unmap_domain_page(vw); }