kvm: async_pf: fix rcu_irq_enter() with irqs enabled

commit bbaf0e2b1c1b4f88abd6ef49576f0efb1734eae5 upstream.

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>
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Willy Tarreau <w@1wt.eu>

This commit is contained in:

Paolo Bonzini

2017-04-26 16:56:26 +02:00

committed by

Willy Tarreau

parent 28968bccd8

commit ca58e31291

1 changed files with 1 additions and 1 deletions

									
										arch/x86/kernel/kvm.c
									
		+1
		-1
	
												View File
												
				@@ -159,8 +159,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)