From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx163.postini.com [74.125.245.163]) by kanga.kvack.org (Postfix) with SMTP id AC2066B0069 for ; Mon, 29 Oct 2012 08:25:35 -0400 (EDT) Received: by mail-da0-f41.google.com with SMTP id i14so2605699dad.14 for ; Mon, 29 Oct 2012 05:25:35 -0700 (PDT) From: Ming Lei Subject: [PATCH v3 3/6] block/genhd.c: apply pm_runtime_set_memalloc_noio on block devices Date: Mon, 29 Oct 2012 20:23:57 +0800 Message-Id: <1351513440-9286-4-git-send-email-ming.lei@canonical.com> In-Reply-To: <1351513440-9286-1-git-send-email-ming.lei@canonical.com> References: <1351513440-9286-1-git-send-email-ming.lei@canonical.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-kernel@vger.kernel.org Cc: Alan Stern , Oliver Neukum , Minchan Kim , Greg Kroah-Hartman , "Rafael J. Wysocki" , Jens Axboe , "David S. Miller" , Andrew Morton , netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-pm@vger.kernel.org, linux-mm@kvack.org, Ming Lei 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 callback for block devices. Cc: Jens Axboe Signed-off-by: Ming Lei --- block/genhd.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/block/genhd.c b/block/genhd.c index 9e02cd6..c5f10ea 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "blk.h" @@ -519,6 +520,12 @@ static void register_disk(struct gendisk *disk) dev_set_name(ddev, disk->disk_name); + /* avoid probable deadlock caused by allocate memory with + * GFP_KERNEL in runtime_resume callback of its all ancestor + * deivces + */ + pm_runtime_set_memalloc_noio(ddev, true); + /* delay uevents, until we scanned partition table */ dev_set_uevent_suppress(ddev, 1); @@ -661,6 +668,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); -- 1.7.9.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org