KVM: Drop unused "hva" pointer from __gfn_to_pfn_memslot()

Drop @hva from __gfn_to_pfn_memslot() now that all callers pass NULL.

No functional change intended.

Tested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Tested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20241010182427.1434605-19-seanjc@google.com>

diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index 9fbc79fad292a98ca1439e43dc354d478de6004a..246c820379ec991b42ba973117423b465829b480 100644 (file)
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -1571,7 +1571,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
        mmap_read_unlock(current->mm);
 
        pfn = __gfn_to_pfn_memslot(memslot, gfn, false, NULL,
-                                  write_fault, &writable, NULL);
+                                  write_fault, &writable);
        if (pfn == KVM_PFN_ERR_HWPOISON) {
                kvm_send_hwpoison_signal(hva, vma_shift);
                return 0;

diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index 8cd02ca4b1b8df139a00fe518f8962afe5003736..2f1d58984b41cde856e473afb82114cab349135e 100644 (file)
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -614,7 +614,7 @@ int kvmppc_book3s_hv_page_fault(struct kvm_vcpu *vcpu,
        } else {
                /* Call KVM generic code to do the slow-path check */
                pfn = __gfn_to_pfn_memslot(memslot, gfn, false, NULL,
-                                          writing, &write_ok, NULL);
+                                          writing, &write_ok);
                if (is_error_noslot_pfn(pfn))
                        return -EFAULT;
                page = NULL;

diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c
index 26a969e935e37e40122267e0a5e2786890af2c23..8304b6f8fe45e3d45ef1636f2524edb6e2f740a9 100644 (file)
--- a/arch/powerpc/kvm/book3s_64_mmu_radix.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c
@@ -853,7 +853,7 @@ int kvmppc_book3s_instantiate_page(struct kvm_vcpu *vcpu,
 
                /* Call KVM generic code to do the slow-path check */
                pfn = __gfn_to_pfn_memslot(memslot, gfn, false, NULL,
-                                          writing, upgrade_p, NULL);
+                                          writing, upgrade_p);
                if (is_error_noslot_pfn(pfn))
                        return -EFAULT;
                page = NULL;

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index d4e21071b78e99f60aafccdf446e0ff71ccaada4..688202ac50c23c4b4c11192ecb63345237d9731b 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -4384,8 +4384,7 @@ static int __kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault
                return kvm_faultin_pfn_private(vcpu, fault);
 
        fault->pfn = __gfn_to_pfn_memslot(fault->slot, fault->gfn, false, true,
-                                         fault->write, &fault->map_writable,
-                                         NULL);
+                                         fault->write, &fault->map_writable);
 
        /*
         * If resolving the page failed because I/O is needed to fault-in the
@@ -4413,8 +4412,7 @@ static int __kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault
         * get a page and a fatal signal, i.e. SIGKILL, is pending.
         */
        fault->pfn = __gfn_to_pfn_memslot(fault->slot, fault->gfn, true, true,
-                                         fault->write, &fault->map_writable,
-                                         NULL);
+                                         fault->write, &fault->map_writable);
        return RET_PF_CONTINUE;
 }
 

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index dc15a9a64408491e8c7584e885760ca3f07ea61a..2c9eb472f05959921ad477041fc5f4ca7a27fd56 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1235,7 +1235,7 @@ kvm_pfn_t gfn_to_pfn_prot(struct kvm *kvm, gfn_t gfn, bool write_fault,
 kvm_pfn_t gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn);
 kvm_pfn_t __gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn,
                               bool interruptible, bool no_wait,
-                              bool write_fault, bool *writable, hva_t *hva);
+                              bool write_fault, bool *writable);
 
 void kvm_release_pfn_clean(kvm_pfn_t pfn);
 void kvm_release_pfn_dirty(kvm_pfn_t pfn);

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index d7a72278c0338f7bb0a186066d86f474df862347..9de915a56bd589ae8da3e4fcafbcb0ed3d3918d3 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2967,13 +2967,10 @@ retry:
 
 kvm_pfn_t __gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn,
                               bool interruptible, bool no_wait,
-                              bool write_fault, bool *writable, hva_t *hva)
+                              bool write_fault, bool *writable)
 {
        unsigned long addr = __gfn_to_hva_many(slot, gfn, NULL, write_fault);
 
-       if (hva)
-               *hva = addr;
-
        if (kvm_is_error_hva(addr)) {
                if (writable)
                        *writable = false;
@@ -2996,13 +2993,13 @@ kvm_pfn_t gfn_to_pfn_prot(struct kvm *kvm, gfn_t gfn, bool write_fault,
                      bool *writable)
 {
        return __gfn_to_pfn_memslot(gfn_to_memslot(kvm, gfn), gfn, false, false,
-                                   write_fault, writable, NULL);
+                                   write_fault, writable);
 }
 EXPORT_SYMBOL_GPL(gfn_to_pfn_prot);
 
 kvm_pfn_t gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn)
 {
-       return __gfn_to_pfn_memslot(slot, gfn, false, false, true, NULL, NULL);
+       return __gfn_to_pfn_memslot(slot, gfn, false, false, true, NULL);
 }
 EXPORT_SYMBOL_GPL(gfn_to_pfn_memslot);