Commit beca5470 authored by Andrew Jones's avatar Andrew Jones Committed by Paolo Bonzini
Browse files

KVM: selftests: virt_map should take npages, not size 



Also correct the comment and prototype for vm_create_default(),
as it takes a number of pages, not a size.

Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d0aac332

tools/testing/selftests/kvm/demand_paging_test.c

+1 −2
Original line number Diff line number Diff line
@@ -410,8 +410,7 @@ static void run_test(enum vm_guest_mode mode, bool use_uffd, 
				    guest_num_pages, 0);



	/* Do mapping for the demand paging memory slot */

	virt_map(vm, guest_test_virt_mem, guest_test_phys_mem,

		 guest_num_pages * guest_page_size, 0);

	virt_map(vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages, 0);



	ucall_init(vm, NULL);

tools/testing/selftests/kvm/dirty_log_test.c

+1 −2
Original line number Diff line number Diff line
@@ -334,8 +334,7 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations, 
				    KVM_MEM_LOG_DIRTY_PAGES);



	/* Do mapping for the dirty track memory slot */

	virt_map(vm, guest_test_virt_mem, guest_test_phys_mem,

		 guest_num_pages * guest_page_size, 0);

	virt_map(vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages, 0);



	/* Cache the HVA pointer of the region */

	host_test_mem = addr_gpa2hva(vm, (vm_paddr_t)guest_test_phys_mem);

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

+3 −3
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 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);

void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,

	      size_t size, uint32_t pgd_memslot);

	      unsigned int npages, uint32_t pgd_memslot);

void *addr_gpa2hva(struct kvm_vm *vm, vm_paddr_t gpa);

void *addr_gva2hva(struct kvm_vm *vm, vm_vaddr_t gva);

vm_paddr_t addr_hva2gpa(struct kvm_vm *vm, void *hva);
@@ -226,7 +226,7 @@ vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, 
 *

 * Input Args:

 *   vcpuid - The id of the single VCPU to add to the VM.

 *   extra_mem_pages - The size of extra memories to add (this will

 *   extra_mem_pages - The number of extra pages to add (this will

 *                     decide how much extra space we will need to

 *                     setup the page tables using memslot 0)

 *   guest_code - The vCPU's entry point
@@ -236,7 +236,7 @@ vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num, 
 * Return:

 *   Pointer to opaque structure that describes the created VM.

 */

struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_size,

struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages,

				 void *guest_code);



/*

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

+5 −5
Original line number Diff line number Diff line
@@ -1015,21 +1015,21 @@ vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min, 
 *   vm - Virtual Machine

 *   vaddr - Virtuall address to map

 *   paddr - VM Physical Address

 *   size - The size of the range to map

 *   npages - The number of pages to map

 *   pgd_memslot - Memory region slot for new virtual translation tables

 *

 * Output Args: None

 *

 * Return: None

 *

 * Within the VM given by vm, creates a virtual translation for the

 * page range starting at vaddr to the page range starting at paddr.

 * Within the VM given by @vm, creates a virtual translation for

 * @npages starting at @vaddr to the page range starting at @paddr.

 */

void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,

	      size_t size, uint32_t pgd_memslot)

	      unsigned int npages, uint32_t pgd_memslot)

{

	size_t page_size = vm->page_size;

	size_t npages = size / page_size;

	size_t size = npages * page_size;



	TEST_ASSERT(vaddr + size > vaddr, "Vaddr overflow");

	TEST_ASSERT(paddr + size > paddr, "Paddr overflow");

tools/testing/selftests/kvm/x86_64/set_memory_region_test.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void test_move_memory_region(void) 
	gpa = vm_phy_pages_alloc(vm, 2, MEM_REGION_GPA, MEM_REGION_SLOT);

	TEST_ASSERT(gpa == MEM_REGION_GPA, "Failed vm_phy_pages_alloc\n");



	virt_map(vm, MEM_REGION_GPA, MEM_REGION_GPA, 2 * 4096, 0);

	virt_map(vm, MEM_REGION_GPA, MEM_REGION_GPA, 2, 0);



	/* Ditto for the host mapping so that both pages can be zeroed. */

	hva = addr_gpa2hva(vm, MEM_REGION_GPA);

CRA Git | Maintained and supported by SUSTech CRA and CCSE