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

KVM: selftests: Unconditionally use memslot 0 for vaddr allocations 



Drop the memslot param(s) from vm_vaddr_alloc() now that all callers
directly specific '0' as the memslot.  Drop the memslot param from
virt_pgd_alloc() as well since vm_vaddr_alloc() is its only user.
I.e. shove the hardcoded '0' down to the vm_phy_pages_alloc() calls.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 408633c3

tools/testing/selftests/kvm/include/kvm_util.h

+2 −3
Original line number Diff line number Diff line
@@ -140,8 +140,7 @@ void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags); 
void vm_mem_region_move(struct kvm_vm *vm, uint32_t slot, uint64_t new_gpa);

void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot);

void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid);

vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min,

			  uint32_t data_memslot, uint32_t pgd_memslot);

vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min);

vm_vaddr_t vm_vaddr_alloc_pages(struct kvm_vm *vm, int nr_pages);

vm_vaddr_t vm_vaddr_alloc_page(struct kvm_vm *vm);
@@ -239,7 +238,7 @@ int kvm_device_access(int dev_fd, uint32_t group, uint64_t attr, 


const char *exit_reason_str(unsigned int exit_reason);



void virt_pgd_alloc(struct kvm_vm *vm, uint32_t pgd_memslot);

void virt_pgd_alloc(struct kvm_vm *vm);



/*

 * VM Virtual Page Map

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

+3 −3
Original line number Diff line number Diff line
@@ -72,12 +72,12 @@ static uint64_t __maybe_unused ptrs_per_pte(struct kvm_vm *vm) 
	return 1 << (vm->page_shift - 3);

}



void virt_pgd_alloc(struct kvm_vm *vm, uint32_t pgd_memslot)

void virt_pgd_alloc(struct kvm_vm *vm)

{

	if (!vm->pgd_created) {

		vm_paddr_t paddr = vm_phy_pages_alloc(vm,

			page_align(vm, ptrs_per_pgd(vm) * 8) / vm->page_size,

			KVM_GUEST_PAGE_TABLE_MIN_PADDR, pgd_memslot);

			KVM_GUEST_PAGE_TABLE_MIN_PADDR, 0);

		vm->pgd = paddr;

		vm->pgd_created = true;

	}
@@ -302,7 +302,7 @@ void aarch64_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, 
					DEFAULT_STACK_PGS * vm->page_size :

					vm->page_size;

	uint64_t stack_vaddr = vm_vaddr_alloc(vm, stack_size,

					DEFAULT_ARM64_GUEST_STACK_VADDR_MIN, 0, 0);

					      DEFAULT_ARM64_GUEST_STACK_VADDR_MIN);



	vm_vcpu_add(vm, vcpuid);

	aarch64_vcpu_setup(vm, vcpuid, init);

tools/testing/selftests/kvm/lib/elf.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename) 
		seg_vend |= vm->page_size - 1;

		size_t seg_size = seg_vend - seg_vstart + 1;



		vm_vaddr_t vaddr = vm_vaddr_alloc(vm, seg_size, seg_vstart, 0, 0);

		vm_vaddr_t vaddr = vm_vaddr_alloc(vm, seg_size, seg_vstart);

		TEST_ASSERT(vaddr == seg_vstart, "Unable to allocate "

			"virtual memory for segment at requested min addr,\n"

			"  segment idx: %u\n"

tools/testing/selftests/kvm/lib/kvm_util.c

+5 −7
Original line number Diff line number Diff line
@@ -1247,15 +1247,13 @@ static vm_vaddr_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz, 
 * a unique set of pages, with the minimum real allocation being at least

 * a page.

 */

vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min,

			  uint32_t data_memslot, uint32_t pgd_memslot)

vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min)

{

	uint64_t pages = (sz >> vm->page_shift) + ((sz % vm->page_size) != 0);



	virt_pgd_alloc(vm, pgd_memslot);

	virt_pgd_alloc(vm);

	vm_paddr_t paddr = vm_phy_pages_alloc(vm, pages,

					      KVM_UTIL_MIN_PFN * vm->page_size,

					      data_memslot);

					      KVM_UTIL_MIN_PFN * vm->page_size, 0);



	/*

	 * Find an unused range of virtual page addresses of at least
@@ -1267,7 +1265,7 @@ vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min, 
	for (vm_vaddr_t vaddr = vaddr_start; pages > 0;

		pages--, vaddr += vm->page_size, paddr += vm->page_size) {



		virt_pg_map(vm, vaddr, paddr, pgd_memslot);

		virt_pg_map(vm, vaddr, paddr, 0);



		sparsebit_set(vm->vpages_mapped,

			vaddr >> vm->page_shift);
@@ -1292,7 +1290,7 @@ vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min, 
 */

vm_vaddr_t vm_vaddr_alloc_pages(struct kvm_vm *vm, int nr_pages)

{

	return vm_vaddr_alloc(vm, nr_pages * getpagesize(), KVM_UTIL_MIN_VADDR, 0, 0);

	return vm_vaddr_alloc(vm, nr_pages * getpagesize(), KVM_UTIL_MIN_VADDR);

}



/*

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

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


#define PAGES_PER_REGION 4



void virt_pgd_alloc(struct kvm_vm *vm, uint32_t memslot)

void virt_pgd_alloc(struct kvm_vm *vm)

{

	vm_paddr_t paddr;
@@ -24,7 +24,7 @@ void virt_pgd_alloc(struct kvm_vm *vm, uint32_t memslot) 
		return;



	paddr = vm_phy_pages_alloc(vm, PAGES_PER_REGION,

				   KVM_GUEST_PAGE_TABLE_MIN_PADDR, memslot);

				   KVM_GUEST_PAGE_TABLE_MIN_PADDR, 0);

	memset(addr_gpa2hva(vm, paddr), 0xff, PAGES_PER_REGION * vm->page_size);



	vm->pgd = paddr;
@@ -170,7 +170,7 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code) 
		    vm->page_size);



	stack_vaddr = vm_vaddr_alloc(vm, stack_size,

				     DEFAULT_GUEST_STACK_VADDR_MIN, 0, 0);

				     DEFAULT_GUEST_STACK_VADDR_MIN);



	vm_vcpu_add(vm, vcpuid);