Signed-off-by: Aneesh Kumar K.V <[email protected]>
---
 arch/powerpc/kvm/book3s_64_mmu_hv.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c 
b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index 6404df613ea3..121146f5a331 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -602,20 +602,20 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, 
struct kvm_vcpu *vcpu,
         * Read the PTE from the process' radix tree and use that
         * so we get the shift and attribute bits.
         */
-       local_irq_disable();
-       ptep = __find_linux_pte(vcpu->arch.pgdir, hva, NULL, &shift);
+       spin_lock(&kvm->mmu_lock);
+       ptep = find_kvm_host_pte(kvm, mmu_seq, hva, &shift);
        /*
         * If the PTE disappeared temporarily due to a THP
         * collapse, just return and let the guest try again.
         */
        if (!ptep) {
-               local_irq_enable();
+               spin_unlock(&kvm->mmu_lock);
                if (page)
                        put_page(page);
                return RESUME_GUEST;
        }
-       pte = *ptep;
-       local_irq_enable();
+       pte = READ_ONCE(*ptep);
+       spin_unlock(&kvm->mmu_lock);
        hpa = pte_pfn(pte) << PAGE_SHIFT;
        pte_size = PAGE_SIZE;
        if (shift)
-- 
2.25.3

Reply via email to