ncr5380: Fix soft lockups

Because of the rudimentary design of the chip, it is necessary to poll the
SCSI bus signals during PIO and this tends to hog the CPU. The driver will
accept new commands while others execute, and this causes a soft lockup
because the workqueue item will not terminate until the issue queue is
emptied.

When exercising dmx3191d using sequential IO from dd, the driver is sent
512 KiB WRITE commands and 128 KiB READs. For a PIO transfer, the rate is
is only about 300 KiB/s, so these are long-running commands. And although
PDMA may run at several MiB/s, interrupts are disabled for the duration
of the transfer.

Fix the unresponsiveness and soft lockup issues by calling cond_resched()
after each command is completed and by limiting max_sectors for drivers
that don't implement real DMA.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

10 files changed, 16 insertions, 4 deletions

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 9616f397e134..38b03af36a6a 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -890,10 +890,10 @@ static void NCR5380_main(struct work_struct *work)
         struct scsi_cmnd *cmd;
         int done;
         
-        spin_lock_irq(&hostdata->lock);
         do {
                 done = 1;
 
+                spin_lock_irq(&hostdata->lock);
                 while (!hostdata->connected &&
                        (cmd = dequeue_next_cmd(instance))) {
 
@@ -930,8 +930,10 @@ static void NCR5380_main(struct work_struct *work)
                         NCR5380_information_transfer(instance);
                         done = 0;
                 }
+                spin_unlock_irq(&hostdata->lock);
+                if (!done)
+                        cond_resched();
         } while (!done);
-        spin_unlock_irq(&hostdata->lock);
 }
 
 #ifndef DONT_USE_INTR
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index b526ba579ba3..221f18c5df93 100644
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -209,6 +209,7 @@ static struct scsi_host_template cumanascsi_template = {
         .use_clustering         = DISABLE_CLUSTERING,
         .proc_name              = "CumanaSCSI-1",
         .cmd_size               = NCR5380_CMD_SIZE,
+        .max_sectors            = 128,
 };
 
 static int cumanascsi1_probe(struct expansion_card *ec,
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index 70e648513275..1fab1d1896b1 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -115,6 +115,7 @@ static struct scsi_host_template oakscsi_template = {
         .use_clustering         = DISABLE_CLUSTERING,
         .proc_name              = "oakscsi",
         .cmd_size               = NCR5380_CMD_SIZE,
+        .max_sectors            = 128,
 };
 
 static int oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index b36fadab422b..a01921dfed0b 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -976,10 +976,10 @@ static void NCR5380_main(struct work_struct *work)
          * alter queues and touch the Falcon lock.
          */
 
-        spin_lock_irq(&hostdata->lock);
         do {
                 done = 1;
 
+                spin_lock_irq(&hostdata->lock);
                 while (!hostdata->connected &&
                        (cmd = dequeue_next_cmd(instance))) {
 
@@ -1026,8 +1026,10 @@ static void NCR5380_main(struct work_struct *work)
                         NCR5380_information_transfer(instance);
                         done = 0;
                 }
+                spin_unlock_irq(&hostdata->lock);
+                if (!done)
+                        cond_resched();
         } while (!done);
-        spin_unlock_irq(&hostdata->lock);
 }
 
 
diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index ddb4e616bfed..6c14e68b9e1a 100644
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -62,6 +62,7 @@ static struct scsi_host_template dmx3191d_driver_template = {
         .cmd_per_lun            = 2,
         .use_clustering         = DISABLE_CLUSTERING,
         .cmd_size               = NCR5380_CMD_SIZE,
+        .max_sectors            = 128,
 };
 
 static int dmx3191d_probe_one(struct pci_dev *pdev,
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index f6166e34e3b0..6c736b071cf4 100644
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -453,5 +453,6 @@ static struct scsi_host_template driver_template = {
         .cmd_per_lun            = 2,
         .use_clustering         = DISABLE_CLUSTERING,
         .cmd_size               = NCR5380_CMD_SIZE,
+        .max_sectors            = 128,
 };
 #include "scsi_module.c"
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 30472064170e..cd79ef402d7a 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -729,6 +729,7 @@ static struct scsi_host_template driver_template = {
         .cmd_per_lun            = 2,
         .use_clustering         = DISABLE_CLUSTERING,
         .cmd_size               = NCR5380_CMD_SIZE,
+        .max_sectors            = 128,
 };
 
 #include "scsi_module.c"
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 18f74b4a0b95..bb2381314a2b 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -324,6 +324,7 @@ static struct scsi_host_template mac_scsi_template = {
         .cmd_per_lun            = 2,
         .use_clustering         = DISABLE_CLUSTERING,
         .cmd_size               = NCR5380_CMD_SIZE,
+        .max_sectors            = 128,
 };
 
 static int __init mac_scsi_probe(struct platform_device *pdev)
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index 77789405f4a9..512037e27783 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -563,6 +563,7 @@ static struct scsi_host_template driver_template = {
         .cmd_per_lun            = 2,
         .use_clustering         = DISABLE_CLUSTERING,
         .cmd_size               = NCR5380_CMD_SIZE,
+        .max_sectors            = 128,
 };
 #include "scsi_module.c"
 
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index e50881ab9eb4..4615fda60dbd 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -407,5 +407,6 @@ static struct scsi_host_template driver_template = {
         .cmd_per_lun            = 2,
         .use_clustering         = DISABLE_CLUSTERING,
         .cmd_size               = NCR5380_CMD_SIZE,
+        .max_sectors            = 128,
 };
 #include "scsi_module.c"