3.16.48-rc1 review patch.  If anyone has any objections, please let me know.

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

From: Paolo Bonzini <pbonz...@redhat.com>

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.zwis...@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
Acked-by: Paul E. McKenney <paul...@linux.vnet.ibm.com>
Tested-by: Wanpeng Li <wanpeng...@hotmail.com>
Signed-off-by: Radim Krčmář <rkrc...@redhat.com>
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 arch/x86/kernel/kvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -160,8 +160,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)

Reply via email to