When server installed some mptsas controller, kernel took long time to
initialized and probe the disks. This patch will create a probe thread for
each device.
By our test, server with 4 LSI controllers, after applied this patch, saved
40s(60 vs 20) for boot time.
Signed-off-by: Joe Jin <joe.jin@xxxxxxxxxx>
Cc: Eric Moore <Eric.Moore@xxxxxxx>
---
drivers/message/fusion/mptsas.c | 52 +++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 7596aec..6c29efc 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -51,6 +51,7 @@
#include <linux/jiffies.h>
#include <linux/workqueue.h>
#include <linux/delay.h> /* for mdelay */
+#include <linux/kthread.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
@@ -85,6 +86,10 @@ module_param(mpt_pt_clear, int, 0);
MODULE_PARM_DESC(mpt_pt_clear,
" Clear persistency table: enable=1 "
"(default=MPTSCSIH_PT_CLEAR=0)");
+static bool mptsas_multiprobe = 1;
+module_param(mptsas_multiprobe, bool, 0);
+MODULE_PARM_DESC(mptsas_multiprobe, " Probe disks by per-device, "
+ "default enabled");
/* scsi-mid layer global parmeter is max_report_luns, which is 511 */
#define MPTSAS_MAX_LUN (16895)
@@ -5118,9 +5123,17 @@ static void mptsas_volume_delete(MPT_ADAPTER *ioc, u8 id)
scsi_device_put(sdev);
}
+struct mptsas_mtprobe_structure {
+ struct pci_dev *pdev;
+ struct pci_device_id *id;
+};
+
static int
-mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+__mptsas_probe(void *void_data)
{
+ struct mptsas_mtprobe_structure *data = void_data;
+ struct pci_dev *pdev = data->pdev;
+ struct pci_device_id *id = data->id;
struct Scsi_Host *sh;
MPT_SCSI_HOST *hd;
MPT_ADAPTER *ioc;
@@ -5134,7 +5147,7 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
r = mpt_attach(pdev,id);
if (r)
- return r;
+ goto done;
ioc = pci_get_drvdata(pdev);
mptsas_fw_event_off(ioc);
@@ -5172,7 +5185,8 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
printk(MYIOC_s_WARN_FMT
"Skipping ioc=%p because SCSI Initiator mode "
"is NOT enabled!\n", ioc->name, ioc);
- return 0;
+ r = 0;
+ goto done;
}
sh = scsi_host_alloc(&mptsas_driver_template, sizeof(MPT_SCSI_HOST));
@@ -5282,14 +5296,42 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
ioc->old_sas_discovery_protocal = 1;
mptsas_scan_sas_topology(ioc);
mptsas_fw_event_on(ioc);
- return 0;
+ r = 0;
+ done:
+ kfree(void_data);
+ return r;
out_mptsas_probe:
-
+ kfree(void_data);
mptscsih_remove(pdev);
return error;
}
+static int
+mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+ struct mptsas_mtprobe_structure *data;
+ struct task_struct *t;
+ int ret = 0;
+
+ data = kzalloc(sizeof(*data), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ data->pdev = pdev;
+ data->id = id;
+
+ if (mptsas_multiprobe) {
+ t = kthread_run(__mptsas_probe, data,
+ "mptsas_probe-%d", pci_name(pdev));
+ if (IS_ERR(t))
+ ret = __mptsas_probe(data);
+ } else
+ ret = __mptsas_probe(data);
+
+ return ret;
+}
+
void
mptsas_shutdown(struct pci_dev *pdev)
{
--
1.7.6
--
To unsubscribe from this list: 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
