From: Yu Kuai <yukuai3@huawei.com>
To: <agk@redhat.com>, <snitzer@kernel.org>, <mpatocka@redhat.com>,
<dm-devel@lists.linux.dev>, <xni@redhat.com>, <song@kernel.org>,
<yukuai3@huawei.com>, <jbrassow@f14.redhat.com>, <neilb@suse.de>,
<heinzm@redhat.com>, <shli@fb.com>, <akpm@osdl.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-raid@vger.kernel.org>,
<yukuai1@huaweicloud.com>, <yi.zhang@huawei.com>,
<yangerkun@huawei.com>
Subject: [PATCH v2 05/11] md: export helpers to stop sync_thread
Date: Wed, 24 Jan 2024 17:14:15 +0800 [thread overview]
Message-ID: <20240124091421.1261579-6-yukuai3@huawei.com> (raw)
In-Reply-To: <20240124091421.1261579-1-yukuai3@huawei.com>
The new heleprs will be used in dm-raid in later patches to fix
regressions and prevent calling md_reap_sync_thread() directly.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/md/md.c | 41 +++++++++++++++++++++++++++++++++++++----
drivers/md/md.h | 3 +++
2 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 6c5d0a372927..90cf31b53804 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4915,30 +4915,63 @@ static void stop_sync_thread(struct mddev *mddev, bool locked, bool check_seq)
mddev_lock_nointr(mddev);
}
-static void idle_sync_thread(struct mddev *mddev)
+void md_idle_sync_thread(struct mddev *mddev)
{
+ lockdep_assert_held(mddev->reconfig_mutex);
+
mutex_lock(&mddev->sync_mutex);
clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
+ stop_sync_thread(mddev, true, true);
+ mutex_unlock(&mddev->sync_mutex);
+}
+EXPORT_SYMBOL_GPL(md_idle_sync_thread);
+
+void md_frozen_sync_thread(struct mddev *mddev)
+{
+ lockdep_assert_held(mddev->reconfig_mutex);
+
+ mutex_lock(&mddev->sync_mutex);
+ set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
+ stop_sync_thread(mddev, true, false);
+ mutex_unlock(&mddev->sync_mutex);
+}
+EXPORT_SYMBOL_GPL(md_frozen_sync_thread);
+void md_unfrozen_sync_thread(struct mddev *mddev)
+{
+ lockdep_assert_held(mddev->reconfig_mutex);
+
+ mutex_lock(&mddev->sync_mutex);
+ clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
+ set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
+ md_wakeup_thread(mddev->thread);
+ sysfs_notify_dirent_safe(mddev->sysfs_action);
+ mutex_unlock(&mddev->sync_mutex);
+}
+EXPORT_SYMBOL_GPL(md_unfrozen_sync_thread);
+
+static void idle_sync_thread(struct mddev *mddev)
+{
if (mddev_lock(mddev)) {
mutex_unlock(&mddev->sync_mutex);
return;
}
+ mutex_lock(&mddev->sync_mutex);
+ clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
stop_sync_thread(mddev, false, true);
mutex_unlock(&mddev->sync_mutex);
}
static void frozen_sync_thread(struct mddev *mddev)
{
- mutex_lock(&mddev->sync_mutex);
- set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
-
if (mddev_lock(mddev)) {
mutex_unlock(&mddev->sync_mutex);
return;
}
+ mutex_lock(&mddev->sync_mutex);
+ set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
stop_sync_thread(mddev, false, false);
mutex_unlock(&mddev->sync_mutex);
}
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 8d881cc59799..437ab70ce79b 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -781,6 +781,9 @@ extern void md_rdev_clear(struct md_rdev *rdev);
extern void md_handle_request(struct mddev *mddev, struct bio *bio);
extern int mddev_suspend(struct mddev *mddev, bool interruptible);
extern void mddev_resume(struct mddev *mddev);
+extern void md_idle_sync_thread(struct mddev *mddev);
+extern void md_frozen_sync_thread(struct mddev *mddev);
+extern void md_unfrozen_sync_thread(struct mddev *mddev);
extern void md_reload_sb(struct mddev *mddev, int raid_disk);
extern void md_update_sb(struct mddev *mddev, int force);
--
2.39.2
next prev parent reply other threads:[~2024-01-24 9:19 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-24 9:14 [PATCH v2 00/11] dm-raid: fix v6.7 regressions Yu Kuai
2024-01-24 9:14 ` [PATCH v2 01/11] md: don't ignore suspended array in md_check_recovery() Yu Kuai
2024-01-24 9:14 ` [PATCH v2 02/11] md: don't ignore read-only " Yu Kuai
2024-01-24 9:14 ` [PATCH v2 03/11] md: make sure md_do_sync() will set MD_RECOVERY_DONE Yu Kuai
2024-01-24 9:14 ` [PATCH v2 04/11] md: don't register sync_thread for reshape directly Yu Kuai
2024-01-24 9:14 ` Yu Kuai [this message]
2024-01-25 7:51 ` [PATCH v2 05/11] md: export helpers to stop sync_thread Xiao Ni
2024-01-25 7:57 ` Yu Kuai
2024-01-26 2:38 ` Yu Kuai
2024-01-25 11:35 ` Xiao Ni
2024-01-25 11:42 ` Yu Kuai
2024-01-25 11:52 ` Xiao Ni
2024-01-25 11:56 ` Yu Kuai
2024-01-25 11:45 ` Yu Kuai
2024-01-25 13:33 ` Xiao Ni
2024-01-26 0:14 ` Song Liu
2024-01-26 6:54 ` Xiao Ni
2024-01-24 9:14 ` [PATCH v2 06/11] dm-raid: really frozen sync_thread during suspend Yu Kuai
2024-01-24 9:14 ` [PATCH v2 07/11] md/dm-raid: don't call md_reap_sync_thread() directly Yu Kuai
2024-01-24 9:14 ` [PATCH v2 08/11] dm-raid: remove mddev_suspend/resume() Yu Kuai
2024-01-24 9:14 ` [PATCH v2 09/11] dm-raid: add a new helper prepare_suspend() in md_personality Yu Kuai
2024-01-24 9:14 ` [PATCH v2 10/11] md: export helper md_is_rdwr() Yu Kuai
2024-01-24 9:14 ` [PATCH v2 11/11] md/raid456: fix a deadlock for dm-raid456 while io concurrent with reshape Yu Kuai
2024-01-24 12:19 ` [PATCH v2 00/11] dm-raid: fix v6.7 regressions Xiao Ni
2024-01-25 0:50 ` Xiao Ni
2024-01-25 1:40 ` Yu Kuai
2024-01-25 0:46 ` Song Liu
2024-01-25 1:08 ` Yu Kuai
2024-01-25 1:51 ` Song Liu
2024-01-25 2:36 ` Yu Kuai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240124091421.1261579-6-yukuai3@huawei.com \
--to=yukuai3@huawei.com \
--cc=agk@redhat.com \
--cc=akpm@osdl.org \
--cc=dm-devel@lists.linux.dev \
--cc=heinzm@redhat.com \
--cc=jbrassow@f14.redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=mpatocka@redhat.com \
--cc=neilb@suse.de \
--cc=shli@fb.com \
--cc=snitzer@kernel.org \
--cc=song@kernel.org \
--cc=xni@redhat.com \
--cc=yangerkun@huawei.com \
--cc=yi.zhang@huawei.com \
--cc=yukuai1@huaweicloud.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).