Commit 1dcd1c58 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: selftests: Unconditionally use memslot 0 for x86's GDT/TSS setup 



Refactor x86's GDT/TSS allocations to for memslot '0' at its
vm_addr_alloc() call sites instead of passing in '0' from on high.  This
is a step toward using a common helper for allocating pages.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210622200529.3650424-5-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7a4f1a75

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

+8 −10
Original line number Diff line number Diff line
@@ -518,24 +518,22 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) 
	exit(EXIT_FAILURE);

}



static void kvm_setup_gdt(struct kvm_vm *vm, struct kvm_dtable *dt, int gdt_memslot,

			  int pgd_memslot)

static void kvm_setup_gdt(struct kvm_vm *vm, struct kvm_dtable *dt)

{

	if (!vm->gdt)

		vm->gdt = vm_vaddr_alloc(vm, getpagesize(),

			KVM_UTIL_MIN_VADDR, gdt_memslot, pgd_memslot);

			KVM_UTIL_MIN_VADDR, 0, 0);



	dt->base = vm->gdt;

	dt->limit = getpagesize();

}



static void kvm_setup_tss_64bit(struct kvm_vm *vm, struct kvm_segment *segp,

				int selector, int gdt_memslot,

				int pgd_memslot)

				int selector)

{

	if (!vm->tss)

		vm->tss = vm_vaddr_alloc(vm, getpagesize(),

			KVM_UTIL_MIN_VADDR, gdt_memslot, pgd_memslot);

			KVM_UTIL_MIN_VADDR, 0, 0);



	memset(segp, 0, sizeof(*segp));

	segp->base = vm->tss;
@@ -546,7 +544,7 @@ static void kvm_setup_tss_64bit(struct kvm_vm *vm, struct kvm_segment *segp, 
	kvm_seg_fill_gdt_64bit(vm, segp);

}



static void vcpu_setup(struct kvm_vm *vm, int vcpuid, int pgd_memslot, int gdt_memslot)

static void vcpu_setup(struct kvm_vm *vm, int vcpuid)

{

	struct kvm_sregs sregs;
@@ -555,7 +553,7 @@ static void vcpu_setup(struct kvm_vm *vm, int vcpuid, int pgd_memslot, int gdt_m 


	sregs.idt.limit = 0;



	kvm_setup_gdt(vm, &sregs.gdt, gdt_memslot, pgd_memslot);

	kvm_setup_gdt(vm, &sregs.gdt);



	switch (vm->mode) {

	case VM_MODE_PXXV48_4K:
@@ -567,7 +565,7 @@ static void vcpu_setup(struct kvm_vm *vm, int vcpuid, int pgd_memslot, int gdt_m 
		kvm_seg_set_kernel_code_64bit(vm, DEFAULT_CODE_SELECTOR, &sregs.cs);

		kvm_seg_set_kernel_data_64bit(vm, DEFAULT_DATA_SELECTOR, &sregs.ds);

		kvm_seg_set_kernel_data_64bit(vm, DEFAULT_DATA_SELECTOR, &sregs.es);

		kvm_setup_tss_64bit(vm, &sregs.tr, 0x18, gdt_memslot, pgd_memslot);

		kvm_setup_tss_64bit(vm, &sregs.tr, 0x18);

		break;



	default:
@@ -588,7 +586,7 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code) 


	/* Create VCPU */

	vm_vcpu_add(vm, vcpuid);

	vcpu_setup(vm, vcpuid, 0, 0);

	vcpu_setup(vm, vcpuid);



	/* Setup guest general purpose registers */

	vcpu_regs_get(vm, vcpuid, &regs);