On Thu, 2006-06-01 at 07:23 -0600, Matthew Wilcox wrote:
> > What are the expected interactions of this code with early userspace aka
> > "kinit" that comes with (soon to be merged) klibc? Does this
> > scsi_complete_async_scans() function get called at all if such "default"
> > initramfs with kinit is used?
>
> It gets called as a late_initcall -- before initramfs gets started. The
> problem comes when you load your scsi driver as a module.
Actually, the first problem is that SCSI doesn't compile as a module at
all: late_initcalls are defined to be module_init calls for modules.
Your adding this to scsi_scan.c now gives us two module_init calls,
which won't build. I fixed this by putting an #ifdef MODULE around the
late_initcall.
> There's a potential solution to this. If we add a hook to sys_module_init
> such that it'll call a specified function before returning, we can make
> it wait until all scans are done. This way, userspace never sees the
> asynchronous scanning behaviour. But if you have devices of different
> types, you won't get the overlapping scans.
How about this solution which works for me with debian on a huge 6 bus
scsi machine: it introduces a new module scsi_wait_scan.ko whose sole
job is to wait for the scans to complete in its init function. The
initrd/initramfs sequence now becomes:
insert all other modules
modprobe scsi_wait_scan
James
---
Index: linux-2.6/drivers/scsi/Makefile
===================================================================
--- linux-2.6.orig/drivers/scsi/Makefile 2006-06-24 13:37:50.000000000 -0500
+++ linux-2.6/drivers/scsi/Makefile 2006-06-24 13:38:08.000000000 -0500
@@ -22,6 +22,10 @@
obj-$(CONFIG_SCSI) += scsi_mod.o
+ifeq ("$(CONFIG_SCSI)", "m")
+ obj-m += scsi_wait_scan.o
+endif
+
obj-$(CONFIG_RAID_ATTRS) += raid_class.o
# --- NOTE ORDERING HERE ---
Index: linux-2.6/drivers/scsi/scsi_priv.h
===================================================================
--- linux-2.6.orig/drivers/scsi/scsi_priv.h 2006-06-24 13:37:50.000000000 -0500
+++ linux-2.6/drivers/scsi/scsi_priv.h 2006-06-24 13:38:08.000000000 -0500
@@ -49,6 +49,9 @@
{ };
#endif
+/* scsi_scan.c */
+int scsi_complete_async_scans(void);
+
/* scsi_devinfo.c */
extern int scsi_get_device_flags(struct scsi_device *sdev,
const unsigned char *vendor,
Index: linux-2.6/drivers/scsi/scsi_scan.c
===================================================================
--- linux-2.6.orig/drivers/scsi/scsi_scan.c 2006-06-24 13:37:50.000000000 -0500
+++ linux-2.6/drivers/scsi/scsi_scan.c 2006-06-24 13:38:08.000000000 -0500
@@ -125,7 +125,7 @@
struct completion prev_finished;
};
-static int scsi_complete_async_scans(void)
+int scsi_complete_async_scans(void)
{
struct async_scan_data *data;
@@ -157,8 +157,10 @@
kfree(data);
return 0;
}
+EXPORT_SYMBOL_GPL(scsi_complete_async_scans);
+#ifndef MODULE
late_initcall(scsi_complete_async_scans);
-
+#endif
/**
* scsi_unlock_floptical - unlock device via a special MODE SENSE command
Index: linux-2.6/drivers/scsi/scsi_wait_scan.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6/drivers/scsi/scsi_wait_scan.c 2006-06-24 13:38:45.000000000 -0500
@@ -0,0 +1,31 @@
+/*
+ * scsi_wait_scan.c
+ *
+ * Copyright (C) 2006 James Bottomley <James.Bottomley@xxxxxxxxxxxx>
+ *
+ * This is a simple module to wait until all the async scans are
+ * complete. The idea is to use it in initrd/initramfs scripts. You
+ * modprobe it after all the modprobes of the root SCSI drivers and it
+ * will wait until they have all finished scanning their busses before
+ * allowing the boot to proceed
+ */
+
+#include <linux/module.h>
+#include "scsi_priv.h"
+
+static int __init wait_scan_init(void)
+{
+ scsi_complete_async_scans();
+ return 0;
+}
+
+static void __exit wait_scan_exit(void)
+{
+}
+
+MODULE_DESCRIPTION("SCSI wait for scans");
+MODULE_AUTHOR("James Bottomley");
+MODULE_LICENSE("GPL");
+
+module_init(wait_scan_init);
+module_exit(wait_scan_exit);
-
: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
