| Message ID | 1351931714-11689-4-git-send-email-ming.lei@canonical.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, 3 Nov 2012 16:35:11 +0800 Ming Lei <ming.lei@canonical.com> wrote: > This patch applyes the introduced pm_runtime_set_memalloc_noio on > block device so that PM core will teach mm to not allocate memory with > GFP_IOFS when calling the runtime_resume and runtime_suspend callback > for block devices and its ancestors. > > ... > > @@ -532,6 +533,13 @@ static void register_disk(struct gendisk *disk) > return; > } > } > + > + /* avoid probable deadlock caused by allocating memory with Again, please fix the comment style. Take a look at the rest of this file! > + * GFP_KERNEL in runtime_resume callback of its all ancestor > + * deivces typo > + */ -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/block/genhd.c b/block/genhd.c index 9e02cd6..f3fe3aa 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -18,6 +18,7 @@ #include <linux/mutex.h> #include <linux/idr.h> #include <linux/log2.h> +#include <linux/pm_runtime.h> #include "blk.h" @@ -532,6 +533,13 @@ static void register_disk(struct gendisk *disk) return; } } + + /* avoid probable deadlock caused by allocating memory with + * GFP_KERNEL in runtime_resume callback of its all ancestor + * deivces + */ + pm_runtime_set_memalloc_noio(ddev, true); + disk->part0.holder_dir = kobject_create_and_add("holders", &ddev->kobj); disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj); @@ -661,6 +669,7 @@ void del_gendisk(struct gendisk *disk) disk->driverfs_dev = NULL; if (!sysfs_deprecated) sysfs_remove_link(block_depr, dev_name(disk_to_dev(disk))); + pm_runtime_set_memalloc_noio(disk_to_dev(disk), false); device_del(disk_to_dev(disk)); } EXPORT_SYMBOL(del_gendisk);
This patch applyes the introduced pm_runtime_set_memalloc_noio on block device so that PM core will teach mm to not allocate memory with GFP_IOFS when calling the runtime_resume and runtime_suspend callback for block devices and its ancestors. Cc: Jens Axboe <axboe@kernel.dk> Signed-off-by: Ming Lei <ming.lei@canonical.com> --- v4: - call pm_runtime_set_memalloc_noio(ddev, true) after device_add --- block/genhd.c | 9 +++++++++ 1 file changed, 9 insertions(+)