KVM: x86/mmu: Don't mark "struct page" accessed when zapping SPTEs

Don't mark pages/folios as accessed in the primary MMU when zapping SPTEs,
as doing so relies on kvm_pfn_to_refcounted_page(), and generally speaking
is unnecessary and wasteful.  KVM participates in page aging via
mmu_notifiers, so there's no need to push "accessed" updates to the
primary MMU.

And if KVM zaps a SPTe in response to an mmu_notifier, marking it accessed
_after_ the primary MMU has decided to zap the page is likely to go
unnoticed, i.e. odds are good that, if the page is being zapped for
reclaim, the page will be swapped out regardless of whether or not KVM
marks the page accessed.

Dropping x86's use of kvm_set_pfn_accessed() also paves the way for
removing kvm_pfn_to_refcounted_page() and all its users.

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-83-seanjc@google.com>

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 0aae8e63566c33a89f42c7f8acad389ce8a0c404..084e6c4d1eaf8992ba92f53d685c9800a5c4cb4f 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -559,10 +559,8 @@ static bool mmu_spte_update(u64 *sptep, u64 new_spte)
  */
 static u64 mmu_spte_clear_track_bits(struct kvm *kvm, u64 *sptep)
 {
-       kvm_pfn_t pfn;
        u64 old_spte = *sptep;
        int level = sptep_to_sp(sptep)->role.level;
-       struct page *page;
 
        if (!is_shadow_present_pte(old_spte) ||
            !spte_has_volatile_bits(old_spte))
@@ -574,21 +572,6 @@ static u64 mmu_spte_clear_track_bits(struct kvm *kvm, u64 *sptep)
                return old_spte;
 
        kvm_update_page_stats(kvm, level, -1);
-
-       pfn = spte_to_pfn(old_spte);
-
-       /*
-        * KVM doesn't hold a reference to any pages mapped into the guest, and
-        * instead uses the mmu_notifier to ensure that KVM unmaps any pages
-        * before they are reclaimed.  Sanity check that, if the pfn is backed
-        * by a refcounted page, the refcount is elevated.
-        */
-       page = kvm_pfn_to_refcounted_page(pfn);
-       WARN_ON_ONCE(page && !page_count(page));
-
-       if (is_accessed_spte(old_spte))
-               kvm_set_pfn_accessed(pfn);
-
        return old_spte;
 }
 

diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c
index 8aa0d7a7602b1108a8ccec5353ec5c9cd4a42529..91caa73a905b9b458f681f07d06c776faddf97b8 100644 (file)
--- a/arch/x86/kvm/mmu/tdp_mmu.c
+++ b/arch/x86/kvm/mmu/tdp_mmu.c
@@ -861,9 +861,6 @@ static bool tdp_mmu_zap_leafs(struct kvm *kvm, struct kvm_mmu_page *root,
 
                tdp_mmu_iter_set_spte(kvm, &iter, SHADOW_NONPRESENT_VALUE);
 
-               if (is_accessed_spte(iter.old_spte))
-                       kvm_set_pfn_accessed(spte_to_pfn(iter.old_spte));
-
                /*
                 * Zappings SPTEs in invalid roots doesn't require a TLB flush,
                 * see kvm_tdp_mmu_zap_invalidated_roots() for details.