scsi: aacraid: use scsi_host_(block,unblock) to block I/O

Use scsi_host_block() and scsi_host_unblock() instead of
scsi_block_requests()/scsi_unblock_requests() to block and unblock I/O.
This has the advantage that the block layer will stop sending I/O to the
adapter instead of having the SCSI midlayer requeueing I/O internally.

Link: https://lore.kernel.org/r/20200228075318.91255-10-hare@suse.de
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Balsundar P < Balsundar.P@microchip.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index fee13a7781986b100ac65404623022f196e99a17..bb14a05f6d77c0298d2c33dea867fa536fc77d47 100644 (file)
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1477,7 +1477,6 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type)
        int index, quirks;
        int retval;
        struct Scsi_Host *host = aac->scsi_host_ptr;
-       struct scsi_device *dev;
        int jafo = 0;
        int bled;
        u64 dmamask;
@@ -1605,16 +1604,7 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type)
         */
        scsi_host_complete_all_commands(host, DID_RESET);
 
-       /*
-        * Any Device that was already marked offline needs to be marked
-        * running
-        */
-       __shost_for_each_device(dev, host) {
-               if (!scsi_device_online(dev))
-                       scsi_device_set_state(dev, SDEV_RUNNING);
-       }
        retval = 0;
-
 out:
        aac->in_reset = 0;
 
@@ -1655,7 +1645,7 @@ int aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type)
         * target (block maximum 60 seconds). Although not necessary,
         * it does make us a good storage citizen.
         */
-       scsi_block_requests(host);
+       scsi_host_block(host);
 
        /* Quiesce build, flush cache, write through mode */
        if (forced < 2)
@@ -1666,7 +1656,7 @@ int aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type)
        retval = _aac_reset_adapter(aac, bled, reset_type);
        spin_unlock_irqrestore(host->host_lock, flagv);
 
-       scsi_unblock_requests(host);
+       retval = scsi_host_unblock(host, SDEV_RUNNING);
 
        if ((forced < 2) && (retval == -ENODEV)) {
                /* Unwind aac_send_shutdown() IOP_RESET unsupported/disabled */

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 4d5b34e0d3a98f09bcbb070c9c935e2288119b58..877464e9d5208c91c0207fcd5a1ddcb95a1836d8 100644 (file)
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1894,7 +1894,7 @@ static int aac_suspend(struct pci_dev *pdev, pm_message_t state)
        struct Scsi_Host *shost = pci_get_drvdata(pdev);
        struct aac_dev *aac = (struct aac_dev *)shost->hostdata;
 
-       scsi_block_requests(shost);
+       scsi_host_block(shost);
        aac_cancel_rescan_worker(aac);
        aac_send_shutdown(aac);
 
@@ -1930,7 +1930,7 @@ static int aac_resume(struct pci_dev *pdev)
        * aac_send_shutdown() to block ioctls from upperlayer
        */
        aac->adapter_shutdown = 0;
-       scsi_unblock_requests(shost);
+       scsi_host_unblock(shost, SDEV_RUNNING);
 
        return 0;
 
@@ -1945,7 +1945,8 @@ fail_device:
 static void aac_shutdown(struct pci_dev *dev)
 {
        struct Scsi_Host *shost = pci_get_drvdata(dev);
-       scsi_block_requests(shost);
+
+       scsi_host_block(shost);
        __aac_shutdown((struct aac_dev *)shost->hostdata);
 }
 
@@ -1991,7 +1992,7 @@ static pci_ers_result_t aac_pci_error_detected(struct pci_dev *pdev,
        case pci_channel_io_frozen:
                aac->handle_pci_error = 1;
 
-               scsi_block_requests(aac->scsi_host_ptr);
+               scsi_host_block(shost);
                aac_cancel_rescan_worker(aac);
                scsi_host_complete_all_commands(shost, DID_NO_CONNECT);
                aac_release_resources(aac);
@@ -2044,7 +2045,6 @@ fail_device:
 static void aac_pci_resume(struct pci_dev *pdev)
 {
        struct Scsi_Host *shost = pci_get_drvdata(pdev);
-       struct scsi_device *sdev = NULL;
        struct aac_dev *aac = (struct aac_dev *)shost_priv(shost);
 
        if (aac_adapter_ioremap(aac, aac->base_size)) {
@@ -2071,10 +2071,7 @@ static void aac_pci_resume(struct pci_dev *pdev)
        aac->adapter_shutdown = 0;
        aac->handle_pci_error = 0;
 
-       shost_for_each_device(sdev, shost)
-               if (sdev->sdev_state == SDEV_OFFLINE)
-                       sdev->sdev_state = SDEV_RUNNING;
-       scsi_unblock_requests(aac->scsi_host_ptr);
+       scsi_host_unblock(shost, SDEV_RUNNING);
        aac_scan_host(aac);
        pci_save_state(pdev);