Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92d71bc6 authored by Eugene Korenevsky's avatar Eugene Korenevsky Committed by Paolo Bonzini
Browse files

KVM: nVMX: remove unnecessary double caching of MAXPHYADDR 



After speed-up of cpuid_maxphyaddr() it can be called frequently:
instead of heavyweight enumeration of CPUID entries it returns a cached
pre-computed value. It is also inlined now. So caching its result became
unnecessary and can be removed.

Signed-off-by: default avatarEugene Korenevsky <ekorenevsky@gmail.com>
Message-Id: <20150329205644.GA1258@gnote>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9090422f

arch/x86/kvm/vmx.c

+6 −8
Original line number Diff line number Diff line
@@ -8866,9 +8866,9 @@ static int nested_vmx_check_apicv_controls(struct kvm_vcpu *vcpu, 


static int nested_vmx_check_msr_switch(struct kvm_vcpu *vcpu,

				       unsigned long count_field,

				       unsigned long addr_field,

				       int maxphyaddr)

				       unsigned long addr_field)

{

	int maxphyaddr;

	u64 count, addr;



	if (vmcs12_read_any(vcpu, count_field, &count) ||
@@ -8878,6 +8878,7 @@ static int nested_vmx_check_msr_switch(struct kvm_vcpu *vcpu, 
	}

	if (count == 0)

		return 0;

	maxphyaddr = cpuid_maxphyaddr(vcpu);

	if (!IS_ALIGNED(addr, 16) || addr >> maxphyaddr ||

	    (addr + count * sizeof(struct vmx_msr_entry) - 1) >> maxphyaddr) {

		pr_warn_ratelimited(
@@ -8891,19 +8892,16 @@ static int nested_vmx_check_msr_switch(struct kvm_vcpu *vcpu, 
static int nested_vmx_check_msr_switch_controls(struct kvm_vcpu *vcpu,

						struct vmcs12 *vmcs12)

{

	int maxphyaddr;



	if (vmcs12->vm_exit_msr_load_count == 0 &&

	    vmcs12->vm_exit_msr_store_count == 0 &&

	    vmcs12->vm_entry_msr_load_count == 0)

		return 0; /* Fast path */

	maxphyaddr = cpuid_maxphyaddr(vcpu);

	if (nested_vmx_check_msr_switch(vcpu, VM_EXIT_MSR_LOAD_COUNT,

					VM_EXIT_MSR_LOAD_ADDR, maxphyaddr) ||

					VM_EXIT_MSR_LOAD_ADDR) ||

	    nested_vmx_check_msr_switch(vcpu, VM_EXIT_MSR_STORE_COUNT,

					VM_EXIT_MSR_STORE_ADDR, maxphyaddr) ||

					VM_EXIT_MSR_STORE_ADDR) ||

	    nested_vmx_check_msr_switch(vcpu, VM_ENTRY_MSR_LOAD_COUNT,

					VM_ENTRY_MSR_LOAD_ADDR, maxphyaddr))

					VM_ENTRY_MSR_LOAD_ADDR))

		return -EINVAL;

	return 0;

}