| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20251124063203.1692144-12-yukuai@fnnas.com>
Date: Mon, 24 Nov 2025 14:32:03 +0800
From: Yu Kuai <yukuai@...as.com>
To: song@...nel.org,
linux-raid@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
filippo@...ian.org,
colyli@...as.com,
yukuai@...as.com
Subject: [PATCH v2 11/11] md: fix abnormal io_opt from member disks
It's reported that mtp3sas can report abnormal io_opt, for consequence,
md array will end up with abnormal io_opt as well, due to the
lcm_not_zero() from blk_stack_limits().
Some personalities will configure optimal IO size, and it's indicate that
users can get the best IO bandwidth if they issue IO with this size, and
we don't want io_opt to be covered by member disks with abnormal io_opt.
Fix this problem by adding a new mddev flags MD_STACK_IO_OPT to indicate
that io_opt configured by personalities is preferred over member disks
or not.
Reported-by: Filippo Giunchedi <filippo@...ian.org>
Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1121006
Reported-by: Coly Li <colyli@...as.com>
Closes: https://lore.kernel.org/all/20250817152645.7115-1-colyli@kernel.org/
Signed-off-by: Yu Kuai <yukuai@...as.com>
---
drivers/md/md.c | 35 ++++++++++++++++++++++++++++++++++-
drivers/md/md.h | 5 ++++-
drivers/md/raid1.c | 2 +-
drivers/md/raid10.c | 4 ++--
4 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index db2d950a1449..7714f367765f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -6191,11 +6191,17 @@ static const struct kobj_type md_ktype = {
int mdp_major = 0;
+static bool rdev_is_mddev(struct md_rdev *rdev)
+{
+ return rdev->bdev->bd_disk->fops == &md_fops;
+}
+
/* stack the limit for all rdevs into lim */
int mddev_stack_rdev_limits(struct mddev *mddev, struct queue_limits *lim,
unsigned int flags)
{
struct md_rdev *rdev;
+ unsigned int io_opt = lim->io_opt;
rdev_for_each(rdev, mddev) {
queue_limits_stack_bdev(lim, rdev->bdev, rdev->data_offset,
@@ -6203,6 +6209,9 @@ int mddev_stack_rdev_limits(struct mddev *mddev, struct queue_limits *lim,
if ((flags & MDDEV_STACK_INTEGRITY) &&
!queue_limits_stack_integrity_bdev(lim, rdev->bdev))
return -EINVAL;
+
+ if (rdev_is_mddev(rdev))
+ set_bit(MD_STACK_IO_OPT, &mddev->flags);
}
/*
@@ -6216,14 +6225,24 @@ int mddev_stack_rdev_limits(struct mddev *mddev, struct queue_limits *lim,
}
mddev->logical_block_size = lim->logical_block_size;
+ /*
+ * If all member disks are not mdraid array, and the personality
+ * already configures io_opt, keep this io_opt and ignore io_opt from
+ * member disks.
+ */
+ if (!test_bit(MD_STACK_IO_OPT, &mddev->flags) && io_opt)
+ lim->io_opt = io_opt;
+
return 0;
}
EXPORT_SYMBOL_GPL(mddev_stack_rdev_limits);
/* apply the extra stacking limits from a new rdev into mddev */
-int mddev_stack_new_rdev(struct mddev *mddev, struct md_rdev *rdev)
+int mddev_stack_new_rdev(struct mddev *mddev, struct md_rdev *rdev,
+ bool io_opt_configured)
{
struct queue_limits lim;
+ unsigned int io_opt = 0;
if (mddev_is_dm(mddev))
return 0;
@@ -6236,6 +6255,18 @@ int mddev_stack_new_rdev(struct mddev *mddev, struct md_rdev *rdev)
}
lim = queue_limits_start_update(mddev->gendisk->queue);
+
+ /*
+ * Keep the old io_opt if no member disks are from md array, and
+ * the personality configure it's own io_opt.
+ */
+ if (!test_bit(MD_STACK_IO_OPT, &mddev->flags)) {
+ if (rdev_is_mddev(rdev))
+ set_bit(MD_STACK_IO_OPT, &mddev->flags);
+ else if (io_opt_configured)
+ io_opt = lim.io_opt;
+ }
+
queue_limits_stack_bdev(&lim, rdev->bdev, rdev->data_offset,
mddev->gendisk->disk_name);
@@ -6246,6 +6277,8 @@ int mddev_stack_new_rdev(struct mddev *mddev, struct md_rdev *rdev)
return -ENXIO;
}
+ if (io_opt)
+ lim.io_opt = io_opt;
return queue_limits_commit_update(mddev->gendisk->queue, &lim);
}
EXPORT_SYMBOL_GPL(mddev_stack_new_rdev);
diff --git a/drivers/md/md.h b/drivers/md/md.h
index ddf989f2a139..d37076593403 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -348,6 +348,7 @@ struct md_cluster_operations;
* @MD_FAILLAST_DEV: Allow last rdev to be removed.
* @MD_SERIALIZE_POLICY: Enforce write IO is not reordered, just used by raid1.
* @MD_BIO_ALIGN: Bio issued to the array will align to io_opt before split.
+ * @MD_STACK_IO_OPT: Stack io_opt by member disks.
*
* change UNSUPPORTED_MDDEV_FLAGS for each array type if new flag is added
*/
@@ -368,6 +369,7 @@ enum mddev_flags {
MD_FAILLAST_DEV,
MD_SERIALIZE_POLICY,
MD_BIO_ALIGN,
+ MD_STACK_IO_OPT,
};
enum mddev_sb_flags {
@@ -1041,7 +1043,8 @@ int do_md_run(struct mddev *mddev);
#define MDDEV_STACK_INTEGRITY (1u << 0)
int mddev_stack_rdev_limits(struct mddev *mddev, struct queue_limits *lim,
unsigned int flags);
-int mddev_stack_new_rdev(struct mddev *mddev, struct md_rdev *rdev);
+int mddev_stack_new_rdev(struct mddev *mddev, struct md_rdev *rdev,
+ bool io_opt_configured);
void mddev_update_io_opt(struct mddev *mddev, unsigned int nr_stripes);
extern const struct block_device_operations md_fops;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 1a957dba2640..f3f3086f27fa 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1944,7 +1944,7 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)
for (mirror = first; mirror <= last; mirror++) {
p = conf->mirrors + mirror;
if (!p->rdev) {
- err = mddev_stack_new_rdev(mddev, rdev);
+ err = mddev_stack_new_rdev(mddev, rdev, false);
if (err)
return err;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 2c6b65b83724..a6edc91e7a9a 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -2139,7 +2139,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)
continue;
}
- err = mddev_stack_new_rdev(mddev, rdev);
+ err = mddev_stack_new_rdev(mddev, rdev, true);
if (err)
return err;
p->head_position = 0;
@@ -2157,7 +2157,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)
clear_bit(In_sync, &rdev->flags);
set_bit(Replacement, &rdev->flags);
rdev->raid_disk = repl_slot;
- err = mddev_stack_new_rdev(mddev, rdev);
+ err = mddev_stack_new_rdev(mddev, rdev, true);
if (err)
return err;
conf->fullsync = 1;
--
2.51.0
Powered by blists - more mailing lists