leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

selftests: kvm/x86: Introduce is_amd_cpu()

Browse Source 
Replace the one ad hoc "AuthenticAMD" CPUID vendor string comparison
with a new function, is_amd_cpu().

Signed-off-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220115052431.447232-4-jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Jim Mattson
2022-01-14 21:24:28 -08:00
committed by Paolo Bonzini
parent b33b9c4078
commit 21066101f4
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/testing/selftests/kvm/include/x86_64/processor.h
View File

@@ -364,6 +364,7 @@ static inline unsigned long get_xmm(int n)
} }
bool is_intel_cpu(void); bool is_intel_cpu(void);
bool is_amd_cpu(void);
struct kvm_x86_state *vcpu_save_state(struct kvm_vm *vm, uint32_t vcpuid); struct kvm_x86_state *vcpu_save_state(struct kvm_vm *vm, uint32_t vcpuid);
void vcpu_load_state(struct kvm_vm *vm, uint32_t vcpuid, void vcpu_load_state(struct kvm_vm *vm, uint32_t vcpuid,

18
tools/testing/selftests/kvm/lib/x86_64/processor.c
View File

@@ -1273,6 +1273,14 @@ bool is_intel_cpu(void)
return cpu_vendor_string_is("GenuineIntel"); return cpu_vendor_string_is("GenuineIntel");
} }
/*
* Exclude early K5 samples with a vendor string of "AMDisbetter!"
*/
bool is_amd_cpu(void)
{
return cpu_vendor_string_is("AuthenticAMD");
}
uint32_t kvm_get_cpuid_max_basic(void) uint32_t kvm_get_cpuid_max_basic(void)
{ {
return kvm_get_supported_cpuid_entry(0)->eax; return kvm_get_supported_cpuid_entry(0)->eax;
@@ -1508,10 +1516,6 @@ struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vm *vm, uint32_t vcpui
return cpuid; return cpuid;
} }
#define X86EMUL_CPUID_VENDOR_AuthenticAMD_ebx 0x68747541
#define X86EMUL_CPUID_VENDOR_AuthenticAMD_ecx 0x444d4163
#define X86EMUL_CPUID_VENDOR_AuthenticAMD_edx 0x69746e65
static inline unsigned x86_family(unsigned int eax) static inline unsigned x86_family(unsigned int eax)
{ {
unsigned int x86; unsigned int x86;
@@ -1533,11 +1537,7 @@ unsigned long vm_compute_max_gfn(struct kvm_vm *vm)
max_gfn = (1ULL << (vm->pa_bits - vm->page_shift)) - 1; max_gfn = (1ULL << (vm->pa_bits - vm->page_shift)) - 1;
/* Avoid reserved HyperTransport region on AMD processors. */ /* Avoid reserved HyperTransport region on AMD processors. */
eax = ecx = 0; if (!is_amd_cpu())
cpuid(&eax, &ebx, &ecx, &edx);
if (ebx != X86EMUL_CPUID_VENDOR_AuthenticAMD_ebx ||
ecx != X86EMUL_CPUID_VENDOR_AuthenticAMD_ecx ||
edx != X86EMUL_CPUID_VENDOR_AuthenticAMD_edx)
return max_gfn; return max_gfn;
/* On parts with <40 physical address bits, the area is fully hidden */ /* On parts with <40 physical address bits, the area is fully hidden */