From patchwork Sat Jan 5 02:25:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 1935471 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D45383FDDA for ; Sat, 5 Jan 2013 02:27:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755631Ab3AEC1q (ORCPT ); Fri, 4 Jan 2013 21:27:46 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:52885 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755560Ab3AEC1n (ORCPT ); Fri, 4 Jan 2013 21:27:43 -0500 Received: by mail-pa0-f47.google.com with SMTP id fa10so9594777pad.34 for ; Fri, 04 Jan 2013 18:27:43 -0800 (PST) X-Received: by 10.68.209.136 with SMTP id mm8mr166770084pbc.146.1357352863174; Fri, 04 Jan 2013 18:27:43 -0800 (PST) Received: from localhost ([183.37.204.167]) by mx.google.com with ESMTPS id qh6sm31164661pbb.25.2013.01.04.18.27.34 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 Jan 2013 18:27:41 -0800 (PST) From: Ming Lei To: Andrew Morton , linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-pm@vger.kernel.org, linux-mm@kvack.org, Alan Stern , Oliver Neukum , Minchan Kim , "Rafael J. Wysocki" , Jens Axboe , "David S. Miller" , Ming Lei Subject: [PATCH v7 3/6] block/genhd.c: apply pm_runtime_set_memalloc_noio on block devices Date: Sat, 5 Jan 2013 10:25:41 +0800 Message-Id: <1357352744-8138-4-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1357352744-8138-1-git-send-email-ming.lei@canonical.com> References: <1357352744-8138-1-git-send-email-ming.lei@canonical.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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 Signed-off-by: Ming Lei --- v5: - fix code style and one typo v4: - call pm_runtime_set_memalloc_noio(ddev, true) after device_add --- block/genhd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block/genhd.c b/block/genhd.c index 4125beb..2eb64a3 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "blk.h" @@ -534,6 +535,14 @@ 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 + * devices + */ + 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); @@ -663,6 +672,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);