Commit bda3deaa authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/kvm/book3s: use find_kvm_host_pte in kvmppc_book3s_instantiate_page 



Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200505071729.54912-18-aneesh.kumar@linux.ibm.com
parent 3ff8df14

arch/powerpc/kvm/book3s_64_mmu_radix.c

+4 −4
Original line number Diff line number Diff line
@@ -813,12 +813,12 @@ 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);

	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.