[PATCH v2 17/22] powerpc/kvm/book3s: use find_kvm_host_pte in kvmppc_book3s_instantiate_page

[Aneesh Kumar K.V]

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

diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c 
b/arch/powerpc/kvm/book3s_64_mmu_radix.c
index f0b021052e33..fae89e3dbee0 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_radix.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c
@@ -813,20 +813,20 @@ int kvmppc_book3s_instantiate_page(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);
 
        /* If we're logging dirty pages, always map single pages */
        large_enable = !(memslot->flags & KVM_MEM_LOG_DIRTY_PAGES);
-- 
2.24.1