KVM: selftests: Fill in vm->vpages_mapped bitmap in virt_map() too

Similar to vm_vaddr_alloc(), virt_map() needs to reflect the mapping
in vm->vpages_mapped.

While on it, remove unneeded code wrapping in vm_vaddr_alloc().

Reviewed-by: Andrew Jones <andrew.jones@linux.dev>
Reviewed-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20221101145426.251680-35-vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index 5ac8f207ed92d27736e98f10e87b2b0ede5480ae..a3ff96ec02355be108dbebc6bd82b6a71b2ac6aa 100644 (file)
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -1319,8 +1319,7 @@ vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min)
 
                virt_pg_map(vm, vaddr, paddr);
 
-               sparsebit_set(vm->vpages_mapped,
-                       vaddr >> vm->page_shift);
+               sparsebit_set(vm->vpages_mapped, vaddr >> vm->page_shift);
        }
 
        return vaddr_start;
@@ -1393,6 +1392,8 @@ void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
                virt_pg_map(vm, vaddr, paddr);
                vaddr += page_size;
                paddr += page_size;
+
+               sparsebit_set(vm->vpages_mapped, vaddr >> vm->page_shift);
        }
 }