hpsa driver uses a shared wq, max sleep time spent in function
hpsa_wait_for_clear_event_notify_ack may take up to 600sec
and that is too much for a shared workqueue.
This patch takes the easiest approach and just creates a
driver's own workqueue.
(instead of modifying hpsa_wait_for_clear_event_notify_ack)
Signed-off-by: Tomas Henzl <the...@redhat.com>
---
drivers/scsi/hpsa.c | 38 ++++++++++++++++++++++++--------------
drivers/scsi/hpsa.h | 1 +
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index cef5d49b59..f60ce7e5bb 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -6409,6 +6409,12 @@ static void hpsa_wait_for_mode_change_ack(struct
ctlr_info *h)
break;
/* delay and try again */
usleep_range(10000, 20000);
+
+ /* we allow a timeout under certain conditions,
+ * so we may return here too when a removal is in progress
+ */
+ if (h->remove_in_progress)
+ return;
}
}
@@ -6937,7 +6943,6 @@ static int hpsa_offline_devices_ready(struct ctlr_info *h)
static void hpsa_monitor_ctlr_worker(struct work_struct *work)
{
- unsigned long flags;
struct ctlr_info *h = container_of(to_delayed_work(work),
struct ctlr_info, monitor_ctlr_work);
detect_controller_lockup(h);
@@ -6952,14 +6957,10 @@ static void hpsa_monitor_ctlr_worker(struct work_struct
*work)
scsi_host_put(h->scsi_host);
}
- spin_lock_irqsave(&h->lock, flags);
- if (h->remove_in_progress) {
- spin_unlock_irqrestore(&h->lock, flags);
+ if (h->remove_in_progress)
return;
- }
- schedule_delayed_work(&h->monitor_ctlr_work,
- h->heartbeat_sample_interval);
- spin_unlock_irqrestore(&h->lock, flags);
+ queue_delayed_work(h->monitor_ctrl_wq, &h->monitor_ctlr_work,
+ h->heartbeat_sample_interval);
}
static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
@@ -6968,6 +6969,7 @@ static int hpsa_init_one(struct pci_dev *pdev, const
struct pci_device_id *ent)
struct ctlr_info *h;
int try_soft_reset = 0;
unsigned long flags;
+ char wq_name[20];
if (number_of_controllers == 0)
printk(KERN_INFO DRIVER_NAME "\n");
@@ -7127,10 +7129,20 @@ reinit_after_soft_reset:
/* Monitor the controller for firmware lockups */
h->heartbeat_sample_interval = HEARTBEAT_SAMPLE_INTERVAL;
INIT_DELAYED_WORK(&h->monitor_ctlr_work, hpsa_monitor_ctlr_worker);
- schedule_delayed_work(&h->monitor_ctlr_work,
- h->heartbeat_sample_interval);
+ snprintf(wq_name, sizeof(wq_name), "monitor_%d_hpsa", h->ctlr);
+ h->monitor_ctrl_wq = alloc_ordered_workqueue(wq_name, 0);
+ if (!h->monitor_ctrl_wq) {
+ dev_err(&pdev->dev, "failed to create monitor workqueue\n");
+ goto clean5;
+ }
+ queue_delayed_work(h->monitor_ctrl_wq, &h->monitor_ctlr_work,
+ h->heartbeat_sample_interval);
return 0;
+clean5:
+ hpsa_unregister_scsi(h);
+ kfree(h->hba_inquiry_data);
+ h->access.set_intr_mask(h, HPSA_INTR_OFF);
clean4:
hpsa_free_sg_chain_blocks(h);
hpsa_free_cmd_pool(h);
@@ -7199,7 +7211,6 @@ static void hpsa_free_device_info(struct ctlr_info *h)
static void hpsa_remove_one(struct pci_dev *pdev)
{
struct ctlr_info *h;
- unsigned long flags;
if (pci_get_drvdata(pdev) == NULL) {
dev_err(&pdev->dev, "unable to remove device\n");
@@ -7208,10 +7219,9 @@ static void hpsa_remove_one(struct pci_dev *pdev)
h = pci_get_drvdata(pdev);
/* Get rid of any controller monitoring work items */
- spin_lock_irqsave(&h->lock, flags);
h->remove_in_progress = 1;
- cancel_delayed_work(&h->monitor_ctlr_work);
- spin_unlock_irqrestore(&h->lock, flags);
+ cancel_delayed_work_sync(&h->monitor_ctlr_work);
+ destroy_workqueue(h->monitor_ctrl_wq);
hpsa_unregister_scsi(h); /* unhook from SCSI subsystem */
hpsa_shutdown(pdev);
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index 24472cec7d..3340ebf654 100644
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -194,6 +194,7 @@ struct ctlr_info {
atomic_t firmware_flash_in_progress;
u32 *lockup_detected;
struct delayed_work monitor_ctlr_work;
+ struct workqueue_struct *monitor_ctrl_wq;
int remove_in_progress;
u32 fifo_recently_full;
/* Address of h->q[x] is passed to intr handler to know which queue */
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
