From: Guoqing Jiang <guoqing.jiang@xxxxxxxxxxxxxxx>
1. The related resources (spin_lock, list and waitqueue) are needed for
address raid1 reorder overlap issue too, so add "is_force" parameter to
funcs (mddev_create/destroy_serial_pool). The parameter is set to true
if we want to enable or disable raid1 io serialization in later patch.
And also add "is_suspend" to mddev_destroy_serial_pool since it will
be called under suspended situation, which also makes both create and
destroy pool have same arguments.
2. Introduce rdevs_init_serial which is called if raid1 io serialization
is enabled since all rdevs need to init related stuffs.
3. rdev_init_serial and clear_bit(CollisionCheck, &rdev->flags) should
be called between suspend and resume.
No need to export mddev_create_serial_pool since it is only called in
md-mod module.
Signed-off-by: Guoqing Jiang <guoqing.jiang@xxxxxxxxxxxxxxx>
---
drivers/md/md-bitmap.c | 4 +--
drivers/md/md.c | 70 +++++++++++++++++++++++++++++-------------
drivers/md/md.h | 2 +-
3 files changed, 51 insertions(+), 25 deletions(-)
diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index 5058716918ef..eff297cf5a81 100644
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -1908,7 +1908,7 @@ int md_bitmap_load(struct mddev *mddev)
goto out;
rdev_for_each(rdev, mddev)
- mddev_create_serial_pool(mddev, rdev, true);
+ mddev_create_serial_pool(mddev, rdev, true, false);
if (mddev_is_clustered(mddev))
md_cluster_ops->load_bitmaps(mddev, mddev->bitmap_info.nodes);
@@ -2484,7 +2484,7 @@ backlog_store(struct mddev *mddev, const char *buf, size_t len)
struct md_rdev *rdev;
rdev_for_each(rdev, mddev)
- mddev_create_serial_pool(mddev, rdev, false);
+ mddev_create_serial_pool(mddev, rdev, false, false);
}
if (old_mwb != backlog)
md_bitmap_update_sb(mddev->bitmap);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 2a44c1db9061..d3619aa39b89 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -127,9 +127,6 @@ static inline int speed_max(struct mddev *mddev)
static int rdev_init_serial(struct md_rdev *rdev)
{
- if (rdev->bdev->bd_queue->nr_hw_queues == 1)
- return 0;
-
spin_lock_init(&rdev->serial_list_lock);
INIT_LIST_HEAD(&rdev->serial_list);
init_waitqueue_head(&rdev->serial_io_wait);
@@ -138,17 +135,30 @@ static int rdev_init_serial(struct md_rdev *rdev)
return 1;
}
+static void rdevs_init_serial(struct mddev *mddev)
+{
+ struct md_rdev *rdev;
+
+ rdev_for_each(rdev, mddev) {
+ if (test_bit(CollisionCheck, &rdev->flags))
+ continue;
+ rdev_init_serial(rdev);
+ }
+}
+
/*
- * Create serial_info_pool if rdev is the first multi-queue device flaged
- * with writemostly, also write-behind mode is enabled.
+ * Create serial_info_pool for raid1 under conditions:
+ * 1. rdev is the first multi-queue device flaged with writemostly,
+ * also write-behind mode is enabled.
+ * 2. is_force is true which means we want to enable serialization
+ * for normal raid1 array.
*/
void mddev_create_serial_pool(struct mddev *mddev, struct md_rdev *rdev,
- bool is_suspend)
+ bool is_suspend, bool is_force)
{
- if (mddev->bitmap_info.max_write_behind == 0)
- return;
-
- if (!test_bit(WriteMostly, &rdev->flags) || !rdev_init_serial(rdev))
+ if (!is_force && (mddev->bitmap_info.max_write_behind == 0 ||
+ (rdev && (rdev->bdev->bd_queue->nr_hw_queues == 1 ||
+ !test_bit(WriteMostly, &rdev->flags)))))
return;
if (mddev->serial_info_pool == NULL) {
@@ -156,6 +166,10 @@ void mddev_create_serial_pool(struct mddev *mddev, struct md_rdev *rdev,
if (!is_suspend)
mddev_suspend(mddev);
+ if (is_force)
+ rdevs_init_serial(mddev);
+ if (!is_force && rdev)
+ rdev_init_serial(rdev);
noio_flag = memalloc_noio_save();
mddev->serial_info_pool =
mempool_create_kmalloc_pool(NR_SERIAL_INFOS,
@@ -167,15 +181,16 @@ void mddev_create_serial_pool(struct mddev *mddev, struct md_rdev *rdev,
mddev_resume(mddev);
}
}
-EXPORT_SYMBOL_GPL(mddev_create_serial_pool);
/*
* Destroy serial_info_pool if rdev is the last device flaged with
- * CollisionCheck.
+ * CollisionCheck, or is_force is true when we disable serialization
+ * for normal raid1.
*/
-static void mddev_destroy_serial_pool(struct mddev *mddev, struct md_rdev *rdev)
+static void mddev_destroy_serial_pool(struct mddev *mddev, struct md_rdev *rdev,
+ bool is_suspend, bool is_force)
{
- if (!test_and_clear_bit(CollisionCheck, &rdev->flags))
+ if (!(is_force || test_bit(CollisionCheck, &rdev->flags)))
return;
if (mddev->serial_info_pool) {
@@ -185,16 +200,27 @@ static void mddev_destroy_serial_pool(struct mddev *mddev, struct md_rdev *rdev)
/*
* Check if other rdevs need serial_info_pool.
*/
- rdev_for_each(temp, mddev)
+ if (!is_suspend)
+ mddev_suspend(mddev);
+ rdev_for_each(temp, mddev) {
+ if (is_force) {
+ clear_bit(CollisionCheck, &temp->flags);
+ continue;
+ }
+
if (temp != rdev &&
test_bit(CollisionCheck, &temp->flags))
num++;
- if (!num) {
- mddev_suspend(rdev->mddev);
+ }
+
+ if (!is_force)
+ clear_bit(CollisionCheck, &rdev->flags);
+ if (is_force || !num) {
mempool_destroy(mddev->serial_info_pool);
mddev->serial_info_pool = NULL;
- mddev_resume(rdev->mddev);
}
+ if (!is_suspend)
+ mddev_resume(mddev);
}
}
@@ -2307,7 +2333,7 @@ static int bind_rdev_to_array(struct md_rdev *rdev, struct mddev *mddev)
pr_debug("md: bind<%s>\n", b);
if (mddev->raid_disks)
- mddev_create_serial_pool(mddev, rdev, false);
+ mddev_create_serial_pool(mddev, rdev, false, false);
if ((err = kobject_add(&rdev->kobj, &mddev->kobj, "dev-%s", b)))
goto fail;
@@ -2345,7 +2371,7 @@ static void unbind_rdev_from_array(struct md_rdev *rdev)
bd_unlink_disk_holder(rdev->bdev, rdev->mddev->gendisk);
list_del_rcu(&rdev->same_set);
pr_debug("md: unbind<%s>\n", bdevname(rdev->bdev,b));
- mddev_destroy_serial_pool(rdev->mddev, rdev);
+ mddev_destroy_serial_pool(rdev->mddev, rdev, false, false);
rdev->mddev = NULL;
sysfs_remove_link(&rdev->kobj, "block");
sysfs_put(rdev->sysfs_state);
@@ -2858,10 +2884,10 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
}
} else if (cmd_match(buf, "writemostly")) {
set_bit(WriteMostly, &rdev->flags);
- mddev_create_serial_pool(rdev->mddev, rdev, false);
+ mddev_create_serial_pool(rdev->mddev, rdev, false, false);
err = 0;
} else if (cmd_match(buf, "-writemostly")) {
- mddev_destroy_serial_pool(rdev->mddev, rdev);
+ mddev_destroy_serial_pool(rdev->mddev, rdev, false, false);
clear_bit(WriteMostly, &rdev->flags);
err = 0;
} else if (cmd_match(buf, "blocked")) {
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 218950b88af6..3ca0c3ac4640 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -738,7 +738,7 @@ extern void md_reload_sb(struct mddev *mddev, int raid_disk);
extern void md_update_sb(struct mddev *mddev, int force);
extern void md_kick_rdev_from_array(struct md_rdev * rdev);
extern void mddev_create_serial_pool(struct mddev *mddev, struct md_rdev *rdev,
- bool is_suspend);
+ bool is_suspend, bool is_force);
struct md_rdev *md_find_rdev_nr_rcu(struct mddev *mddev, int nr);
struct md_rdev *md_find_rdev_rcu(struct mddev *mddev, dev_t dev);
--
2.17.1
