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 04/11] scsi_transport_iscsi: use session as argument for iscsi_block_scsi_eh()
Date: Mon, 2 May 2022 23:59:42 +0200 [thread overview]
Message-ID: <20220502215953.5463-8-hare@suse.de> (raw)
In-Reply-To: <20220502215953.5463-1-hare@suse.de>
We should be passing in the session directly instead of deriving it
from the scsi command.
Signed-off-by: Hannes Reinecke <hare@suse.com>
---
drivers/scsi/qla4xxx/ql4_os.c | 34 ++++++++++++++++++-----------
drivers/scsi/scsi_transport_iscsi.c | 6 ++---
include/scsi/scsi_transport_iscsi.h | 2 +-
3 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 3f6cb2a5c2c2..f4969b99c07f 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -9262,15 +9262,18 @@ static int qla4xxx_eh_abort(struct scsi_cmnd *cmd)
**/
static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
{
- struct scsi_qla_host *ha = to_qla_host(cmd->device->host);
- struct ddb_entry *ddb_entry = cmd->device->hostdata;
+ struct scsi_device *sdev = cmd->device;
+ struct scsi_qla_host *ha = to_qla_host(sdev->host);
+ struct iscsi_cls_session *session;
+ struct ddb_entry *ddb_entry = sdev->hostdata;
int ret = FAILED, stat;
int rval;
if (!ddb_entry)
return ret;
- ret = iscsi_block_scsi_eh(cmd);
+ session = starget_to_session(scsi_target(sdev));
+ ret = iscsi_block_scsi_eh(session);
if (ret)
return ret;
ret = FAILED;
@@ -9331,19 +9334,25 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
**/
static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd)
{
- struct scsi_qla_host *ha = to_qla_host(cmd->device->host);
- struct ddb_entry *ddb_entry = cmd->device->hostdata;
+ struct scsi_target *starget = scsi_target(cmd->device);
+ struct iscsi_cls_session *cls_session = starget_to_session(starget);
+ struct iscsi_session *sess;
+ struct scsi_qla_host *ha;
+ struct ddb_entry *ddb_entry;
int stat, ret;
int rval;
+ sess = cls_session->dd_data;
+ ddb_entry = sess->dd_data;
if (!ddb_entry)
return FAILED;
+ ha = ddb_entry->ha;
- ret = iscsi_block_scsi_eh(cmd);
+ ret = iscsi_block_scsi_eh(cls_session);
if (ret)
return ret;
- starget_printk(KERN_INFO, scsi_target(cmd->device),
+ starget_printk(KERN_INFO, starget,
"WARM TARGET RESET ISSUED.\n");
DEBUG2(printk(KERN_INFO
@@ -9360,14 +9369,13 @@ static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd)
stat = qla4xxx_reset_target(ha, ddb_entry);
if (stat != QLA_SUCCESS) {
- starget_printk(KERN_INFO, scsi_target(cmd->device),
+ starget_printk(KERN_INFO, starget,
"WARM TARGET RESET FAILED.\n");
return FAILED;
}
- if (qla4xxx_eh_wait_for_commands(ha, scsi_target(cmd->device),
- NULL)) {
- starget_printk(KERN_INFO, scsi_target(cmd->device),
+ if (qla4xxx_eh_wait_for_commands(ha, starget, NULL)) {
+ starget_printk(KERN_INFO, starget,
"WARM TARGET DEVICE RESET FAILED - "
"waiting for commands.\n");
return FAILED;
@@ -9376,13 +9384,13 @@ static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd)
/* Send marker. */
if (qla4xxx_send_marker_iocb(ha, ddb_entry, cmd->device->lun,
MM_TGT_WARM_RESET) != QLA_SUCCESS) {
- starget_printk(KERN_INFO, scsi_target(cmd->device),
+ starget_printk(KERN_INFO, starget,
"WARM TARGET DEVICE RESET FAILED - "
"marker iocb failed.\n");
return FAILED;
}
- starget_printk(KERN_INFO, scsi_target(cmd->device),
+ starget_printk(KERN_INFO, starget,
"WARM TARGET RESET SUCCEEDED.\n");
return SUCCESS;
}
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 2c0dd64159b0..bdc9ef29fe9c 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -1821,17 +1821,15 @@ static void iscsi_scan_session(struct work_struct *work)
/**
* iscsi_block_scsi_eh - block scsi eh until session state has transistioned
- * @cmd: scsi cmd passed to scsi eh handler
+ * @session: iscsi session derived from scsi eh handler argument
*
* If the session is down this function will wait for the recovery
* timer to fire or for the session to be logged back in. If the
* recovery timer fires then FAST_IO_FAIL is returned. The caller
* should pass this error value to the scsi eh.
*/
-int iscsi_block_scsi_eh(struct scsi_cmnd *cmd)
+int iscsi_block_scsi_eh(struct iscsi_cls_session *session)
{
- struct iscsi_cls_session *session =
- starget_to_session(scsi_target(cmd->device));
unsigned long flags;
int ret = 0;
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 9acb8422f680..5771275f8bf3 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -456,7 +456,7 @@ extern struct iscsi_endpoint *iscsi_create_endpoint(int dd_size);
extern void iscsi_destroy_endpoint(struct iscsi_endpoint *ep);
extern struct iscsi_endpoint *iscsi_lookup_endpoint(u64 handle);
extern void iscsi_put_endpoint(struct iscsi_endpoint *ep);
-extern int iscsi_block_scsi_eh(struct scsi_cmnd *cmd);
+extern int iscsi_block_scsi_eh(struct iscsi_cls_session *session);
extern struct iscsi_iface *iscsi_create_iface(struct Scsi_Host *shost,
struct iscsi_transport *t,
uint32_t iface_type,
--
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 ` Hannes Reinecke [this message]
2022-05-03 20:32 ` [PATCH 04/11] scsi_transport_iscsi: use session as argument for iscsi_block_scsi_eh() 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 ` [PATCH 5/7] scsi: Do not allocate scsi command in scsi_ioctl_reset() Hannes Reinecke
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 --
2022-05-02 21:54 [PATCH 00/11] scsi: EH rework prep patches, part 2 Hannes Reinecke
2022-05-02 21:54 ` [PATCH 04/11] scsi_transport_iscsi: use session as argument for iscsi_block_scsi_eh() Hannes Reinecke
2022-05-03 14:26 ` Christoph Hellwig
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-8-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox