KVM: x86/mmu: Drop pointless "return" wrapper label in FNAME(fetch)

Drop the pointless and poorly named "out_gpte_changed" label, in
FNAME(fetch), and instead return RET_PF_RETRY directly.

No functional change intended.

Link: https://lore.kernel.org/r/20240802203900.348808-3-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h
index 0e97e080a997e9bbffbdb67ce7e79b7ea4f68654..480c5412299173258cfd5c89fcc907b96c223b10 100644 (file)
--- a/arch/x86/kvm/mmu/paging_tmpl.h
+++ b/arch/x86/kvm/mmu/paging_tmpl.h
@@ -646,10 +646,10 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault,
         * really care if it changes underneath us after this point).
         */
        if (FNAME(gpte_changed)(vcpu, gw, top_level))
-               goto out_gpte_changed;
+               return RET_PF_RETRY;
 
        if (WARN_ON_ONCE(!VALID_PAGE(vcpu->arch.mmu->root.hpa)))
-               goto out_gpte_changed;
+               return RET_PF_RETRY;
 
        /*
         * Load a new root and retry the faulting instruction in the extremely
@@ -659,7 +659,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault,
         */
        if (unlikely(kvm_mmu_is_dummy_root(vcpu->arch.mmu->root.hpa))) {
                kvm_make_request(KVM_REQ_MMU_FREE_OBSOLETE_ROOTS, vcpu);
-               goto out_gpte_changed;
+               return RET_PF_RETRY;
        }
 
        for_each_shadow_entry(vcpu, fault->addr, it) {
@@ -699,7 +699,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault,
                 * protected is still there.
                 */
                if (FNAME(gpte_changed)(vcpu, gw, it.level - 1))
-                       goto out_gpte_changed;
+                       return RET_PF_RETRY;
 
                if (sp != ERR_PTR(-EEXIST))
                        link_shadow_page(vcpu, it.sptep, sp);
@@ -753,9 +753,6 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault,
 
        FNAME(pte_prefetch)(vcpu, gw, it.sptep);
        return ret;
-
-out_gpte_changed:
-       return RET_PF_RETRY;
 }
 
 /*