block: mark GFP_NOIO around sysfs ->store()
Subsystems (2)
PATCH 1/1 block: mark GFP_NOIO around sysfs ->store()
sysfs ->store is called with queue freezed, meantime we have several ->store() callbacks(update_nr_requests, wbt, scheduler) to allocate memory with GFP_KERNEL which may run into direct reclaim code path, then potential deadlock can be caused.
Fix the issue by marking NOIO around sysfs ->store()
--- block/blk-sysfs.c | 3 +++ 1 file changed, 3 insertions(+)
block/blk-sysfs.c +3 -0
@@ -681,6 +681,7 @@ queue_attr_store(struct kobject *kobj, struct attribute *attr,struct queue_sysfs_entry *entry =to_queue (attr); struct gendisk *disk = container_of(kobj, struct gendisk, queue_kobj);struct request_queue *q = disk->queue; +unsigned int noio_flag;ssize_t res;if (!entry->store_limit && !entry->store)
@@ -711,7 +712,9 @@ queue_attr_store(struct kobject *kobj, struct attribute *attr,mutex_lock (&q->sysfs_lock);blk_mq_freeze_queue (q); + noio_flag =memalloc_noio_save (); res = entry->store (disk, page, length); +memalloc_noio_restore (noio_flag);blk_mq_unfreeze_queue (q);mutex_unlock (&q->sysfs_lock);return res;
Signature · 1 line
2.44.0
Quoted 6 lines · Ming Lei
sysfs ->store is called with queue freezed, meantime we have several ->store()
callbacks(update_nr_requests, wbt, scheduler)to allocate memory withGFP_KERNELwhich may run into direct reclaim code path, then potential deadlock can be caused.Fix the issue by marking NOIO around sysfs ->store()
Yes, that's a good thing, and we should aim for more of that for block layer code that requires NOIO:
Quoted 10 lines · Ming Lei
sysfs ->store is called with queue freezed, meantime we have several ->store()
callbacks(update_nr_requests, wbt, scheduler)to allocate memory withGFP_KERNELwhich may run into direct reclaim code path, then potential deadlock can be caused.Fix the issue by marking NOIO around sysfs ->store()
Reported-by Thomas Hellström<[email protected]>Signed-off-by Ming Lei<[email protected]>
I guess that you should be including a link to https://lore.kernel.org/linux-block/Z4RkemI9f6N5zoEF@fedora/T/#mc774c65eeca5c024d29695f9ac6152b87763f305
Regardless, FWIW:
Quoted 6 lines · John Garry
Quoted 5 lines · Ming Lei
sysfs ->store is called with queue freezed, meantime we have several ->store()
callbacks(update_nr_requests, wbt, scheduler)to allocate memory withGFP_KERNELwhich may run into direct reclaim code path, then potential deadlock can be caused.
Quoted 8 lines
Quoted 5 lines
Fix the issue by marking NOIO around sysfs ->store()
Reported-by Thomas Hellström<[email protected]>Signed-off-by Ming Lei<[email protected]>I guess that you should be including a link to https://lore.kernel.org/linux-block/Z4RkemI9f6N5zoEF@fedora/T/#mc774c65eeca5c024d29695f9ac6152b87763f305
Indeed, I will add a Closes tag in V2.
Quoted 2 lines
Regardless, FWIW:
Reviewed-by John Garry <[email protected]>
Thanks,
Signature · 1 line
Ming
Quoted 8 lines · Ming Lei
sysfs ->store is called with queue freezed, meantime we have several ->store()
callbacks(update_nr_requests, wbt, scheduler)to allocate memory withGFP_KERNELwhich may run into direct reclaim code path, then potential deadlock can be caused.Fix the issue by marking NOIO around sysfs ->store()
[...]
Applied, thanks!
[1/1] block: mark GFP_NOIO around sysfs ->store()
commit: 7c0be4ead1f8f5f8be0803f347de0de81e3b8e1c
Best regards,
Signature · 1 line
Jens Axboe