Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'md-6.19-20251231' of gitolite.kernel.org:pub/scm/linux/kernel/git/mdraid/linux into block-6.19
Pull MD fixes from Yu Kuai:
"- Fix null-pointer dereference in raid5 sysfs group_thread_cnt store
(Tuo Li)
- Fix possible mempool corruption during raid1 raid_disks update via
sysfs (FengWei Shih)
- Fix logical_block_size configuration being overwritten during
super_1_validate() (Li Nan)
- Fix forward incompatibility with configurable logical block size:
arrays assembled on new kernels could not be assembled on kernels
<=6.18 due to non-zero reserved pad rejection (Li Nan)
- Fix static checker warning about iterator not incremented (Li Nan)"
* tag 'md-6.19-20251231' of gitolite.kernel.org:pub/scm/linux/kernel/git/mdraid/linux:
md: Fix forward incompatibility from configurable logical block size
md: Fix logical_block_size configuration being overwritten
md: suspend array while updating raid_disks via sysfs
md/raid5: fix possible null-pointer dereferences in raid5_store_group_thread_cnt()
md: Fix static checker warning in analyze_sbs
+56
-15
+50
-11
drivers/md/md.c
+50
-11
drivers/md/md.c
···
1999
1999
mddev->layout = le32_to_cpu(sb->layout);
2000
2000
mddev->raid_disks = le32_to_cpu(sb->raid_disks);
2001
2001
mddev->dev_sectors = le64_to_cpu(sb->size);
2002
-
mddev->logical_block_size = le32_to_cpu(sb->logical_block_size);
2003
2002
mddev->events = ev1;
2004
2003
mddev->bitmap_info.offset = 0;
2005
2004
mddev->bitmap_info.space = 0;
···
2013
2014
memcpy(mddev->uuid, sb->set_uuid, 16);
2014
2015
2015
2016
mddev->max_disks = (4096-256)/2;
2017
+
2018
+
if (!mddev->logical_block_size)
2019
+
mddev->logical_block_size = le32_to_cpu(sb->logical_block_size);
2016
2020
2017
2021
if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_BITMAP_OFFSET) &&
2018
2022
mddev->bitmap_info.file == NULL) {
···
3884
3882
3885
3883
static int analyze_sbs(struct mddev *mddev)
3886
3884
{
3887
-
int i;
3888
3885
struct md_rdev *rdev, *freshest, *tmp;
3889
3886
3890
3887
freshest = NULL;
···
3910
3909
super_types[mddev->major_version].
3911
3910
validate_super(mddev, NULL/*freshest*/, freshest);
3912
3911
3913
-
i = 0;
3914
3912
rdev_for_each_safe(rdev, tmp, mddev) {
3915
3913
if (mddev->max_disks &&
3916
-
(rdev->desc_nr >= mddev->max_disks ||
3917
-
i > mddev->max_disks)) {
3914
+
rdev->desc_nr >= mddev->max_disks) {
3918
3915
pr_warn("md: %s: %pg: only %d devices permitted\n",
3919
3916
mdname(mddev), rdev->bdev,
3920
3917
mddev->max_disks);
···
4406
4407
if (err < 0)
4407
4408
return err;
4408
4409
4409
-
err = mddev_lock(mddev);
4410
+
err = mddev_suspend_and_lock(mddev);
4410
4411
if (err)
4411
4412
return err;
4412
4413
if (mddev->pers)
···
4431
4432
} else
4432
4433
mddev->raid_disks = n;
4433
4434
out_unlock:
4434
-
mddev_unlock(mddev);
4435
+
mddev_unlock_and_resume(mddev);
4435
4436
return err ? err : len;
4436
4437
}
4437
4438
static struct md_sysfs_entry md_raid_disks =
···
5980
5981
if (mddev->major_version == 0)
5981
5982
return -EINVAL;
5982
5983
5983
-
if (mddev->pers)
5984
-
return -EBUSY;
5985
-
5986
5984
err = kstrtouint(buf, 10, &lbs);
5987
5985
if (err < 0)
5988
5986
return -EINVAL;
5987
+
5988
+
if (mddev->pers) {
5989
+
unsigned int curr_lbs;
5990
+
5991
+
if (mddev->logical_block_size)
5992
+
return -EBUSY;
5993
+
/*
5994
+
* To fix forward compatibility issues, LBS is not
5995
+
* configured for arrays from old kernels (<=6.18) by default.
5996
+
* If the user confirms no rollback to old kernels,
5997
+
* enable LBS by writing current LBS — to prevent data
5998
+
* loss from LBS changes.
5999
+
*/
6000
+
curr_lbs = queue_logical_block_size(mddev->gendisk->queue);
6001
+
if (lbs != curr_lbs)
6002
+
return -EINVAL;
6003
+
6004
+
mddev->logical_block_size = curr_lbs;
6005
+
set_bit(MD_SB_CHANGE_DEVS, &mddev->sb_flags);
6006
+
pr_info("%s: logical block size configured successfully, array will not be assembled in old kernels (<= 6.18)\n",
6007
+
mdname(mddev));
6008
+
return len;
6009
+
}
5989
6010
5990
6011
err = mddev_lock(mddev);
5991
6012
if (err)
···
6182
6163
mdname(mddev));
6183
6164
return -EINVAL;
6184
6165
}
6185
-
mddev->logical_block_size = lim->logical_block_size;
6166
+
6167
+
/* Only 1.x meta needs to set logical block size */
6168
+
if (mddev->major_version == 0)
6169
+
return 0;
6170
+
6171
+
/*
6172
+
* Fix forward compatibility issue. Only set LBS by default for
6173
+
* new arrays, mddev->events == 0 indicates the array was just
6174
+
* created. When assembling an array, read LBS from the superblock
6175
+
* instead — LBS is 0 in superblocks created by old kernels.
6176
+
*/
6177
+
if (!mddev->events) {
6178
+
pr_info("%s: array will not be assembled in old kernels that lack configurable LBS support (<= 6.18)\n",
6179
+
mdname(mddev));
6180
+
mddev->logical_block_size = lim->logical_block_size;
6181
+
}
6182
+
6183
+
if (!mddev->logical_block_size)
6184
+
pr_warn("%s: echo current LBS to md/logical_block_size to prevent data loss issues from LBS changes.\n"
6185
+
"\tNote: After setting, array will not be assembled in old kernels (<= 6.18)\n",
6186
+
mdname(mddev));
6186
6187
6187
6188
return 0;
6188
6189
}
+6
-4
drivers/md/raid5.c
+6
-4
drivers/md/raid5.c
···
7187
7187
err = mddev_suspend_and_lock(mddev);
7188
7188
if (err)
7189
7189
return err;
7190
+
conf = mddev->private;
7191
+
if (!conf) {
7192
+
mddev_unlock_and_resume(mddev);
7193
+
return -ENODEV;
7194
+
}
7190
7195
raid5_quiesce(mddev, true);
7191
7196
7192
-
conf = mddev->private;
7193
-
if (!conf)
7194
-
err = -ENODEV;
7195
-
else if (new != conf->worker_cnt_per_group) {
7197
+
if (new != conf->worker_cnt_per_group) {
7196
7198
old_groups = conf->worker_groups;
7197
7199
if (old_groups)
7198
7200
flush_workqueue(raid5_wq);