mtd: block: prevent reclaim I/O during request processing
PATCH 1/1 mtd: block: prevent reclaim I/O during request processing
The blktrans request callbacks run under dev->lock and may allocate memory with GFP_KERNEL. For example, mtdblock_writesect() uses vmalloc() to allocate its eraseblock cache. Direct reclaim can then recurse into block I/O and deadlock on resources held by the request being processed. syzbot reports a circular locking dependency involving the device mutex and fs_reclaim.
Commit d5ba1c8ffd0b ("mtd: don't use PF_MEMALLOC") removed PF_MEMALLOC from the MTD request thread. That flag had prevented direct reclaim, so its removal made allocations during request processing eligible for reclaim without excluding I/O.
Wrap request processing in mtd_queue_rq() in a NOIO scope. This covers both the request and background callbacks, including allocations made by lower MTD drivers, and prevents reclaim from initiating filesystem or block I/O.
--- drivers/mtd/mtd_blkdevs.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/mtd/mtd_blkdevs.c +5 -0
@@ -18,6 +18,7 @@#include <linux/spinlock.h> #include <linux/hdreg.h> #include <linux/mutex.h> +#include <linux/sched/mm.h> #include <linux/uaccess.h> #include "mtdcore.h"
@@ -167,6 +168,7 @@ static blk_status_t mtd_queue_rq(struct blk_mq_hw_ctx *hctx, const struct blk_mq_queue_data *bd) {struct mtd_blktrans_dev *dev; +unsigned int noio_flags; dev = hctx->queue->queuedata;if (!dev) {
@@ -174,10 +176,13 @@ static blk_status_t mtd_queue_rq(struct blk_mq_hw_ctx *hctx,return BLK_STS_IOERR ; } +/* Reclaim must not recurse into I/O while processing requests. */ + noio_flags =memalloc_noio_save ();spin_lock_irq (&dev->queue_lock);list_add_tail (&bd->rq->queuelist, &dev->rq_list);mtd_blktrans_work (dev);spin_unlock_irq (&dev->queue_lock); +memalloc_noio_restore (noio_flags);return BLK_STS_OK ; }
Signature · 1 line
2.43.0
Quoted 8 lines · Qingfang Deng
The blktrans request callbacks run under
dev->lockand may allocate memory withGFP_KERNEL. For example,mtdblock_writesect()usesvmalloc()to allocate its eraseblock cache. Direct reclaim can then recurse into block I/O and deadlock on resources held by the request being processed. syzbot reports a circular locking dependency involving the device mutex andfs_reclaim.[...]
Applied to mtd/next, thanks!
[1/1] mtd: block: prevent reclaim I/O during request processing
commit: d498b2ddda99eed28cde177b1620dbcea246a1c4
Patche(s) should be available on mtd/linux.git and will be part of the next PR (provided that no robot complains by then).
Kind regards,
Miquèl