KVM: x86: Partially allow KVM_SET_CPUID{,2} after KVM_RUN for CPU hotplug
v4 cover KVM: x86: Partially allow KVM_SET_CPUID{,2} after KVM_RUN for CPU hotplug
Changes since v3:
- Use memcmp() [Sean].
- Update the comment in kvm_set_cpuid() making (hopefully) it more clear that the introduced check does not cover all potentially problemmatic scenarios [Sean].
- Add "KVM: x86: Move CPUID.(EAX=0x12,ECX=1) mangling to __kvm_update_cpuid_runtime()" patch.
Original description:
Recently, KVM made it illegal to change CPUID after KVM_RUN but unfortunately this change is not fully compatible with existing VMMs. In particular, QEMU reuses vCPU fds for CPU hotplug after unplug and it calls KVM_SET_CPUID2. Relax the requirement by implementing an allowing KVM_SET_CPUID{,2} with the exact same data.
Vitaly Kuznetsov (5):
KVM: x86: Do runtime CPUID update before updating
vcpu->arch.cpuid_entries
KVM: x86: Move CPUID.(EAX=0x12,ECX=1) mangling to
__kvm_update_cpuid_runtime()
KVM: x86: Partially allow KVM_SET_CPUID{,2} after KVM_RUN
KVM: selftests: Rename 'get_cpuid_test' to 'cpuid_test'
KVM: selftests: Test KVM_SET_CPUID2 after KVM_RUN
arch/x86/kvm/cpuid.c | 119 +++++++++++++-----
arch/x86/kvm/x86.c | 19 ---
tools/testing/selftests/kvm/.gitignore | 2 +-
tools/testing/selftests/kvm/Makefile | 4 +-
.../selftests/kvm/include/x86_64/processor.h | 7 ++
.../selftests/kvm/lib/x86_64/processor.c | 33 ++++-
.../x86_64/{get_cpuid_test.c => cpuid_test.c} | 30 +++++
7 files changed, 157 insertions(+), 57 deletions(-)
rename tools/testing/selftests/kvm/x86_64/{get_cpuid_test.c => cpuid_test.c} (83%)Signature · 1 line
2.34.1
PATCH v4 1/5 KVM: x86: Do runtime CPUID update before updating vcpu->arch.cpuid_entries
kvm_update_cpuid_runtime() mangles CPUID data coming from userspace VMM after updating 'vcpu->arch.cpuid_entries', this makes it impossible to compare an update with what was previously supplied. Introduce __kvm_update_cpuid_runtime() version which can be used to tweak the input before it goes to 'vcpu->arch.cpuid_entries' so the upcoming update check can compare tweaked data.
No functional change intended.
--- arch/x86/kvm/cpuid.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-)
arch/x86/kvm/cpuid.c +24 -10
@@ -145,14 +145,21 @@ static void kvm_update_kvm_cpuid_base(struct kvm_vcpu *vcpu) } } -static struct kvm_cpuid_entry2 *kvm_find_kvm_cpuid_features (struct kvm_vcpu *vcpu) +static struct kvm_cpuid_entry2 *__kvm_find_kvm_cpuid_features (struct kvm_vcpu *vcpu, +struct kvm_cpuid_entry2 *entries,int nent) {u32 base = vcpu->arch.kvm_cpuid_base;if (!base)return NULL ; -return kvm_find_cpuid_entry (vcpu, base |KVM_CPUID_FEATURES ,0 ); +return cpuid_entry2_find (entries, nent, base |KVM_CPUID_FEATURES ,0 ); +} + +static struct kvm_cpuid_entry2 *kvm_find_kvm_cpuid_features (struct kvm_vcpu *vcpu) +{ +return __kvm_find_kvm_cpuid_features (vcpu, vcpu->arch.cpuid_entries, + vcpu->arch.cpuid_nent); }void kvm_update_pv_runtime (struct kvm_vcpu *vcpu)
@@ -167,11 +174,12 @@ void kvm_update_pv_runtime(struct kvm_vcpu *vcpu) vcpu->arch.pv_cpuid.features = best->eax; } -void kvm_update_cpuid_runtime (struct kvm_vcpu *vcpu) +static void __kvm_update_cpuid_runtime (struct kvm_vcpu *vcpu,struct kvm_cpuid_entry2 *entries, +int nent) {struct kvm_cpuid_entry2 *best; - best =kvm_find_cpuid_entry (vcpu,1 ,0 ); + best =cpuid_entry2_find (entries, nent,1 ,0 );if (best) {/* Update OSXSAVE bit */ if (boot_cpu_has (X86_FEATURE_XSAVE ))
@@ -182,33 +190,38 @@ void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) vcpu->arch.apic_base & MSR_IA32_APICBASE_ENABLE); } - best =kvm_find_cpuid_entry (vcpu,7 ,0 ); + best =cpuid_entry2_find (entries, nent,7 ,0 );if (best &&boot_cpu_has (X86_FEATURE_PKU ) && best->function ==0x7 )cpuid_entry_change (best,X86_FEATURE_OSPKE ,kvm_read_cr4_bits (vcpu,X86_CR4_PKE )); - best =kvm_find_cpuid_entry (vcpu,0xD ,0 ); + best =cpuid_entry2_find (entries, nent,0xD ,0 );if (best) best->ebx =xstate_required_size (vcpu->arch.xcr0, false); - best =kvm_find_cpuid_entry (vcpu,0xD ,1 ); + best =cpuid_entry2_find (entries, nent,0xD ,1 );if (best && (cpuid_entry_has (best,X86_FEATURE_XSAVES ) ||cpuid_entry_has (best,X86_FEATURE_XSAVEC ))) best->ebx =xstate_required_size (vcpu->arch.xcr0, true); - best =kvm_find_kvm_cpuid_features (vcpu); + best =__kvm_find_kvm_cpuid_features (vcpu, entries, nent);if (kvm_hlt_in_guest (vcpu->kvm) && best && (best->eax & (1 <<KVM_FEATURE_PV_UNHALT ))) best->eax &= ~(1 <<KVM_FEATURE_PV_UNHALT );if (!kvm_check_has_quirk (vcpu->kvm,KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT )) { - best =kvm_find_cpuid_entry (vcpu,0x1 ,0 ); + best =cpuid_entry2_find (entries, nent,0x1 ,0 );if (best)cpuid_entry_change (best,X86_FEATURE_MWAIT , vcpu->arch.ia32_misc_enable_msr &MSR_IA32_MISC_ENABLE_MWAIT ); } } + +void kvm_update_cpuid_runtime (struct kvm_vcpu *vcpu) +{ +__kvm_update_cpuid_runtime (vcpu, vcpu->arch.cpuid_entries, vcpu->arch.cpuid_nent); +}EXPORT_SYMBOL_GPL (kvm_update_cpuid_runtime);static void kvm_vcpu_after_set_cpuid (struct kvm_vcpu *vcpu)
@@ -298,6 +311,8 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, {int r; +__kvm_update_cpuid_runtime (vcpu, e2, nent); + r =kvm_check_cpuid (vcpu, e2, nent);if (r)return r;
@@ -307,7 +322,6 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, vcpu->arch.cpuid_nent = nent;kvm_update_kvm_cpuid_base (vcpu); -kvm_update_cpuid_runtime (vcpu);kvm_vcpu_after_set_cpuid (vcpu);return 0 ;
Signature · 1 line
2.34.1
PATCH v4 2/5 KVM: x86: Move CPUID.(EAX=0x12,ECX=1) mangling to __kvm_update_cpuid_runtime()
In reply to Vitaly KuznetsovTo support comparing CPUID data update with what's already set for a vCPU all mangling needs to happen in __kvm_update_cpuid_runtime(), before 'vcpu->arch.cpuid_entries' is updated. CPUID.(EAX=0x12,ECX=1) is currently being mangled in kvm_vcpu_after_set_cpuid(), move it to __kvm_update_cpuid_runtime(). Split off cpuid_get_supported_xcr0() helper as 'vcpu->arch.guest_supported_xcr0' update needs (logically) to stay in kvm_vcpu_after_set_cpuid().
No functional change intended.
--- arch/x86/kvm/cpuid.c | 54 +++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 21 deletions(-)
arch/x86/kvm/cpuid.c +33 -21
@@ -174,10 +174,26 @@ void kvm_update_pv_runtime(struct kvm_vcpu *vcpu) vcpu->arch.pv_cpuid.features = best->eax; } +/* +* Calculate guest's supported XCR0 taking into account guest CPUID data and +* supported_xcr0 (comprised of host configuration and KVM_SUPPORTED_XCR0). +*/ +static u64 cpuid_get_supported_xcr0 (struct kvm_cpuid_entry2 *entries,int nent) +{ +struct kvm_cpuid_entry2 *best; + + best =cpuid_entry2_find (entries, nent,0xd ,0 ); +if (!best) +return 0 ; + +return (best->eax | ((u64 )best->edx <<32 )) & supported_xcr0; +} +static void __kvm_update_cpuid_runtime (struct kvm_vcpu *vcpu,struct kvm_cpuid_entry2 *entries,int nent) {struct kvm_cpuid_entry2 *best; +u64 guest_supported_xcr0 =cpuid_get_supported_xcr0 (entries, nent); best =cpuid_entry2_find (entries, nent,1 ,0 );if (best) {
@@ -216,6 +232,21 @@ static void __kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu, struct kvm_cpuid_e vcpu->arch.ia32_misc_enable_msr & MSR_IA32_MISC_ENABLE_MWAIT); } + +/* +* Bits 127:0 of the allowed SECS.ATTRIBUTES (CPUID.0x12.0x1) enumerate +* the supported XSAVE Feature Request Mask (XFRM), i.e. the enclave's +* requested XCR0 value. The enclave's XFRM must be a subset of XCRO +* at the time of EENTER, thus adjust the allowed XFRM by the guest's +* supported XCR0. Similar to XCR0 handling, FP and SSE are forced to +* '1' even on CPUs that don't support XSAVE. +*/ + best =cpuid_entry2_find (entries, nent,0x12 ,0x1 ); +if (best) { + best->ecx &= guest_supported_xcr0 &0xffffffff ; + best->edx &= guest_supported_xcr0 >>32 ; + best->ecx |=XFEATURE_MASK_FPSSE ; + } }void kvm_update_cpuid_runtime (struct kvm_vcpu *vcpu)
@@ -239,27 +270,8 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)kvm_apic_set_version (vcpu); } - best =kvm_find_cpuid_entry (vcpu,0xD ,0 ); -if (!best) - vcpu->arch.guest_supported_xcr0 =0 ; -else - vcpu->arch.guest_supported_xcr0 = - (best->eax | ((u64 )best->edx <<32 )) & supported_xcr0; - -/* -* Bits 127:0 of the allowed SECS.ATTRIBUTES (CPUID.0x12.0x1) enumerate -* the supported XSAVE Feature Request Mask (XFRM), i.e. the enclave's -* requested XCR0 value. The enclave's XFRM must be a subset of XCRO -* at the time of EENTER, thus adjust the allowed XFRM by the guest's -* supported XCR0. Similar to XCR0 handling, FP and SSE are forced to -* '1' even on CPUs that don't support XSAVE. -*/ - best =kvm_find_cpuid_entry (vcpu,0x12 ,0x1 ); -if (best) { - best->ecx &= vcpu->arch.guest_supported_xcr0 &0xffffffff ; - best->edx &= vcpu->arch.guest_supported_xcr0 >>32 ; - best->ecx |=XFEATURE_MASK_FPSSE ; - } + vcpu->arch.guest_supported_xcr0 = +cpuid_get_supported_xcr0 (vcpu->arch.cpuid_entries, vcpu->arch.cpuid_nent);kvm_update_pv_runtime (vcpu);
Signature · 1 line
2.34.1
Paolo Bonzini
maintainerRe: [PATCH v4 2/5] KVM: x86: Move CPUID.(EAX=0x12,ECX=1) mangling to __kvm_update_cpuid_runtime()
Quoted 9 lines · Vitaly Kuznetsov
To support comparing CPUID data update with what's already set for a vCPU all mangling needs to happen in
__kvm_update_cpuid_runtime(), before 'vcpu->arch.cpuid_entries' is updated. CPUID.(EAX=0x12,ECX=1) is currently being mangled inkvm_vcpu_after_set_cpuid(), move it to__kvm_update_cpuid_runtime(). Split offcpuid_get_supported_xcr0()helper as 'vcpu->arch.guest_supported_xcr0' update needs (logically) to stay inkvm_vcpu_after_set_cpuid().No functional change intended.
Since v3 is already on its way to Linus, I'll merge this patch next week.
Paolo
Re: [PATCH v4 2/5] KVM: x86: Move CPUID.(EAX=0x12,ECX=1) mangling to __kvm_update_cpuid_runtime()
Quoted 9 lines · Paolo Bonzini
Quoted 8 lines · Vitaly Kuznetsov
To support comparing CPUID data update with what's already set for a vCPU all mangling needs to happen in
__kvm_update_cpuid_runtime(), before 'vcpu->arch.cpuid_entries' is updated. CPUID.(EAX=0x12,ECX=1) is currently being mangled inkvm_vcpu_after_set_cpuid(), move it to__kvm_update_cpuid_runtime(). Split offcpuid_get_supported_xcr0()helper as 'vcpu->arch.guest_supported_xcr0' update needs (logically) to stay inkvm_vcpu_after_set_cpuid().
Quoted 4 lines
Quoted 1 line
No functional change intended.
Since v3 is already on its way to Linus, I'll merge this patch next week.
Thanks,
there is also a change in "[PATCH v4 3/5] KVM: x86: Partially allow KVM_SET_CPUID{,2} after KVM_RUN" where I switch to memcmp (as suggested by Sean). I can send an incremental patch if needed.
Signature · 1 line
Vitaly
Paolo Bonzini
maintainerRe: [PATCH v4 2/5] KVM: x86: Move CPUID.(EAX=0x12,ECX=1) mangling to __kvm_update_cpuid_runtime()
Quoted 5 lines · Vitaly Kuznetsov
Thanks,
there is also a change in "[PATCH v4 3/5] KVM: x86: Partially allow KVM_SET_CPUID{,2} after
KVM_RUN" where I switch to memcmp (as suggested by Sean). I can send an incremental patch if needed.
Sure, thanks!
Paolo
PATCH v4 3/5 KVM: x86: Partially allow KVM_SET_CPUID{,2} after KVM_RUN
In reply to Vitaly KuznetsovCommit feb627e8d6f6 ("KVM: x86: Forbid KVM_SET_CPUID{,2} after KVM_RUN") forbade changing CPUID altogether but unfortunately this is not fully compatible with existing VMMs. In particular, QEMU reuses vCPU fds for CPU hotplug after unplug and it calls KVM_SET_CPUID2. Instead of full ban, check whether the supplied CPUID data is equal to what was previously set.
--- arch/x86/kvm/cpuid.c | 31 +++++++++++++++++++++++++++++++ arch/x86/kvm/x86.c | 19 ------------------- 2 files changed, 31 insertions(+), 19 deletions(-)
arch/x86/kvm/cpuid.c +31 -0
@@ -119,6 +119,19 @@ static int kvm_check_cpuid(struct kvm_vcpu *vcpu,return fpu_enable_guest_xfd_features (&vcpu->arch.guest_fpu, xfeatures); } +/* Check whether the supplied CPUID data is equal to what is already set for the vCPU. */ +static int kvm_cpuid_check_equal (struct kvm_vcpu *vcpu,struct kvm_cpuid_entry2 *e2, +int nent) +{ +if (nent != vcpu->arch.cpuid_nent) +return -EINVAL ; + +if (memcmp (e2, vcpu->arch.cpuid_entries, nent *sizeof (*e2))) +return -EINVAL ; + +return 0 ; +} +static void kvm_update_kvm_cpuid_base (struct kvm_vcpu *vcpu) {u32 function;
@@ -325,6 +338,24 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2,__kvm_update_cpuid_runtime (vcpu, e2, nent); +/* +* KVM does not correctly handle changing guest CPUID after KVM_RUN, as +* MAXPHYADDR, GBPAGES support, AMD reserved bit behavior, etc.. aren't +* tracked in kvm_mmu_page_role. As a result, KVM may miss guest page +* faults due to reusing SPs/SPTEs. In practice no sane VMM mucks with +* the core vCPU model on the fly. To avoid potential hard to debug +* problems, forbid changing CPUID data after successfully entering the +* guest. Banning KVM_SET_CPUID{,2} altogether is incompatible with +* certain VMMs (e.g. QEMU) which reuse vCPU fds for CPU hotplug as +* KVM_SET_CPUID{,2} call (with the same CPUID data) may be issued again +* upon hotplug. +* Note, there are other problematic scenarios which are currently not +* being handled, e.g. supplying different CPUID data for different +* vCPUs also won't be handled correctly by KVM MMU. +*/ +if (vcpu->arch.last_vmentry_cpu !=-1 ) +return kvm_cpuid_check_equal (vcpu, e2, nent); + r =kvm_check_cpuid (vcpu, e2, nent);if (r)return r;
arch/x86/kvm/x86.c +0 -19
@@ -5230,17 +5230,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp,struct kvm_cpuid __user *cpuid_arg = argp;struct kvm_cpuid cpuid; -/* -* KVM does not correctly handle changing guest CPUID after KVM_RUN, as -* MAXPHYADDR, GBPAGES support, AMD reserved bit behavior, etc.. aren't -* tracked in kvm_mmu_page_role. As a result, KVM may miss guest page -* faults due to reusing SPs/SPTEs. In practice no sane VMM mucks with -* the core vCPU model on the fly, so fail. -*/ - r = -EINVAL ; -if (vcpu->arch.last_vmentry_cpu !=-1 ) - goto out; - r = -EFAULT ;if (copy_from_user (&cpuid, cpuid_arg,sizeof (cpuid))) goto out;
@@ -5251,14 +5240,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp,struct kvm_cpuid2 __user *cpuid_arg = argp;struct kvm_cpuid2 cpuid; -/* -* KVM_SET_CPUID{,2} after KVM_RUN is forbidded, see the comment in -* KVM_SET_CPUID case above. -*/ - r = -EINVAL ; -if (vcpu->arch.last_vmentry_cpu !=-1 ) - goto out; - r = -EFAULT ;if (copy_from_user (&cpuid, cpuid_arg,sizeof (cpuid))) goto out;
Signature · 1 line
2.34.1
PATCH v4 4/5 KVM: selftests: Rename 'get_cpuid_test' to 'cpuid_test'
In reply to Vitaly KuznetsovIn preparation to reusing the existing 'get_cpuid_test' for testing "KVM_SET_CPUID{,2} after KVM_RUN" rename it to 'cpuid_test' to avoid the confusion.
No functional change intended.
---
tools/testing/selftests/kvm/.gitignore | 2 +-
tools/testing/selftests/kvm/Makefile | 4 ++--
.../selftests/kvm/x86_64/{get_cpuid_test.c => cpuid_test.c} | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename tools/testing/selftests/kvm/x86_64/{get_cpuid_test.c => cpuid_test.c} (100%)tools/testing/selftests/kvm/.gitignore +1 -1
@@ -8,11 +8,11 @@ /s390x/memop /s390x/resets /s390x/sync_regs_test +/x86_64/cpuid_test /x86_64/cr4_cpuid_sync_test /x86_64/debug_regs /x86_64/evmcs_test /x86_64/emulator_error_test -/x86_64/get_cpuid_test /x86_64/get_msr_index_features /x86_64/kvm_clock_test /x86_64/kvm_pv_test
tools/testing/selftests/kvm/Makefile +2 -2
@@ -43,11 +43,11 @@ LIBKVM_aarch64 = lib/aarch64/processor.c lib/aarch64/ucall.c lib/aarch64/handler LIBKVM_s390x = lib/s390x/processor.c lib/s390x/ucall.c lib/s390x/diag318_test_handler.c LIBKVM_riscv = lib/riscv/processor.c lib/riscv/ucall.c -TEST_GEN_PROGS_x86_64 = x86_64/cr4_cpuid_sync_test +TEST_GEN_PROGS_x86_64 = x86_64/cpuid_test +TEST_GEN_PROGS_x86_64 += x86_64/cr4_cpuid_sync_test TEST_GEN_PROGS_x86_64 += x86_64/get_msr_index_features TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test TEST_GEN_PROGS_x86_64 += x86_64/emulator_error_test -TEST_GEN_PROGS_x86_64 += x86_64/get_cpuid_test TEST_GEN_PROGS_x86_64 += x86_64/hyperv_clock TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid TEST_GEN_PROGS_x86_64 += x86_64/hyperv_features
tools/testing/selftests/kvm/x86_64/cpuid_test.c renamed from tools/testing/selftests/kvm/x86_64/get_cpuid_test.c +0 -0
Signature · 1 line
2.34.1
PATCH v4 5/5 KVM: selftests: Test KVM_SET_CPUID2 after KVM_RUN
In reply to Vitaly KuznetsovKVM forbids KVM_SET_CPUID2 after KVM_RUN was performed on a vCPU unless the supplied CPUID data is equal to what was previously set. Test this.
--- .../selftests/kvm/include/x86_64/processor.h | 7 ++++ .../selftests/kvm/lib/x86_64/processor.c | 33 ++++++++++++++++--- .../testing/selftests/kvm/x86_64/cpuid_test.c | 30 +++++++++++++++++ 3 files changed, 66 insertions(+), 4 deletions(-)
tools/testing/selftests/kvm/include/x86_64/processor.h +7 -0
@@ -375,6 +375,8 @@ uint64_t kvm_get_feature_msr(uint64_t msr_index);struct kvm_cpuid2 *kvm_get_supported_cpuid (void );struct kvm_cpuid2 *vcpu_get_cpuid (struct kvm_vm *vm,uint32_t vcpuid); +int __vcpu_set_cpuid (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_cpuid2 *cpuid);void vcpu_set_cpuid (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_cpuid2 *cpuid);
@@ -418,6 +420,11 @@ uint64_t vm_get_page_table_entry(struct kvm_vm *vm, int vcpuid, uint64_t vaddr);void vm_set_page_table_entry (struct kvm_vm *vm,int vcpuid,uint64_t vaddr,uint64_t pte); +/* +* get_cpuid() - find matching CPUID entry and return pointer to it. +*/ +struct kvm_cpuid_entry2 *get_cpuid (struct kvm_cpuid2 *cpuid,uint32_t function, +uint32_t index);/* * set_cpuid() - overwrites a matching cpuid entry with the provided value. * matches based on ent->function && ent->index. returns true
tools/testing/selftests/kvm/lib/x86_64/processor.c +29 -4
@@ -886,6 +886,17 @@ kvm_get_supported_cpuid_index(uint32_t function, uint32_t index)return entry; } + +int __vcpu_set_cpuid (struct kvm_vm *vm,uint32_t vcpuid, +struct kvm_cpuid2 *cpuid) +{ +struct vcpu *vcpu =vcpu_find (vm, vcpuid); + +TEST_ASSERT (vcpu !=NULL ,"vcpu not found, vcpuid: %u" , vcpuid); + +return ioctl (vcpu->fd,KVM_SET_CPUID2 , cpuid); +} +/* * VM VCPU CPUID Set *
@@ -903,12 +914,9 @@ kvm_get_supported_cpuid_index(uint32_t function, uint32_t index)void vcpu_set_cpuid (struct kvm_vm *vm,uint32_t vcpuid,struct kvm_cpuid2 *cpuid) { -struct vcpu *vcpu =vcpu_find (vm, vcpuid);int rc; -TEST_ASSERT (vcpu !=NULL ,"vcpu not found, vcpuid: %u" , vcpuid); - - rc =ioctl (vcpu->fd,KVM_SET_CPUID2 , cpuid); + rc =__vcpu_set_cpuid (vm, vcpuid, cpuid);TEST_ASSERT (rc ==0 ,"KVM_SET_CPUID2 failed, rc: %i errno: %i" , rc, errno);
@@ -1384,6 +1392,23 @@ void assert_on_unhandled_exception(struct kvm_vm *vm, uint32_t vcpuid) } } +struct kvm_cpuid_entry2 *get_cpuid (struct kvm_cpuid2 *cpuid,uint32_t function, +uint32_t index) +{ +int i; + +for (i =0 ; i < cpuid->nent; i++) { +struct kvm_cpuid_entry2 *cur = &cpuid->entries[i]; + +if (cur->function == function && cur->index == index) +return cur; + } + +TEST_FAIL ("CPUID function 0x%x index 0x%x not found " , function, index); + +return NULL ; +} +bool set_cpuid (struct kvm_cpuid2 *cpuid,struct kvm_cpuid_entry2 *ent) {
tools/testing/selftests/kvm/x86_64/cpuid_test.c +30 -0
@@ -154,6 +154,34 @@ struct kvm_cpuid2 *vcpu_alloc_cpuid(struct kvm_vm *vm, vm_vaddr_t *p_gva, structreturn guest_cpuids; } +static void set_cpuid_after_run (struct kvm_vm *vm,struct kvm_cpuid2 *cpuid) +{ +struct kvm_cpuid_entry2 *ent; +int rc; +u32 eax, ebx, x; + +/* Setting unmodified CPUID is allowed */ + rc =__vcpu_set_cpuid (vm,VCPU_ID , cpuid); +TEST_ASSERT (!rc,"Setting unmodified CPUID after KVM_RUN failed: %d" , rc); + +/* Changing CPU features is forbidden */ + ent =get_cpuid (cpuid,0x7 ,0 ); + ebx = ent->ebx; + ent->ebx--; + rc =__vcpu_set_cpuid (vm,VCPU_ID , cpuid); +TEST_ASSERT (rc,"Changing CPU features should fail" ); + ent->ebx = ebx; + +/* Changing MAXPHYADDR is forbidden */ + ent =get_cpuid (cpuid,0x80000008 ,0 ); + eax = ent->eax; + x = eax &0xff ; + ent->eax = (eax & ~0xffu ) | (x -1 ); + rc =__vcpu_set_cpuid (vm,VCPU_ID , cpuid); +TEST_ASSERT (rc,"Changing MAXPHYADDR should fail" ); + ent->eax = eax; +} +int main (void ) {struct kvm_cpuid2 *supp_cpuid, *cpuid2;
@@ -175,5 +203,7 @@ int main(void)for (stage =0 ; stage <3 ; stage++)run_vcpu (vm,VCPU_ID , stage); +set_cpuid_after_run (vm, cpuid2); +kvm_vm_free (vm); }
Signature · 1 line
2.34.1