KVM: VMX: Don't reload APIC access page if its control is disabled (4de1f9d4) · Commits · 戴 / test

Don't reload the APIC access page if its control is disabled, e.g. if the guest is running with x2APIC (likely) or with the local APIC disabled (unlikely), to avoid unnecessary TLB flushes and VMWRITEs. Unconditionally reload the APIC access page and flush the TLB when the guest's virtual APIC transitions to "xAPIC enabled", as any changes to the APIC access page's mapping will not be recorded while the guest's virtual APIC is disabled. Signed-off-by:

Sean Christopherson <sean.j.christopherson@intel.com> Message-Id: <20200320212833.3507-30-sean.j.christopherson@intel.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/vmx/vmx.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -6126,7 +6126,15 @@ void vmx_set_virtual_apic_mode(struct kvm_vcpu *vcpu)
		if (flexpriority_enabled) {
		sec_exec_control \|=
		SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES;
		vmx_flush_tlb_current(vcpu);
		kvm_make_request(KVM_REQ_APIC_PAGE_RELOAD, vcpu);

		/*
		* Flush the TLB, reloading the APIC access page will
		* only do so if its physical address has changed, but
		* the guest may have inserted a non-APIC mapping into
		* the TLB while the APIC access page was disabled.
		*/
		kvm_make_request(KVM_REQ_TLB_FLUSH_CURRENT, vcpu);
		}
		break;
		case LAPIC_MODE_X2APIC:
		@@ -6150,6 +6158,10 @@ static void vmx_set_apic_access_page_addr(struct kvm_vcpu *vcpu)
		return;
		}

		if (!(secondary_exec_controls_get(to_vmx(vcpu)) &
		SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES))
		return;

		page = gfn_to_page(vcpu->kvm, APIC_DEFAULT_PHYS_BASE >> PAGE_SHIFT);
		if (is_error_page(page))
		return;

Admin message