* [PATCH md-6.15 1/7] md: merge common code into find_pers()
2025-02-15 9:22 [PATCH 0/7 md-6.15] md: introduce md_submodle_head Yu Kuai
@ 2025-02-15 9:22 ` Yu Kuai
2025-02-17 10:16 ` Glass Su
2025-02-15 9:22 ` [PATCH md-6.15 2/7] md: only include md-cluster.h if necessary Yu Kuai
` (6 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Yu Kuai @ 2025-02-15 9:22 UTC (permalink / raw)
To: song, yukuai3; +Cc: linux-raid, linux-kernel, yukuai1, yi.zhang, yangerkun
From: Yu Kuai <yukuai3@huawei.com>
- pers_lock() are held and released from caller
- try_module_get() is called from caller
- error message from caller
Merge above code into find_pers(), and rename it to get_pers(), also
add a wrapper to module_put() as put_pers().
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/md/md.c | 68 +++++++++++++++++++++++++++----------------------
1 file changed, 38 insertions(+), 30 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 30b3dbbce2d2..37f3a89eba94 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -888,16 +888,37 @@ struct md_rdev *md_find_rdev_rcu(struct mddev *mddev, dev_t dev)
}
EXPORT_SYMBOL_GPL(md_find_rdev_rcu);
-static struct md_personality *find_pers(int level, char *clevel)
+static struct md_personality *get_pers(int level, char *clevel)
{
+ struct md_personality *ret = NULL;
struct md_personality *pers;
+
+ spin_lock(&pers_lock);
list_for_each_entry(pers, &pers_list, list) {
- if (level != LEVEL_NONE && pers->level == level)
- return pers;
- if (strcmp(pers->name, clevel)==0)
- return pers;
+ if ((level != LEVEL_NONE && pers->level == level) ||
+ !strcmp(pers->name, clevel)) {
+ if (try_module_get(pers->owner))
+ ret = pers;
+ break;
+ }
}
- return NULL;
+ spin_unlock(&pers_lock);
+
+ if (!ret) {
+ if (level != LEVEL_NONE)
+ pr_warn("md: personality for level %d is not loaded!\n",
+ level);
+ else
+ pr_warn("md: personality for level %s is not loaded!\n",
+ clevel);
+ }
+
+ return ret;
+}
+
+static void put_pers(struct md_personality *pers)
+{
+ module_put(pers->owner);
}
/* return the offset of the super block in 512byte sectors */
@@ -3931,24 +3952,20 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
if (request_module("md-%s", clevel) != 0)
request_module("md-level-%s", clevel);
- spin_lock(&pers_lock);
- pers = find_pers(level, clevel);
- if (!pers || !try_module_get(pers->owner)) {
- spin_unlock(&pers_lock);
- pr_warn("md: personality %s not loaded\n", clevel);
+ pers = get_pers(level, clevel);
+ if (!pers) {
rv = -EINVAL;
goto out_unlock;
}
- spin_unlock(&pers_lock);
if (pers == mddev->pers) {
/* Nothing to do! */
- module_put(pers->owner);
+ put_pers(pers);
rv = len;
goto out_unlock;
}
if (!pers->takeover) {
- module_put(pers->owner);
+ put_pers(pers);
pr_warn("md: %s: %s does not support personality takeover\n",
mdname(mddev), clevel);
rv = -EINVAL;
@@ -3969,7 +3986,7 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
mddev->raid_disks -= mddev->delta_disks;
mddev->delta_disks = 0;
mddev->reshape_backwards = 0;
- module_put(pers->owner);
+ put_pers(pers);
pr_warn("md: %s: %s would not accept array\n",
mdname(mddev), clevel);
rv = PTR_ERR(priv);
@@ -4026,7 +4043,7 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
mddev->to_remove = &md_redundancy_group;
}
- module_put(oldpers->owner);
+ put_pers(oldpers);
rdev_for_each(rdev, mddev) {
if (rdev->raid_disk < 0)
@@ -6096,20 +6113,11 @@ int md_run(struct mddev *mddev)
goto exit_sync_set;
}
- spin_lock(&pers_lock);
- pers = find_pers(mddev->level, mddev->clevel);
- if (!pers || !try_module_get(pers->owner)) {
- spin_unlock(&pers_lock);
- if (mddev->level != LEVEL_NONE)
- pr_warn("md: personality for level %d is not loaded!\n",
- mddev->level);
- else
- pr_warn("md: personality for level %s is not loaded!\n",
- mddev->clevel);
+ pers = get_pers(mddev->level, mddev->clevel);
+ if (!pers) {
err = -EINVAL;
goto abort;
}
- spin_unlock(&pers_lock);
if (mddev->level != pers->level) {
mddev->level = pers->level;
mddev->new_level = pers->level;
@@ -6119,7 +6127,7 @@ int md_run(struct mddev *mddev)
if (mddev->reshape_position != MaxSector &&
pers->start_reshape == NULL) {
/* This personality cannot handle reshaping... */
- module_put(pers->owner);
+ put_pers(pers);
err = -EINVAL;
goto abort;
}
@@ -6246,7 +6254,7 @@ int md_run(struct mddev *mddev)
if (mddev->private)
pers->free(mddev, mddev->private);
mddev->private = NULL;
- module_put(pers->owner);
+ put_pers(pers);
mddev->bitmap_ops->destroy(mddev);
abort:
bioset_exit(&mddev->io_clone_set);
@@ -6467,7 +6475,7 @@ static void __md_stop(struct mddev *mddev)
mddev->private = NULL;
if (pers->sync_request && mddev->to_remove == NULL)
mddev->to_remove = &md_redundancy_group;
- module_put(pers->owner);
+ put_pers(pers);
clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
bioset_exit(&mddev->bio_set);
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH md-6.15 1/7] md: merge common code into find_pers()
2025-02-15 9:22 ` [PATCH md-6.15 1/7] md: merge common code into find_pers() Yu Kuai
@ 2025-02-17 10:16 ` Glass Su
0 siblings, 0 replies; 16+ messages in thread
From: Glass Su @ 2025-02-17 10:16 UTC (permalink / raw)
To: Yu Kuai; +Cc: song, yukuai3, linux-raid, linux-kernel, yi.zhang, yangerkun
> On Feb 15, 2025, at 17:22, Yu Kuai <yukuai1@huaweicloud.com> wrote:
>
> From: Yu Kuai <yukuai3@huawei.com>
>
> - pers_lock() are held and released from caller
> - try_module_get() is called from caller
> - error message from caller
>
> Merge above code into find_pers(), and rename it to get_pers(), also
> add a wrapper to module_put() as put_pers().
>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Su Yue <glass.su@suse.com>
> ---
> drivers/md/md.c | 68 +++++++++++++++++++++++++++----------------------
> 1 file changed, 38 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index 30b3dbbce2d2..37f3a89eba94 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -888,16 +888,37 @@ struct md_rdev *md_find_rdev_rcu(struct mddev *mddev, dev_t dev)
> }
> EXPORT_SYMBOL_GPL(md_find_rdev_rcu);
>
> -static struct md_personality *find_pers(int level, char *clevel)
> +static struct md_personality *get_pers(int level, char *clevel)
> {
> + struct md_personality *ret = NULL;
> struct md_personality *pers;
> +
> + spin_lock(&pers_lock);
> list_for_each_entry(pers, &pers_list, list) {
> - if (level != LEVEL_NONE && pers->level == level)
> - return pers;
> - if (strcmp(pers->name, clevel)==0)
> - return pers;
> + if ((level != LEVEL_NONE && pers->level == level) ||
> + !strcmp(pers->name, clevel)) {
> + if (try_module_get(pers->owner))
> + ret = pers;
> + break;
> + }
> }
> - return NULL;
> + spin_unlock(&pers_lock);
> +
> + if (!ret) {
> + if (level != LEVEL_NONE)
> + pr_warn("md: personality for level %d is not loaded!\n",
> + level);
> + else
> + pr_warn("md: personality for level %s is not loaded!\n",
> + clevel);
> + }
> +
> + return ret;
> +}
> +
> +static void put_pers(struct md_personality *pers)
> +{
> + module_put(pers->owner);
> }
>
> /* return the offset of the super block in 512byte sectors */
> @@ -3931,24 +3952,20 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
>
> if (request_module("md-%s", clevel) != 0)
> request_module("md-level-%s", clevel);
> - spin_lock(&pers_lock);
> - pers = find_pers(level, clevel);
> - if (!pers || !try_module_get(pers->owner)) {
> - spin_unlock(&pers_lock);
> - pr_warn("md: personality %s not loaded\n", clevel);
> + pers = get_pers(level, clevel);
> + if (!pers) {
> rv = -EINVAL;
> goto out_unlock;
> }
> - spin_unlock(&pers_lock);
>
> if (pers == mddev->pers) {
> /* Nothing to do! */
> - module_put(pers->owner);
> + put_pers(pers);
> rv = len;
> goto out_unlock;
> }
> if (!pers->takeover) {
> - module_put(pers->owner);
> + put_pers(pers);
> pr_warn("md: %s: %s does not support personality takeover\n",
> mdname(mddev), clevel);
> rv = -EINVAL;
> @@ -3969,7 +3986,7 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
> mddev->raid_disks -= mddev->delta_disks;
> mddev->delta_disks = 0;
> mddev->reshape_backwards = 0;
> - module_put(pers->owner);
> + put_pers(pers);
> pr_warn("md: %s: %s would not accept array\n",
> mdname(mddev), clevel);
> rv = PTR_ERR(priv);
> @@ -4026,7 +4043,7 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
> mddev->to_remove = &md_redundancy_group;
> }
>
> - module_put(oldpers->owner);
> + put_pers(oldpers);
>
> rdev_for_each(rdev, mddev) {
> if (rdev->raid_disk < 0)
> @@ -6096,20 +6113,11 @@ int md_run(struct mddev *mddev)
> goto exit_sync_set;
> }
>
> - spin_lock(&pers_lock);
> - pers = find_pers(mddev->level, mddev->clevel);
> - if (!pers || !try_module_get(pers->owner)) {
> - spin_unlock(&pers_lock);
> - if (mddev->level != LEVEL_NONE)
> - pr_warn("md: personality for level %d is not loaded!\n",
> - mddev->level);
> - else
> - pr_warn("md: personality for level %s is not loaded!\n",
> - mddev->clevel);
> + pers = get_pers(mddev->level, mddev->clevel);
> + if (!pers) {
> err = -EINVAL;
> goto abort;
> }
> - spin_unlock(&pers_lock);
> if (mddev->level != pers->level) {
> mddev->level = pers->level;
> mddev->new_level = pers->level;
> @@ -6119,7 +6127,7 @@ int md_run(struct mddev *mddev)
> if (mddev->reshape_position != MaxSector &&
> pers->start_reshape == NULL) {
> /* This personality cannot handle reshaping... */
> - module_put(pers->owner);
> + put_pers(pers);
> err = -EINVAL;
> goto abort;
> }
> @@ -6246,7 +6254,7 @@ int md_run(struct mddev *mddev)
> if (mddev->private)
> pers->free(mddev, mddev->private);
> mddev->private = NULL;
> - module_put(pers->owner);
> + put_pers(pers);
> mddev->bitmap_ops->destroy(mddev);
> abort:
> bioset_exit(&mddev->io_clone_set);
> @@ -6467,7 +6475,7 @@ static void __md_stop(struct mddev *mddev)
> mddev->private = NULL;
> if (pers->sync_request && mddev->to_remove == NULL)
> mddev->to_remove = &md_redundancy_group;
> - module_put(pers->owner);
> + put_pers(pers);
> clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
>
> bioset_exit(&mddev->bio_set);
> --
> 2.39.2
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH md-6.15 2/7] md: only include md-cluster.h if necessary
2025-02-15 9:22 [PATCH 0/7 md-6.15] md: introduce md_submodle_head Yu Kuai
2025-02-15 9:22 ` [PATCH md-6.15 1/7] md: merge common code into find_pers() Yu Kuai
@ 2025-02-15 9:22 ` Yu Kuai
2025-02-17 10:20 ` Glass Su
2025-02-15 9:22 ` [PATCH md-6.15 3/7] md: introduce struct md_submodule_head and APIs Yu Kuai
` (5 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Yu Kuai @ 2025-02-15 9:22 UTC (permalink / raw)
To: song, yukuai3; +Cc: linux-raid, linux-kernel, yukuai1, yi.zhang, yangerkun
From: Yu Kuai <yukuai3@huawei.com>
md-cluster is only supportted by raid1 and raid10, there is no need to
include md-cluster.h for other personalities.
Also move APIs that is only used in md-cluster.c from md.h to
md-cluster.h.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/md/md-bitmap.c | 2 ++
drivers/md/md-cluster.h | 7 +++++++
drivers/md/md.h | 7 -------
drivers/md/raid1.c | 1 +
drivers/md/raid10.c | 1 +
5 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index 23c09d22fcdb..71aa7dc80e26 100644
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -29,8 +29,10 @@
#include <linux/buffer_head.h>
#include <linux/seq_file.h>
#include <trace/events/block.h>
+
#include "md.h"
#include "md-bitmap.h"
+#include "md-cluster.h"
#define BITMAP_MAJOR_LO 3
/* version 4 insists the bitmap is in little-endian order
diff --git a/drivers/md/md-cluster.h b/drivers/md/md-cluster.h
index 470bf18ffde5..6c7aad00f5da 100644
--- a/drivers/md/md-cluster.h
+++ b/drivers/md/md-cluster.h
@@ -35,4 +35,11 @@ struct md_cluster_operations {
void (*update_size)(struct mddev *mddev, sector_t old_dev_sectors);
};
+extern int register_md_cluster_operations(const struct md_cluster_operations *ops,
+ struct module *module);
+extern int unregister_md_cluster_operations(void);
+extern int md_setup_cluster(struct mddev *mddev, int nodes);
+extern void md_cluster_stop(struct mddev *mddev);
+extern void md_reload_sb(struct mddev *mddev, int raid_disk);
+
#endif /* _MD_CLUSTER_H */
diff --git a/drivers/md/md.h b/drivers/md/md.h
index def808064ad8..c9bc70e6d5b4 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -19,7 +19,6 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
#include <trace/events/block.h>
-#include "md-cluster.h"
#define MaxSector (~(sector_t)0)
@@ -845,11 +844,6 @@ static inline void safe_put_page(struct page *p)
extern int register_md_personality(struct md_personality *p);
extern int unregister_md_personality(struct md_personality *p);
-extern int register_md_cluster_operations(const struct md_cluster_operations *ops,
- struct module *module);
-extern int unregister_md_cluster_operations(void);
-extern int md_setup_cluster(struct mddev *mddev, int nodes);
-extern void md_cluster_stop(struct mddev *mddev);
extern struct md_thread *md_register_thread(
void (*run)(struct md_thread *thread),
struct mddev *mddev,
@@ -906,7 +900,6 @@ 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);
extern void mddev_create_serial_pool(struct mddev *mddev, struct md_rdev *rdev);
extern void mddev_destroy_serial_pool(struct mddev *mddev,
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 9d57a88dbd26..e55db07e43d4 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -36,6 +36,7 @@
#include "md.h"
#include "raid1.h"
#include "md-bitmap.h"
+#include "md-cluster.h"
#define UNSUPPORTED_MDDEV_FLAGS \
((1L << MD_HAS_JOURNAL) | \
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index efe93b979167..3df39b2399b2 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -24,6 +24,7 @@
#include "raid10.h"
#include "raid0.h"
#include "md-bitmap.h"
+#include "md-cluster.h"
/*
* RAID10 provides a combination of RAID0 and RAID1 functionality.
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH md-6.15 2/7] md: only include md-cluster.h if necessary
2025-02-15 9:22 ` [PATCH md-6.15 2/7] md: only include md-cluster.h if necessary Yu Kuai
@ 2025-02-17 10:20 ` Glass Su
2025-02-18 2:40 ` Yu Kuai
0 siblings, 1 reply; 16+ messages in thread
From: Glass Su @ 2025-02-17 10:20 UTC (permalink / raw)
To: Yu Kuai; +Cc: song, yukuai3, linux-raid, linux-kernel, yi.zhang, yangerkun
> On Feb 15, 2025, at 17:22, Yu Kuai <yukuai1@huaweicloud.com> wrote:
>
> From: Yu Kuai <yukuai3@huawei.com>
>
> md-cluster is only supportted by raid1 and raid10, there is no need to
> include md-cluster.h for other personalities.
>
> Also move APIs that is only used in md-cluster.c from md.h to
> md-cluster.h.
>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Su Yue <glass.su@suse.com>
> ---
> drivers/md/md-bitmap.c | 2 ++
> drivers/md/md-cluster.h | 7 +++++++
> drivers/md/md.h | 7 -------
> drivers/md/raid1.c | 1 +
> drivers/md/raid10.c | 1 +
> 5 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
> index 23c09d22fcdb..71aa7dc80e26 100644
> --- a/drivers/md/md-bitmap.c
> +++ b/drivers/md/md-bitmap.c
> @@ -29,8 +29,10 @@
> #include <linux/buffer_head.h>
> #include <linux/seq_file.h>
> #include <trace/events/block.h>
> +
> #include "md.h"
> #include "md-bitmap.h"
> +#include "md-cluster.h"
>
> #define BITMAP_MAJOR_LO 3
> /* version 4 insists the bitmap is in little-endian order
> diff --git a/drivers/md/md-cluster.h b/drivers/md/md-cluster.h
> index 470bf18ffde5..6c7aad00f5da 100644
> --- a/drivers/md/md-cluster.h
> +++ b/drivers/md/md-cluster.h
> @@ -35,4 +35,11 @@ struct md_cluster_operations {
> void (*update_size)(struct mddev *mddev, sector_t old_dev_sectors);
> };
>
> +extern int register_md_cluster_operations(const struct md_cluster_operations *ops,
> + struct module *module);
> +extern int unregister_md_cluster_operations(void);
> +extern int md_setup_cluster(struct mddev *mddev, int nodes);
> +extern void md_cluster_stop(struct mddev *mddev);
> +extern void md_reload_sb(struct mddev *mddev, int raid_disk);
> +
> #endif /* _MD_CLUSTER_H */
> diff --git a/drivers/md/md.h b/drivers/md/md.h
> index def808064ad8..c9bc70e6d5b4 100644
> --- a/drivers/md/md.h
> +++ b/drivers/md/md.h
> @@ -19,7 +19,6 @@
> #include <linux/wait.h>
> #include <linux/workqueue.h>
> #include <trace/events/block.h>
> -#include "md-cluster.h"
>
> #define MaxSector (~(sector_t)0)
>
> @@ -845,11 +844,6 @@ static inline void safe_put_page(struct page *p)
>
> extern int register_md_personality(struct md_personality *p);
> extern int unregister_md_personality(struct md_personality *p);
> -extern int register_md_cluster_operations(const struct md_cluster_operations *ops,
> - struct module *module);
> -extern int unregister_md_cluster_operations(void);
> -extern int md_setup_cluster(struct mddev *mddev, int nodes);
> -extern void md_cluster_stop(struct mddev *mddev);
> extern struct md_thread *md_register_thread(
> void (*run)(struct md_thread *thread),
> struct mddev *mddev,
> @@ -906,7 +900,6 @@ 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);
> extern void mddev_create_serial_pool(struct mddev *mddev, struct md_rdev *rdev);
> extern void mddev_destroy_serial_pool(struct mddev *mddev,
> diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
> index 9d57a88dbd26..e55db07e43d4 100644
> --- a/drivers/md/raid1.c
> +++ b/drivers/md/raid1.c
> @@ -36,6 +36,7 @@
> #include "md.h"
> #include "raid1.h"
> #include "md-bitmap.h"
> +#include "md-cluster.h"
>
> #define UNSUPPORTED_MDDEV_FLAGS \
> ((1L << MD_HAS_JOURNAL) | \
> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
> index efe93b979167..3df39b2399b2 100644
> --- a/drivers/md/raid10.c
> +++ b/drivers/md/raid10.c
> @@ -24,6 +24,7 @@
> #include "raid10.h"
> #include "raid0.h"
> #include "md-bitmap.h"
> +#include "md-cluster.h"
>
> /*
> * RAID10 provides a combination of RAID0 and RAID1 functionality.
> --
> 2.39.2
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH md-6.15 2/7] md: only include md-cluster.h if necessary
2025-02-17 10:20 ` Glass Su
@ 2025-02-18 2:40 ` Yu Kuai
2025-02-18 3:40 ` Su Yue
0 siblings, 1 reply; 16+ messages in thread
From: Yu Kuai @ 2025-02-18 2:40 UTC (permalink / raw)
To: Glass Su, Yu Kuai
Cc: song, linux-raid, linux-kernel, yi.zhang, yangerkun, yukuai (C)
Hi,
在 2025/02/17 18:20, Glass Su 写道:
>
>
>> On Feb 15, 2025, at 17:22, Yu Kuai <yukuai1@huaweicloud.com> wrote:
>>
>> From: Yu Kuai <yukuai3@huawei.com>
>>
>> md-cluster is only supportted by raid1 and raid10, there is no need to
>> include md-cluster.h for other personalities.
>>
>> Also move APIs that is only used in md-cluster.c from md.h to
>> md-cluster.h.
>>
>> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
>
> Reviewed-by: Su Yue <glass.su@suse.com>
Thanks for the review! Any ideas for the remaining patches?
Kuai
>> ---
>> drivers/md/md-bitmap.c | 2 ++
>> drivers/md/md-cluster.h | 7 +++++++
>> drivers/md/md.h | 7 -------
>> drivers/md/raid1.c | 1 +
>> drivers/md/raid10.c | 1 +
>> 5 files changed, 11 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
>> index 23c09d22fcdb..71aa7dc80e26 100644
>> --- a/drivers/md/md-bitmap.c
>> +++ b/drivers/md/md-bitmap.c
>> @@ -29,8 +29,10 @@
>> #include <linux/buffer_head.h>
>> #include <linux/seq_file.h>
>> #include <trace/events/block.h>
>> +
>> #include "md.h"
>> #include "md-bitmap.h"
>> +#include "md-cluster.h"
>>
>> #define BITMAP_MAJOR_LO 3
>> /* version 4 insists the bitmap is in little-endian order
>> diff --git a/drivers/md/md-cluster.h b/drivers/md/md-cluster.h
>> index 470bf18ffde5..6c7aad00f5da 100644
>> --- a/drivers/md/md-cluster.h
>> +++ b/drivers/md/md-cluster.h
>> @@ -35,4 +35,11 @@ struct md_cluster_operations {
>> void (*update_size)(struct mddev *mddev, sector_t old_dev_sectors);
>> };
>>
>> +extern int register_md_cluster_operations(const struct md_cluster_operations *ops,
>> + struct module *module);
>> +extern int unregister_md_cluster_operations(void);
>> +extern int md_setup_cluster(struct mddev *mddev, int nodes);
>> +extern void md_cluster_stop(struct mddev *mddev);
>> +extern void md_reload_sb(struct mddev *mddev, int raid_disk);
>> +
>> #endif /* _MD_CLUSTER_H */
>> diff --git a/drivers/md/md.h b/drivers/md/md.h
>> index def808064ad8..c9bc70e6d5b4 100644
>> --- a/drivers/md/md.h
>> +++ b/drivers/md/md.h
>> @@ -19,7 +19,6 @@
>> #include <linux/wait.h>
>> #include <linux/workqueue.h>
>> #include <trace/events/block.h>
>> -#include "md-cluster.h"
>>
>> #define MaxSector (~(sector_t)0)
>>
>> @@ -845,11 +844,6 @@ static inline void safe_put_page(struct page *p)
>>
>> extern int register_md_personality(struct md_personality *p);
>> extern int unregister_md_personality(struct md_personality *p);
>> -extern int register_md_cluster_operations(const struct md_cluster_operations *ops,
>> - struct module *module);
>> -extern int unregister_md_cluster_operations(void);
>> -extern int md_setup_cluster(struct mddev *mddev, int nodes);
>> -extern void md_cluster_stop(struct mddev *mddev);
>> extern struct md_thread *md_register_thread(
>> void (*run)(struct md_thread *thread),
>> struct mddev *mddev,
>> @@ -906,7 +900,6 @@ 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);
>> extern void mddev_create_serial_pool(struct mddev *mddev, struct md_rdev *rdev);
>> extern void mddev_destroy_serial_pool(struct mddev *mddev,
>> diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
>> index 9d57a88dbd26..e55db07e43d4 100644
>> --- a/drivers/md/raid1.c
>> +++ b/drivers/md/raid1.c
>> @@ -36,6 +36,7 @@
>> #include "md.h"
>> #include "raid1.h"
>> #include "md-bitmap.h"
>> +#include "md-cluster.h"
>>
>> #define UNSUPPORTED_MDDEV_FLAGS \
>> ((1L << MD_HAS_JOURNAL) | \
>> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
>> index efe93b979167..3df39b2399b2 100644
>> --- a/drivers/md/raid10.c
>> +++ b/drivers/md/raid10.c
>> @@ -24,6 +24,7 @@
>> #include "raid10.h"
>> #include "raid0.h"
>> #include "md-bitmap.h"
>> +#include "md-cluster.h"
>>
>> /*
>> * RAID10 provides a combination of RAID0 and RAID1 functionality.
>> --
>> 2.39.2
>>
>>
>
> .
>
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH md-6.15 2/7] md: only include md-cluster.h if necessary
2025-02-18 2:40 ` Yu Kuai
@ 2025-02-18 3:40 ` Su Yue
0 siblings, 0 replies; 16+ messages in thread
From: Su Yue @ 2025-02-18 3:40 UTC (permalink / raw)
To: Yu Kuai
Cc: Glass Su, song, linux-raid, linux-kernel, yi.zhang, yangerkun,
yukuai (C)
On Tue 18 Feb 2025 at 10:40, Yu Kuai <yukuai1@huaweicloud.com>
wrote:
> Hi,
>
> 在 2025/02/17 18:20, Glass Su 写道:
>>
>>> On Feb 15, 2025, at 17:22, Yu Kuai <yukuai1@huaweicloud.com>
>>> wrote:
>>>
>>> From: Yu Kuai <yukuai3@huawei.com>
>>>
>>> md-cluster is only supportted by raid1 and raid10, there is no
>>> need to
>>> include md-cluster.h for other personalities.
>>>
>>> Also move APIs that is only used in md-cluster.c from md.h to
>>> md-cluster.h.
>>>
>>> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
>> Reviewed-by: Su Yue <glass.su@suse.com>
>
> Thanks for the review! Any ideas for the remaining patches?
>
Just did slight tests for md cluster. Sent RVB for remaining
patches.
Thanks for taking care of md cluster.
--
Su
> Kuai
>
>>> ---
>>> drivers/md/md-bitmap.c | 2 ++
>>> drivers/md/md-cluster.h | 7 +++++++
>>> drivers/md/md.h | 7 -------
>>> drivers/md/raid1.c | 1 +
>>> drivers/md/raid10.c | 1 +
>>> 5 files changed, 11 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
>>> index 23c09d22fcdb..71aa7dc80e26 100644
>>> --- a/drivers/md/md-bitmap.c
>>> +++ b/drivers/md/md-bitmap.c
>>> @@ -29,8 +29,10 @@
>>> #include <linux/buffer_head.h>
>>> #include <linux/seq_file.h>
>>> #include <trace/events/block.h>
>>> +
>>> #include "md.h"
>>> #include "md-bitmap.h"
>>> +#include "md-cluster.h"
>>>
>>> #define BITMAP_MAJOR_LO 3
>>> /* version 4 insists the bitmap is in little-endian order
>>> diff --git a/drivers/md/md-cluster.h b/drivers/md/md-cluster.h
>>> index 470bf18ffde5..6c7aad00f5da 100644
>>> --- a/drivers/md/md-cluster.h
>>> +++ b/drivers/md/md-cluster.h
>>> @@ -35,4 +35,11 @@ struct md_cluster_operations {
>>> void (*update_size)(struct mddev *mddev, sector_t
>>> old_dev_sectors);
>>> };
>>>
>>> +extern int register_md_cluster_operations(const struct
>>> md_cluster_operations *ops,
>>> + struct module *module);
>>> +extern int unregister_md_cluster_operations(void);
>>> +extern int md_setup_cluster(struct mddev *mddev, int nodes);
>>> +extern void md_cluster_stop(struct mddev *mddev);
>>> +extern void md_reload_sb(struct mddev *mddev, int raid_disk);
>>> +
>>> #endif /* _MD_CLUSTER_H */
>>> diff --git a/drivers/md/md.h b/drivers/md/md.h
>>> index def808064ad8..c9bc70e6d5b4 100644
>>> --- a/drivers/md/md.h
>>> +++ b/drivers/md/md.h
>>> @@ -19,7 +19,6 @@
>>> #include <linux/wait.h>
>>> #include <linux/workqueue.h>
>>> #include <trace/events/block.h>
>>> -#include "md-cluster.h"
>>>
>>> #define MaxSector (~(sector_t)0)
>>>
>>> @@ -845,11 +844,6 @@ static inline void safe_put_page(struct
>>> page *p)
>>>
>>> extern int register_md_personality(struct md_personality *p);
>>> extern int unregister_md_personality(struct md_personality
>>> *p);
>>> -extern int register_md_cluster_operations(const struct
>>> md_cluster_operations *ops,
>>> - struct module *module);
>>> -extern int unregister_md_cluster_operations(void);
>>> -extern int md_setup_cluster(struct mddev *mddev, int nodes);
>>> -extern void md_cluster_stop(struct mddev *mddev);
>>> extern struct md_thread *md_register_thread(
>>> void (*run)(struct md_thread *thread),
>>> struct mddev *mddev,
>>> @@ -906,7 +900,6 @@ 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);
>>> extern void mddev_create_serial_pool(struct mddev *mddev,
>>> struct md_rdev *rdev);
>>> extern void mddev_destroy_serial_pool(struct mddev *mddev,
>>> diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
>>> index 9d57a88dbd26..e55db07e43d4 100644
>>> --- a/drivers/md/raid1.c
>>> +++ b/drivers/md/raid1.c
>>> @@ -36,6 +36,7 @@
>>> #include "md.h"
>>> #include "raid1.h"
>>> #include "md-bitmap.h"
>>> +#include "md-cluster.h"
>>>
>>> #define UNSUPPORTED_MDDEV_FLAGS \
>>> ((1L << MD_HAS_JOURNAL) | \
>>> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
>>> index efe93b979167..3df39b2399b2 100644
>>> --- a/drivers/md/raid10.c
>>> +++ b/drivers/md/raid10.c
>>> @@ -24,6 +24,7 @@
>>> #include "raid10.h"
>>> #include "raid0.h"
>>> #include "md-bitmap.h"
>>> +#include "md-cluster.h"
>>>
>>> /*
>>> * RAID10 provides a combination of RAID0 and RAID1
>>> functionality.
>>> -- 2.39.2
>>>
>>>
>> .
>>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH md-6.15 3/7] md: introduce struct md_submodule_head and APIs
2025-02-15 9:22 [PATCH 0/7 md-6.15] md: introduce md_submodle_head Yu Kuai
2025-02-15 9:22 ` [PATCH md-6.15 1/7] md: merge common code into find_pers() Yu Kuai
2025-02-15 9:22 ` [PATCH md-6.15 2/7] md: only include md-cluster.h if necessary Yu Kuai
@ 2025-02-15 9:22 ` Yu Kuai
2025-02-15 9:22 ` [PATCH md-6.15 4/7] md: switch personalities to use md_submodule_head Yu Kuai
` (4 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Yu Kuai @ 2025-02-15 9:22 UTC (permalink / raw)
To: song, yukuai3; +Cc: linux-raid, linux-kernel, yukuai1, yi.zhang, yangerkun
From: Yu Kuai <yukuai3@huawei.com>
Prepare to unify registration and unregistration of md personalities
and md-cluster, also prepare for add kconfig for md-bitmap.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/md/md-cluster.h | 2 ++
drivers/md/md.c | 14 ++++++++++++++
drivers/md/md.h | 31 +++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+)
diff --git a/drivers/md/md-cluster.h b/drivers/md/md-cluster.h
index 6c7aad00f5da..4e842af11fb4 100644
--- a/drivers/md/md-cluster.h
+++ b/drivers/md/md-cluster.h
@@ -10,6 +10,8 @@ struct mddev;
struct md_rdev;
struct md_cluster_operations {
+ struct md_submodule_head head;
+
int (*join)(struct mddev *mddev, int nodes);
int (*leave)(struct mddev *mddev);
int (*slot_number)(struct mddev *mddev);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 37f3a89eba94..6b83039a3dcc 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -79,6 +79,8 @@ static const char *action_name[NR_SYNC_ACTIONS] = {
[ACTION_IDLE] = "idle",
};
+static DEFINE_XARRAY(md_submodule);
+
/* pers_list is a list of registered personalities protected by pers_lock. */
static LIST_HEAD(pers_list);
static DEFINE_SPINLOCK(pers_lock);
@@ -8522,6 +8524,18 @@ static const struct proc_ops mdstat_proc_ops = {
.proc_poll = mdstat_poll,
};
+int register_md_submodule(struct md_submodule_head *msh)
+{
+ return xa_insert(&md_submodule, msh->id, msh, GFP_KERNEL);
+}
+EXPORT_SYMBOL_GPL(register_md_submodule);
+
+void unregister_md_submodule(struct md_submodule_head *msh)
+{
+ xa_erase(&md_submodule, msh->id);
+}
+EXPORT_SYMBOL_GPL(unregister_md_submodule);
+
int register_md_personality(struct md_personality *p)
{
pr_debug("md: %s personality registered for level %d\n",
diff --git a/drivers/md/md.h b/drivers/md/md.h
index c9bc70e6d5b4..4807fa0d0362 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -18,10 +18,37 @@
#include <linux/timer.h>
#include <linux/wait.h>
#include <linux/workqueue.h>
+#include <linux/raid/md_u.h>
#include <trace/events/block.h>
#define MaxSector (~(sector_t)0)
+enum md_submodule_type {
+ MD_PERSONALITY = 0,
+ MD_CLUSTER,
+ MD_BITMAP, /* TODO */
+};
+
+enum md_submodule_id {
+ ID_LINEAR = LEVEL_LINEAR,
+ ID_RAID0 = 0,
+ ID_RAID1 = 1,
+ ID_RAID4 = 4,
+ ID_RAID5 = 5,
+ ID_RAID6 = 6,
+ ID_RAID10 = 10,
+ ID_CLUSTER,
+ ID_BITMAP, /* TODO */
+ ID_LLBITMAP, /* TODO */
+};
+
+struct md_submodule_head {
+ enum md_submodule_type type;
+ enum md_submodule_id id;
+ const char *name;
+ struct module *owner;
+};
+
/*
* These flags should really be called "NO_RETRY" rather than
* "FAILFAST" because they don't make any promise about time lapse,
@@ -698,6 +725,7 @@ static inline void md_sync_acct_bio(struct bio *bio, unsigned long nr_sectors)
struct md_personality
{
+ struct md_submodule_head head;
char *name;
int level;
struct list_head list;
@@ -842,6 +870,9 @@ static inline void safe_put_page(struct page *p)
if (p) put_page(p);
}
+int register_md_submodule(struct md_submodule_head *msh);
+void unregister_md_submodule(struct md_submodule_head *msh);
+
extern int register_md_personality(struct md_personality *p);
extern int unregister_md_personality(struct md_personality *p);
extern struct md_thread *md_register_thread(
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH md-6.15 4/7] md: switch personalities to use md_submodule_head
2025-02-15 9:22 [PATCH 0/7 md-6.15] md: introduce md_submodle_head Yu Kuai
` (2 preceding siblings ...)
2025-02-15 9:22 ` [PATCH md-6.15 3/7] md: introduce struct md_submodule_head and APIs Yu Kuai
@ 2025-02-15 9:22 ` Yu Kuai
2025-02-15 9:22 ` [PATCH md-6.15 5/7] md/md-cluster: cleanup md_cluster_ops reference Yu Kuai
` (3 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Yu Kuai @ 2025-02-15 9:22 UTC (permalink / raw)
To: song, yukuai3; +Cc: linux-raid, linux-kernel, yukuai1, yi.zhang, yangerkun
From: Yu Kuai <yukuai3@huawei.com>
Remove the global list 'pers_list', and switch to use md_submodule_head,
which is managed by xarry. Prepare to unify registration and unregistration
for all sub modules.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/md/md-linear.c | 15 ++++----
drivers/md/md.c | 82 +++++++++++++++++-------------------------
drivers/md/md.h | 7 +---
drivers/md/raid0.c | 18 ++++++----
drivers/md/raid1.c | 22 +++++++-----
drivers/md/raid10.c | 22 +++++++-----
drivers/md/raid5.c | 70 +++++++++++++++++++++++++-----------
7 files changed, 130 insertions(+), 106 deletions(-)
diff --git a/drivers/md/md-linear.c b/drivers/md/md-linear.c
index 369aed044b40..5d9b08115375 100644
--- a/drivers/md/md-linear.c
+++ b/drivers/md/md-linear.c
@@ -5,7 +5,6 @@
*/
#include <linux/blkdev.h>
-#include <linux/raid/md_u.h>
#include <linux/seq_file.h>
#include <linux/module.h>
#include <linux/slab.h>
@@ -320,9 +319,13 @@ static void linear_quiesce(struct mddev *mddev, int state)
}
static struct md_personality linear_personality = {
- .name = "linear",
- .level = LEVEL_LINEAR,
- .owner = THIS_MODULE,
+ .head = {
+ .type = MD_PERSONALITY,
+ .id = ID_LINEAR,
+ .name = "linear",
+ .owner = THIS_MODULE,
+ },
+
.make_request = linear_make_request,
.run = linear_run,
.free = linear_free,
@@ -335,12 +338,12 @@ static struct md_personality linear_personality = {
static int __init linear_init(void)
{
- return register_md_personality(&linear_personality);
+ return register_md_submodule(&linear_personality.head);
}
static void linear_exit(void)
{
- unregister_md_personality(&linear_personality);
+ unregister_md_submodule(&linear_personality.head);
}
module_init(linear_init);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 6b83039a3dcc..498ae11e3f6e 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -81,8 +81,6 @@ static const char *action_name[NR_SYNC_ACTIONS] = {
static DEFINE_XARRAY(md_submodule);
-/* pers_list is a list of registered personalities protected by pers_lock. */
-static LIST_HEAD(pers_list);
static DEFINE_SPINLOCK(pers_lock);
static const struct kobj_type md_ktype;
@@ -893,18 +891,21 @@ EXPORT_SYMBOL_GPL(md_find_rdev_rcu);
static struct md_personality *get_pers(int level, char *clevel)
{
struct md_personality *ret = NULL;
- struct md_personality *pers;
+ struct md_submodule_head *head;
+ unsigned long i;
- spin_lock(&pers_lock);
- list_for_each_entry(pers, &pers_list, list) {
- if ((level != LEVEL_NONE && pers->level == level) ||
- !strcmp(pers->name, clevel)) {
- if (try_module_get(pers->owner))
- ret = pers;
+ xa_lock(&md_submodule);
+ xa_for_each(&md_submodule, i, head) {
+ if (head->type != MD_PERSONALITY)
+ continue;
+ if ((level != LEVEL_NONE && head->id == level) ||
+ !strcmp(head->name, clevel)) {
+ if (try_module_get(head->owner))
+ ret = (void *)head;
break;
}
}
- spin_unlock(&pers_lock);
+ xa_unlock(&md_submodule);
if (!ret) {
if (level != LEVEL_NONE)
@@ -920,7 +921,7 @@ static struct md_personality *get_pers(int level, char *clevel)
static void put_pers(struct md_personality *pers)
{
- module_put(pers->owner);
+ module_put(pers->head.owner);
}
/* return the offset of the super block in 512byte sectors */
@@ -1203,7 +1204,7 @@ int md_check_no_bitmap(struct mddev *mddev)
if (!mddev->bitmap_info.file && !mddev->bitmap_info.offset)
return 0;
pr_warn("%s: bitmaps are not supported for %s\n",
- mdname(mddev), mddev->pers->name);
+ mdname(mddev), mddev->pers->head.name);
return 1;
}
EXPORT_SYMBOL(md_check_no_bitmap);
@@ -3883,7 +3884,7 @@ level_show(struct mddev *mddev, char *page)
spin_lock(&mddev->lock);
p = mddev->pers;
if (p)
- ret = sprintf(page, "%s\n", p->name);
+ ret = sprintf(page, "%s\n", p->head.name);
else if (mddev->clevel[0])
ret = sprintf(page, "%s\n", mddev->clevel);
else if (mddev->level != LEVEL_NONE)
@@ -3940,7 +3941,7 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
rv = -EINVAL;
if (!mddev->pers->quiesce) {
pr_warn("md: %s: %s does not support online personality change\n",
- mdname(mddev), mddev->pers->name);
+ mdname(mddev), mddev->pers->head.name);
goto out_unlock;
}
@@ -4003,7 +4004,7 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
oldpriv = mddev->private;
mddev->pers = pers;
mddev->private = priv;
- strscpy(mddev->clevel, pers->name, sizeof(mddev->clevel));
+ strscpy(mddev->clevel, pers->head.name, sizeof(mddev->clevel));
mddev->level = mddev->new_level;
mddev->layout = mddev->new_layout;
mddev->chunk_sectors = mddev->new_chunk_sectors;
@@ -5603,7 +5604,7 @@ __ATTR(fail_last_dev, S_IRUGO | S_IWUSR, fail_last_dev_show,
static ssize_t serialize_policy_show(struct mddev *mddev, char *page)
{
- if (mddev->pers == NULL || (mddev->pers->level != 1))
+ if (mddev->pers == NULL || (mddev->pers->head.id != ID_RAID1))
return sprintf(page, "n/a\n");
else
return sprintf(page, "%d\n", mddev->serialize_policy);
@@ -5629,7 +5630,7 @@ serialize_policy_store(struct mddev *mddev, const char *buf, size_t len)
err = mddev_suspend_and_lock(mddev);
if (err)
return err;
- if (mddev->pers == NULL || (mddev->pers->level != 1)) {
+ if (mddev->pers == NULL || (mddev->pers->head.id != ID_RAID1)) {
pr_err("md: serialize_policy is only effective for raid1\n");
err = -EINVAL;
goto unlock;
@@ -6120,11 +6121,11 @@ int md_run(struct mddev *mddev)
err = -EINVAL;
goto abort;
}
- if (mddev->level != pers->level) {
- mddev->level = pers->level;
- mddev->new_level = pers->level;
+ if (mddev->level != pers->head.id) {
+ mddev->level = pers->head.id;
+ mddev->new_level = pers->head.id;
}
- strscpy(mddev->clevel, pers->name, sizeof(mddev->clevel));
+ strscpy(mddev->clevel, pers->head.name, sizeof(mddev->clevel));
if (mddev->reshape_position != MaxSector &&
pers->start_reshape == NULL) {
@@ -8134,7 +8135,8 @@ void md_error(struct mddev *mddev, struct md_rdev *rdev)
return;
mddev->pers->error_handler(mddev, rdev);
- if (mddev->pers->level == 0 || mddev->pers->level == LEVEL_LINEAR)
+ if (mddev->pers->head.id == ID_RAID0 ||
+ mddev->pers->head.id == ID_LINEAR)
return;
if (mddev->degraded && !test_bit(MD_BROKEN, &mddev->flags))
@@ -8172,14 +8174,17 @@ static void status_unused(struct seq_file *seq)
static void status_personalities(struct seq_file *seq)
{
- struct md_personality *pers;
+ struct md_submodule_head *head;
+ unsigned long i;
seq_puts(seq, "Personalities : ");
- spin_lock(&pers_lock);
- list_for_each_entry(pers, &pers_list, list)
- seq_printf(seq, "[%s] ", pers->name);
- spin_unlock(&pers_lock);
+ xa_lock(&md_submodule);
+ xa_for_each(&md_submodule, i, head)
+ if (head->type == MD_PERSONALITY)
+ seq_printf(seq, "[%s] ", head->name);
+ xa_unlock(&md_submodule);
+
seq_puts(seq, "\n");
}
@@ -8402,7 +8407,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
seq_printf(seq, " (read-only)");
if (mddev->ro == MD_AUTO_READ)
seq_printf(seq, " (auto-read-only)");
- seq_printf(seq, " %s", mddev->pers->name);
+ seq_printf(seq, " %s", mddev->pers->head.name);
} else {
seq_printf(seq, "inactive");
}
@@ -8536,27 +8541,6 @@ void unregister_md_submodule(struct md_submodule_head *msh)
}
EXPORT_SYMBOL_GPL(unregister_md_submodule);
-int register_md_personality(struct md_personality *p)
-{
- pr_debug("md: %s personality registered for level %d\n",
- p->name, p->level);
- spin_lock(&pers_lock);
- list_add_tail(&p->list, &pers_list);
- spin_unlock(&pers_lock);
- return 0;
-}
-EXPORT_SYMBOL(register_md_personality);
-
-int unregister_md_personality(struct md_personality *p)
-{
- pr_debug("md: %s personality unregistered\n", p->name);
- spin_lock(&pers_lock);
- list_del_init(&p->list);
- spin_unlock(&pers_lock);
- return 0;
-}
-EXPORT_SYMBOL(unregister_md_personality);
-
int register_md_cluster_operations(const struct md_cluster_operations *ops,
struct module *module)
{
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 4807fa0d0362..f9e0f0d390f1 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -726,10 +726,7 @@ static inline void md_sync_acct_bio(struct bio *bio, unsigned long nr_sectors)
struct md_personality
{
struct md_submodule_head head;
- char *name;
- int level;
- struct list_head list;
- struct module *owner;
+
bool __must_check (*make_request)(struct mddev *mddev, struct bio *bio);
/*
* start up works that do NOT require md_thread. tasks that
@@ -873,8 +870,6 @@ static inline void safe_put_page(struct page *p)
int register_md_submodule(struct md_submodule_head *msh);
void unregister_md_submodule(struct md_submodule_head *msh);
-extern int register_md_personality(struct md_personality *p);
-extern int unregister_md_personality(struct md_personality *p);
extern struct md_thread *md_register_thread(
void (*run)(struct md_thread *thread),
struct mddev *mddev,
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 8fc9339b00c7..2aec92e6e0a9 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -811,9 +811,13 @@ static void raid0_quiesce(struct mddev *mddev, int quiesce)
static struct md_personality raid0_personality=
{
- .name = "raid0",
- .level = 0,
- .owner = THIS_MODULE,
+ .head = {
+ .type = MD_PERSONALITY,
+ .id = ID_RAID0,
+ .name = "raid0",
+ .owner = THIS_MODULE,
+ },
+
.make_request = raid0_make_request,
.run = raid0_run,
.free = raid0_free,
@@ -824,14 +828,14 @@ static struct md_personality raid0_personality=
.error_handler = raid0_error,
};
-static int __init raid0_init (void)
+static int __init raid0_init(void)
{
- return register_md_personality (&raid0_personality);
+ return register_md_submodule(&raid0_personality.head);
}
-static void raid0_exit (void)
+static void __exit raid0_exit(void)
{
- unregister_md_personality (&raid0_personality);
+ unregister_md_submodule(&raid0_personality.head);
}
module_init(raid0_init);
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index e55db07e43d4..c4bfd190c698 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -3494,9 +3494,13 @@ static void *raid1_takeover(struct mddev *mddev)
static struct md_personality raid1_personality =
{
- .name = "raid1",
- .level = 1,
- .owner = THIS_MODULE,
+ .head = {
+ .type = MD_PERSONALITY,
+ .id = ID_RAID1,
+ .name = "raid1",
+ .owner = THIS_MODULE,
+ },
+
.make_request = raid1_make_request,
.run = raid1_run,
.free = raid1_free,
@@ -3513,18 +3517,18 @@ static struct md_personality raid1_personality =
.takeover = raid1_takeover,
};
-static int __init raid_init(void)
+static int __init raid1_init(void)
{
- return register_md_personality(&raid1_personality);
+ return register_md_submodule(&raid1_personality.head);
}
-static void raid_exit(void)
+static void __exit raid1_exit(void)
{
- unregister_md_personality(&raid1_personality);
+ unregister_md_submodule(&raid1_personality.head);
}
-module_init(raid_init);
-module_exit(raid_exit);
+module_init(raid1_init);
+module_exit(raid1_exit);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("RAID1 (mirroring) personality for MD");
MODULE_ALIAS("md-personality-3"); /* RAID1 */
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 3df39b2399b2..5823329841ba 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -5126,9 +5126,13 @@ static void raid10_finish_reshape(struct mddev *mddev)
static struct md_personality raid10_personality =
{
- .name = "raid10",
- .level = 10,
- .owner = THIS_MODULE,
+ .head = {
+ .type = MD_PERSONALITY,
+ .id = ID_RAID10,
+ .name = "raid10",
+ .owner = THIS_MODULE,
+ },
+
.make_request = raid10_make_request,
.run = raid10_run,
.free = raid10_free,
@@ -5148,18 +5152,18 @@ static struct md_personality raid10_personality =
.update_reshape_pos = raid10_update_reshape_pos,
};
-static int __init raid_init(void)
+static int __init raid10_init(void)
{
- return register_md_personality(&raid10_personality);
+ return register_md_submodule(&raid10_personality.head);
}
-static void raid_exit(void)
+static void __exit raid10_exit(void)
{
- unregister_md_personality(&raid10_personality);
+ unregister_md_submodule(&raid10_personality.head);
}
-module_init(raid_init);
-module_exit(raid_exit);
+module_init(raid10_init);
+module_exit(raid10_exit);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("RAID10 (striped mirror) personality for MD");
MODULE_ALIAS("md-personality-9"); /* RAID10 */
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 5c79429acc64..d73a775b16c5 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -8954,9 +8954,13 @@ static void raid5_prepare_suspend(struct mddev *mddev)
static struct md_personality raid6_personality =
{
- .name = "raid6",
- .level = 6,
- .owner = THIS_MODULE,
+ .head = {
+ .type = MD_PERSONALITY,
+ .id = ID_RAID6,
+ .name = "raid6",
+ .owner = THIS_MODULE,
+ },
+
.make_request = raid5_make_request,
.run = raid5_run,
.start = raid5_start,
@@ -8980,9 +8984,13 @@ static struct md_personality raid6_personality =
};
static struct md_personality raid5_personality =
{
- .name = "raid5",
- .level = 5,
- .owner = THIS_MODULE,
+ .head = {
+ .type = MD_PERSONALITY,
+ .id = ID_RAID5,
+ .name = "raid5",
+ .owner = THIS_MODULE,
+ },
+
.make_request = raid5_make_request,
.run = raid5_run,
.start = raid5_start,
@@ -9007,9 +9015,13 @@ static struct md_personality raid5_personality =
static struct md_personality raid4_personality =
{
- .name = "raid4",
- .level = 4,
- .owner = THIS_MODULE,
+ .head = {
+ .type = MD_PERSONALITY,
+ .id = ID_RAID4,
+ .name = "raid4",
+ .owner = THIS_MODULE,
+ },
+
.make_request = raid5_make_request,
.run = raid5_run,
.start = raid5_start,
@@ -9045,21 +9057,39 @@ static int __init raid5_init(void)
"md/raid5:prepare",
raid456_cpu_up_prepare,
raid456_cpu_dead);
- if (ret) {
- destroy_workqueue(raid5_wq);
- return ret;
- }
- register_md_personality(&raid6_personality);
- register_md_personality(&raid5_personality);
- register_md_personality(&raid4_personality);
+ if (ret)
+ goto err_destroy_wq;
+
+ ret = register_md_submodule(&raid6_personality.head);
+ if (ret)
+ goto err_cpuhp_remove;
+
+ ret = register_md_submodule(&raid5_personality.head);
+ if (ret)
+ goto err_unregister_raid6;
+
+ ret = register_md_submodule(&raid4_personality.head);
+ if (ret)
+ goto err_unregister_raid5;
+
return 0;
+
+err_unregister_raid5:
+ unregister_md_submodule(&raid5_personality.head);
+err_unregister_raid6:
+ unregister_md_submodule(&raid6_personality.head);
+err_cpuhp_remove:
+ cpuhp_remove_multi_state(CPUHP_MD_RAID5_PREPARE);
+err_destroy_wq:
+ destroy_workqueue(raid5_wq);
+ return ret;
}
-static void raid5_exit(void)
+static void __exit raid5_exit(void)
{
- unregister_md_personality(&raid6_personality);
- unregister_md_personality(&raid5_personality);
- unregister_md_personality(&raid4_personality);
+ unregister_md_submodule(&raid6_personality.head);
+ unregister_md_submodule(&raid5_personality.head);
+ unregister_md_submodule(&raid4_personality.head);
cpuhp_remove_multi_state(CPUHP_MD_RAID5_PREPARE);
destroy_workqueue(raid5_wq);
}
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH md-6.15 5/7] md/md-cluster: cleanup md_cluster_ops reference
2025-02-15 9:22 [PATCH 0/7 md-6.15] md: introduce md_submodle_head Yu Kuai
` (3 preceding siblings ...)
2025-02-15 9:22 ` [PATCH md-6.15 4/7] md: switch personalities to use md_submodule_head Yu Kuai
@ 2025-02-15 9:22 ` Yu Kuai
2025-02-17 10:28 ` Glass Su
2025-02-15 9:22 ` [PATCH md-6.15 6/7] md: don't export md_cluster_ops Yu Kuai
` (2 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Yu Kuai @ 2025-02-15 9:22 UTC (permalink / raw)
To: song, yukuai3; +Cc: linux-raid, linux-kernel, yukuai1, yi.zhang, yangerkun
From: Yu Kuai <yukuai3@huawei.com>
md_cluster_ops->slot_number() is implemented inside md-cluster.c, just
call it directly.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/md/md-cluster.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index 6595f89becdb..6fd436a1d373 100644
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -1166,7 +1166,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz
struct dlm_lock_resource *bm_lockres;
char str[64];
- if (i == md_cluster_ops->slot_number(mddev))
+ if (i == slot_number(mddev))
continue;
bitmap = mddev->bitmap_ops->get_from_slot(mddev, i);
@@ -1216,7 +1216,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz
*/
static int cluster_check_sync_size(struct mddev *mddev)
{
- int current_slot = md_cluster_ops->slot_number(mddev);
+ int current_slot = slot_number(mddev);
int node_num = mddev->bitmap_info.nodes;
struct dlm_lock_resource *bm_lockres;
struct md_bitmap_stats stats;
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH md-6.15 5/7] md/md-cluster: cleanup md_cluster_ops reference
2025-02-15 9:22 ` [PATCH md-6.15 5/7] md/md-cluster: cleanup md_cluster_ops reference Yu Kuai
@ 2025-02-17 10:28 ` Glass Su
0 siblings, 0 replies; 16+ messages in thread
From: Glass Su @ 2025-02-17 10:28 UTC (permalink / raw)
To: Yu Kuai; +Cc: song, yukuai3, linux-raid, linux-kernel, yi.zhang, yangerkun
> On Feb 15, 2025, at 17:22, Yu Kuai <yukuai1@huaweicloud.com> wrote:
>
> From: Yu Kuai <yukuai3@huawei.com>
>
> md_cluster_ops->slot_number() is implemented inside md-cluster.c, just
> call it directly.
>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Su Yue <glass.su@suse.com>
> ---
> drivers/md/md-cluster.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
> index 6595f89becdb..6fd436a1d373 100644
> --- a/drivers/md/md-cluster.c
> +++ b/drivers/md/md-cluster.c
> @@ -1166,7 +1166,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz
> struct dlm_lock_resource *bm_lockres;
> char str[64];
>
> - if (i == md_cluster_ops->slot_number(mddev))
> + if (i == slot_number(mddev))
> continue;
>
> bitmap = mddev->bitmap_ops->get_from_slot(mddev, i);
> @@ -1216,7 +1216,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz
> */
> static int cluster_check_sync_size(struct mddev *mddev)
> {
> - int current_slot = md_cluster_ops->slot_number(mddev);
> + int current_slot = slot_number(mddev);
> int node_num = mddev->bitmap_info.nodes;
> struct dlm_lock_resource *bm_lockres;
> struct md_bitmap_stats stats;
> --
> 2.39.2
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH md-6.15 6/7] md: don't export md_cluster_ops
2025-02-15 9:22 [PATCH 0/7 md-6.15] md: introduce md_submodle_head Yu Kuai
` (4 preceding siblings ...)
2025-02-15 9:22 ` [PATCH md-6.15 5/7] md/md-cluster: cleanup md_cluster_ops reference Yu Kuai
@ 2025-02-15 9:22 ` Yu Kuai
2025-02-18 3:36 ` Su Yue
2025-02-15 9:22 ` [PATCH md-6.15 7/7] md: switch md-cluster to use md_submodle_head Yu Kuai
2025-03-05 1:34 ` [PATCH 0/7 md-6.15] md: introduce md_submodle_head Yu Kuai
7 siblings, 1 reply; 16+ messages in thread
From: Yu Kuai @ 2025-02-15 9:22 UTC (permalink / raw)
To: song, yukuai3; +Cc: linux-raid, linux-kernel, yukuai1, yi.zhang, yangerkun
From: Yu Kuai <yukuai3@huawei.com>
Add a new field 'cluster_ops' and initialize it md_setup_cluster(), so
that the gloable variable 'md_cluter_ops' doesn't need to be exported.
Also prepare to switch md-cluster to use md_submod_head.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/md/md-bitmap.c | 6 +--
drivers/md/md.c | 94 ++++++++++++++++++++++++------------------
drivers/md/md.h | 3 +-
drivers/md/raid1-10.c | 4 +-
drivers/md/raid1.c | 10 ++---
drivers/md/raid10.c | 18 ++++----
6 files changed, 76 insertions(+), 59 deletions(-)
diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index 71aa7dc80e26..9ac23e02b606 100644
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -944,7 +944,7 @@ static int md_bitmap_read_sb(struct bitmap *bitmap)
bmname(bitmap), err);
goto out_no_sb;
}
- bitmap->cluster_slot = md_cluster_ops->slot_number(bitmap->mddev);
+ bitmap->cluster_slot = bitmap->mddev->cluster_ops->slot_number(bitmap->mddev);
goto re_read;
}
@@ -2023,7 +2023,7 @@ static void md_bitmap_free(void *data)
sysfs_put(bitmap->sysfs_can_clear);
if (mddev_is_clustered(bitmap->mddev) && bitmap->mddev->cluster_info &&
- bitmap->cluster_slot == md_cluster_ops->slot_number(bitmap->mddev))
+ bitmap->cluster_slot == bitmap->mddev->cluster_ops->slot_number(bitmap->mddev))
md_cluster_stop(bitmap->mddev);
/* Shouldn't be needed - but just in case.... */
@@ -2231,7 +2231,7 @@ static int bitmap_load(struct mddev *mddev)
mddev_create_serial_pool(mddev, rdev);
if (mddev_is_clustered(mddev))
- md_cluster_ops->load_bitmaps(mddev, mddev->bitmap_info.nodes);
+ mddev->cluster_ops->load_bitmaps(mddev, mddev->bitmap_info.nodes);
/* Clear out old bitmap info first: Either there is none, or we
* are resuming after someone else has possibly changed things,
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 498ae11e3f6e..d94c9aa8c3aa 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -85,8 +85,7 @@ static DEFINE_SPINLOCK(pers_lock);
static const struct kobj_type md_ktype;
-const struct md_cluster_operations *md_cluster_ops;
-EXPORT_SYMBOL(md_cluster_ops);
+static const struct md_cluster_operations *md_cluster_ops;
static struct module *md_cluster_mod;
static DECLARE_WAIT_QUEUE_HEAD(resync_wait);
@@ -2663,11 +2662,11 @@ void md_update_sb(struct mddev *mddev, int force_change)
force_change = 1;
if (test_and_clear_bit(MD_SB_CHANGE_CLEAN, &mddev->sb_flags))
nospares = 1;
- ret = md_cluster_ops->metadata_update_start(mddev);
+ ret = mddev->cluster_ops->metadata_update_start(mddev);
/* Has someone else has updated the sb */
if (!does_sb_need_changing(mddev)) {
if (ret == 0)
- md_cluster_ops->metadata_update_cancel(mddev);
+ mddev->cluster_ops->metadata_update_cancel(mddev);
bit_clear_unless(&mddev->sb_flags, BIT(MD_SB_CHANGE_PENDING),
BIT(MD_SB_CHANGE_DEVS) |
BIT(MD_SB_CHANGE_CLEAN));
@@ -2807,7 +2806,7 @@ void md_update_sb(struct mddev *mddev, int force_change)
/* if there was a failure, MD_SB_CHANGE_DEVS was set, and we re-write super */
if (mddev_is_clustered(mddev) && ret == 0)
- md_cluster_ops->metadata_update_finish(mddev);
+ mddev->cluster_ops->metadata_update_finish(mddev);
if (mddev->in_sync != sync_req ||
!bit_clear_unless(&mddev->sb_flags, BIT(MD_SB_CHANGE_PENDING),
@@ -2966,7 +2965,7 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
else {
err = 0;
if (mddev_is_clustered(mddev))
- err = md_cluster_ops->remove_disk(mddev, rdev);
+ err = mddev->cluster_ops->remove_disk(mddev, rdev);
if (err == 0) {
md_kick_rdev_from_array(rdev);
@@ -3076,7 +3075,7 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)
* by this node eventually
*/
if (!mddev_is_clustered(rdev->mddev) ||
- (err = md_cluster_ops->gather_bitmaps(rdev)) == 0) {
+ (err = mddev->cluster_ops->gather_bitmaps(rdev)) == 0) {
clear_bit(Faulty, &rdev->flags);
err = add_bound_rdev(rdev);
}
@@ -6994,7 +6993,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
set_bit(Candidate, &rdev->flags);
else if (info->state & (1 << MD_DISK_CLUSTER_ADD)) {
/* --add initiated by this node */
- err = md_cluster_ops->add_new_disk(mddev, rdev);
+ err = mddev->cluster_ops->add_new_disk(mddev, rdev);
if (err) {
export_rdev(rdev, mddev);
return err;
@@ -7011,14 +7010,14 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
if (mddev_is_clustered(mddev)) {
if (info->state & (1 << MD_DISK_CANDIDATE)) {
if (!err) {
- err = md_cluster_ops->new_disk_ack(mddev,
- err == 0);
+ err = mddev->cluster_ops->new_disk_ack(
+ mddev, err == 0);
if (err)
md_kick_rdev_from_array(rdev);
}
} else {
if (err)
- md_cluster_ops->add_new_disk_cancel(mddev);
+ mddev->cluster_ops->add_new_disk_cancel(mddev);
else
err = add_bound_rdev(rdev);
}
@@ -7098,10 +7097,9 @@ static int hot_remove_disk(struct mddev *mddev, dev_t dev)
goto busy;
kick_rdev:
- if (mddev_is_clustered(mddev)) {
- if (md_cluster_ops->remove_disk(mddev, rdev))
- goto busy;
- }
+ if (mddev_is_clustered(mddev) &&
+ mddev->cluster_ops->remove_disk(mddev, rdev))
+ goto busy;
md_kick_rdev_from_array(rdev);
set_bit(MD_SB_CHANGE_DEVS, &mddev->sb_flags);
@@ -7404,7 +7402,7 @@ static int update_size(struct mddev *mddev, sector_t num_sectors)
rv = mddev->pers->resize(mddev, num_sectors);
if (!rv) {
if (mddev_is_clustered(mddev))
- md_cluster_ops->update_size(mddev, old_dev_sectors);
+ mddev->cluster_ops->update_size(mddev, old_dev_sectors);
else if (!mddev_is_dm(mddev))
set_capacity_and_notify(mddev->gendisk,
mddev->array_sectors);
@@ -7452,6 +7450,27 @@ static int update_raid_disks(struct mddev *mddev, int raid_disks)
return rv;
}
+static int get_cluster_ops(struct mddev *mddev)
+{
+ spin_lock(&pers_lock);
+ mddev->cluster_ops = md_cluster_ops;
+ if (mddev->cluster_ops && !try_module_get(md_cluster_mod))
+ mddev->cluster_ops = NULL;
+ spin_unlock(&pers_lock);
+
+ return mddev->cluster_ops == NULL ? -ENOENT : 0;
+}
+
+static void put_cluster_ops(struct mddev *mddev)
+{
+ if (!mddev->cluster_ops)
+ return;
+
+ mddev->cluster_ops->leave(mddev);
+ module_put(md_cluster_mod);
+ mddev->cluster_ops = NULL;
+}
+
/*
* update_array_info is used to change the configuration of an
* on-line array.
@@ -7560,16 +7579,15 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
if (mddev->bitmap_info.nodes) {
/* hold PW on all the bitmap lock */
- if (md_cluster_ops->lock_all_bitmaps(mddev) <= 0) {
+ if (mddev->cluster_ops->lock_all_bitmaps(mddev) <= 0) {
pr_warn("md: can't change bitmap to none since the array is in use by more than one node\n");
rv = -EPERM;
- md_cluster_ops->unlock_all_bitmaps(mddev);
+ mddev->cluster_ops->unlock_all_bitmaps(mddev);
goto err;
}
mddev->bitmap_info.nodes = 0;
- md_cluster_ops->leave(mddev);
- module_put(md_cluster_mod);
+ put_cluster_ops(mddev);
mddev->safemode_delay = DEFAULT_SAFEMODE_DELAY;
}
mddev->bitmap_ops->destroy(mddev);
@@ -7853,7 +7871,7 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
case CLUSTERED_DISK_NACK:
if (mddev_is_clustered(mddev))
- md_cluster_ops->new_disk_ack(mddev, false);
+ mddev->cluster_ops->new_disk_ack(mddev, false);
else
err = -EINVAL;
goto unlock;
@@ -8568,19 +8586,20 @@ EXPORT_SYMBOL(unregister_md_cluster_operations);
int md_setup_cluster(struct mddev *mddev, int nodes)
{
- int ret;
- if (!md_cluster_ops)
+ int ret = get_cluster_ops(mddev);
+
+ if (ret) {
request_module("md-cluster");
- spin_lock(&pers_lock);
+ ret = get_cluster_ops(mddev);
+ }
+
/* ensure module won't be unloaded */
- if (!md_cluster_ops || !try_module_get(md_cluster_mod)) {
+ if (ret) {
pr_warn("can't find md-cluster module or get its reference.\n");
- spin_unlock(&pers_lock);
- return -ENOENT;
+ return ret;
}
- spin_unlock(&pers_lock);
- ret = md_cluster_ops->join(mddev, nodes);
+ ret = mddev->cluster_ops->join(mddev, nodes);
if (!ret)
mddev->safemode_delay = 0;
return ret;
@@ -8588,10 +8607,7 @@ int md_setup_cluster(struct mddev *mddev, int nodes)
void md_cluster_stop(struct mddev *mddev)
{
- if (!md_cluster_ops)
- return;
- md_cluster_ops->leave(mddev);
- module_put(md_cluster_mod);
+ put_cluster_ops(mddev);
}
static int is_mddev_idle(struct mddev *mddev, int init)
@@ -8984,7 +9000,7 @@ void md_do_sync(struct md_thread *thread)
}
if (mddev_is_clustered(mddev)) {
- ret = md_cluster_ops->resync_start(mddev);
+ ret = mddev->cluster_ops->resync_start(mddev);
if (ret)
goto skip;
@@ -9011,7 +9027,7 @@ void md_do_sync(struct md_thread *thread)
*
*/
if (mddev_is_clustered(mddev))
- md_cluster_ops->resync_start_notify(mddev);
+ mddev->cluster_ops->resync_start_notify(mddev);
do {
int mddev2_minor = -1;
mddev->curr_resync = MD_RESYNC_DELAYED;
@@ -9795,7 +9811,7 @@ void md_reap_sync_thread(struct mddev *mddev)
* call resync_finish here if MD_CLUSTER_RESYNC_LOCKED is set by
* clustered raid */
if (test_and_clear_bit(MD_CLUSTER_RESYNC_LOCKED, &mddev->flags))
- md_cluster_ops->resync_finish(mddev);
+ mddev->cluster_ops->resync_finish(mddev);
clear_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
@@ -9803,13 +9819,13 @@ void md_reap_sync_thread(struct mddev *mddev)
clear_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);
clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
/*
- * We call md_cluster_ops->update_size here because sync_size could
+ * We call mddev->cluster_ops->update_size here because sync_size could
* be changed by md_update_sb, and MD_RECOVERY_RESHAPE is cleared,
* so it is time to update size across cluster.
*/
if (mddev_is_clustered(mddev) && is_reshaped
&& !test_bit(MD_CLOSING, &mddev->flags))
- md_cluster_ops->update_size(mddev, old_dev_sectors);
+ mddev->cluster_ops->update_size(mddev, old_dev_sectors);
/* flag recovery needed just to double check */
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
sysfs_notify_dirent_safe(mddev->sysfs_completed);
@@ -10035,7 +10051,7 @@ static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev)
if (rdev2->raid_disk == -1 && role != MD_DISK_ROLE_SPARE &&
!(le32_to_cpu(sb->feature_map) &
MD_FEATURE_RESHAPE_ACTIVE) &&
- !md_cluster_ops->resync_status_get(mddev)) {
+ !mddev->cluster_ops->resync_status_get(mddev)) {
/*
* -1 to make raid1_add_disk() set conf->fullsync
* to 1. This could avoid skipping sync when the
diff --git a/drivers/md/md.h b/drivers/md/md.h
index f9e0f0d390f1..873f33e2a1f6 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -320,6 +320,7 @@ extern int rdev_set_badblocks(struct md_rdev *rdev, sector_t s, int sectors,
extern int rdev_clear_badblocks(struct md_rdev *rdev, sector_t s, int sectors,
int is_new);
struct md_cluster_info;
+struct md_cluster_operations;
/**
* enum mddev_flags - md device flags.
@@ -602,6 +603,7 @@ struct mddev {
mempool_t *serial_info_pool;
void (*sync_super)(struct mddev *mddev, struct md_rdev *rdev);
struct md_cluster_info *cluster_info;
+ const struct md_cluster_operations *cluster_ops;
unsigned int good_device_nr; /* good device num within cluster raid */
unsigned int noio_flag; /* for memalloc scope API */
@@ -947,7 +949,6 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
}
}
-extern const struct md_cluster_operations *md_cluster_ops;
static inline int mddev_is_clustered(struct mddev *mddev)
{
return mddev->cluster_info && mddev->bitmap_info.nodes > 1;
diff --git a/drivers/md/raid1-10.c b/drivers/md/raid1-10.c
index 4378d3250bd7..4a51b151a981 100644
--- a/drivers/md/raid1-10.c
+++ b/drivers/md/raid1-10.c
@@ -287,8 +287,8 @@ static inline bool raid1_should_read_first(struct mddev *mddev,
return true;
if (mddev_is_clustered(mddev) &&
- md_cluster_ops->area_resyncing(mddev, READ, this_sector,
- this_sector + len))
+ mddev->cluster_ops->area_resyncing(mddev, READ, this_sector,
+ this_sector + len))
return true;
return false;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index c4bfd190c698..f7761a19482f 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1468,7 +1468,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
bool is_discard = (bio_op(bio) == REQ_OP_DISCARD);
if (mddev_is_clustered(mddev) &&
- md_cluster_ops->area_resyncing(mddev, WRITE,
+ mddev->cluster_ops->area_resyncing(mddev, WRITE,
bio->bi_iter.bi_sector, bio_end_sector(bio))) {
DEFINE_WAIT(w);
@@ -1479,7 +1479,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
for (;;) {
prepare_to_wait(&conf->wait_barrier,
&w, TASK_IDLE);
- if (!md_cluster_ops->area_resyncing(mddev, WRITE,
+ if (!mddev->cluster_ops->area_resyncing(mddev, WRITE,
bio->bi_iter.bi_sector,
bio_end_sector(bio)))
break;
@@ -3039,9 +3039,9 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,
conf->cluster_sync_low = mddev->curr_resync_completed;
conf->cluster_sync_high = conf->cluster_sync_low + CLUSTER_RESYNC_WINDOW_SECTORS;
/* Send resync message */
- md_cluster_ops->resync_info_update(mddev,
- conf->cluster_sync_low,
- conf->cluster_sync_high);
+ mddev->cluster_ops->resync_info_update(mddev,
+ conf->cluster_sync_low,
+ conf->cluster_sync_high);
}
/* For a user-requested sync, we read all readable devices and do a
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 5823329841ba..e68aa4b134ee 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1356,9 +1356,9 @@ static void raid10_write_request(struct mddev *mddev, struct bio *bio,
int error;
if ((mddev_is_clustered(mddev) &&
- md_cluster_ops->area_resyncing(mddev, WRITE,
- bio->bi_iter.bi_sector,
- bio_end_sector(bio)))) {
+ mddev->cluster_ops->area_resyncing(mddev, WRITE,
+ bio->bi_iter.bi_sector,
+ bio_end_sector(bio)))) {
DEFINE_WAIT(w);
/* Bail out if REQ_NOWAIT is set for the bio */
if (bio->bi_opf & REQ_NOWAIT) {
@@ -1368,7 +1368,7 @@ static void raid10_write_request(struct mddev *mddev, struct bio *bio,
for (;;) {
prepare_to_wait(&conf->wait_barrier,
&w, TASK_IDLE);
- if (!md_cluster_ops->area_resyncing(mddev, WRITE,
+ if (!mddev->cluster_ops->area_resyncing(mddev, WRITE,
bio->bi_iter.bi_sector, bio_end_sector(bio)))
break;
schedule();
@@ -3717,7 +3717,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
conf->cluster_sync_low = mddev->curr_resync_completed;
raid10_set_cluster_sync_high(conf);
/* Send resync message */
- md_cluster_ops->resync_info_update(mddev,
+ mddev->cluster_ops->resync_info_update(mddev,
conf->cluster_sync_low,
conf->cluster_sync_high);
}
@@ -3750,7 +3750,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
}
if (broadcast_msg) {
raid10_set_cluster_sync_high(conf);
- md_cluster_ops->resync_info_update(mddev,
+ mddev->cluster_ops->resync_info_update(mddev,
conf->cluster_sync_low,
conf->cluster_sync_high);
}
@@ -4544,7 +4544,7 @@ static int raid10_start_reshape(struct mddev *mddev)
if (ret)
goto abort;
- ret = md_cluster_ops->resize_bitmaps(mddev, newsize, oldsize);
+ ret = mddev->cluster_ops->resize_bitmaps(mddev, newsize, oldsize);
if (ret) {
mddev->bitmap_ops->resize(mddev, oldsize, 0, false);
goto abort;
@@ -4835,7 +4835,7 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr,
conf->cluster_sync_low = sb_reshape_pos;
}
- md_cluster_ops->resync_info_update(mddev, conf->cluster_sync_low,
+ mddev->cluster_ops->resync_info_update(mddev, conf->cluster_sync_low,
conf->cluster_sync_high);
}
@@ -4980,7 +4980,7 @@ static void raid10_update_reshape_pos(struct mddev *mddev)
struct r10conf *conf = mddev->private;
sector_t lo, hi;
- md_cluster_ops->resync_info_get(mddev, &lo, &hi);
+ mddev->cluster_ops->resync_info_get(mddev, &lo, &hi);
if (((mddev->reshape_position <= hi) && (mddev->reshape_position >= lo))
|| mddev->reshape_position == MaxSector)
conf->reshape_progress = mddev->reshape_position;
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH md-6.15 6/7] md: don't export md_cluster_ops
2025-02-15 9:22 ` [PATCH md-6.15 6/7] md: don't export md_cluster_ops Yu Kuai
@ 2025-02-18 3:36 ` Su Yue
0 siblings, 0 replies; 16+ messages in thread
From: Su Yue @ 2025-02-18 3:36 UTC (permalink / raw)
To: Yu Kuai; +Cc: song, yukuai3, linux-raid, linux-kernel, yi.zhang, yangerkun
On Sat 15 Feb 2025 at 17:22, Yu Kuai <yukuai1@huaweicloud.com>
wrote:
> From: Yu Kuai <yukuai3@huawei.com>
>
> Add a new field 'cluster_ops' and initialize it
> md_setup_cluster(), so
> that the gloable variable 'md_cluter_ops' doesn't need to be
> exported.
> Also prepare to switch md-cluster to use md_submod_head.
>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
> drivers/md/md-bitmap.c | 6 +--
> drivers/md/md.c | 94
> ++++++++++++++++++++++++------------------
> drivers/md/md.h | 3 +-
> drivers/md/raid1-10.c | 4 +-
> drivers/md/raid1.c | 10 ++---
> drivers/md/raid10.c | 18 ++++----
> 6 files changed, 76 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
> index 71aa7dc80e26..9ac23e02b606 100644
> --- a/drivers/md/md-bitmap.c
> +++ b/drivers/md/md-bitmap.c
> @@ -944,7 +944,7 @@ static int md_bitmap_read_sb(struct bitmap
> *bitmap)
> bmname(bitmap), err);
> goto out_no_sb;
> }
> - bitmap->cluster_slot =
> md_cluster_ops->slot_number(bitmap->mddev);
> + bitmap->cluster_slot =
> bitmap->mddev->cluster_ops->slot_number(bitmap->mddev);
> goto re_read;
> }
>
> @@ -2023,7 +2023,7 @@ static void md_bitmap_free(void *data)
> sysfs_put(bitmap->sysfs_can_clear);
>
> if (mddev_is_clustered(bitmap->mddev) &&
> bitmap->mddev->cluster_info &&
> - bitmap->cluster_slot ==
> md_cluster_ops->slot_number(bitmap->mddev))
> + bitmap->cluster_slot ==
> bitmap->mddev->cluster_ops->slot_number(bitmap->mddev))
> md_cluster_stop(bitmap->mddev);
>
> /* Shouldn't be needed - but just in case.... */
> @@ -2231,7 +2231,7 @@ static int bitmap_load(struct mddev
> *mddev)
> mddev_create_serial_pool(mddev, rdev);
>
> if (mddev_is_clustered(mddev))
> - md_cluster_ops->load_bitmaps(mddev,
> mddev->bitmap_info.nodes);
> + mddev->cluster_ops->load_bitmaps(mddev,
> mddev->bitmap_info.nodes);
>
> /* Clear out old bitmap info first: Either there is none, or
> we
> * are resuming after someone else has possibly changed
> things,
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index 498ae11e3f6e..d94c9aa8c3aa 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -85,8 +85,7 @@ static DEFINE_SPINLOCK(pers_lock);
>
> static const struct kobj_type md_ktype;
>
> -const struct md_cluster_operations *md_cluster_ops;
> -EXPORT_SYMBOL(md_cluster_ops);
> +static const struct md_cluster_operations *md_cluster_ops;
> static struct module *md_cluster_mod;
>
> static DECLARE_WAIT_QUEUE_HEAD(resync_wait);
> @@ -2663,11 +2662,11 @@ void md_update_sb(struct mddev *mddev,
> int force_change)
> force_change = 1;
> if (test_and_clear_bit(MD_SB_CHANGE_CLEAN,
> &mddev->sb_flags))
> nospares = 1;
> - ret = md_cluster_ops->metadata_update_start(mddev);
> + ret = mddev->cluster_ops->metadata_update_start(mddev);
> /* Has someone else has updated the sb */
> if (!does_sb_need_changing(mddev)) {
> if (ret == 0)
> - md_cluster_ops->metadata_update_cancel(mddev);
> + mddev->cluster_ops->metadata_update_cancel(mddev);
> bit_clear_unless(&mddev->sb_flags,
> BIT(MD_SB_CHANGE_PENDING),
> BIT(MD_SB_CHANGE_DEVS) |
> BIT(MD_SB_CHANGE_CLEAN));
> @@ -2807,7 +2806,7 @@ void md_update_sb(struct mddev *mddev, int
> force_change)
> /* if there was a failure, MD_SB_CHANGE_DEVS was set, and we
> re-write super */
>
> if (mddev_is_clustered(mddev) && ret == 0)
> - md_cluster_ops->metadata_update_finish(mddev);
> + mddev->cluster_ops->metadata_update_finish(mddev);
>
> if (mddev->in_sync != sync_req ||
> !bit_clear_unless(&mddev->sb_flags,
> BIT(MD_SB_CHANGE_PENDING),
> @@ -2966,7 +2965,7 @@ state_store(struct md_rdev *rdev, const
> char *buf, size_t len)
> else {
> err = 0;
> if (mddev_is_clustered(mddev))
> - err = md_cluster_ops->remove_disk(mddev, rdev);
> + err = mddev->cluster_ops->remove_disk(mddev,
> rdev);
>
> if (err == 0) {
> md_kick_rdev_from_array(rdev);
> @@ -3076,7 +3075,7 @@ state_store(struct md_rdev *rdev, const
> char *buf, size_t len)
> * by this node eventually
> */
> if (!mddev_is_clustered(rdev->mddev) ||
> - (err = md_cluster_ops->gather_bitmaps(rdev)) == 0)
> {
> + (err = mddev->cluster_ops->gather_bitmaps(rdev))
> == 0) {
> clear_bit(Faulty, &rdev->flags);
> err = add_bound_rdev(rdev);
> }
> @@ -6994,7 +6993,7 @@ int md_add_new_disk(struct mddev *mddev,
> struct mdu_disk_info_s *info)
> set_bit(Candidate, &rdev->flags);
> else if (info->state & (1 << MD_DISK_CLUSTER_ADD)) {
> /* --add initiated by this node */
> - err = md_cluster_ops->add_new_disk(mddev, rdev);
> + err = mddev->cluster_ops->add_new_disk(mddev,
> rdev);
> if (err) {
> export_rdev(rdev, mddev);
> return err;
> @@ -7011,14 +7010,14 @@ int md_add_new_disk(struct mddev *mddev,
> struct mdu_disk_info_s *info)
> if (mddev_is_clustered(mddev)) {
> if (info->state & (1 << MD_DISK_CANDIDATE)) {
> if (!err) {
> - err = md_cluster_ops->new_disk_ack(mddev,
> - err == 0);
> + err = mddev->cluster_ops->new_disk_ack(
> + mddev, err == 0);
> if (err)
> md_kick_rdev_from_array(rdev);
> }
> } else {
> if (err)
> - md_cluster_ops->add_new_disk_cancel(mddev);
> +
> mddev->cluster_ops->add_new_disk_cancel(mddev);
> else
> err = add_bound_rdev(rdev);
> }
> @@ -7098,10 +7097,9 @@ static int hot_remove_disk(struct mddev
> *mddev, dev_t dev)
> goto busy;
>
> kick_rdev:
> - if (mddev_is_clustered(mddev)) {
> - if (md_cluster_ops->remove_disk(mddev, rdev))
> - goto busy;
> - }
> + if (mddev_is_clustered(mddev) &&
> + mddev->cluster_ops->remove_disk(mddev, rdev))
> + goto busy;
>
> md_kick_rdev_from_array(rdev);
> set_bit(MD_SB_CHANGE_DEVS, &mddev->sb_flags);
> @@ -7404,7 +7402,7 @@ static int update_size(struct mddev
> *mddev, sector_t num_sectors)
> rv = mddev->pers->resize(mddev, num_sectors);
> if (!rv) {
> if (mddev_is_clustered(mddev))
> - md_cluster_ops->update_size(mddev, old_dev_sectors);
> + mddev->cluster_ops->update_size(mddev,
> old_dev_sectors);
> else if (!mddev_is_dm(mddev))
> set_capacity_and_notify(mddev->gendisk,
> mddev->array_sectors);
> @@ -7452,6 +7450,27 @@ static int update_raid_disks(struct mddev
> *mddev, int raid_disks)
> return rv;
> }
>
> +static int get_cluster_ops(struct mddev *mddev)
> +{
> + spin_lock(&pers_lock);
> + mddev->cluster_ops = md_cluster_ops;
> + if (mddev->cluster_ops && !try_module_get(md_cluster_mod))
>
It was little confusing here to me. But the logic is clear after
PATCH 7. So:
Reviewed-by: Su Yue <glass.su@suse.com>
> + mddev->cluster_ops = NULL;
> + spin_unlock(&pers_lock);
> +
> + return mddev->cluster_ops == NULL ? -ENOENT : 0;
> +}
> +
> +static void put_cluster_ops(struct mddev *mddev)
> +{
> + if (!mddev->cluster_ops)
> + return;
> +
> + mddev->cluster_ops->leave(mddev);
> + module_put(md_cluster_mod);
> + mddev->cluster_ops = NULL;
> +}
> +
> /*
> * update_array_info is used to change the configuration of an
> * on-line array.
> @@ -7560,16 +7579,15 @@ static int update_array_info(struct
> mddev *mddev, mdu_array_info_t *info)
>
> if (mddev->bitmap_info.nodes) {
> /* hold PW on all the bitmap lock */
> - if (md_cluster_ops->lock_all_bitmaps(mddev) <= 0)
> {
> + if (mddev->cluster_ops->lock_all_bitmaps(mddev) <=
> 0) {
> pr_warn("md: can't change bitmap to none since
> the array is in use by more than one node\n");
> rv = -EPERM;
> - md_cluster_ops->unlock_all_bitmaps(mddev);
> + mddev->cluster_ops->unlock_all_bitmaps(mddev);
> goto err;
> }
>
> mddev->bitmap_info.nodes = 0;
> - md_cluster_ops->leave(mddev);
> - module_put(md_cluster_mod);
> + put_cluster_ops(mddev);
> mddev->safemode_delay = DEFAULT_SAFEMODE_DELAY;
> }
> mddev->bitmap_ops->destroy(mddev);
> @@ -7853,7 +7871,7 @@ static int md_ioctl(struct block_device
> *bdev, blk_mode_t mode,
>
> case CLUSTERED_DISK_NACK:
> if (mddev_is_clustered(mddev))
> - md_cluster_ops->new_disk_ack(mddev, false);
> + mddev->cluster_ops->new_disk_ack(mddev, false);
> else
> err = -EINVAL;
> goto unlock;
> @@ -8568,19 +8586,20 @@
> EXPORT_SYMBOL(unregister_md_cluster_operations);
>
> int md_setup_cluster(struct mddev *mddev, int nodes)
> {
> - int ret;
> - if (!md_cluster_ops)
> + int ret = get_cluster_ops(mddev);
> +
> + if (ret) {
> request_module("md-cluster");
> - spin_lock(&pers_lock);
> + ret = get_cluster_ops(mddev);
> + }
> +
> /* ensure module won't be unloaded */
> - if (!md_cluster_ops || !try_module_get(md_cluster_mod)) {
> + if (ret) {
> pr_warn("can't find md-cluster module or get its
> reference.\n");
> - spin_unlock(&pers_lock);
> - return -ENOENT;
> + return ret;
> }
> - spin_unlock(&pers_lock);
>
> - ret = md_cluster_ops->join(mddev, nodes);
> + ret = mddev->cluster_ops->join(mddev, nodes);
> if (!ret)
> mddev->safemode_delay = 0;
> return ret;
> @@ -8588,10 +8607,7 @@ int md_setup_cluster(struct mddev *mddev,
> int nodes)
>
> void md_cluster_stop(struct mddev *mddev)
> {
> - if (!md_cluster_ops)
> - return;
> - md_cluster_ops->leave(mddev);
> - module_put(md_cluster_mod);
> + put_cluster_ops(mddev);
> }
>
> static int is_mddev_idle(struct mddev *mddev, int init)
> @@ -8984,7 +9000,7 @@ void md_do_sync(struct md_thread *thread)
> }
>
> if (mddev_is_clustered(mddev)) {
> - ret = md_cluster_ops->resync_start(mddev);
> + ret = mddev->cluster_ops->resync_start(mddev);
> if (ret)
> goto skip;
>
> @@ -9011,7 +9027,7 @@ void md_do_sync(struct md_thread *thread)
> *
> */
> if (mddev_is_clustered(mddev))
> - md_cluster_ops->resync_start_notify(mddev);
> + mddev->cluster_ops->resync_start_notify(mddev);
> do {
> int mddev2_minor = -1;
> mddev->curr_resync = MD_RESYNC_DELAYED;
> @@ -9795,7 +9811,7 @@ void md_reap_sync_thread(struct mddev
> *mddev)
> * call resync_finish here if MD_CLUSTER_RESYNC_LOCKED is set
> by
> * clustered raid */
> if (test_and_clear_bit(MD_CLUSTER_RESYNC_LOCKED,
> &mddev->flags))
> - md_cluster_ops->resync_finish(mddev);
> + mddev->cluster_ops->resync_finish(mddev);
> clear_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
> clear_bit(MD_RECOVERY_DONE, &mddev->recovery);
> clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
> @@ -9803,13 +9819,13 @@ void md_reap_sync_thread(struct mddev
> *mddev)
> clear_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);
> clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
> /*
> - * We call md_cluster_ops->update_size here because sync_size
> could
> + * We call mddev->cluster_ops->update_size here because
> sync_size could
> * be changed by md_update_sb, and MD_RECOVERY_RESHAPE is
> cleared,
> * so it is time to update size across cluster.
> */
> if (mddev_is_clustered(mddev) && is_reshaped
> && !test_bit(MD_CLOSING, &mddev->flags))
> - md_cluster_ops->update_size(mddev, old_dev_sectors);
> + mddev->cluster_ops->update_size(mddev, old_dev_sectors);
> /* flag recovery needed just to double check */
> set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
> sysfs_notify_dirent_safe(mddev->sysfs_completed);
> @@ -10035,7 +10051,7 @@ static void check_sb_changes(struct
> mddev *mddev, struct md_rdev *rdev)
> if (rdev2->raid_disk == -1 && role !=
> MD_DISK_ROLE_SPARE &&
> !(le32_to_cpu(sb->feature_map) &
> MD_FEATURE_RESHAPE_ACTIVE) &&
> - !md_cluster_ops->resync_status_get(mddev)) {
> + !mddev->cluster_ops->resync_status_get(mddev)) {
> /*
> * -1 to make raid1_add_disk() set conf->fullsync
> * to 1. This could avoid skipping sync when the
> diff --git a/drivers/md/md.h b/drivers/md/md.h
> index f9e0f0d390f1..873f33e2a1f6 100644
> --- a/drivers/md/md.h
> +++ b/drivers/md/md.h
> @@ -320,6 +320,7 @@ extern int rdev_set_badblocks(struct md_rdev
> *rdev, sector_t s, int sectors,
> extern int rdev_clear_badblocks(struct md_rdev *rdev, sector_t
> s, int sectors,
> int is_new);
> struct md_cluster_info;
> +struct md_cluster_operations;
>
> /**
> * enum mddev_flags - md device flags.
> @@ -602,6 +603,7 @@ struct mddev {
> mempool_t *serial_info_pool;
> void (*sync_super)(struct mddev *mddev, struct md_rdev *rdev);
> struct md_cluster_info *cluster_info;
> + const struct md_cluster_operations *cluster_ops;
> unsigned int good_device_nr; /* good device num
> within cluster raid */
> unsigned int noio_flag; /* for memalloc scope API
> */
>
> @@ -947,7 +949,6 @@ static inline void rdev_dec_pending(struct
> md_rdev *rdev, struct mddev *mddev)
> }
> }
>
> -extern const struct md_cluster_operations *md_cluster_ops;
> static inline int mddev_is_clustered(struct mddev *mddev)
> {
> return mddev->cluster_info && mddev->bitmap_info.nodes > 1;
> diff --git a/drivers/md/raid1-10.c b/drivers/md/raid1-10.c
> index 4378d3250bd7..4a51b151a981 100644
> --- a/drivers/md/raid1-10.c
> +++ b/drivers/md/raid1-10.c
> @@ -287,8 +287,8 @@ static inline bool
> raid1_should_read_first(struct mddev *mddev,
> return true;
>
> if (mddev_is_clustered(mddev) &&
> - md_cluster_ops->area_resyncing(mddev, READ, this_sector,
> - this_sector + len))
> + mddev->cluster_ops->area_resyncing(mddev, READ,
> this_sector,
> + this_sector + len))
> return true;
>
> return false;
> diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
> index c4bfd190c698..f7761a19482f 100644
> --- a/drivers/md/raid1.c
> +++ b/drivers/md/raid1.c
> @@ -1468,7 +1468,7 @@ static void raid1_write_request(struct
> mddev *mddev, struct bio *bio,
> bool is_discard = (bio_op(bio) == REQ_OP_DISCARD);
>
> if (mddev_is_clustered(mddev) &&
> - md_cluster_ops->area_resyncing(mddev, WRITE,
> + mddev->cluster_ops->area_resyncing(mddev, WRITE,
> bio->bi_iter.bi_sector, bio_end_sector(bio))) {
>
> DEFINE_WAIT(w);
> @@ -1479,7 +1479,7 @@ static void raid1_write_request(struct
> mddev *mddev, struct bio *bio,
> for (;;) {
> prepare_to_wait(&conf->wait_barrier,
> &w, TASK_IDLE);
> - if (!md_cluster_ops->area_resyncing(mddev, WRITE,
> + if (!mddev->cluster_ops->area_resyncing(mddev, WRITE,
> bio->bi_iter.bi_sector,
> bio_end_sector(bio)))
> break;
> @@ -3039,9 +3039,9 @@ static sector_t raid1_sync_request(struct
> mddev *mddev, sector_t sector_nr,
> conf->cluster_sync_low = mddev->curr_resync_completed;
> conf->cluster_sync_high = conf->cluster_sync_low +
> CLUSTER_RESYNC_WINDOW_SECTORS;
> /* Send resync message */
> - md_cluster_ops->resync_info_update(mddev,
> - conf->cluster_sync_low,
> - conf->cluster_sync_high);
> + mddev->cluster_ops->resync_info_update(mddev,
> + conf->cluster_sync_low,
> + conf->cluster_sync_high);
> }
>
> /* For a user-requested sync, we read all readable devices and
> do a
> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
> index 5823329841ba..e68aa4b134ee 100644
> --- a/drivers/md/raid10.c
> +++ b/drivers/md/raid10.c
> @@ -1356,9 +1356,9 @@ static void raid10_write_request(struct
> mddev *mddev, struct bio *bio,
> int error;
>
> if ((mddev_is_clustered(mddev) &&
> - md_cluster_ops->area_resyncing(mddev, WRITE,
> - bio->bi_iter.bi_sector,
> - bio_end_sector(bio)))) {
> + mddev->cluster_ops->area_resyncing(mddev, WRITE,
> + bio->bi_iter.bi_sector,
> + bio_end_sector(bio)))) {
> DEFINE_WAIT(w);
> /* Bail out if REQ_NOWAIT is set for the bio */
> if (bio->bi_opf & REQ_NOWAIT) {
> @@ -1368,7 +1368,7 @@ static void raid10_write_request(struct
> mddev *mddev, struct bio *bio,
> for (;;) {
> prepare_to_wait(&conf->wait_barrier,
> &w, TASK_IDLE);
> - if (!md_cluster_ops->area_resyncing(mddev, WRITE,
> + if (!mddev->cluster_ops->area_resyncing(mddev, WRITE,
> bio->bi_iter.bi_sector, bio_end_sector(bio)))
> break;
> schedule();
> @@ -3717,7 +3717,7 @@ static sector_t raid10_sync_request(struct
> mddev *mddev, sector_t sector_nr,
> conf->cluster_sync_low = mddev->curr_resync_completed;
> raid10_set_cluster_sync_high(conf);
> /* Send resync message */
> - md_cluster_ops->resync_info_update(mddev,
> + mddev->cluster_ops->resync_info_update(mddev,
> conf->cluster_sync_low,
> conf->cluster_sync_high);
> }
> @@ -3750,7 +3750,7 @@ static sector_t raid10_sync_request(struct
> mddev *mddev, sector_t sector_nr,
> }
> if (broadcast_msg) {
> raid10_set_cluster_sync_high(conf);
> - md_cluster_ops->resync_info_update(mddev,
> + mddev->cluster_ops->resync_info_update(mddev,
> conf->cluster_sync_low,
> conf->cluster_sync_high);
> }
> @@ -4544,7 +4544,7 @@ static int raid10_start_reshape(struct
> mddev *mddev)
> if (ret)
> goto abort;
>
> - ret = md_cluster_ops->resize_bitmaps(mddev, newsize,
> oldsize);
> + ret = mddev->cluster_ops->resize_bitmaps(mddev, newsize,
> oldsize);
> if (ret) {
> mddev->bitmap_ops->resize(mddev, oldsize, 0, false);
> goto abort;
> @@ -4835,7 +4835,7 @@ static sector_t reshape_request(struct
> mddev *mddev, sector_t sector_nr,
> conf->cluster_sync_low = sb_reshape_pos;
> }
>
> - md_cluster_ops->resync_info_update(mddev,
> conf->cluster_sync_low,
> + mddev->cluster_ops->resync_info_update(mddev,
> conf->cluster_sync_low,
> conf->cluster_sync_high);
> }
>
> @@ -4980,7 +4980,7 @@ static void
> raid10_update_reshape_pos(struct mddev *mddev)
> struct r10conf *conf = mddev->private;
> sector_t lo, hi;
>
> - md_cluster_ops->resync_info_get(mddev, &lo, &hi);
> + mddev->cluster_ops->resync_info_get(mddev, &lo, &hi);
> if (((mddev->reshape_position <= hi) &&
> (mddev->reshape_position >= lo))
> || mddev->reshape_position == MaxSector)
> conf->reshape_progress = mddev->reshape_position;
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH md-6.15 7/7] md: switch md-cluster to use md_submodle_head
2025-02-15 9:22 [PATCH 0/7 md-6.15] md: introduce md_submodle_head Yu Kuai
` (5 preceding siblings ...)
2025-02-15 9:22 ` [PATCH md-6.15 6/7] md: don't export md_cluster_ops Yu Kuai
@ 2025-02-15 9:22 ` Yu Kuai
2025-02-18 3:37 ` Su Yue
2025-03-05 1:34 ` [PATCH 0/7 md-6.15] md: introduce md_submodle_head Yu Kuai
7 siblings, 1 reply; 16+ messages in thread
From: Yu Kuai @ 2025-02-15 9:22 UTC (permalink / raw)
To: song, yukuai3; +Cc: linux-raid, linux-kernel, yukuai1, yi.zhang, yangerkun
From: Yu Kuai <yukuai3@huawei.com>
To make code cleaner, and prepare to add kconfig for bitmap.
Also remove the unsed global variables pers_lock, md_cluster_ops and
md_cluster_mod, and exported symbols register_md_cluster_operations(),
unregister_md_cluster_operations() and md_cluster_ops.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/md/md-cluster.c | 14 ++++++++++----
drivers/md/md-cluster.h | 3 ---
drivers/md/md.c | 41 ++++++-----------------------------------
drivers/md/md.h | 2 +-
4 files changed, 17 insertions(+), 43 deletions(-)
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index 6fd436a1d373..94221d964d4f 100644
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -1612,7 +1612,14 @@ static int gather_bitmaps(struct md_rdev *rdev)
return err;
}
-static const struct md_cluster_operations cluster_ops = {
+static struct md_cluster_operations cluster_ops = {
+ .head = {
+ .type = MD_CLUSTER,
+ .id = ID_CLUSTER,
+ .name = "cluster",
+ .owner = THIS_MODULE,
+ },
+
.join = join,
.leave = leave,
.slot_number = slot_number,
@@ -1642,13 +1649,12 @@ static int __init cluster_init(void)
{
pr_warn("md-cluster: support raid1 and raid10 (limited support)\n");
pr_info("Registering Cluster MD functions\n");
- register_md_cluster_operations(&cluster_ops, THIS_MODULE);
- return 0;
+ return register_md_submodule(&cluster_ops.head);
}
static void cluster_exit(void)
{
- unregister_md_cluster_operations();
+ unregister_md_submodule(&cluster_ops.head);
}
module_init(cluster_init);
diff --git a/drivers/md/md-cluster.h b/drivers/md/md-cluster.h
index 4e842af11fb4..8fb06d853173 100644
--- a/drivers/md/md-cluster.h
+++ b/drivers/md/md-cluster.h
@@ -37,9 +37,6 @@ struct md_cluster_operations {
void (*update_size)(struct mddev *mddev, sector_t old_dev_sectors);
};
-extern int register_md_cluster_operations(const struct md_cluster_operations *ops,
- struct module *module);
-extern int unregister_md_cluster_operations(void);
extern int md_setup_cluster(struct mddev *mddev, int nodes);
extern void md_cluster_stop(struct mddev *mddev);
extern void md_reload_sb(struct mddev *mddev, int raid_disk);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index d94c9aa8c3aa..4d93cc1aaabc 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -81,13 +81,8 @@ static const char *action_name[NR_SYNC_ACTIONS] = {
static DEFINE_XARRAY(md_submodule);
-static DEFINE_SPINLOCK(pers_lock);
-
static const struct kobj_type md_ktype;
-static const struct md_cluster_operations *md_cluster_ops;
-static struct module *md_cluster_mod;
-
static DECLARE_WAIT_QUEUE_HEAD(resync_wait);
static struct workqueue_struct *md_wq;
@@ -7452,11 +7447,12 @@ static int update_raid_disks(struct mddev *mddev, int raid_disks)
static int get_cluster_ops(struct mddev *mddev)
{
- spin_lock(&pers_lock);
- mddev->cluster_ops = md_cluster_ops;
- if (mddev->cluster_ops && !try_module_get(md_cluster_mod))
+ xa_lock(&md_submodule);
+ mddev->cluster_ops = xa_load(&md_submodule, ID_CLUSTER);
+ if (mddev->cluster_ops &&
+ !try_module_get(mddev->cluster_ops->head.owner))
mddev->cluster_ops = NULL;
- spin_unlock(&pers_lock);
+ xa_unlock(&md_submodule);
return mddev->cluster_ops == NULL ? -ENOENT : 0;
}
@@ -7467,7 +7463,7 @@ static void put_cluster_ops(struct mddev *mddev)
return;
mddev->cluster_ops->leave(mddev);
- module_put(md_cluster_mod);
+ module_put(mddev->cluster_ops->head.owner);
mddev->cluster_ops = NULL;
}
@@ -8559,31 +8555,6 @@ void unregister_md_submodule(struct md_submodule_head *msh)
}
EXPORT_SYMBOL_GPL(unregister_md_submodule);
-int register_md_cluster_operations(const struct md_cluster_operations *ops,
- struct module *module)
-{
- int ret = 0;
- spin_lock(&pers_lock);
- if (md_cluster_ops != NULL)
- ret = -EALREADY;
- else {
- md_cluster_ops = ops;
- md_cluster_mod = module;
- }
- spin_unlock(&pers_lock);
- return ret;
-}
-EXPORT_SYMBOL(register_md_cluster_operations);
-
-int unregister_md_cluster_operations(void)
-{
- spin_lock(&pers_lock);
- md_cluster_ops = NULL;
- spin_unlock(&pers_lock);
- return 0;
-}
-EXPORT_SYMBOL(unregister_md_cluster_operations);
-
int md_setup_cluster(struct mddev *mddev, int nodes)
{
int ret = get_cluster_ops(mddev);
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 873f33e2a1f6..dd6a28f5d8e6 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -603,7 +603,7 @@ struct mddev {
mempool_t *serial_info_pool;
void (*sync_super)(struct mddev *mddev, struct md_rdev *rdev);
struct md_cluster_info *cluster_info;
- const struct md_cluster_operations *cluster_ops;
+ struct md_cluster_operations *cluster_ops;
unsigned int good_device_nr; /* good device num within cluster raid */
unsigned int noio_flag; /* for memalloc scope API */
--
2.39.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH md-6.15 7/7] md: switch md-cluster to use md_submodle_head
2025-02-15 9:22 ` [PATCH md-6.15 7/7] md: switch md-cluster to use md_submodle_head Yu Kuai
@ 2025-02-18 3:37 ` Su Yue
0 siblings, 0 replies; 16+ messages in thread
From: Su Yue @ 2025-02-18 3:37 UTC (permalink / raw)
To: Yu Kuai; +Cc: song, yukuai3, linux-raid, linux-kernel, yi.zhang, yangerkun
On Sat 15 Feb 2025 at 17:22, Yu Kuai <yukuai1@huaweicloud.com>
wrote:
> From: Yu Kuai <yukuai3@huawei.com>
>
> To make code cleaner, and prepare to add kconfig for bitmap.
>
> Also remove the unsed global variables pers_lock, md_cluster_ops
> and
> md_cluster_mod, and exported symbols
> register_md_cluster_operations(),
> unregister_md_cluster_operations() and md_cluster_ops.
>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
>
Reviewed-by: Su Yue <glass.su@suse.com>
> ---
> drivers/md/md-cluster.c | 14 ++++++++++----
> drivers/md/md-cluster.h | 3 ---
> drivers/md/md.c | 41
> ++++++-----------------------------------
> drivers/md/md.h | 2 +-
> 4 files changed, 17 insertions(+), 43 deletions(-)
>
> diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
> index 6fd436a1d373..94221d964d4f 100644
> --- a/drivers/md/md-cluster.c
> +++ b/drivers/md/md-cluster.c
> @@ -1612,7 +1612,14 @@ static int gather_bitmaps(struct md_rdev
> *rdev)
> return err;
> }
>
> -static const struct md_cluster_operations cluster_ops = {
> +static struct md_cluster_operations cluster_ops = {
> + .head = {
> + .type = MD_CLUSTER,
> + .id = ID_CLUSTER,
> + .name = "cluster",
> + .owner = THIS_MODULE,
> + },
> +
> .join = join,
> .leave = leave,
> .slot_number = slot_number,
> @@ -1642,13 +1649,12 @@ static int __init cluster_init(void)
> {
> pr_warn("md-cluster: support raid1 and raid10 (limited
> support)\n");
> pr_info("Registering Cluster MD functions\n");
> - register_md_cluster_operations(&cluster_ops, THIS_MODULE);
> - return 0;
> + return register_md_submodule(&cluster_ops.head);
> }
>
> static void cluster_exit(void)
> {
> - unregister_md_cluster_operations();
> + unregister_md_submodule(&cluster_ops.head);
> }
>
> module_init(cluster_init);
> diff --git a/drivers/md/md-cluster.h b/drivers/md/md-cluster.h
> index 4e842af11fb4..8fb06d853173 100644
> --- a/drivers/md/md-cluster.h
> +++ b/drivers/md/md-cluster.h
> @@ -37,9 +37,6 @@ struct md_cluster_operations {
> void (*update_size)(struct mddev *mddev, sector_t
> old_dev_sectors);
> };
>
> -extern int register_md_cluster_operations(const struct
> md_cluster_operations *ops,
> - struct module *module);
> -extern int unregister_md_cluster_operations(void);
> extern int md_setup_cluster(struct mddev *mddev, int nodes);
> extern void md_cluster_stop(struct mddev *mddev);
> extern void md_reload_sb(struct mddev *mddev, int raid_disk);
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index d94c9aa8c3aa..4d93cc1aaabc 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -81,13 +81,8 @@ static const char
> *action_name[NR_SYNC_ACTIONS] = {
>
> static DEFINE_XARRAY(md_submodule);
>
> -static DEFINE_SPINLOCK(pers_lock);
> -
> static const struct kobj_type md_ktype;
>
> -static const struct md_cluster_operations *md_cluster_ops;
> -static struct module *md_cluster_mod;
> -
> static DECLARE_WAIT_QUEUE_HEAD(resync_wait);
> static struct workqueue_struct *md_wq;
>
> @@ -7452,11 +7447,12 @@ static int update_raid_disks(struct
> mddev *mddev, int raid_disks)
>
> static int get_cluster_ops(struct mddev *mddev)
> {
> - spin_lock(&pers_lock);
> - mddev->cluster_ops = md_cluster_ops;
> - if (mddev->cluster_ops && !try_module_get(md_cluster_mod))
> + xa_lock(&md_submodule);
> + mddev->cluster_ops = xa_load(&md_submodule, ID_CLUSTER);
> + if (mddev->cluster_ops &&
> + !try_module_get(mddev->cluster_ops->head.owner))
> mddev->cluster_ops = NULL;
> - spin_unlock(&pers_lock);
> + xa_unlock(&md_submodule);
>
> return mddev->cluster_ops == NULL ? -ENOENT : 0;
> }
> @@ -7467,7 +7463,7 @@ static void put_cluster_ops(struct mddev
> *mddev)
> return;
>
> mddev->cluster_ops->leave(mddev);
> - module_put(md_cluster_mod);
> + module_put(mddev->cluster_ops->head.owner);
> mddev->cluster_ops = NULL;
> }
>
> @@ -8559,31 +8555,6 @@ void unregister_md_submodule(struct
> md_submodule_head *msh)
> }
> EXPORT_SYMBOL_GPL(unregister_md_submodule);
>
> -int register_md_cluster_operations(const struct
> md_cluster_operations *ops,
> - struct module *module)
> -{
> - int ret = 0;
> - spin_lock(&pers_lock);
> - if (md_cluster_ops != NULL)
> - ret = -EALREADY;
> - else {
> - md_cluster_ops = ops;
> - md_cluster_mod = module;
> - }
> - spin_unlock(&pers_lock);
> - return ret;
> -}
> -EXPORT_SYMBOL(register_md_cluster_operations);
> -
> -int unregister_md_cluster_operations(void)
> -{
> - spin_lock(&pers_lock);
> - md_cluster_ops = NULL;
> - spin_unlock(&pers_lock);
> - return 0;
> -}
> -EXPORT_SYMBOL(unregister_md_cluster_operations);
> -
> int md_setup_cluster(struct mddev *mddev, int nodes)
> {
> int ret = get_cluster_ops(mddev);
> diff --git a/drivers/md/md.h b/drivers/md/md.h
> index 873f33e2a1f6..dd6a28f5d8e6 100644
> --- a/drivers/md/md.h
> +++ b/drivers/md/md.h
> @@ -603,7 +603,7 @@ struct mddev {
> mempool_t *serial_info_pool;
> void (*sync_super)(struct mddev *mddev, struct md_rdev *rdev);
> struct md_cluster_info *cluster_info;
> - const struct md_cluster_operations *cluster_ops;
> + struct md_cluster_operations *cluster_ops;
> unsigned int good_device_nr; /* good device num
> within cluster raid */
> unsigned int noio_flag; /* for memalloc scope API
> */
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 0/7 md-6.15] md: introduce md_submodle_head
2025-02-15 9:22 [PATCH 0/7 md-6.15] md: introduce md_submodle_head Yu Kuai
` (6 preceding siblings ...)
2025-02-15 9:22 ` [PATCH md-6.15 7/7] md: switch md-cluster to use md_submodle_head Yu Kuai
@ 2025-03-05 1:34 ` Yu Kuai
7 siblings, 0 replies; 16+ messages in thread
From: Yu Kuai @ 2025-03-05 1:34 UTC (permalink / raw)
To: Yu Kuai, song; +Cc: linux-raid, linux-kernel, yi.zhang, yangerkun, yukuai (C)
在 2025/02/15 17:22, Yu Kuai 写道:
> From: Yu Kuai <yukuai3@huawei.com>
>
> This set introduce md_submodle_head and related API to replace
> personality and md-cluter registration, and remove lots of exported
> helpers and global variables.
>
> Also prepare to add kconfig for md-bitmap.
>
> Yu Kuai (7):
> md: merge common code into find_pers()
> md: only include md-cluster.h if necessary
> md: introduce struct md_submodule_head and APIs
> md: switch personalities to use md_submodule_head
> md/md-cluster: cleanup md_cluster_ops reference
> md: don't export md_cluster_ops
> md: switch md-cluster to use md_submodle_head
>
Applied to md-6.15
Thanks
> drivers/md/md-bitmap.c | 8 +-
> drivers/md/md-cluster.c | 18 ++-
> drivers/md/md-cluster.h | 6 +
> drivers/md/md-linear.c | 15 ++-
> drivers/md/md.c | 259 +++++++++++++++++++---------------------
> drivers/md/md.h | 48 +++++---
> drivers/md/raid0.c | 18 +--
> drivers/md/raid1-10.c | 4 +-
> drivers/md/raid1.c | 33 ++---
> drivers/md/raid10.c | 41 ++++---
> drivers/md/raid5.c | 70 +++++++----
> 11 files changed, 297 insertions(+), 223 deletions(-)
>
^ permalink raw reply [flat|nested] 16+ messages in thread