hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mpt3sas: delay scsi_add_host call to work with scsi-mq 

In _scsih_probe, delay the call to scsi_add_host until the host has been
fully set up.

Otherwise, the default .can_queue value of 1 causes scsi-mq to set the block
layer request queue size to its minimum size, resulting in awful performance.

In _scsih_probe error handling, call mpt3sas_base_detach rather than
scsi_remove_host to properly clean up in reverse order.

In _scsih_remove, call scsi_remove_host earlier to clean up in reverse order.

Signed-off-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nagalakshmi Nandigama <Nagalakshmi.Nandigama@avagotech.com>
Signed-off-by: Sreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Reddy, Sreekanth 2014-07-14 12:01:35 +05:30 committed by Christoph Hellwig
parent 02b7708134
commit 4dc06fd846
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/mpt3sas/mpt3sas_base.c
View File

@ -266,7 +266,7 @@ mpt3sas_base_stop_watchdog(struct MPT3SAS_ADAPTER *ioc)
ioc->fault_reset_work_q = NULL; ioc->fault_reset_work_q = NULL;
spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock, flags); spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock, flags);
if (wq) { if (wq) {
if (!cancel_delayed_work(&ioc->fault_reset_work)) if (!cancel_delayed_work_sync(&ioc->fault_reset_work))
flush_workqueue(wq); flush_workqueue(wq);
destroy_workqueue(wq); destroy_workqueue(wq);
} }

26
drivers/scsi/mpt3sas/mpt3sas_scsih.c
View File

@ -2581,11 +2581,10 @@ _scsih_fw_event_cleanup_queue(struct MPT3SAS_ADAPTER *ioc)
return; return;
list_for_each_entry_safe(fw_event, next, &ioc->fw_event_list, list) { list_for_each_entry_safe(fw_event, next, &ioc->fw_event_list, list) {
if (cancel_delayed_work(&fw_event->delayed_work)) { if (cancel_delayed_work_sync(&fw_event->delayed_work)) {
_scsih_fw_event_free(ioc, fw_event); _scsih_fw_event_free(ioc, fw_event);
continue; continue;
} }
fw_event->cancel_pending_work = 1;
} }
} }
@ -7039,7 +7038,7 @@ static void
_mpt3sas_fw_work(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work *fw_event) _mpt3sas_fw_work(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work *fw_event)
{ {
/* the queue is being flushed so ignore this event */ /* the queue is being flushed so ignore this event */
if (ioc->remove_host || fw_event->cancel_pending_work || if (ioc->remove_host ||
ioc->pci_error_recovery) { ioc->pci_error_recovery) {
_scsih_fw_event_free(ioc, fw_event); _scsih_fw_event_free(ioc, fw_event);
return; return;
@ -7439,9 +7438,9 @@ static void _scsih_remove(struct pci_dev *pdev)
} }
sas_remove_host(shost); sas_remove_host(shost);
scsi_remove_host(shost);
mpt3sas_base_detach(ioc); mpt3sas_base_detach(ioc);
list_del(&ioc->list); list_del(&ioc->list);
scsi_remove_host(shost);
scsi_host_put(shost); scsi_host_put(shost);
} }
@ -7809,13 +7808,6 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
} }
} }
if ((scsi_add_host(shost, &pdev->dev))) {
pr_err(MPT3SAS_FMT "failure at %s:%d/%s()!\n",
ioc->name, __FILE__, __LINE__, __func__);
list_del(&ioc->list);
goto out_add_shost_fail;
}
/* register EEDP capabilities with SCSI layer */ /* register EEDP capabilities with SCSI layer */
if (prot_mask > 0) if (prot_mask > 0)
scsi_host_set_prot(shost, prot_mask); scsi_host_set_prot(shost, prot_mask);
@ -7843,15 +7835,21 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
ioc->name, __FILE__, __LINE__, __func__); ioc->name, __FILE__, __LINE__, __func__);
goto out_attach_fail; goto out_attach_fail;
} }
if ((scsi_add_host(shost, &pdev->dev))) {
pr_err(MPT3SAS_FMT "failure at %s:%d/%s()!\n",
ioc->name, __FILE__, __LINE__, __func__);
list_del(&ioc->list);
goto out_add_shost_fail;
}
scsi_scan_host(shost); scsi_scan_host(shost);
return 0; return 0;
out_add_shost_fail:
mpt3sas_base_detach(ioc);
out_attach_fail: out_attach_fail:
destroy_workqueue(ioc->firmware_event_thread); destroy_workqueue(ioc->firmware_event_thread);
out_thread_fail: out_thread_fail:
list_del(&ioc->list); list_del(&ioc->list);
scsi_remove_host(shost);
out_add_shost_fail:
scsi_host_put(shost); scsi_host_put(shost);
return -ENODEV; return -ENODEV;
} }