]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: MIPS: Mark "struct page" pfns accessed prior to dropping mmu_lock
authorSean Christopherson <seanjc@google.com>
Thu, 10 Oct 2024 18:24:13 +0000 (11:24 -0700)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 25 Oct 2024 17:00:49 +0000 (13:00 -0400)
Mark pages accessed before dropping mmu_lock when faulting in guest memory
so that MIPS can convert to kvm_release_faultin_page() without tripping
its lockdep assertion on mmu_lock being held.

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

arch/mips/kvm/mmu.c

index f1e4b618ec6d5b6d9beb2240659ef30bd0c60d29..69463ab24d97f6c2612df6580ccec157afa2de54 100644 (file)
@@ -634,10 +634,9 @@ retry:
 
        if (writeable)
                kvm_set_pfn_dirty(pfn);
+       kvm_release_pfn_clean(pfn);
 
        spin_unlock(&kvm->mmu_lock);
-       kvm_release_pfn_clean(pfn);
-       kvm_set_pfn_accessed(pfn);
 out:
        srcu_read_unlock(&kvm->srcu, srcu_idx);
        return err;