From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>,
Hannes Reinecke <hare@suse.com>
Subject: [PATCH 5/7] scsi: Do not allocate scsi command in scsi_ioctl_reset()
Date: Mon, 2 May 2022 23:59:45 +0200 [thread overview]
Message-ID: <20220502215953.5463-11-hare@suse.de> (raw)
In-Reply-To: <20220502215953.5463-1-hare@suse.de>
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@suse.com>
---
drivers/scsi/scsi_error.c | 119 +++++++++++++++++---------------------
1 file changed, 54 insertions(+), 65 deletions(-)
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 93f7006982d8..ad68149ab8a1 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -824,16 +824,22 @@ void scsi_eh_done(struct scsi_cmnd *scmd)
complete(eh_action);
}
+static void __scsi_report_device_reset(struct scsi_device *sdev)
+{
+ sdev->was_reset = 1;
+ sdev->expecting_cc_ua = 1;
+}
+
/**
* 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;
struct scsi_host_template *hostt = host->hostt;
+ struct scsi_device *sdev;
SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, host, "Snd Host RST\n"));
@@ -847,7 +853,8 @@ 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));
+ __shost_for_each_device(sdev, host)
+ __scsi_report_device_reset(sdev);
spin_unlock_irqrestore(host->host_lock, flags);
}
@@ -856,43 +863,39 @@ 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;
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);
}
return rtn;
}
-static void __scsi_report_device_reset(struct scsi_device *sdev, void *data)
-{
- sdev->was_reset = 1;
- sdev->expecting_cc_ua = 1;
-}
-
/**
* 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
@@ -900,13 +903,13 @@ 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;
+ struct scsi_device *sdev;
struct scsi_host_template *hostt = host->hostt;
- struct scsi_target *starget = scsi_target(scmd->device);
if (!hostt->eh_target_reset_handler)
return FAILED;
@@ -914,8 +917,11 @@ static enum scsi_disposition scsi_try_target_reset(struct scsi_cmnd *scmd)
rtn = hostt->eh_target_reset_handler(starget);
if (rtn == SUCCESS) {
spin_lock_irqsave(host->host_lock, flags);
- __starget_for_each_device(starget, NULL,
- __scsi_report_device_reset);
+ __shost_for_each_device(sdev, host) {
+ if ((sdev->channel == starget->channel) &&
+ (sdev->id == starget->id))
+ __scsi_report_device_reset(sdev);
+ }
spin_unlock_irqrestore(host->host_lock, flags);
}
@@ -924,7 +930,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
@@ -932,17 +938,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;
- struct scsi_host_template *hostt = scmd->device->host->hostt;
+ 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);
return rtn;
}
@@ -974,11 +980,15 @@ scsi_try_to_abort_cmd(struct scsi_host_template *hostt, struct scsi_cmnd *scmd)
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);
}
/**
@@ -1561,7 +1571,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 ||
@@ -1626,7 +1636,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,
@@ -1701,7 +1711,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(chan_scmd);
+ rtn = scsi_try_bus_reset(shost, channel);
if (rtn == SUCCESS || rtn == FAST_IO_FAIL) {
list_for_each_entry_safe(scmd, next, work_q, eh_entry) {
if (channel == scmd_channel(scmd)) {
@@ -1747,7 +1757,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) {
@@ -2342,7 +2352,7 @@ void scsi_report_bus_reset(struct Scsi_Host *shost, int channel)
__shost_for_each_device(sdev, shost) {
if (channel == sdev_channel(sdev))
- __scsi_report_device_reset(sdev, NULL);
+ __scsi_report_device_reset(sdev);
}
}
EXPORT_SYMBOL(scsi_report_bus_reset);
@@ -2376,7 +2386,7 @@ void scsi_report_device_reset(struct Scsi_Host *shost, int channel, int target)
__shost_for_each_device(sdev, shost) {
if (channel == sdev_channel(sdev) &&
target == sdev_id(sdev))
- __scsi_report_device_reset(sdev, NULL);
+ __scsi_report_device_reset(sdev);
}
}
EXPORT_SYMBOL(scsi_report_device_reset);
@@ -2389,9 +2399,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;
@@ -2406,23 +2415,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);
@@ -2432,22 +2424,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;
@@ -2473,9 +2465,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.29.2
next prev parent reply other threads:[~2022-05-02 22:01 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-02 21:59 [PATCH 0/7] scsi: EH rework main part Hannes Reinecke
2022-05-02 21:59 ` [PATCH 01/11] pmcraid: Select device in pmcraid_eh_bus_reset_handler() Hannes Reinecke
2022-05-02 21:59 ` [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler Hannes Reinecke
2022-05-03 21:02 ` Lee Duncan
2022-05-02 21:59 ` [PATCH 2/7] scsi: Use Scsi_Host and channel number as argument for eh_bus_reset_handler() Hannes Reinecke
2022-05-03 21:12 ` Lee Duncan
2022-05-06 11:20 ` Steffen Maier
2022-05-06 15:29 ` Sathya Prakash Veerichetty
2022-05-02 21:59 ` [PATCH 02/11] sym53c8xx_2: rework reset handling Hannes Reinecke
2022-05-02 21:59 ` [PATCH 03/11] libiscsi: use cls_session as argument for target and session reset Hannes Reinecke
2022-05-03 20:04 ` michael.christie
2022-05-02 21:59 ` [PATCH 3/7] scsi: Use scsi_target as argument for eh_target_reset_handler() Hannes Reinecke
2022-05-06 10:18 ` Steffen Maier
2022-05-02 21:59 ` [PATCH 04/11] scsi_transport_iscsi: use session as argument for iscsi_block_scsi_eh() Hannes Reinecke
2022-05-03 20:32 ` michael.christie
2022-05-02 21:59 ` [PATCH 4/7] scsi: Use scsi_device as argument to eh_device_reset_handler() Hannes Reinecke
2022-05-02 21:59 ` [PATCH 05/11] pmcraid: select first available device for target reset Hannes Reinecke
2022-05-02 21:59 ` Hannes Reinecke [this message]
2022-05-02 21:59 ` [PATCH 06/11] bfa: Do not use scsi command to signal TMF status Hannes Reinecke
2022-05-02 21:59 ` [PATCH 6/7] scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL Hannes Reinecke
2022-05-02 21:59 ` [PATCH 07/11] aha152x: look for stuck command when resetting device Hannes Reinecke
2022-05-02 21:59 ` [PATCH 7/7] scsi_error: streamline scsi_eh_bus_device_reset() Hannes Reinecke
2022-05-02 21:59 ` [PATCH 08/11] a1000u2w: do not rely on the command for inia100_device_reset() Hannes Reinecke
2022-05-02 21:59 ` [PATCH 09/11] xen-scsifront: add scsi device as argument to scsifront_do_request() Hannes Reinecke
2022-05-02 21:59 ` [PATCH 10/11] fas216: Rework device reset to not rely on SCSI command pointer Hannes Reinecke
2022-05-02 21:59 ` [PATCH 11/11] csiostor: use separate TMF command Hannes Reinecke
2022-05-05 2:27 ` [PATCH 0/7] scsi: EH rework main part chenxiang (M)
2022-05-05 16:19 ` Hannes Reinecke
2022-05-06 3:24 ` chenxiang (M)
-- strict thread matches above, loose matches on Subject: below --
2023-10-02 15:59 [PATCHv5 0/7] scsi: EH rework, " Hannes Reinecke
2023-10-02 15:59 ` [PATCH 5/7] scsi: Do not allocate scsi command in scsi_ioctl_reset() Hannes Reinecke
2023-10-03 17:39 ` Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220502215953.5463-11-hare@suse.de \
--to=hare@suse.de \
--cc=hare@suse.com \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.