From patchwork Mon Oct 2 22:52:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 9981293 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8BB4F60384 for ; Mon, 2 Oct 2017 22:52:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EDD5285EF for ; Mon, 2 Oct 2017 22:52:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7378B289A0; Mon, 2 Oct 2017 22:52:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6E22285EF for ; Mon, 2 Oct 2017 22:52:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751816AbdJBWwU (ORCPT ); Mon, 2 Oct 2017 18:52:20 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:36638 "EHLO esa5.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560AbdJBWwU (ORCPT ); Mon, 2 Oct 2017 18:52:20 -0400 X-IronPort-AV: E=Sophos;i="5.42,471,1500912000"; d="scan'208";a="55892367" Received: from sjappemgw11.hgst.com (HELO sjappemgw12.hgst.com) ([199.255.44.62]) by ob1.hgst.iphmx.com with ESMTP; 03 Oct 2017 06:52:20 +0800 Received: from thinkpad-bart.sdcorp.global.sandisk.com (HELO thinkpad-bart.int.fusionio.com) ([10.11.172.152]) by sjappemgw12.hgst.com with ESMTP; 02 Oct 2017 15:52:19 -0700 From: Bart Van Assche To: Jens Axboe Cc: linux-block@vger.kernel.org, Christoph Hellwig , "Martin K . Petersen" , =Oleksandr Natalenko , "Luis R . Rodriguez" , Bart Van Assche , Shaohua Li , linux-raid@vger.kernel.org, Ming Lei , Hannes Reinecke , Johannes Thumshirn Subject: [PATCH v5 2/8] md: Neither resync nor reshape while the system is frozen Date: Mon, 2 Oct 2017 15:52:12 -0700 Message-Id: <20171002225218.18548-3-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002225218.18548-1-bart.vanassche@wdc.com> References: <20171002225218.18548-1-bart.vanassche@wdc.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some people use the md driver on laptops and use the suspend and resume functionality. Since it is essential that submitting of new I/O requests stops before a hibernation image is created, interrupt the md resync and reshape actions if the system is being frozen. Note: the resync and reshape will restart after the system is resumed and a message similar to the following will appear in the system log: md: md0: data-check interrupted. Additionally, only allow resync or reshape activity to be started after system freezing is over. Signed-off-by: Bart Van Assche Cc: Shaohua Li Cc: linux-raid@vger.kernel.org Cc: Ming Lei Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: Johannes Thumshirn --- drivers/md/md.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 3f7426120a3b..a2cf2a93b0cb 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -66,6 +66,7 @@ #include #include #include +#include #include #include "md.h" @@ -7450,7 +7451,8 @@ static int md_thread(void *arg) wait_event_interruptible_timeout (thread->wqueue, - test_bit(THREAD_WAKEUP, &thread->flags) + (test_bit(THREAD_WAKEUP, &thread->flags) && + atomic_read(&system_freezing_cnt) == 0) || kthread_should_stop() || kthread_should_park(), thread->timeout); @@ -8961,6 +8963,37 @@ static void md_stop_all_writes(void) mdelay(1000*1); } +/* + * Ensure that neither resyncing nor reshaping occurs while the system is + * frozen. + */ +static int md_notify_pm(struct notifier_block *bl, unsigned long state, + void *unused) +{ + struct mddev *mddev; + struct list_head *tmp; + + pr_debug("%s: state = %ld; system_freezing_cnt = %d\n", __func__, state, + atomic_read(&system_freezing_cnt)); + + switch (state) { + case PM_HIBERNATION_PREPARE: + md_stop_all_writes(); + break; + case PM_POST_HIBERNATION: + rcu_read_lock(); + for_each_mddev(mddev, tmp) + wake_up(&mddev->thread->wqueue); + rcu_read_unlock(); + break; + } + return NOTIFY_DONE; +} + +static struct notifier_block md_pm_notifier = { + .notifier_call = md_notify_pm, +}; + static int md_notify_reboot(struct notifier_block *this, unsigned long code, void *x) { @@ -9007,6 +9040,7 @@ static int __init md_init(void) md_probe, NULL, NULL); register_reboot_notifier(&md_reboot_notifier); + register_pm_notifier(&md_pm_notifier); raid_table_header = register_sysctl_table(raid_root_table); md_geninit(); @@ -9246,6 +9280,7 @@ static __exit void md_exit(void) unregister_blkdev(MD_MAJOR,"md"); unregister_blkdev(mdp_major, "mdp"); + unregister_pm_notifier(&md_pm_notifier); unregister_reboot_notifier(&md_reboot_notifier); unregister_sysctl_table(raid_table_header);