Added a new routine scsi_chg_noretries_abort_io_device().
This functions accepts two arguments Scsi_device and a bool(set).
When set is passed as 1
this routine will set SCMD_NORETRIES_ABORT bit in
scmd->state for all the io's on the scsi device associated
with remote port.
When set is passed as 0
This routine will clear SCMD_NORETRIES_ABORT bit in
scmd->state for all the io's on the scsi device associated
with remote port.
Export the symbol so the routine can be called by scsi_transport_fc.c
Added new function declaration scsi_chg_noretries_abort_io_device in
scsi_priv.h
Signed-off-by: Muneendra <muneendra.kumar@xxxxxxxxxxxx>
---
v3:
Used the existing scsi command iterators scsi_host_busy_iter.
Set the SCMD_NORETRIES_ABORT to every command instead of only the inflight ios.
Modified the scsi_chg_noretries_abort_io_device argument type from int to bool
v2:
Renamed the below functions as
scsi_set_noretries_abort_io_device ->scsi_chg_noretries_abort_io_device
__scsi_set_noretries_abort_io_device->__scsi_set_noretries_abort_io_device
which accepts the value as an arg to set/clear the SCMD_NORETRIES_ABORT bit
---
drivers/scsi/scsi_error.c | 65 +++++++++++++++++++++++++++++++++++++++
drivers/scsi/scsi_priv.h | 2 ++
2 files changed, 67 insertions(+)
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index aa30c1c9e9db..70e70fdfb00c 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -279,6 +279,71 @@ void scsi_eh_scmd_add(struct scsi_cmnd *scmd)
call_rcu(&scmd->rcu, scsi_eh_inc_host_failed);
}
+static bool
+scsi_clear_noretries_abort_io(struct scsi_cmnd *scmd, void *priv, bool reserved)
+{
+ struct scsi_device *sdev = scmd->device;
+
+ /* only clear SCMD_NORETRIES_ABORT on ios on a specific sdev */
+ if (sdev != priv)
+ return true;
+
+ /*Clear the SCMD_NORETRIES_ABORT bit*/
+ clear_bit(SCMD_NORETRIES_ABORT, &scmd->state);
+ return true;
+}
+
+static bool
+scsi_set_noretries_abort_io(struct scsi_cmnd *scmd, void *priv, bool reserved)
+{
+ struct scsi_device *sdev = scmd->device;
+
+ /* only set SCMD_NORETRIES_ABORT on ios on a specific sdev */
+ if (sdev != priv)
+ return true;
+ /* we don't want this command reissued on abort success
+ * so set SCMD_NORETRIES_ABORT bit to ensure it
+ * won't get reissued
+ */
+ set_bit(SCMD_NORETRIES_ABORT, &scmd->state);
+ return true;
+}
+
+static int
+__scsi_chg_noretries_abort_io_device(struct scsi_device *sdev, bool set)
+{
+
+ if (sdev->sdev_state != SDEV_RUNNING)
+ return -EINVAL;
+
+ blk_mq_quiesce_queue(sdev->request_queue);
+ if (set)
+ scsi_host_busy_iter(sdev->host, scsi_set_noretries_abort_io, sdev);
+ else
+ scsi_host_busy_iter(sdev->host, scsi_clear_noretries_abort_io, sdev);
+
+ blk_mq_unquiesce_queue(sdev->request_queue);
+ return 0;
+}
+
+/*
+ * scsi_chg_noretries_abort_io_device - set/clear the SCMD_NORETRIES_ABORT
+ * bit for all the pending io's on a device
+ * @sdev: scsi_device
+ */
+int
+scsi_chg_noretries_abort_io_device(struct scsi_device *sdev, bool set)
+{
+ struct Scsi_Host *shost = sdev->host;
+ int ret = -EINVAL;
+
+ mutex_lock(&shost->scan_mutex);
+ ret = __scsi_chg_noretries_abort_io_device(sdev, set);
+ mutex_unlock(&shost->scan_mutex);
+ return ret;
+}
+EXPORT_SYMBOL(scsi_chg_noretries_abort_io_device);
+
/**
* scsi_times_out - Timeout function for normal scsi commands.
* @req: request that is timing out.
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 180636d54982..9ccd3b716cf9 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -82,6 +82,8 @@ void scsi_eh_ready_devs(struct Scsi_Host *shost,
int scsi_eh_get_sense(struct list_head *work_q,
struct list_head *done_q);
int scsi_noretry_cmd(struct scsi_cmnd *scmd);
+extern int scsi_chg_noretries_abort_io_device(struct scsi_device *sdev,
+ bool set);
/* scsi_lib.c */
extern int scsi_maybe_unblock_host(struct scsi_device *sdev);
--
2.26.2
Attachment:
smime.p7s
Description: S/MIME Cryptographic Signature
