Commit a49700b6 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: nVMX: Don't speculatively write APIC-access page address 



If nested_get_vmcs12_pages() fails to map L1's APIC_ACCESS_ADDR into
L2, then it disables SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES in vmcs02.
In other words, the APIC_ACCESS_ADDR in vmcs02 is guaranteed to be
written with the correct value before being consumed by hardware, drop
the unneessary VMWRITE.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ca2f5466

arch/x86/kvm/vmx/nested.c

+0 −8
Original line number Diff line number Diff line
@@ -2083,14 +2083,6 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12) 
			vmcs_write16(GUEST_INTR_STATUS,

				vmcs12->guest_intr_status);



		/*

		 * Write an illegal value to APIC_ACCESS_ADDR. Later,

		 * nested_get_vmcs12_pages will either fix it up or

		 * remove the VM execution control.

		 */

		if (exec_control & SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES)

			vmcs_write64(APIC_ACCESS_ADDR, -1ull);



		vmcs_write32(SECONDARY_VM_EXEC_CONTROL, exec_control);

	}