I accidentally ran into the 128-devices limit in md.c's
detected_devices. It doesn't seem like a high-enough limit, and I
don't quite see why we wouldn't use a list for this.
Besides, there appears to be a race condition in it:
detected_devices[dev_cnt++] = dev;
won't atomically increment dev_cnt and use its previous value, unless
there's something up the call stack that guarantees mutual exclusion.
I don't see that this is the case.
Previously devices that exceeded the array would be silently
discarded. Now we'll only discard them if we run out of memory, and
we'll report so if we do.
Before I wrap up, a question on style: does it make sense to use
kzmalloc to allocate this newly-created data structure that contains
only a list_head and a dev_t, where the latter is immediately copied
from another dev_t variable, and then the whole thing is added to a
list? I.e., could any list-checking present or future feature rely on
list_head fields that might hurt if not zero-initialized, or would it
be future-proof to just use kmalloc in this case?
This was tested on an Athlon64 notebook with 2 disks on RAID (internal
and external USB) with the latest Fedora development kernel plus this
patch.
Signed-off-by: Alexandre Oliva <[email protected]>
Index: kernel-2.6.17-1.2462.fc6/drivers/md/md.c
===================================================================
--- kernel-2.6.17-1.2462.fc6.orig/drivers/md/md.c 2006-07-30 01:03:28.000000000 -0300
+++ kernel-2.6.17-1.2462.fc6/drivers/md/md.c 2006-07-30 03:40:54.000000000 -0300
@@ -1435,7 +1435,7 @@ static void unlock_rdev(mdk_rdev_t *rdev
blkdev_put_partition(bdev);
}
-void md_autodetect_dev(dev_t dev);
+int md_register_autodetect_dev(dev_t dev);
static void export_rdev(mdk_rdev_t * rdev)
{
@@ -1447,7 +1447,8 @@ static void export_rdev(mdk_rdev_t * rde
free_disk_sb(rdev);
list_del_init(&rdev->same_set);
#ifndef MODULE
- md_autodetect_dev(rdev->bdev->bd_dev);
+ if (md_register_autodetect_dev(rdev->bdev->bd_dev))
+ printk(KERN_ERR "md: out of memory re-registering %s\n", b);
#endif
unlock_rdev(rdev);
kobject_put(&rdev->kobj);
@@ -5575,27 +5576,40 @@ static int __init md_init(void)
* Searches all registered partitions for autorun RAID arrays
* at boot time.
*/
-static dev_t detected_devices[128];
-static int dev_cnt;
+static LIST_HEAD(detected_devices);
+static DEFINE_SPINLOCK(detected_devices_lock);
-void md_autodetect_dev(dev_t dev)
+struct detected_dev_list_t {
+ struct list_head list;
+ dev_t dev;
+};
+
+int md_register_autodetect_dev(dev_t dev)
{
- if (dev_cnt >= 0 && dev_cnt < 127)
- detected_devices[dev_cnt++] = dev;
+ struct detected_dev_list_t *ldev = kzalloc(sizeof (*ldev), GFP_KERNEL);
+
+ if (!ldev)
+ return -1;
+
+ ldev->dev = dev;
+
+ spin_lock(&detected_devices_lock);
+ list_add_tail(&ldev->list, &detected_devices);
+ spin_unlock(&detected_devices_lock);
+
+ return 0;
}
static void autostart_arrays(int part)
{
- mdk_rdev_t *rdev;
- int i;
+ struct detected_dev_list_t *ldev, *next;
printk(KERN_INFO "md: Autodetecting RAID arrays.\n");
- for (i = 0; i < dev_cnt; i++) {
- dev_t dev = detected_devices[i];
-
- rdev = md_import_device(dev,0, 0);
+ spin_lock(&detected_devices_lock);
+ list_for_each_entry_safe(ldev, next, &detected_devices, list) {
+ mdk_rdev_t *rdev = md_import_device(ldev->dev, 0, 0);
if (IS_ERR(rdev))
continue;
@@ -5604,8 +5618,11 @@ static void autostart_arrays(int part)
continue;
}
list_add(&rdev->same_set, &pending_raid_disks);
+ list_del(&ldev->list);
+ kfree(ldev);
}
- dev_cnt = 0;
+ BUG_ON(!list_empty(&detected_devices));
+ spin_unlock(&detected_devices_lock);
autorun_devices(part);
}
Index: kernel-2.6.17-1.2462.fc6/fs/partitions/check.c
===================================================================
--- kernel-2.6.17-1.2462.fc6.orig/fs/partitions/check.c 2006-07-30 01:03:34.000000000 -0300
+++ kernel-2.6.17-1.2462.fc6/fs/partitions/check.c 2006-07-30 03:41:02.000000000 -0300
@@ -36,7 +36,7 @@
#include "karma.h"
#ifdef CONFIG_BLK_DEV_MD
-extern void md_autodetect_dev(dev_t dev);
+extern int md_register_autodetect_dev(dev_t dev);
#endif
int warn_no_part = 1; /*This is ugly: should make genhd removable media aware*/
@@ -471,8 +471,10 @@ int rescan_partitions(struct gendisk *di
}
add_partition(disk, p, from, size);
#ifdef CONFIG_BLK_DEV_MD
- if (state->parts[p].flags)
- md_autodetect_dev(bdev->bd_dev+p);
+ if (state->parts[p].flags
+ && md_register_autodetect_dev(bdev->bd_dev+p))
+ printk(KERN_ERR "md: out of memory registering %s%d\n",
+ disk->disk_name, p);
#endif
}
kfree(state);
--
Alexandre Oliva http://www.lsd.ic.unicamp.br/~oliva/
Secretary for FSF Latin America http://www.fsfla.org/
Red Hat Compiler Engineer aoliva@{redhat.com, gcc.gnu.org}
Free Software Evangelist oliva@{lsd.ic.unicamp.br, gnu.org}
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
