KVM: x86/mmu: Replace open coded usage of tdp_mmu_page with is_tdp_mmu_page()

[ Upstream commit aeb568a1a6041e3d69def54046747bbd989bc4ed ]

Use is_tdp_mmu_page() instead of querying sp->tdp_mmu_page directly so
that all users benefit if KVM ever finds a way to optimize the logic.

No functional change intended.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20221012181702.3663607-10-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Stable-dep-of: edbdb43fc96b ("KVM: x86: Preserve TDP MMU roots until they are explicitly invalidated")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 8666e8ff48a6ea1e8aa5f7f8c8720d1f03e40cdb..dcca08a08bd0cf228a5c603010e6b6bd85b29400 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -1942,7 +1942,7 @@ static bool is_obsolete_sp(struct kvm *kvm, struct kvm_mmu_page *sp)
                return true;
 
        /* TDP MMU pages do not use the MMU generation. */
-       return !sp->tdp_mmu_page &&
+       return !is_tdp_mmu_page(sp) &&
               unlikely(sp->mmu_valid_gen != kvm->arch.mmu_valid_gen);
 }
 

diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c
index 7e5952e95d3bf7c4fe1f73bbee1471c1c5581013..cc1fb9a65620152249c79cbf1770602a209b1e66 100644 (file)
--- a/arch/x86/kvm/mmu/tdp_mmu.c
+++ b/arch/x86/kvm/mmu/tdp_mmu.c
@@ -133,7 +133,7 @@ void kvm_tdp_mmu_put_root(struct kvm *kvm, struct kvm_mmu_page *root,
        if (!refcount_dec_and_test(&root->tdp_mmu_root_count))
                return;
 
-       WARN_ON(!root->tdp_mmu_page);
+       WARN_ON(!is_tdp_mmu_page(root));
 
        /*
         * The root now has refcount=0.  It is valid, but readers already