RE: [PATCH 11/13] aacraid: use scsi_host_busy_iter() to wait for outstanding commands

[<Balsundar.P@xxxxxxxxxxxxx>]

Acked-by: Balsundar P < Balsundar.P@xxxxxxxxxxxxx>

-----Original Message-----
From: Hannes Reinecke <hare@xxxxxxx> 
Sent: Wednesday, December 4, 2019 20:29
To: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>; Bart van Assche <bvanassche@xxxxxxx>; Balsundar P - I31211 <Balsundar.P@xxxxxxxxxxxxx>; James Bottomley <james.bottomley@xxxxxxxxxxxxxxxxxxxxx>; linux-scsi@xxxxxxxxxxxxxxx; Hannes Reinecke <hare@xxxxxxx>
Subject: [PATCH 11/13] aacraid: use scsi_host_busy_iter() to wait for outstanding commands

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

Instead of traversing the list of possible commands by hands we should be using scsi_host_busy_iter() to figure out if there are outstanding commands.

Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
---
 drivers/scsi/aacraid/comminit.c | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index f75878d773cf..355b16f0b145 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -272,36 +272,35 @@ static void aac_queue_init(struct aac_dev * dev, struct aac_queue * q, u32 *mem,
        q->entries = qsize;
 }

+static bool wait_for_io_iter(struct scsi_cmnd *cmd, void *data, bool 
+rsvd) {
+       int *active = data;
+
+       if (cmd->SCp.phase == AAC_OWNER_FIRMWARE)
+               *active = *active + 1;
+       return true;
+}
 static void aac_wait_for_io_completion(struct aac_dev *aac)  {
-       unsigned long flagv = 0;
-       int i = 0;
+       int i = 0, active;

        for (i = 60; i; --i) {
-               struct scsi_device *dev;
-               struct scsi_cmnd *command;
-               int active = 0;
-
-               __shost_for_each_device(dev, aac->scsi_host_ptr) {
-                       spin_lock_irqsave(&dev->list_lock, flagv);
-                       list_for_each_entry(command, &dev->cmd_list, list) {
-                               if (command->SCp.phase == AAC_OWNER_FIRMWARE) {
-                                       active++;
-                                       break;
-                               }
-                       }
-                       spin_unlock_irqrestore(&dev->list_lock, flagv);
-                       if (active)
-                               break;

-               }
+               active = 0;
+               scsi_host_busy_iter(aac->scsi_host_ptr,
+                                   wait_for_io_iter, &active);
                /*
                 * We can exit If all the commands are complete
                 */
                if (active == 0)
                        break;
+               dev_info(&aac->pdev->dev,
+                        "Wait for %d commands to complete\n", active);
                ssleep(1);
        }
+       if (active)
+               dev_err(&aac->pdev->dev,
+                       "%d outstanding commands during shutdown\n", 
+ active);
 }

 /**
--
2.16.4