x86/kvm: Don't enable IRQ when IRQ enabled in kvm_wait
Subsystems (3)
PATCH 1/1 x86/kvm: Don't enable IRQ when IRQ enabled in kvm_wait
From: Lai Jiangshan <[email protected]>
Commit f4e61f0c9add3 ("x86/kvm: Fix broken irq restoration in kvm_wait") replaced "local_irq_restore() when IRQ enabled" with "local_irq_enable() when IRQ enabled" to suppress a warnning.
Although there is no similar debugging warnning for doing local_irq_enable() when IRQ enabled as doing local_irq_restore() in the same IRQ situation. But doing local_irq_enable() when IRQ enabled is no less broken as doing local_irq_restore() and we'd better avoid it.
---
The original debugging warnning was introduced in commit 997acaf6b4b5 ("lockdep: report broken irq restoration"). I think a similar debugging check and warnning should also be added to "local_irq_enable() when IRQ enabled" and even maybe "local_irq_disable() when IRQ disabled" to detect something this:
| local_irq_save(flags);
| local_irq_disable();
| local_irq_restore(flags);
| local_irq_enable();Or even we can do the check in lockdep+TRACE_IRQFLAGS:
In lockdep_hardirqs_on_prepare(), lockdep_hardirqs_enabled() was checked (and exit) before checking DEBUG_LOCKS_WARN_ON(!irqs_disabled()), so lockdep can't give any warning for these kind of situations. If we did the check in lockdep, we would have found the problem before, and we don't need 997acaf6b4b5.
Any thought? Mark? Peter?
arch/x86/kernel/kvm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/kernel/kvm.c +3 -2
@@ -884,10 +884,11 @@ static void kvm_wait(u8 *ptr, u8 val) }else {local_irq_disable (); +/* safe_halt() will enable IRQ */ if (READ_ONCE (*ptr) == val)safe_halt (); - -local_irq_enable (); +else +local_irq_enable (); } }
Signature · 1 line
2.19.1.6.gb485710b
Ping
Quoted 62 lines · Lai Jiangshan
From: Lai Jiangshan <[email protected]>
Commit
f4e61f0c9add3("x86/kvm: Fix broken irq restoration inkvm_wait") replaced "local_irq_restore()when IRQ enabled" with "local_irq_enable()when IRQ enabled" to suppress a warnning.Although there is no similar debugging warnning for doing
local_irq_enable()when IRQ enabled as doinglocal_irq_restore()in the same IRQ situation. But doinglocal_irq_enable()when IRQ enabled is no less broken as doinglocal_irq_restore()and we'd better avoid it.Cc Mark Rutland <[email protected]>Cc Peter Zijlstra (Intel) <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>---
The original debugging warnning was introduced in commit
997acaf6b4b5("lockdep: report broken irq restoration"). I think a similar debugging check and warnning should also be added to "local_irq_enable()when IRQ enabled" and even maybe "local_irq_disable()when IRQ disabled" to detect something this:| local_irq_save(flags); | local_irq_disable(); | local_irq_restore(flags); | local_irq_enable();Or even we can do the check in lockdep+TRACE_IRQFLAGS:
In
lockdep_hardirqs_on_prepare(),lockdep_hardirqs_enabled()was checked (and exit) before checking DEBUG_LOCKS_WARN_ON(!irqs_disabled()), so lockdep can't give any warning for these kind of situations. If we did the check in lockdep, we would have found the problem before, and we don't need997acaf6b4b5.Any thought? Mark? Peter?
arch/x86/kernel/kvm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)arch/x86/kernel/kvm.c +3
-3@@ -884,10 +884,11 @@ static void kvm_wait(u8 *ptr, u8 val) }else {local_irq_disable (); +/* safe_halt() will enable IRQ */ if (READ_ONCE (*ptr) == val)safe_halt (); - -local_irq_enable (); +else +local_irq_enable (); } } --2.19.1.6.gb485710b
Quoted 49 lines · Lai Jiangshan
From: Lai Jiangshan <[email protected]>
Commit
f4e61f0c9add3("x86/kvm: Fix broken irq restoration inkvm_wait") replaced "local_irq_restore()when IRQ enabled" with "local_irq_enable()when IRQ enabled" to suppress a warnning.Although there is no similar debugging warnning for doing
local_irq_enable()when IRQ enabled as doinglocal_irq_restore()in the same IRQ situation. But doinglocal_irq_enable()when IRQ enabled is no less broken as doinglocal_irq_restore()and we'd better avoid it.Cc Mark Rutland <[email protected]>Cc Peter Zijlstra (Intel) <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>---
The original debugging warnning was introduced in commit
997acaf6b4b5("lockdep: report broken irq restoration"). I think a similar debugging check and warnning should also be added to "local_irq_enable()when IRQ enabled" and even maybe "local_irq_disable()when IRQ disabled" to detect something this:| local_irq_save(flags); | local_irq_disable(); | local_irq_restore(flags); | local_irq_enable();Or even we can do the check in lockdep+TRACE_IRQFLAGS:
In
lockdep_hardirqs_on_prepare(),lockdep_hardirqs_enabled()was checked (and exit) before checking DEBUG_LOCKS_WARN_ON(!irqs_disabled()), so lockdep can't give any warning for these kind of situations. If we did the check in lockdep, we would have found the problem before, and we don't need997acaf6b4b5.Any thought? Mark? Peter?
arch/x86/kernel/kvm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)arch/x86/kernel/kvm.c +0
-0@@ -884,10 +884,11 @@ static void kvm_wait(u8 *ptr, u8 val) }else {local_irq_disable ();
arch/x86/kernel/kvm.c static void kvm_wait(u8 *ptr, u8 val) · line 894
Quoted 10 lines
arch/x86/kernel/kvm.c +3
-2+/* safe_halt() will enable IRQ */ if (READ_ONCE (*ptr) == val)safe_halt (); - -local_irq_enable (); +else +local_irq_enable (); } }
Queued, thanks.
paolo