Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87b9e6aa authored by Don Brace's avatar Don Brace Committed by Martin K. Petersen
Browse files

scsi: hpsa: limit outstanding rescans 



Avoid rescan storms. No need to queue another if one is pending.

Reviewed-by: default avatarScott Benesh <scott.benesh@microsemi.com>
Reviewed-by: default avatarScott Teel <scott.teel@microsemi.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 85b29008

drivers/scsi/hpsa.c

+15 −1
Original line number Diff line number Diff line
@@ -5555,7 +5555,7 @@ static void hpsa_scan_complete(struct ctlr_info *h) 


	spin_lock_irqsave(&h->scan_lock, flags);

	h->scan_finished = 1;

	wake_up_all(&h->scan_wait_queue);

	wake_up(&h->scan_wait_queue);

	spin_unlock_irqrestore(&h->scan_lock, flags);

}
@@ -5573,11 +5573,23 @@ static void hpsa_scan_start(struct Scsi_Host *sh) 
	if (unlikely(lockup_detected(h)))

		return hpsa_scan_complete(h);



	/*

	 * If a scan is already waiting to run, no need to add another

	 */

	spin_lock_irqsave(&h->scan_lock, flags);

	if (h->scan_waiting) {

		spin_unlock_irqrestore(&h->scan_lock, flags);

		return;

	}



	spin_unlock_irqrestore(&h->scan_lock, flags);



	/* wait until any scan already in progress is finished. */

	while (1) {

		spin_lock_irqsave(&h->scan_lock, flags);

		if (h->scan_finished)

			break;

		h->scan_waiting = 1;

		spin_unlock_irqrestore(&h->scan_lock, flags);

		wait_event(h->scan_wait_queue, h->scan_finished);

		/* Note: We don't need to worry about a race between this
@@ -5587,6 +5599,7 @@ static void hpsa_scan_start(struct Scsi_Host *sh) 
		 */

	}

	h->scan_finished = 0; /* mark scan as in progress */

	h->scan_waiting = 0;

	spin_unlock_irqrestore(&h->scan_lock, flags);



	if (unlikely(lockup_detected(h)))
@@ -8789,6 +8802,7 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	init_waitqueue_head(&h->event_sync_wait_queue);

	mutex_init(&h->reset_mutex);

	h->scan_finished = 1; /* no scan currently in progress */

	h->scan_waiting = 0;



	pci_set_drvdata(pdev, h);

	h->ndevices = 0;

drivers/scsi/hpsa.h

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ struct ctlr_info { 
	dma_addr_t		errinfo_pool_dhandle;

	unsigned long  		*cmd_pool_bits;

	int			scan_finished;

	u8			scan_waiting : 1;

	spinlock_t		scan_lock;

	wait_queue_head_t	scan_wait_queue;