printk: nbcon: Fix nbcon_cpu_emergency_flush() when preemptible
John Ogness
maintainerPATCH 1/1 printk: nbcon: Fix nbcon_cpu_emergency_flush() when preemptible
nbcon_cpu_emergency_flush() can be called in a preemptible context. In that case the CPU is not in an emergency state. However, in order to see that the CPU is not in an emergency state (accessing the per-cpu variable), preemption must be disabled.
Disable preemption when checking the CPU state.
--- kernel/printk/nbcon.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
kernel/printk/nbcon.c +12 -1
@@ -1443,8 +1443,19 @@ void nbcon_cpu_emergency_exit(void)*/ void nbcon_cpu_emergency_flush (void ) { +bool is_emergency; + +/* +* If this context is not an emergency context, preemption might be +* enabled. To be sure, disable preemption when checking if this is +* an emergency context. +*/ +preempt_disable (); + is_emergency = (*nbcon_get_cpu_emergency_nesting () !=0 ); +preempt_enable (); +/* The explicit flush is needed only in the emergency context. */ -if (*(nbcon_get_cpu_emergency_nesting ()) ==0 ) +if (!is_emergency)return ;nbcon_atomic_flush_pending ();
Signature · 1 line
2.30.2
Quoted 6 lines · John Ogness
nbcon_cpu_emergency_flush()can be called in a preemptible context. In that case the CPU is not in an emergency state. However, in order to see that the CPU is not in an emergency state (accessing the per-cpu variable), preemption must be disabled.
Quoted 6 lines
Disable preemption when checking the CPU state.
Reported-by Juri Lelli <[email protected]>Closes https://lore.kernel.org/aqkcpca4vgadxc3yzcu74xwq3grslj5m43f3eb5fcs23yo2gy4@gcsnqcts5tos open hereFixes 46a1379208b7 ("printk: nbcon: Implement emergency sections")Signed-off-by John Ogness <[email protected]>
Great catch!
I am going to push it...
Best Regards,
Petr
Petr Mladek
maintainerQuoted 14 lines · Petr Mladek
Quoted 6 lines · John Ogness
nbcon_cpu_emergency_flush()can be called in a preemptible context. In that case the CPU is not in an emergency state. However, in order to see that the CPU is not in an emergency state (accessing the per-cpu variable), preemption must be disabled.Quoted 6 lines
Disable preemption when checking the CPU state.
Reported-by Juri Lelli <[email protected]>Closes https://lore.kernel.org/aqkcpca4vgadxc3yzcu74xwq3grslj5m43f3eb5fcs23yo2gy4@gcsnqcts5tos open hereFixes 46a1379208b7 ("printk: nbcon: Implement emergency sections")Signed-off-by John Ogness <[email protected]>
Quoted 5 lines
Great catch!
Reviewed-by Petr Mladek <[email protected]>I am going to push it...
Juri, should/could I add your Tested-by ?
Best Regards,
Petr
Juri Lelli
Tested-byQuoted 15 lines · Petr Mladek
Quoted 14 lines · Petr Mladek
Quoted 12 lines · John Ogness
nbcon_cpu_emergency_flush()can be called in a preemptible context. In that case the CPU is not in an emergency state. However, in order to see that the CPU is not in an emergency state (accessing the per-cpu variable), preemption must be disabled.Disable preemption when checking the CPU state.
Reported-by Juri Lelli <[email protected]>Closes https://lore.kernel.org/aqkcpca4vgadxc3yzcu74xwq3grslj5m43f3eb5fcs23yo2gy4@gcsnqcts5tos open hereFixes 46a1379208b7 ("printk: nbcon: Implement emergency sections")Signed-off-by John Ogness <[email protected]>
Quoted 7 lines
Quoted 5 lines
Great catch!
Reviewed-by Petr Mladek <[email protected]>I am going to push it...
Juri, should/could I add your Tested-by ?
A yes please if you like. Thanks!
You guys were so quick to act on it! :)
Best,
Juri
Petr Mladek
maintainerQuoted 6 lines · John Ogness
nbcon_cpu_emergency_flush()can be called in a preemptible context. In that case the CPU is not in an emergency state. However, in order to see that the CPU is not in an emergency state (accessing the per-cpu variable), preemption must be disabled.
Quoted 6 lines
Disable preemption when checking the CPU state.
Reported-by Juri Lelli <[email protected]>Closes https://lore.kernel.org/aqkcpca4vgadxc3yzcu74xwq3grslj5m43f3eb5fcs23yo2gy4@gcsnqcts5tos open hereFixes 46a1379208b7 ("printk: nbcon: Implement emergency sections")Signed-off-by John Ogness <[email protected]>
JFYI, the patch has been comitted into printk/linux.git, branch rework/write-atomic.
Best Regards,
Petr