Commit bbaf0e2b authored Apr 26, 2017 by Paolo Bonzini Committed by Radim Krčmář Jun 06, 2017

kvm: async_pf: fix rcu_irq_enter() with irqs enabled



native_safe_halt enables interrupts, and you just shouldn't
call rcu_irq_enter() with interrupts enabled.  Reorder the
call with the following local_irq_disable() to respect the
invariant.

Reported-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Tested-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>

parent 3c2993b8

arch/x86/kernel/kvm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -161,8 +161,8 @@ void kvm_async_pf_task_wait(u32 token)
		*/
		rcu_irq_exit();
		native_safe_halt();
		rcu_irq_enter();
		local_irq_disable();
		rcu_irq_enter();
		}
		}
		if (!n.halted)