From: Sean Christopherson <seanjc@google.com>
Date: Thu, 10 Oct 2024 18:24:13 +0000 (-0700)
Subject: KVM: MIPS: Mark "struct page" pfns accessed prior to dropping mmu_lock
X-Git-Tag: v6.13-rc1~97^2~17^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13d66fddaaa40c82a664cbec0ac9d31b7771a396;p=thirdparty%2Fkernel%2Flinux.git

KVM: MIPS: Mark "struct page" pfns accessed prior to dropping mmu_lock

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>
---

diff --git a/arch/mips/kvm/mmu.c b/arch/mips/kvm/mmu.c
index f1e4b618ec6d5..69463ab24d97f 100644
--- a/arch/mips/kvm/mmu.c
+++ b/arch/mips/kvm/mmu.c
@@ -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;