kvm/ppc/booke64: Fix lazy ee handling in kvmppc_handle_exit() (7c11c0cc) · Commits · 戴 / test

EE is hard-disabled on entry to kvmppc_handle_exit(), so call hard_irq_disable() so that PACA_IRQ_HARD_DIS is set, and soft_enabled is unset. Without this, we get warnings such as arch/powerpc/kernel/time.c:300, and sometimes host kernel hangs. Signed-off-by:

Scott Wood <scottwood@freescale.com> Signed-off-by:

Gleb Natapov <gleb@redhat.com>

arch/powerpc/kvm/booke.c

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -834,6 +834,17 @@ int kvmppc_handle_exit(struct kvm_run run, struct kvm_vcpu vcpu,
	int s;		int s;
	int idx;		int idx;

			#ifdef CONFIG_PPC64
			WARN_ON(local_paca->irq_happened != 0);
			#endif

			/*
			* We enter with interrupts disabled in hardware, but
			* we need to call hard_irq_disable anyway to ensure that
			* the software state is kept in sync.
			*/
			hard_irq_disable();

	/* update before a new last_exit_type is rewritten */		/* update before a new last_exit_type is rewritten */
	kvmppc_update_timing_stats(vcpu);		kvmppc_update_timing_stats(vcpu);

Admin message