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

KVM: selftests: Unconditionally use memslot '0' for page table allocations 



Drop the memslot param from virt_pg_map() and virt_map() and shove the
hardcoded '0' down to the vm_phy_page_alloc() calls.

No functional change intended.

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

tools/testing/selftests/kvm/dirty_log_test.c

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) 
				    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, 0);

	virt_map(vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages);



	/* 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

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



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

	      unsigned int npages, uint32_t pgd_memslot);

	      unsigned int npages);

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);
@@ -256,8 +256,7 @@ void virt_pgd_alloc(struct kvm_vm *vm); 
 * Within @vm, creates a virtual translation for the page starting

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

 */

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

		 uint32_t memslot);

void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr);



vm_paddr_t vm_phy_page_alloc(struct kvm_vm *vm, vm_paddr_t paddr_min,

			     uint32_t memslot);

tools/testing/selftests/kvm/kvm_page_table_test.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg) 
				    TEST_MEM_SLOT_INDEX, guest_num_pages, 0);



	/* Do mapping(GVA->GPA) for the testing memory slot */

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

	virt_map(vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages);



	/* Cache the HVA pointer of the region */

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

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

+7 −8
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ void virt_pgd_alloc(struct kvm_vm *vm) 
	}

}



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

		  uint32_t pgd_memslot, uint64_t flags)

static void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,

			 uint64_t flags)

{

	uint8_t attr_idx = flags & 7;

	uint64_t *ptep;
@@ -105,7 +105,7 @@ void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, 


	ptep = addr_gpa2hva(vm, vm->pgd) + pgd_index(vm, vaddr) * 8;

	if (!*ptep) {

		*ptep = vm_phy_page_alloc(vm, KVM_GUEST_PAGE_TABLE_MIN_PADDR, pgd_memslot);

		*ptep = vm_phy_page_alloc(vm, KVM_GUEST_PAGE_TABLE_MIN_PADDR, 0);

		*ptep |= 3;

	}
@@ -113,14 +113,14 @@ void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, 
	case 4:

		ptep = addr_gpa2hva(vm, pte_addr(vm, *ptep)) + pud_index(vm, vaddr) * 8;

		if (!*ptep) {

			*ptep = vm_phy_page_alloc(vm, KVM_GUEST_PAGE_TABLE_MIN_PADDR, pgd_memslot);

			*ptep = vm_phy_page_alloc(vm, KVM_GUEST_PAGE_TABLE_MIN_PADDR, 0);

			*ptep |= 3;

		}

		/* fall through */

	case 3:

		ptep = addr_gpa2hva(vm, pte_addr(vm, *ptep)) + pmd_index(vm, vaddr) * 8;

		if (!*ptep) {

			*ptep = vm_phy_page_alloc(vm, KVM_GUEST_PAGE_TABLE_MIN_PADDR, pgd_memslot);

			*ptep = vm_phy_page_alloc(vm, KVM_GUEST_PAGE_TABLE_MIN_PADDR, 0);

			*ptep |= 3;

		}

		/* fall through */
@@ -135,12 +135,11 @@ void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, 
	*ptep |= (attr_idx << 2) | (1 << 10) /* Access Flag */;

}



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

		 uint32_t pgd_memslot)

void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)

{

	uint64_t attr_idx = 4; /* NORMAL (See DEFAULT_MAIR_EL1) */



	_virt_pg_map(vm, vaddr, paddr, pgd_memslot, attr_idx);

	_virt_pg_map(vm, vaddr, paddr, attr_idx);

}



vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ static bool ucall_mmio_init(struct kvm_vm *vm, vm_paddr_t gpa) 
	if (kvm_userspace_memory_region_find(vm, gpa, gpa + 1))

		return false;



	virt_pg_map(vm, gpa, gpa, 0);

	virt_pg_map(vm, gpa, gpa);



	ucall_exit_mmio_addr = (vm_vaddr_t *)gpa;

	sync_global_to_guest(vm, ucall_exit_mmio_addr);