Re: [PATCH v2] block: fix PF_BLOCK_TS/current->plug ordering in blk_finish_plug()

From: Chao Yu

Date: Tue Nov 17 2026 - 22:31:48 EST


On 11/18/26 10:31, Zi-Hao Huang via B4 Relay wrote:
> From: Zi-Hao Huang <zi-hao.huang@xxxxxxxxxxxx>
>
> blk_plug_invalidate_ts() runs on context switch and assumes that
> PF_BLOCK_TS set implies current->plug != NULL. blk_finish_plug() breaks
> this: it clears PF_BLOCK_TS in __blk_flush_plug() and then sets
> current->plug = NULL, with plain accesses.
>
> clang inlines __blk_flush_plug() and emits the store to current->plug
> before the store that clears the flag (arm64, Android common kernel):
>
> ldr w8, [x20, #0x44] // w8 = current->flags
> str xzr, [x20, #0xaa8] // current->plug = NULL
> and w8, w8, #0xdfffffff // w8 &= ~PF_BLOCK_TS <- preempted here
> str w8, [x20, #0x44] // current->flags = w8
>
> If an interrupt hits there and preempts the task, the task is later
> scheduled back in with PF_BLOCK_TS set and no plug, and
> blk_plug_invalidate_ts() writes to NULL + 0x20 (plug->cur_ktime):
>
> Unable to handle kernel NULL pointer dereference at 0000000000000020
> pc : __schedule+0x108c
> preempt_schedule_irq+0x48/0xa8
> el1_interrupt+0x48/0x8c
> blk_finish_plug+0x6c/0x18c
> ext4_do_writepages+0xd3c/0xef8
>
> The window is only a few instructions wide, so this is rare. It was hit
> at cycle 127 of a warm reboot stress test.
>
> Add a compiler barrier so the flag is cleared before the plug is
> dropped. A compiler barrier is enough because the race is with
> preemption of the same task on the same CPU. With the barrier, the same
> build stores current->flags before current->plug.
>
> Fixes: fad156c2af22 ("block: invalidate cached plug timestamp after task switch")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Zi-Hao Huang <zi-hao.huang@xxxxxxxxxxxx>
> Reviewed-by: Sandeep Dhavale <dhavale@xxxxxxxxxx>
Oh, I didn't notice your v1 before sending mine, it looks good to me.

Reviewed-by: Chao Yu <chao@xxxxxxxxxx>

Thanks,