Skip to content

Commit bd024e8

Browse files
committed
asm-generic/mmiowb: Allow mmiowb_set_pending() when preemptible()
Although mmiowb() is concerned only with serialising MMIO writes occuring in contexts where a spinlock is held, the call to mmiowb_set_pending() from the MMIO write accessors can occur in preemptible contexts, such as during driver probe() functions where ordering between CPUs is not usually a concern, assuming that the task migration path provides the necessary ordering guarantees. Unfortunately, the default implementation of mmiowb_set_pending() is not preempt-safe, as it makes use of a a per-cpu variable to track its internal state. This has been reported to generate the following splat on riscv: | BUG: using smp_processor_id() in preemptible [00000000] code: swapper/0/1 | caller is regmap_mmio_write32le+0x1c/0x46 | CPU: 3 PID: 1 Comm: swapper/0 Not tainted 5.8.0-rc3-hfu+ #1 | Call Trace: | walk_stackframe+0x0/0x7a | dump_stack+0x6e/0x88 | regmap_mmio_write32le+0x18/0x46 | check_preemption_disabled+0xa4/0xaa | regmap_mmio_write32le+0x18/0x46 | regmap_mmio_write+0x26/0x44 | regmap_write+0x28/0x48 | sifive_gpio_probe+0xc0/0x1da Although it's possible to fix the driver in this case, other splats have been seen from other drivers, including the infamous 8250 UART, and so it's better to address this problem in the mmiowb core itself. Fix mmiowb_set_pending() by using the raw_cpu_ptr() to get at the mmiowb state and then only updating the 'mmiowb_pending' field if we are not preemptible (i.e. we have a non-zero nesting count). Cc: Arnd Bergmann <[email protected]> Cc: Paul Walmsley <[email protected]> Cc: Guo Ren <[email protected]> Cc: Michael Ellerman <[email protected]> Reported-by: Palmer Dabbelt <[email protected]> Reported-by: Emil Renner Berthing <[email protected]> Tested-by: Emil Renner Berthing <[email protected]> Reviewed-by: Palmer Dabbelt <[email protected]> Acked-by: Palmer Dabbelt <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 5afc785 commit bd024e8

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

include/asm-generic/mmiowb.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,17 @@
2727
#include <asm/smp.h>
2828

2929
DECLARE_PER_CPU(struct mmiowb_state, __mmiowb_state);
30-
#define __mmiowb_state() this_cpu_ptr(&__mmiowb_state)
30+
#define __mmiowb_state() raw_cpu_ptr(&__mmiowb_state)
3131
#else
3232
#define __mmiowb_state() arch_mmiowb_state()
3333
#endif /* arch_mmiowb_state */
3434

3535
static inline void mmiowb_set_pending(void)
3636
{
3737
struct mmiowb_state *ms = __mmiowb_state();
38-
ms->mmiowb_pending = ms->nesting_count;
38+
39+
if (likely(ms->nesting_count))
40+
ms->mmiowb_pending = ms->nesting_count;
3941
}
4042

4143
static inline void mmiowb_spin_lock(void)

0 commit comments

Comments
 (0)