As we now have moved the error handler functions to not rely on
a scsi command we can drop the out-of-band scsi command allocation
from scsi_ioctl_reset().
Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
Reviewed-by: Bart Van Assche <bvanassche@xxxxxxx>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@xxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
---
drivers/scsi/scsi_error.c | 95 ++++++++++++++++-----------------------
1 file changed, 39 insertions(+), 56 deletions(-)
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 7c9c376affda..63b762d5d66f 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -866,13 +866,12 @@ void scsi_eh_done(struct scsi_cmnd *scmd)
/**
* scsi_try_host_reset - ask host adapter to reset itself
- * @scmd: SCSI cmd to send host reset.
+ * @host: SCSI host to be reset.
*/
-static enum scsi_disposition scsi_try_host_reset(struct scsi_cmnd *scmd)
+static enum scsi_disposition scsi_try_host_reset(struct Scsi_Host *host)
{
unsigned long flags;
enum scsi_disposition rtn;
- struct Scsi_Host *host = scmd->device->host;
const struct scsi_host_template *hostt = host->hostt;
SCSI_LOG_ERROR_RECOVERY(3,
@@ -887,7 +886,7 @@ static enum scsi_disposition scsi_try_host_reset(struct scsi_cmnd *scmd)
if (!hostt->skip_settle_delay)
ssleep(HOST_RESET_SETTLE_TIME);
spin_lock_irqsave(host->host_lock, flags);
- scsi_report_bus_reset(host, scmd_channel(scmd));
+ scsi_report_bus_reset(host, -1);
spin_unlock_irqrestore(host->host_lock, flags);
}
@@ -896,28 +895,29 @@ static enum scsi_disposition scsi_try_host_reset(struct scsi_cmnd *scmd)
/**
* scsi_try_bus_reset - ask host to perform a bus reset
- * @scmd: SCSI cmd to send bus reset.
+ * @host: SCSI host to send bus reset.
+ * @channel: Number of the bus to be reset
*/
-static enum scsi_disposition scsi_try_bus_reset(struct scsi_cmnd *scmd)
+static enum scsi_disposition scsi_try_bus_reset(struct Scsi_Host *host,
+ int channel)
{
unsigned long flags;
enum scsi_disposition rtn;
- struct Scsi_Host *host = scmd->device->host;
const struct scsi_host_template *hostt = host->hostt;
- SCSI_LOG_ERROR_RECOVERY(3, scmd_printk(KERN_INFO, scmd,
- "%s: Snd Bus RST\n", __func__));
+ SCSI_LOG_ERROR_RECOVERY(3, shost_printk(KERN_INFO, host,
+ "%s: Snd Bus RST to bus %d\n", __func__, channel));
if (!hostt->eh_bus_reset_handler)
return FAILED;
- rtn = hostt->eh_bus_reset_handler(host, scmd_channel(scmd));
+ rtn = hostt->eh_bus_reset_handler(host, channel);
if (rtn == SUCCESS) {
if (!hostt->skip_settle_delay)
ssleep(BUS_RESET_SETTLE_TIME);
spin_lock_irqsave(host->host_lock, flags);
- scsi_report_bus_reset(host, scmd_channel(scmd));
+ scsi_report_bus_reset(host, channel);
spin_unlock_irqrestore(host->host_lock, flags);
}
@@ -932,7 +932,8 @@ static void __scsi_report_device_reset(struct scsi_device *sdev, void *data)
/**
* scsi_try_target_reset - Ask host to perform a target reset
- * @scmd: SCSI cmd used to send a target reset
+ * @host: SCSI Host
+ * @starget: SCSI target to be reset
*
* Notes:
* There is no timeout for this operation. if this operation is
@@ -940,13 +941,12 @@ static void __scsi_report_device_reset(struct scsi_device *sdev, void *data)
* timer on it, and set the host back to a consistent state prior to
* returning.
*/
-static enum scsi_disposition scsi_try_target_reset(struct scsi_cmnd *scmd)
+static enum scsi_disposition scsi_try_target_reset(struct Scsi_Host *host,
+ struct scsi_target *starget)
{
unsigned long flags;
enum scsi_disposition rtn;
- struct Scsi_Host *host = scmd->device->host;
const struct scsi_host_template *hostt = host->hostt;
- struct scsi_target *starget = scsi_target(scmd->device);
if (!hostt->eh_target_reset_handler)
return FAILED;
@@ -964,7 +964,7 @@ static enum scsi_disposition scsi_try_target_reset(struct scsi_cmnd *scmd)
/**
* scsi_try_bus_device_reset - Ask host to perform a BDR on a dev
- * @scmd: SCSI cmd used to send BDR
+ * @sdev: SCSI device to perform the BDR on
*
* Notes:
* There is no timeout for this operation. if this operation is
@@ -972,17 +972,17 @@ static enum scsi_disposition scsi_try_target_reset(struct scsi_cmnd *scmd)
* timer on it, and set the host back to a consistent state prior to
* returning.
*/
-static enum scsi_disposition scsi_try_bus_device_reset(struct scsi_cmnd *scmd)
+static enum scsi_disposition scsi_try_bus_device_reset(struct scsi_device *sdev)
{
enum scsi_disposition rtn;
- const struct scsi_host_template *hostt = scmd->device->host->hostt;
+ const struct scsi_host_template *hostt = sdev->host->hostt;
if (!hostt->eh_device_reset_handler)
return FAILED;
- rtn = hostt->eh_device_reset_handler(scmd->device);
+ rtn = hostt->eh_device_reset_handler(sdev);
if (rtn == SUCCESS)
- __scsi_report_device_reset(scmd->device, NULL);
+ __scsi_report_device_reset(sdev, NULL);
return rtn;
}
@@ -1014,11 +1014,15 @@ scsi_try_to_abort_cmd(const struct scsi_host_template *hostt, struct scsi_cmnd *
static void scsi_abort_eh_cmnd(struct scsi_cmnd *scmd)
{
- if (scsi_try_to_abort_cmd(scmd->device->host->hostt, scmd) != SUCCESS)
- if (scsi_try_bus_device_reset(scmd) != SUCCESS)
- if (scsi_try_target_reset(scmd) != SUCCESS)
- if (scsi_try_bus_reset(scmd) != SUCCESS)
- scsi_try_host_reset(scmd);
+ struct Scsi_Host *host = scmd->device->host;
+ struct scsi_target *starget = scsi_target(scmd->device);
+ int channel = scmd->device->channel;
+
+ if (scsi_try_to_abort_cmd(host->hostt, scmd) != SUCCESS)
+ if (scsi_try_bus_device_reset(scmd->device) != SUCCESS)
+ if (scsi_try_target_reset(host, starget) != SUCCESS)
+ if (scsi_try_bus_reset(host, channel) != SUCCESS)
+ scsi_try_host_reset(host);
}
/**
@@ -1592,7 +1596,7 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
SCSI_LOG_ERROR_RECOVERY(3,
sdev_printk(KERN_INFO, sdev,
"%s: Sending BDR\n", current->comm));
- rtn = scsi_try_bus_device_reset(bdr_scmd);
+ rtn = scsi_try_bus_device_reset(sdev);
if (rtn == SUCCESS || rtn == FAST_IO_FAIL) {
if (!scsi_device_online(sdev) ||
rtn == FAST_IO_FAIL ||
@@ -1658,7 +1662,7 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,
shost_printk(KERN_INFO, shost,
"%s: Sending target reset to target %d\n",
current->comm, id));
- rtn = scsi_try_target_reset(scmd);
+ rtn = scsi_try_target_reset(shost, scsi_target(scmd->device));
if (rtn != SUCCESS && rtn != FAST_IO_FAIL)
SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost,
@@ -1722,7 +1726,7 @@ static int scsi_eh_bus_reset(struct Scsi_Host *shost,
shost_printk(KERN_INFO, shost,
"%s: Sending BRST chan: %d\n",
current->comm, channel));
- rtn = scsi_try_bus_reset(scmd);
+ rtn = scsi_try_bus_reset(shost, channel);
if (rtn != SUCCESS && rtn != FAST_IO_FAIL) {
SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost,
@@ -1768,7 +1772,7 @@ static int scsi_eh_host_reset(struct Scsi_Host *shost,
"%s: Sending HRST\n",
current->comm));
- rtn = scsi_try_host_reset(scmd);
+ rtn = scsi_try_host_reset(shost);
if (rtn == SUCCESS) {
list_splice_init(work_q, &check_list);
} else if (rtn == FAST_IO_FAIL) {
@@ -2379,7 +2383,7 @@ void scsi_report_bus_reset(struct Scsi_Host *shost, unsigned int channel)
struct scsi_device *sdev;
__shost_for_each_device(sdev, shost) {
- if (channel == sdev_channel(sdev))
+ if (channel == -1 || channel == sdev_channel(sdev))
__scsi_report_device_reset(sdev, NULL);
}
}
@@ -2427,9 +2431,8 @@ EXPORT_SYMBOL(scsi_report_device_reset);
int
scsi_ioctl_reset(struct scsi_device *dev, int __user *arg)
{
- struct scsi_cmnd *scmd;
struct Scsi_Host *shost = dev->host;
- struct request *rq;
+ struct scsi_target *starget = scsi_target(dev);
unsigned long flags;
int error = 0, val;
enum scsi_disposition rtn;
@@ -2444,23 +2447,6 @@ scsi_ioctl_reset(struct scsi_device *dev, int __user *arg)
if (scsi_autopm_get_host(shost) < 0)
return -EIO;
- error = -EIO;
- rq = kzalloc(sizeof(struct request) + sizeof(struct scsi_cmnd) +
- shost->hostt->cmd_size, GFP_KERNEL);
- if (!rq)
- goto out_put_autopm_host;
- blk_rq_init(NULL, rq);
-
- scmd = (struct scsi_cmnd *)(rq + 1);
- scsi_init_command(dev, scmd);
-
- scmd->submitter = SUBMITTED_BY_SCSI_RESET_IOCTL;
- memset(&scmd->sdb, 0, sizeof(scmd->sdb));
-
- scmd->cmd_len = 0;
-
- scmd->sc_data_direction = DMA_BIDIRECTIONAL;
-
spin_lock_irqsave(shost->host_lock, flags);
shost->tmf_in_progress = 1;
spin_unlock_irqrestore(shost->host_lock, flags);
@@ -2470,22 +2456,22 @@ scsi_ioctl_reset(struct scsi_device *dev, int __user *arg)
rtn = SUCCESS;
break;
case SG_SCSI_RESET_DEVICE:
- rtn = scsi_try_bus_device_reset(scmd);
+ rtn = scsi_try_bus_device_reset(dev);
if (rtn == SUCCESS || (val & SG_SCSI_RESET_NO_ESCALATE))
break;
fallthrough;
case SG_SCSI_RESET_TARGET:
- rtn = scsi_try_target_reset(scmd);
+ rtn = scsi_try_target_reset(shost, starget);
if (rtn == SUCCESS || (val & SG_SCSI_RESET_NO_ESCALATE))
break;
fallthrough;
case SG_SCSI_RESET_BUS:
- rtn = scsi_try_bus_reset(scmd);
+ rtn = scsi_try_bus_reset(shost, dev->channel);
if (rtn == SUCCESS || (val & SG_SCSI_RESET_NO_ESCALATE))
break;
fallthrough;
case SG_SCSI_RESET_HOST:
- rtn = scsi_try_host_reset(scmd);
+ rtn = scsi_try_host_reset(shost);
if (rtn == SUCCESS)
break;
fallthrough;
@@ -2511,9 +2497,6 @@ scsi_ioctl_reset(struct scsi_device *dev, int __user *arg)
wake_up(&shost->host_wait);
scsi_run_host_queues(shost);
- kfree(rq);
-
-out_put_autopm_host:
scsi_autopm_put_host(shost);
return error;
}
--
2.35.3
