diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-04-26 16:56:26 +0200 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-06-25 22:02:18 -0400 |
| commit | 702eb8d270f2edd8b18c2afbb360bc2bf9eca33e (patch) | |
| tree | 2621fcf863bcdd1636c9b3d1b2eebc47041ad96d /arch/x86 | |
| parent | 4b1bf4b008ca1495bbd12b0a3f8a3319cfddad75 (diff) | |
kvm: async_pf: fix rcu_irq_enter() with irqs enabled
[ Upstream commit bbaf0e2b1c1b4f88abd6ef49576f0efb1734eae5 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/kvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 9435620062df..27e63c1770e6 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -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) |