KVM: Use plain "struct page" pointer instead of single-entry array

Use a single pointer instead of a single-entry array for the struct page
pointer in hva_to_pfn_fast().  Using an array makes the code unnecessarily
annoying to read and update.

No functional change intended.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
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-27-seanjc@google.com>

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index c20386a8aa3eaf1e656b9f874041cd2a9012def2..32f0858da7f278e6b1c66aefbcb11baafafe9541 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2752,7 +2752,7 @@ unsigned long kvm_vcpu_gfn_to_hva_prot(struct kvm_vcpu *vcpu, gfn_t gfn, bool *w
  */
 static bool hva_to_pfn_fast(struct kvm_follow_pfn *kfp, kvm_pfn_t *pfn)
 {
-       struct page *page[1];
+       struct page *page;
 
        /*
         * Fast pin a writable pfn only if it is a write fault request
@@ -2762,8 +2762,8 @@ static bool hva_to_pfn_fast(struct kvm_follow_pfn *kfp, kvm_pfn_t *pfn)
        if (!((kfp->flags & FOLL_WRITE) || kfp->map_writable))
                return false;
 
-       if (get_user_page_fast_only(kfp->hva, FOLL_WRITE, page)) {
-               *pfn = page_to_pfn(page[0]);
+       if (get_user_page_fast_only(kfp->hva, FOLL_WRITE, &page)) {
+               *pfn = page_to_pfn(page);
                if (kfp->map_writable)
                        *kfp->map_writable = true;
                return true;