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

KVM: x86: Refactor kvm_cpuid() param that controls out-of-range logic 



Invert and rename the kvm_cpuid() param that controls out-of-range logic
to better reflect the semantics of the affected callers, i.e. callers
that bypass the out-of-range logic do so because they are looking up an
exact guest CPUID entry, e.g. to query the maxphyaddr.

Similarly, rename kvm_cpuid()'s internal "found" to "exact" to clarify
that it tracks whether or not the exact requested leaf was found, as
opposed to any usable leaf being found.

No functional change intended.

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

arch/x86/kvm/cpuid.c

+7 −7
Original line number Diff line number Diff line
@@ -986,16 +986,16 @@ get_out_of_range_cpuid_entry(struct kvm_vcpu *vcpu, u32 *fn_ptr, u32 index) 
}



bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx,

	       u32 *ecx, u32 *edx, bool check_limit)

	       u32 *ecx, u32 *edx, bool exact_only)

{

	u32 orig_function = *eax, function = *eax, index = *ecx;

	struct kvm_cpuid_entry2 *entry;

	bool found;

	bool exact;



	entry = kvm_find_cpuid_entry(vcpu, function, index);

	found = entry;

	exact = !!entry;



	if (!entry && check_limit)

	if (!entry && !exact_only)

		entry = get_out_of_range_cpuid_entry(vcpu, &function, index);



	if (entry) {
@@ -1026,8 +1026,8 @@ bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx, 
			}

		}

	}

	trace_kvm_cpuid(orig_function, *eax, *ebx, *ecx, *edx, found);

	return found;

	trace_kvm_cpuid(orig_function, *eax, *ebx, *ecx, *edx, exact);

	return exact;

}

EXPORT_SYMBOL_GPL(kvm_cpuid);
@@ -1040,7 +1040,7 @@ int kvm_emulate_cpuid(struct kvm_vcpu *vcpu) 


	eax = kvm_rax_read(vcpu);

	ecx = kvm_rcx_read(vcpu);

	kvm_cpuid(vcpu, &eax, &ebx, &ecx, &edx, true);

	kvm_cpuid(vcpu, &eax, &ebx, &ecx, &edx, false);

	kvm_rax_write(vcpu, eax);

	kvm_rbx_write(vcpu, ebx);

	kvm_rcx_write(vcpu, ecx);

arch/x86/kvm/cpuid.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu, 
			      struct kvm_cpuid2 *cpuid,

			      struct kvm_cpuid_entry2 __user *entries);

bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx,

	       u32 *ecx, u32 *edx, bool check_limit);

	       u32 *ecx, u32 *edx, bool exact_only);



int cpuid_query_maxphyaddr(struct kvm_vcpu *vcpu);

arch/x86/kvm/emulate.c

+4 −4
Original line number Diff line number Diff line
@@ -2722,7 +2722,7 @@ static bool vendor_intel(struct x86_emulate_ctxt *ctxt) 
	u32 eax, ebx, ecx, edx;



	eax = ecx = 0;

	ctxt->ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx, false);

	ctxt->ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx, true);

	return is_guest_vendor_intel(ebx, ecx, edx);

}
@@ -2740,7 +2740,7 @@ static bool em_syscall_is_enabled(struct x86_emulate_ctxt *ctxt) 


	eax = 0x00000000;

	ecx = 0x00000000;

	ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx, false);

	ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx, true);

	/*

	 * remark: Intel CPUs only support "syscall" in 64bit longmode. Also a

	 * 64bit guest with a 32bit compat-app running will #UD !! While this
@@ -3971,7 +3971,7 @@ static int em_cpuid(struct x86_emulate_ctxt *ctxt) 


	eax = reg_read(ctxt, VCPU_REGS_RAX);

	ecx = reg_read(ctxt, VCPU_REGS_RCX);

	ctxt->ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx, true);

	ctxt->ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx, false);

	*reg_write(ctxt, VCPU_REGS_RAX) = eax;

	*reg_write(ctxt, VCPU_REGS_RBX) = ebx;

	*reg_write(ctxt, VCPU_REGS_RCX) = ecx;
@@ -4241,7 +4241,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt) 
			eax = 0x80000008;

			ecx = 0;

			if (ctxt->ops->get_cpuid(ctxt, &eax, &ebx, &ecx,

						 &edx, false))

						 &edx, true))

				maxphyaddr = eax & 0xff;

			else

				maxphyaddr = 36;

arch/x86/kvm/kvm_emulate.h

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ struct x86_emulate_ops { 
			 enum x86_intercept_stage stage);



	bool (*get_cpuid)(struct x86_emulate_ctxt *ctxt, u32 *eax, u32 *ebx,

			  u32 *ecx, u32 *edx, bool check_limit);

			  u32 *ecx, u32 *edx, bool exact_only);

	bool (*guest_has_long_mode)(struct x86_emulate_ctxt *ctxt);

	bool (*guest_has_movbe)(struct x86_emulate_ctxt *ctxt);

	bool (*guest_has_fxsr)(struct x86_emulate_ctxt *ctxt);

arch/x86/kvm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -2193,7 +2193,7 @@ static void svm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) 
	}

	init_vmcb(svm);



	kvm_cpuid(vcpu, &eax, &dummy, &dummy, &dummy, true);

	kvm_cpuid(vcpu, &eax, &dummy, &dummy, &dummy, false);

	kvm_rdx_write(vcpu, eax);



	if (kvm_vcpu_apicv_active(vcpu) && !init_event)

CRA Git | Maintained and supported by SUSTech CRA and CCSE