md: Explicitly create command-line configured devices

PATCH Applied Chris Webb 2 participants 2 messages Jun 1, 2022 MD RAID

Share & tools

Chris Webb

author

2022-06-01 11:03 UTC #0 lore raw

PATCH v2 1/1 md: Explicitly create command-line configured devices

Boot-time assembly of arrays with md= command-line arguments breaks when CONFIG_BLOCK_LEGACY_AUTOLOAD is unset. md_setup_drive() in md-autodetect.c calls blkdev_get_by_dev(), assuming this implicitly creates the block device.

Fix this by attempting to md_alloc() the array first. As in the probe path, ignore any error as failure is caught by blkdev_get_by_dev() anyway.

Signed-off-by Chris Webb <[email protected]>

Reviewed-by Christoph Hellwig <[email protected]>

---
v2: Correction from Christoph's review: dropped redundant 'extern' from md_alloc() prototype in md.h.

 drivers/md/md-autodetect.c | 1 +
 drivers/md/md.c            | 2 +-
 drivers/md/md.h            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

drivers/md/md-autodetect.c +1 -0

index 2cf973722f59..344910ba435c 100644
@@ -169,6 +169,7 @@ static void __init md_setup_drive(struct md_setup_args *args)
 
 	pr_info("md: Loading %s: %s\n", name, args->device_names);
 
+	md_alloc(mdev, name);
 	bdev = blkdev_get_by_dev(mdev, FMODE_READ, NULL);
 	if (IS_ERR(bdev)) {
 		pr_err("md: open failed - cannot start array %s\n", name);

drivers/md/md.c +1 -1

index 707e802d0082..5a4bca886572 100644
@@ -5638,7 +5638,7 @@ int mddev_init_writes_pending(struct mddev *mddev)
 }
 EXPORT_SYMBOL_GPL(mddev_init_writes_pending);
 
-static int md_alloc(dev_t dev, char *name)
+int md_alloc(dev_t dev, char *name)
 {
 	/*
 	 * If dev is zero, name is the name of a device to allocate with

drivers/md/md.h +1 -0

index cf2cbb17acbd..8da7ec314bbf 100644
@@ -751,6 +751,7 @@ extern int md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev);
 extern int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale);
 
 extern void mddev_init(struct mddev *mddev);
+int md_alloc(dev_t dev, char *name);
 extern int md_run(struct mddev *mddev);
 extern int md_start(struct mddev *mddev);
 extern void md_stop(struct mddev *mddev);

Song Liu

maintainer Applied

2022-06-01 23:18 UTC #1 lore raw

Quoted 11 lines · Chris Webb

Boot-time assembly of arrays with md= command-line arguments breaks when CONFIG_BLOCK_LEGACY_AUTOLOAD is unset. md_setup_drive() in md-autodetect.c calls blkdev_get_by_dev(), assuming this implicitly creates the block device.
Fix this by attempting to md_alloc() the array first. As in the probe path, ignore any error as failure is caught by blkdev_get_by_dev() anyway.
Signed-off-by Chris Webb <[email protected]>
Reviewed-by Christoph Hellwig <[email protected]>

Applied to md-next.

Thanks!
Song