]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
blk-mq: use NOIO context to prevent deadlock during debugfs creation
authorYu Kuai <yukuai@fnnas.com>
Sat, 14 Feb 2026 05:43:50 +0000 (13:43 +0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 16 Feb 2026 17:47:25 +0000 (10:47 -0700)
commitdfe48ea179733be948c432f6af2fc3913cf5dd28
tree5b931d881352843e79ab7d7509f4750dfe6d0284
parent3678a334a55e869b413e2fb4824e92200b149d73
blk-mq: use NOIO context to prevent deadlock during debugfs creation

Creating debugfs entries can trigger fs reclaim, which can enter back
into the block layer request_queue. This can cause deadlock if the
queue is frozen.

Previously, a WARN_ON_ONCE check was used in debugfs_create_files()
to detect this condition, but it was racy since the queue can be frozen
from another context at any time.

Introduce blk_debugfs_lock()/blk_debugfs_unlock() helpers that combine
the debugfs_mutex with memalloc_noio_save()/restore() to prevent fs
reclaim from triggering block I/O. Also add blk_debugfs_lock_nomemsave()
and blk_debugfs_unlock_nomemrestore() variants for callers that don't
need NOIO protection (e.g., debugfs removal or read-only operations).

Replace all raw debugfs_mutex lock/unlock pairs with these helpers,
using the _nomemsave/_nomemrestore variants where appropriate.

Reported-by: Yi Zhang <yi.zhang@redhat.com>
Closes: https://lore.kernel.org/all/CAHj4cs9gNKEYAPagD9JADfO5UH+OiCr4P7OO2wjpfOYeM-RV=A@mail.gmail.com/
Reported-by: Shinichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Closes: https://lore.kernel.org/all/aYWQR7CtYdk3K39g@shinmob/
Suggested-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Yu Kuai <yukuai@fnnas.com>
Reviewed-by: Nilay Shroff <nilay@linux.ibm.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-mq-debugfs.c
block/blk-mq-sched.c
block/blk-sysfs.c
block/blk-wbt.c
block/blk.h
kernel/trace/blktrace.c