Commit 87ecfdbc authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: e500: always restore irqs 



If find_linux_pte fails, IRQs will not be restored.  This is unlikely
to happen in practice since it would have been reported as hanging
hosts, but it should of course be fixed anyway.

Cc: stable@vger.kernel.org
Reported-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f07044dd

arch/powerpc/kvm/e500_mmu_host.c

+2 −2
Original line number Diff line number Diff line
@@ -479,7 +479,6 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, 
		if (pte_present(pte)) {

			wimg = (pte_val(pte) >> PTE_WIMGE_SHIFT) &

				MAS2_WIMGE_MASK;

			local_irq_restore(flags);

		} else {

			local_irq_restore(flags);

			pr_err_ratelimited("%s: pte not present: gfn %lx,pfn %lx\n",
@@ -488,8 +487,9 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, 
			goto out;

		}

	}

	writable = kvmppc_e500_ref_setup(ref, gtlbe, pfn, wimg);

	local_irq_restore(flags);



	writable = kvmppc_e500_ref_setup(ref, gtlbe, pfn, wimg);

	kvmppc_e500_setup_stlbe(&vcpu_e500->vcpu, gtlbe, tsize,

				ref, gvaddr, stlbe);