Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758951Ab2J2MZj (ORCPT ); Mon, 29 Oct 2012 08:25:39 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:41712 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755532Ab2J2MZf (ORCPT ); Mon, 29 Oct 2012 08:25:35 -0400 From: Ming Lei 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 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> X-Mailer: git-send-email 1.7.9.5 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1568 Lines: 51 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 from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/