Commit 6b15ae74 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Wentao Guan
Browse files

Revert "KVM: e500: always restore irqs" 

stable inclusion
from stable-v6.6.83
commit 9e4b27250fcd4341d8bc80f762e33811e75b1e86
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBX1M5

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9e4b27250fcd4341d8bc80f762e33811e75b1e86

--------------------------------

This reverts commit b9d93eda1214985d1b3d00a0f9d4306282a5b189 which is
commit 87ecfdbc699cc95fac73291b52650283ddcf929d upstream.

It should not have been applied.

Link: https://lore.kernel.org/r/CABgObfb5U9zwTQBPkPB=mKu-vMrRspPCm4wfxoQpB+SyAnb5WQ@mail.gmail.com


Reported-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 9e4b27250fcd4341d8bc80f762e33811e75b1e86)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent a0e347a2

arch/powerpc/kvm/e500_mmu_host.c

+2 −2
Original line number Diff line number Diff line
@@ -479,6 +479,7 @@ 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",
@@ -487,9 +488,8 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, 
			goto out;

		}

	}

	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);