Skip to content

Commit 44c93b2

Browse files
committed
KVM: selftests: Map x86's exception_handlers at VM creation, not vCPU setup
Map x86's exception handlers at VM creation, not vCPU setup, as the mapping is per-VM, i.e. doesn't need to be (re)done for every vCPU. Reviewed-by: Ackerley Tng <ackerleytng@google.com> Link: https://lore.kernel.org/r/20240314232637.2538648-12-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent c1b9793 commit 44c93b2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@ static void vcpu_init_descriptor_tables(struct kvm_vcpu *vcpu)
553553
sregs.gdt.limit = getpagesize() - 1;
554554
kvm_seg_set_kernel_data_64bit(NULL, DEFAULT_DATA_SELECTOR, &sregs.gs);
555555
vcpu_sregs_set(vcpu, &sregs);
556-
*(vm_vaddr_t *)addr_gva2hva(vm, (vm_vaddr_t)(&exception_handlers)) = vm->handlers;
557556
}
558557

559558
static void vcpu_init_sregs(struct kvm_vm *vm, struct kvm_vcpu *vcpu)
@@ -652,6 +651,8 @@ static void vm_init_descriptor_tables(struct kvm_vm *vm)
652651
for (i = 0; i < NUM_INTERRUPTS; i++)
653652
set_idt_entry(vm, i, (unsigned long)(&idt_handlers)[i], 0,
654653
DEFAULT_CODE_SELECTOR);
654+
655+
*(vm_vaddr_t *)addr_gva2hva(vm, (vm_vaddr_t)(&exception_handlers)) = vm->handlers;
655656
}
656657

657658
void vm_install_exception_handler(struct kvm_vm *vm, int vector,

0 commit comments

Comments
 (0)