Commit 40854713 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: selftests: Add kvm_cpu_*() support for X86_PROPERTY_* 



Extent X86_PROPERTY_* support to KVM, i.e. add kvm_cpu_property() and
kvm_cpu_has_p(), and use the new helpers in kvm_get_cpu_address_width().

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20221006005125.680782-7-seanjc@google.com
parent a29e6e38

tools/testing/selftests/kvm/include/x86_64/processor.h

+29 −5
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ struct kvm_x86_cpu_property { 


#define X86_PROPERTY_MAX_EXT_LEAF		KVM_X86_CPU_PROPERTY(0x80000000, 0, EAX, 0, 31)

#define X86_PROPERTY_MAX_PHY_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 0, 7)

#define X86_PROPERTY_MAX_VIRT_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 8, 15)

#define X86_PROPERTY_PHYS_ADDR_REDUCTION	KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 6, 11)



#define X86_PROPERTY_MAX_CENTAUR_LEAF		KVM_X86_CPU_PROPERTY(0xC0000000, 0, EAX, 0, 31)
@@ -703,6 +704,34 @@ static inline bool kvm_cpu_has(struct kvm_x86_cpu_feature feature) 
	return kvm_cpuid_has(kvm_get_supported_cpuid(), feature);

}



uint32_t kvm_cpuid_property(const struct kvm_cpuid2 *cpuid,

			    struct kvm_x86_cpu_property property);



static inline uint32_t kvm_cpu_property(struct kvm_x86_cpu_property property)

{

	return kvm_cpuid_property(kvm_get_supported_cpuid(), property);

}



static __always_inline bool kvm_cpu_has_p(struct kvm_x86_cpu_property property)

{

	uint32_t max_leaf;



	switch (property.function & 0xc0000000) {

	case 0:

		max_leaf = kvm_cpu_property(X86_PROPERTY_MAX_BASIC_LEAF);

		break;

	case 0x40000000:

		max_leaf = kvm_cpu_property(X86_PROPERTY_MAX_KVM_LEAF);

		break;

	case 0x80000000:

		max_leaf = kvm_cpu_property(X86_PROPERTY_MAX_EXT_LEAF);

		break;

	case 0xc0000000:

		max_leaf = kvm_cpu_property(X86_PROPERTY_MAX_CENTAUR_LEAF);

	}

	return max_leaf >= property.function;

}



static inline size_t kvm_cpuid2_size(int nr_entries)

{

	return sizeof(struct kvm_cpuid2) +
@@ -815,11 +844,6 @@ static inline uint32_t kvm_get_cpuid_max_basic(void) 
	return kvm_get_supported_cpuid_entry(0)->eax;

}



static inline uint32_t kvm_get_cpuid_max_extended(void)

{

	return kvm_get_supported_cpuid_entry(0x80000000)->eax;

}



void kvm_get_cpu_address_width(unsigned int *pa_bits, unsigned int *va_bits);

bool vm_is_unrestricted_guest(struct kvm_vm *vm);

tools/testing/selftests/kvm/lib/x86_64/processor.c

+10 −7
Original line number Diff line number Diff line
@@ -681,6 +681,13 @@ bool kvm_cpuid_has(const struct kvm_cpuid2 *cpuid, 
			     feature.reg, feature.bit, feature.bit);

}



uint32_t kvm_cpuid_property(const struct kvm_cpuid2 *cpuid,

			    struct kvm_x86_cpu_property property)

{

	return __kvm_cpu_has(cpuid, property.function, property.index,

			     property.reg, property.lo_bit, property.hi_bit);

}



uint64_t kvm_get_feature_msr(uint64_t msr_index)

{

	struct {
@@ -1018,16 +1025,12 @@ bool is_amd_cpu(void) 


void kvm_get_cpu_address_width(unsigned int *pa_bits, unsigned int *va_bits)

{

	const struct kvm_cpuid_entry2 *entry;



	/* SDM 4.1.4 */

	if (kvm_get_cpuid_max_extended() < 0x80000008) {

	if (!kvm_cpu_has_p(X86_PROPERTY_MAX_PHY_ADDR)) {

		*pa_bits == kvm_cpu_has(X86_FEATURE_PAE) ? 36 : 32;

		*va_bits = 32;

	} else {

		entry = kvm_get_supported_cpuid_entry(0x80000008);

		*pa_bits = entry->eax & 0xff;

		*va_bits = (entry->eax >> 8) & 0xff;

		*pa_bits = kvm_cpu_property(X86_PROPERTY_MAX_PHY_ADDR);

		*va_bits = kvm_cpu_property(X86_PROPERTY_MAX_VIRT_ADDR);

	}

}