[PATCH v4 13/22] powerpc/kvm/book3s: Use find_kvm_host_pte in page fault handler

[Aneesh Kumar K.V]

Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.ibm.com>
---
 arch/powerpc/kvm/book3s_64_mmu_hv.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c 
b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index 2b35f9bcf892..38e934dc1714 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -602,12 +602,12 @@ 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)
        pte = __pte(0);
        if (ptep)
-               pte = *ptep;
-       local_irq_enable();
+               pte = READ_ONCE(*ptep);
+       spin_unlock(&kvm->mmu_lock);
        /*
         * If the PTE disappeared temporarily due to a THP
         * collapse, just return and let the guest try again.
-- 
2.26.2