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

KVM: selftests: Convert fix_hypercall_test away from VCPU_ID

Browse Source 
Convert fix_hypercall_test to use vm_create_with_one_vcpu() and pass
around a 'struct kvm_vcpu' object instead of using a global VCPU_ID.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson
2022-04-18 11:50:15 -07:00
committed by Paolo Bonzini
parent e5d86c7a03
commit afcda3dcb3
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c
View File

@@ -14,8 +14,6 @@
#include "kvm_util.h" #include "kvm_util.h"
#include "processor.h" #include "processor.h"
#define VCPU_ID 0
static bool ud_expected; static bool ud_expected;
static void guest_ud_handler(struct ex_regs *regs) static void guest_ud_handler(struct ex_regs *regs)
@@ -94,22 +92,20 @@ static void guest_main(void)
GUEST_DONE(); GUEST_DONE();
} }
static void setup_ud_vector(struct kvm_vm *vm) static void setup_ud_vector(struct kvm_vcpu *vcpu)
{ {
vm_init_descriptor_tables(vm); vm_init_descriptor_tables(vcpu->vm);
vcpu_init_descriptor_tables(vm, VCPU_ID); vcpu_init_descriptor_tables(vcpu->vm, vcpu->id);
vm_install_exception_handler(vm, UD_VECTOR, guest_ud_handler); vm_install_exception_handler(vcpu->vm, UD_VECTOR, guest_ud_handler);
} }
static void enter_guest(struct kvm_vm *vm) static void enter_guest(struct kvm_vcpu *vcpu)
{ {
struct kvm_run *run; struct kvm_run *run = vcpu->run;
struct ucall uc; struct ucall uc;
run = vcpu_state(vm, VCPU_ID); vcpu_run(vcpu->vm, vcpu->id);
switch (get_ucall(vcpu->vm, vcpu->id, &uc)) {
vcpu_run(vm, VCPU_ID);
switch (get_ucall(vm, VCPU_ID, &uc)) {
case UCALL_SYNC: case UCALL_SYNC:
pr_info("%s: %016lx\n", (const char *)uc.args[2], uc.args[3]); pr_info("%s: %016lx\n", (const char *)uc.args[2], uc.args[3]);
break; break;
@@ -125,25 +121,27 @@ static void enter_guest(struct kvm_vm *vm)
static void test_fix_hypercall(void) static void test_fix_hypercall(void)
{ {
struct kvm_vcpu *vcpu;
struct kvm_vm *vm; struct kvm_vm *vm;
vm = vm_create_default(VCPU_ID, 0, guest_main); vm = vm_create_with_one_vcpu(&vcpu, guest_main);
setup_ud_vector(vm); setup_ud_vector(vcpu);
ud_expected = false; ud_expected = false;
sync_global_to_guest(vm, ud_expected); sync_global_to_guest(vm, ud_expected);
virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA); virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA);
enter_guest(vm); enter_guest(vcpu);
} }
static void test_fix_hypercall_disabled(void) static void test_fix_hypercall_disabled(void)
{ {
struct kvm_vcpu *vcpu;
struct kvm_vm *vm; struct kvm_vm *vm;
vm = vm_create_default(VCPU_ID, 0, guest_main); vm = vm_create_with_one_vcpu(&vcpu, guest_main);
setup_ud_vector(vm); setup_ud_vector(vcpu);
vm_enable_cap(vm, KVM_CAP_DISABLE_QUIRKS2, vm_enable_cap(vm, KVM_CAP_DISABLE_QUIRKS2,
KVM_X86_QUIRK_FIX_HYPERCALL_INSN); KVM_X86_QUIRK_FIX_HYPERCALL_INSN);
@@ -153,7 +151,7 @@ static void test_fix_hypercall_disabled(void)
virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA); virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA);
enter_guest(vm); enter_guest(vcpu);
} }
int main(void) int main(void)