mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
x86/vvmx: don't enable vmcs shadowing for nested guests
Running "./xtf_runner vvmx" in L1 Xen under L0 Xen produces the
following result on H/W with VMCS shadowing:
Test: vmxon
Failure in test_vmxon_in_root_cpl0()
Expected 0x8200000f: VMfailValid(15) VMXON_IN_ROOT
Got 0x82004400: VMfailValid(17408) <unknown>
Test result: FAILURE
This happens because SDM allows vmentries with enabled VMCS shadowing
VM-execution control and VMCS link pointer value of ~0ull. But results
of a nested VMREAD are undefined in such cases.
Fix this by not copying the value of VMCS shadowing control from vmcs01
to vmcs02.
Signed-off-by: Sergey Dyasli <sergey.dyasli@citrix.com>
Acked-by: Kevin Tian <kevin.tian@intel.com>
This commit is contained in:
1 parent
26f9a18485
commit
19fdb8e258
1 file changed
+1
@@ -633,6 +633,7 @@ void nvmx_update_secondary_exec_control(struct vcpu *v,
|
||||
SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY;
|
||||
|
||||
host_cntrl &= ~apicv_bit;
|
||||
host_cntrl &= ~SECONDARY_EXEC_ENABLE_VMCS_SHADOWING;
|
||||
shadow_cntrl = get_vvmcs(v, SECONDARY_VM_EXEC_CONTROL);
|
||||
|
||||
/* No vAPIC-v support, so it shouldn't be set in vmcs12. */
|
||||
|
||||