* [PATCHv5 0/7] scsi: EH rework, main part
@ 2023-10-02 15:59 Hannes Reinecke
2023-10-02 15:59 ` [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler Hannes Reinecke
` (8 more replies)
0 siblings, 9 replies; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-02 15:59 UTC (permalink / raw)
To: Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig, Hannes Reinecke
Hi all,
(taking up an old thread:)
here's now the main part of my EH rework.
It modifies the reset callbacks for SCSI EH such that
each callback (eh_host_reset_handler, eh_bus_reset_handler,
eh_target_reset_handler, eh_device_reset_handler) only
references the actual entity it needs to work on
(ie 'Scsi_Host', (scsi bus), 'scsi_target', 'scsi_device'),
and the 'struct scsi_cmnd' is dropped from the argument list.
This simplifies the handler themselves as they don't need to
exclude some 'magic' command, and we don't need to allocate
a mock 'struct scsi_cmnd' when issuing a reset via SCSI ioctl.
The entire patchset can be found at:
https://git.kernel.org/pub/scm/linux/kernel/git/hare/scsi-devel.git
branch eh-rework.v5
As usual, comments and reviews are welcome.
Hannes Reinecke (7):
scsi: Use Scsi_Host as argument for eh_host_reset_handler
scsi: Use Scsi_Host and channel number as argument for
eh_bus_reset_handler()
scsi: Use scsi_target as argument for eh_target_reset_handler()
scsi: Use scsi_device as argument to eh_device_reset_handler()
scsi: Do not allocate scsi command in scsi_ioctl_reset()
scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL
scsi_error: streamline scsi_eh_bus_device_reset()
Documentation/scsi/scsi_eh.rst | 16 +-
Documentation/scsi/scsi_mid_low_api.rst | 31 +++-
drivers/infiniband/ulp/srp/ib_srp.c | 12 +-
drivers/message/fusion/mptfc.c | 25 ++--
drivers/message/fusion/mptsas.c | 12 +-
drivers/message/fusion/mptscsih.c | 86 +++++------
drivers/message/fusion/mptscsih.h | 8 +-
drivers/message/fusion/mptspi.c | 10 +-
drivers/s390/scsi/zfcp_scsi.c | 16 +-
drivers/scsi/3w-9xxx.c | 11 +-
drivers/scsi/3w-sas.c | 11 +-
drivers/scsi/3w-xxxx.c | 11 +-
drivers/scsi/53c700.c | 39 ++---
drivers/scsi/BusLogic.c | 14 +-
drivers/scsi/NCR5380.c | 3 +-
drivers/scsi/a100u2w.c | 11 +-
drivers/scsi/aacraid/linit.c | 35 ++---
drivers/scsi/advansys.c | 26 ++--
drivers/scsi/aha152x.c | 10 +-
drivers/scsi/aha1542.c | 30 ++--
drivers/scsi/aic7xxx/aic79xx_osm.c | 37 ++---
drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 +-
drivers/scsi/arcmsr/arcmsr_hba.c | 6 +-
drivers/scsi/arm/acornscsi.c | 8 +-
drivers/scsi/arm/fas216.c | 18 +--
drivers/scsi/arm/fas216.h | 17 ++-
drivers/scsi/atari_scsi.c | 4 +-
drivers/scsi/be2iscsi/be_main.c | 12 +-
drivers/scsi/bfa/bfad_im.c | 8 +-
drivers/scsi/bnx2fc/bnx2fc.h | 4 +-
drivers/scsi/bnx2fc/bnx2fc_io.c | 10 +-
drivers/scsi/csiostor/csio_scsi.c | 5 +-
drivers/scsi/cxlflash/main.c | 10 +-
drivers/scsi/dc395x.c | 25 ++--
drivers/scsi/esas2r/esas2r.h | 8 +-
drivers/scsi/esas2r/esas2r_main.c | 55 +++----
drivers/scsi/esp_scsi.c | 8 +-
drivers/scsi/fdomain.c | 3 +-
drivers/scsi/fnic/fnic.h | 4 +-
drivers/scsi/fnic/fnic_scsi.c | 8 +-
drivers/scsi/hpsa.c | 14 +-
drivers/scsi/hptiop.c | 6 +-
drivers/scsi/ibmvscsi/ibmvfc.c | 15 +-
drivers/scsi/ibmvscsi/ibmvscsi.c | 23 +--
drivers/scsi/imm.c | 4 +-
drivers/scsi/initio.c | 11 +-
drivers/scsi/ipr.c | 26 ++--
drivers/scsi/ips.c | 22 +--
drivers/scsi/libfc/fc_fcp.c | 18 +--
drivers/scsi/libiscsi.c | 19 ++-
drivers/scsi/libsas/sas_scsi_host.c | 21 +--
drivers/scsi/lpfc/lpfc_scsi.c | 23 ++-
drivers/scsi/mac53c94.c | 8 +-
drivers/scsi/megaraid.c | 4 +-
drivers/scsi/megaraid.h | 2 +-
drivers/scsi/megaraid/megaraid_mbox.c | 14 +-
drivers/scsi/megaraid/megaraid_sas.h | 3 +-
drivers/scsi/megaraid/megaraid_sas_base.c | 44 +++---
drivers/scsi/megaraid/megaraid_sas_fusion.c | 54 ++++---
drivers/scsi/mesh.c | 10 +-
drivers/scsi/mpi3mr/mpi3mr_os.c | 135 ++++++++---------
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 72 ++++-----
drivers/scsi/mvumi.c | 7 +-
drivers/scsi/myrb.c | 3 +-
drivers/scsi/myrs.c | 3 +-
drivers/scsi/ncr53c8xx.c | 4 +-
drivers/scsi/nsp32.c | 12 +-
drivers/scsi/pcmcia/nsp_cs.c | 10 +-
drivers/scsi/pcmcia/nsp_cs.h | 6 +-
drivers/scsi/pcmcia/qlogic_stub.c | 4 +-
drivers/scsi/pcmcia/sym53c500_cs.c | 8 +-
drivers/scsi/pmcraid.c | 27 ++--
drivers/scsi/ppa.c | 4 +-
drivers/scsi/qedf/qedf_main.c | 13 +-
drivers/scsi/qedi/qedi_iscsi.c | 3 +-
drivers/scsi/qla1280.c | 36 +++--
drivers/scsi/qla2xxx/qla_os.c | 83 +++++------
drivers/scsi/qla4xxx/ql4_os.c | 54 +++----
drivers/scsi/qlogicfas408.c | 10 +-
drivers/scsi/qlogicfas408.h | 2 +-
drivers/scsi/qlogicpti.c | 3 +-
drivers/scsi/scsi_debug.c | 33 ++---
drivers/scsi/scsi_error.c | 153 ++++++++++----------
drivers/scsi/scsi_lib.c | 2 -
drivers/scsi/smartpqi/smartpqi.h | 1 -
drivers/scsi/smartpqi/smartpqi_init.c | 19 +--
drivers/scsi/snic/snic.h | 5 +-
drivers/scsi/snic/snic_scsi.c | 41 ++----
drivers/scsi/stex.c | 7 +-
drivers/scsi/storvsc_drv.c | 4 +-
drivers/scsi/sym53c8xx_2/sym_glue.c | 13 +-
drivers/scsi/virtio_scsi.c | 12 +-
drivers/scsi/vmw_pvscsi.c | 20 ++-
drivers/scsi/wd33c93.c | 5 +-
drivers/scsi/wd33c93.h | 2 +-
drivers/scsi/wd719x.c | 17 ++-
drivers/scsi/xen-scsifront.c | 6 +-
drivers/staging/rts5208/rtsx.c | 6 +-
drivers/target/loopback/tcm_loop.c | 17 ++-
drivers/ufs/core/ufshcd.c | 14 +-
drivers/usb/image/microtek.c | 4 +-
drivers/usb/storage/scsiglue.c | 8 +-
drivers/usb/storage/uas.c | 3 +-
include/scsi/libfc.h | 4 +-
include/scsi/libiscsi.h | 4 +-
include/scsi/libsas.h | 4 +-
include/scsi/scsi_cmnd.h | 1 -
include/scsi/scsi_host.h | 8 +-
108 files changed, 921 insertions(+), 1009 deletions(-)
--
2.35.3
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler
2023-10-02 15:59 [PATCHv5 0/7] scsi: EH rework, main part Hannes Reinecke
@ 2023-10-02 15:59 ` Hannes Reinecke
2023-10-03 17:33 ` Bart Van Assche
2023-10-05 11:14 ` John Garry
2023-10-02 15:59 ` [PATCH 2/7] scsi: Use Scsi_Host and channel number as argument for eh_bus_reset_handler() Hannes Reinecke
` (7 subsequent siblings)
8 siblings, 2 replies; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-02 15:59 UTC (permalink / raw)
To: Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig, Hannes Reinecke
Issuing a host reset should not rely on any commands.
So use Scsi_Host as argument for eh_host_reset_handler.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
Documentation/scsi/scsi_eh.rst | 2 +-
Documentation/scsi/scsi_mid_low_api.rst | 4 +--
drivers/infiniband/ulp/srp/ib_srp.c | 6 ++--
drivers/message/fusion/mptscsih.c | 19 ++++++-----
drivers/message/fusion/mptscsih.h | 2 +-
drivers/s390/scsi/zfcp_scsi.c | 5 ++-
drivers/scsi/3w-9xxx.c | 11 ++++---
drivers/scsi/3w-sas.c | 11 ++++---
drivers/scsi/3w-xxxx.c | 11 +++----
drivers/scsi/53c700.c | 39 ++++++++++++-----------
drivers/scsi/BusLogic.c | 14 +++-----
drivers/scsi/NCR5380.c | 3 +-
drivers/scsi/aacraid/linit.c | 6 ++--
drivers/scsi/advansys.c | 26 ++++++++-------
drivers/scsi/aha1542.c | 20 ++++++------
drivers/scsi/arm/acornscsi.c | 8 ++---
drivers/scsi/arm/fas216.c | 4 +--
drivers/scsi/arm/fas216.h | 6 ++--
drivers/scsi/atari_scsi.c | 4 +--
drivers/scsi/cxlflash/main.c | 5 ++-
drivers/scsi/esas2r/esas2r.h | 2 +-
drivers/scsi/esas2r/esas2r_main.c | 16 ++++++----
drivers/scsi/esp_scsi.c | 4 +--
drivers/scsi/fdomain.c | 3 +-
drivers/scsi/fnic/fnic.h | 2 +-
drivers/scsi/fnic/fnic_scsi.c | 3 +-
drivers/scsi/hptiop.c | 6 ++--
drivers/scsi/ibmvscsi/ibmvfc.c | 4 +--
drivers/scsi/ibmvscsi/ibmvscsi.c | 4 +--
drivers/scsi/imm.c | 4 +--
drivers/scsi/ipr.c | 4 +--
drivers/scsi/ips.c | 22 +++++--------
drivers/scsi/libfc/fc_fcp.c | 5 ++-
drivers/scsi/lpfc/lpfc_scsi.c | 3 +-
drivers/scsi/mac53c94.c | 8 ++---
drivers/scsi/megaraid.c | 4 +--
drivers/scsi/megaraid.h | 2 +-
drivers/scsi/megaraid/megaraid_mbox.c | 14 +++-----
drivers/scsi/megaraid/megaraid_sas_base.c | 34 ++++++++++----------
drivers/scsi/mesh.c | 10 +++---
drivers/scsi/mpi3mr/mpi3mr_os.c | 12 +++----
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 11 +++----
drivers/scsi/mvumi.c | 7 ++--
drivers/scsi/myrb.c | 3 +-
drivers/scsi/myrs.c | 3 +-
drivers/scsi/nsp32.c | 12 +++----
drivers/scsi/pcmcia/nsp_cs.c | 4 +--
drivers/scsi/pcmcia/nsp_cs.h | 2 +-
drivers/scsi/pcmcia/qlogic_stub.c | 4 +--
drivers/scsi/pcmcia/sym53c500_cs.c | 8 ++---
drivers/scsi/pmcraid.c | 6 ++--
drivers/scsi/ppa.c | 4 +--
drivers/scsi/qedf/qedf_main.c | 4 +--
drivers/scsi/qedi/qedi_iscsi.c | 3 +-
drivers/scsi/qla1280.c | 3 +-
drivers/scsi/qla2xxx/qla_os.c | 18 ++++-------
drivers/scsi/qla4xxx/ql4_os.c | 18 +++++------
drivers/scsi/qlogicfas408.c | 10 +++---
drivers/scsi/qlogicfas408.h | 2 +-
drivers/scsi/qlogicpti.c | 3 +-
drivers/scsi/scsi_debug.c | 8 +++--
drivers/scsi/scsi_error.c | 2 +-
drivers/scsi/snic/snic.h | 3 +-
drivers/scsi/snic/snic_scsi.c | 37 +++++----------------
drivers/scsi/stex.c | 7 ++--
drivers/scsi/storvsc_drv.c | 4 +--
drivers/scsi/sym53c8xx_2/sym_glue.c | 3 +-
drivers/scsi/vmw_pvscsi.c | 5 ++-
drivers/scsi/wd33c93.c | 5 +--
drivers/scsi/wd33c93.h | 2 +-
drivers/scsi/wd719x.c | 4 +--
drivers/ufs/core/ufshcd.c | 6 ++--
drivers/usb/image/microtek.c | 4 +--
include/scsi/libfc.h | 2 +-
include/scsi/scsi_host.h | 2 +-
75 files changed, 261 insertions(+), 330 deletions(-)
diff --git a/Documentation/scsi/scsi_eh.rst b/Documentation/scsi/scsi_eh.rst
index 104d09e9af09..da95971b4f44 100644
--- a/Documentation/scsi/scsi_eh.rst
+++ b/Documentation/scsi/scsi_eh.rst
@@ -217,7 +217,7 @@ considered to fail always.
int (* eh_abort_handler)(struct scsi_cmnd *);
int (* eh_device_reset_handler)(struct scsi_cmnd *);
int (* eh_bus_reset_handler)(struct scsi_cmnd *);
- int (* eh_host_reset_handler)(struct scsi_cmnd *);
+ int (* eh_host_reset_handler)(struct Scsi_Host *);
Higher-severity actions are taken only when lower-severity actions
cannot recover some of failed scmds. Also, note that failure of the
diff --git a/Documentation/scsi/scsi_mid_low_api.rst b/Documentation/scsi/scsi_mid_low_api.rst
index 022198c51350..85b1384ba4fd 100644
--- a/Documentation/scsi/scsi_mid_low_api.rst
+++ b/Documentation/scsi/scsi_mid_low_api.rst
@@ -777,7 +777,7 @@ Details::
/**
* eh_host_reset_handler - reset host (host bus adapter)
- * @scp: SCSI host that contains this device should be reset
+ * @shp: SCSI host that contains this device should be reset
*
* Returns SUCCESS if command aborted else FAILED
*
@@ -794,7 +794,7 @@ Details::
*
* Optionally defined in: LLD
**/
- int eh_host_reset_handler(struct scsi_cmnd * scp)
+ int eh_host_reset_handler(struct Scsi_Host * shp)
/**
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 1574218764e0..07a61d238d6b 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -2831,11 +2831,11 @@ static int srp_reset_device(struct scsi_cmnd *scmnd)
return SUCCESS;
}
-static int srp_reset_host(struct scsi_cmnd *scmnd)
+static int srp_reset_host(struct Scsi_Host *shost)
{
- struct srp_target_port *target = host_to_target(scmnd->device->host);
+ struct srp_target_port *target = host_to_target(shost);
- shost_printk(KERN_ERR, target->scsi_host, PFX "SRP reset_host called\n");
+ shost_printk(KERN_ERR, shost, PFX "SRP reset_host called\n");
return srp_reconnect_rport(target->rport) == 0 ? SUCCESS : FAILED;
}
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 9080a73b4ea6..caf045cfea0e 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1955,15 +1955,15 @@ mptscsih_bus_reset(struct scsi_cmnd * SCpnt)
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/**
- * mptscsih_host_reset - Perform a SCSI host adapter RESET (new_eh variant)
- * @SCpnt: Pointer to scsi_cmnd structure, IO which reset is due to
+ * mptscsih_host_reset - Perform a SCSI host adapter RESET
+ * @sh: Pointer to Scsi_Host structure, which is reset due to
*
* (linux scsi_host_template.eh_host_reset_handler routine)
*
* Returns SUCCESS or FAILED.
*/
int
-mptscsih_host_reset(struct scsi_cmnd *SCpnt)
+mptscsih_host_reset(struct Scsi_Host *sh)
{
MPT_SCSI_HOST * hd;
int status = SUCCESS;
@@ -1971,9 +1971,8 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
int retval;
/* If we can't locate the host to reset, then we failed. */
- if ((hd = shost_priv(SCpnt->device->host)) == NULL){
- printk(KERN_ERR MYNAM ": host reset: "
- "Can't locate host! (sc=%p)\n", SCpnt);
+ if ((hd = shost_priv(sh)) == NULL){
+ printk(KERN_ERR MYNAM ": host reset: Can't locate host!\n");
return FAILED;
}
@@ -1981,8 +1980,8 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
mptscsih_flush_running_cmds(hd);
ioc = hd->ioc;
- printk(MYIOC_s_INFO_FMT "attempting host reset! (sc=%p)\n",
- ioc->name, SCpnt);
+ printk(MYIOC_s_INFO_FMT "attempting host reset!\n",
+ ioc->name);
/* If our attempts to reset the host failed, then return a failed
* status. The host will be taken off line by the SCSI mid-layer.
@@ -1993,8 +1992,8 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
else
status = SUCCESS;
- printk(MYIOC_s_INFO_FMT "host reset: %s (sc=%p)\n",
- ioc->name, ((retval == 0) ? "SUCCESS" : "FAILED" ), SCpnt);
+ printk(MYIOC_s_INFO_FMT "host reset: %s\n",
+ ioc->name, ((retval == 0) ? "SUCCESS" : "FAILED" ));
return status;
}
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index e3d92c392673..0faefe9c7541 100644
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -122,7 +122,7 @@ extern int mptscsih_abort(struct scsi_cmnd * SCpnt);
extern int mptscsih_dev_reset(struct scsi_cmnd * SCpnt);
extern int mptscsih_target_reset(struct scsi_cmnd * SCpnt);
extern int mptscsih_bus_reset(struct scsi_cmnd * SCpnt);
-extern int mptscsih_host_reset(struct scsi_cmnd *SCpnt);
+extern int mptscsih_host_reset(struct Scsi_Host *sh);
extern int mptscsih_bios_param(struct scsi_device * sdev, struct block_device *bdev, sector_t capacity, int geom[]);
extern int mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
extern int mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 14f929cca271..60ef1e2ab3cd 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -371,10 +371,9 @@ static int zfcp_scsi_eh_target_reset_handler(struct scsi_cmnd *scpnt)
return ret;
}
-static int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt)
+static int zfcp_scsi_eh_host_reset_handler(struct Scsi_Host *host)
{
- struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(scpnt->device);
- struct zfcp_adapter *adapter = zfcp_sdev->port->adapter;
+ struct zfcp_adapter *adapter = (struct zfcp_adapter *)host->hostdata[0];
int ret = SUCCESS, fc_ret;
if (!(adapter->connection_features & FSF_FEATURE_NPIV_MODE)) {
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index f925f8664c2c..f0efdfcdac44 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1717,18 +1717,19 @@ static int twa_scsi_biosparam(struct scsi_device *sdev, struct block_device *bde
} /* End twa_scsi_biosparam() */
/* This is the new scsi eh reset function */
-static int twa_scsi_eh_reset(struct scsi_cmnd *SCpnt)
+static int twa_scsi_eh_reset(struct Scsi_Host *shost)
{
TW_Device_Extension *tw_dev = NULL;
int retval = FAILED;
- tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata;
+ tw_dev = (TW_Device_Extension *)shost->hostdata;
tw_dev->num_resets++;
- sdev_printk(KERN_WARNING, SCpnt->device,
- "WARNING: (0x%02X:0x%04X): Command (0x%x) timed out, resetting card.\n",
- TW_DRIVER, 0x2c, SCpnt->cmnd[0]);
+ shost_printk(KERN_WARNING, shost,
+ "WARNING: (0x%02X:0x%04X): "
+ "Command timed out, resetting card.\n",
+ TW_DRIVER, 0x2c);
/* Make sure we are not issuing an ioctl or resetting from ioctl */
mutex_lock(&tw_dev->ioctl_lock);
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
index 55989eaa2d9f..80885200ba52 100644
--- a/drivers/scsi/3w-sas.c
+++ b/drivers/scsi/3w-sas.c
@@ -1423,18 +1423,19 @@ static int twl_scsi_biosparam(struct scsi_device *sdev, struct block_device *bde
} /* End twl_scsi_biosparam() */
/* This is the new scsi eh reset function */
-static int twl_scsi_eh_reset(struct scsi_cmnd *SCpnt)
+static int twl_scsi_eh_reset(struct Scsi_Host *shost)
{
TW_Device_Extension *tw_dev = NULL;
int retval = FAILED;
- tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata;
+ tw_dev = (TW_Device_Extension *)shost->hostdata;
tw_dev->num_resets++;
- sdev_printk(KERN_WARNING, SCpnt->device,
- "WARNING: (0x%02X:0x%04X): Command (0x%x) timed out, resetting card.\n",
- TW_DRIVER, 0x2c, SCpnt->cmnd[0]);
+ shost_printk(KERN_WARNING, shost,
+ "WARNING: (0x%02X:0x%04X): "
+ "Command timed out, resetting card.\n",
+ TW_DRIVER, 0x2c);
/* Make sure we are not issuing an ioctl or resetting from ioctl */
mutex_lock(&tw_dev->ioctl_lock);
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index f39c9ec2e781..73c4becaea05 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -1366,25 +1366,24 @@ static int tw_scsi_biosparam(struct scsi_device *sdev, struct block_device *bdev
} /* End tw_scsi_biosparam() */
/* This is the new scsi eh reset function */
-static int tw_scsi_eh_reset(struct scsi_cmnd *SCpnt)
+static int tw_scsi_eh_reset(struct Scsi_Host *shost)
{
TW_Device_Extension *tw_dev=NULL;
int retval = FAILED;
- tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata;
+ tw_dev = (TW_Device_Extension *)shost->hostdata;
tw_dev->num_resets++;
- sdev_printk(KERN_WARNING, SCpnt->device,
- "WARNING: Command (0x%x) timed out, resetting card.\n",
- SCpnt->cmnd[0]);
+ shost_printk(KERN_WARNING, shost,
+ "WARNING: Command timed out, resetting card.\n");
/* Make sure we are not issuing an ioctl or resetting from ioctl */
mutex_lock(&tw_dev->ioctl_lock);
/* Now reset the card and some of the device extension data */
if (tw_reset_device_extension(tw_dev)) {
- printk(KERN_WARNING "3w-xxxx: scsi%d: Reset failed.\n", tw_dev->host->host_no);
+ shost_printk(KERN_WARNING, shost, "Reset failed.\n");
goto out;
}
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index 857be0f3ae5b..7cdea2f0f66a 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -155,7 +155,7 @@ MODULE_LICENSE("GPL");
STATIC int NCR_700_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *);
STATIC int NCR_700_abort(struct scsi_cmnd * SCpnt);
-STATIC int NCR_700_host_reset(struct scsi_cmnd * SCpnt);
+STATIC int NCR_700_host_reset(struct Scsi_Host *host);
STATIC void NCR_700_chip_setup(struct Scsi_Host *host);
STATIC void NCR_700_chip_reset(struct Scsi_Host *host);
STATIC int NCR_700_slave_alloc(struct scsi_device *SDpnt);
@@ -1934,40 +1934,41 @@ NCR_700_abort(struct scsi_cmnd * SCp)
}
STATIC int
-NCR_700_host_reset(struct scsi_cmnd * SCp)
+NCR_700_host_reset(struct Scsi_Host * host)
{
DECLARE_COMPLETION_ONSTACK(complete);
- struct NCR_700_Host_Parameters *hostdata =
- (struct NCR_700_Host_Parameters *)SCp->device->host->hostdata[0];
+ struct NCR_700_Host_Parameters *hostdata =
+ (struct NCR_700_Host_Parameters *)host->hostdata[0];
- scmd_printk(KERN_INFO, SCp,
- "New error handler wants HOST reset, cmd %p\n\t", SCp);
- scsi_print_command(SCp);
+ shost_printk(KERN_INFO, host,
+ "New error handler wants HOST reset\n");
/* In theory, eh_complete should always be null because the
* eh is single threaded, but just in case we're handling a
* reset via sg or something */
- spin_lock_irq(SCp->device->host->host_lock);
+ spin_lock_irq(host->host_lock);
while (hostdata->eh_complete != NULL) {
- spin_unlock_irq(SCp->device->host->host_lock);
+ spin_unlock_irq(host->host_lock);
msleep_interruptible(100);
- spin_lock_irq(SCp->device->host->host_lock);
+ spin_lock_irq(host->host_lock);
}
hostdata->eh_complete = &complete;
- NCR_700_internal_bus_reset(SCp->device->host);
- NCR_700_chip_reset(SCp->device->host);
+ NCR_700_internal_bus_reset(host);
+ NCR_700_chip_reset(host);
- spin_unlock_irq(SCp->device->host->host_lock);
+ spin_unlock_irq(host->host_lock);
wait_for_completion(&complete);
- spin_lock_irq(SCp->device->host->host_lock);
+ spin_lock_irq(host->host_lock);
hostdata->eh_complete = NULL;
- /* Revalidate the transport parameters of the failing device */
- if(hostdata->fast)
- spi_schedule_dv_device(SCp->device);
-
- spin_unlock_irq(SCp->device->host->host_lock);
+ /* Revalidate the transport parameters for attached devices */
+ if(hostdata->fast) {
+ struct scsi_device *sdev;
+ __shost_for_each_device(sdev, host)
+ spi_schedule_dv_device(sdev);
+ }
+ spin_unlock_irq(host->host_lock);
return SUCCESS;
}
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 72ceaf650b0d..3bbd8e204ec9 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -2852,21 +2852,15 @@ static bool blogic_write_outbox(struct blogic_adapter *adapter,
/* Error Handling (EH) support */
-static int blogic_hostreset(struct scsi_cmnd *SCpnt)
+static int blogic_hostreset(struct Scsi_Host *shost)
{
struct blogic_adapter *adapter =
- (struct blogic_adapter *) SCpnt->device->host->hostdata;
-
- unsigned int id = SCpnt->device->id;
- struct blogic_tgt_stats *stats = &adapter->tgt_stats[id];
+ (struct blogic_adapter *) shost->hostdata;
int rc;
- spin_lock_irq(SCpnt->device->host->host_lock);
-
- blogic_inc_count(&stats->adapter_reset_req);
-
+ spin_lock_irq(shost->host_lock);
rc = blogic_resetadapter(adapter, false);
- spin_unlock_irq(SCpnt->device->host->host_lock);
+ spin_unlock_irq(shost->host_lock);
return rc;
}
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index cea3a79d538e..80ef73f119ad 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -2379,9 +2379,8 @@ static void bus_reset_cleanup(struct Scsi_Host *instance)
* Returns SUCCESS
*/
-static int NCR5380_host_reset(struct scsi_cmnd *cmd)
+static int NCR5380_host_reset(struct Scsi_Host *instance)
{
- struct Scsi_Host *instance = cmd->device->host;
struct NCR5380_hostdata *hostdata = shost_priv(instance);
unsigned long flags;
struct NCR5380_cmd *ncmd;
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index c4a36c0be527..121b6447baa6 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1087,13 +1087,11 @@ static int aac_eh_bus_reset(struct scsi_cmnd* cmd)
/*
* aac_eh_host_reset - Host reset command handling
- * @scsi_cmd: SCSI command block causing the reset
+ * @host: SCSI host to be reset
*
*/
-static int aac_eh_host_reset(struct scsi_cmnd *cmd)
+static int aac_eh_host_reset(struct Scsi_Host *host)
{
- struct scsi_device * dev = cmd->device;
- struct Scsi_Host * host = dev->host;
struct aac_dev * aac = (struct aac_dev *)host->hostdata;
int ret = FAILED;
__le32 supported_options2 = 0;
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index ab066bb27a57..b21e3987229f 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -7016,9 +7016,8 @@ static int AscISR(ASC_DVC_VAR *asc_dvc)
* sleeping is allowed and no locking other than for host structures is
* required. Returns SUCCESS or FAILED.
*/
-static int advansys_reset(struct scsi_cmnd *scp)
+static int advansys_reset(struct Scsi_Host *shost)
{
- struct Scsi_Host *shost = scp->device->host;
struct asc_board *boardp = shost_priv(shost);
unsigned long flags;
int status;
@@ -7028,7 +7027,7 @@ static int advansys_reset(struct scsi_cmnd *scp)
ASC_STATS(shost, reset);
- scmd_printk(KERN_INFO, scp, "SCSI host reset started...\n");
+ shost_printk(KERN_INFO, shost, "SCSI host reset started...\n");
if (ASC_NARROW_BOARD(boardp)) {
ASC_DVC_VAR *asc_dvc = &boardp->dvc_var.asc_dvc_var;
@@ -7039,16 +7038,18 @@ static int advansys_reset(struct scsi_cmnd *scp)
/* Refer to ASC_IERR_* definitions for meaning of 'err_code'. */
if (asc_dvc->err_code || !asc_dvc->overrun_dma) {
- scmd_printk(KERN_INFO, scp, "SCSI host reset error: "
- "0x%x, status: 0x%x\n", asc_dvc->err_code,
+ shost_printk(KERN_INFO, shost,
+ "SCSI host reset error: 0x%x, status: 0x%x\n",
+ asc_dvc->err_code,
status);
ret = FAILED;
} else if (status) {
- scmd_printk(KERN_INFO, scp, "SCSI host reset warning: "
- "0x%x\n", status);
+ shost_printk(KERN_INFO, shost,
+ "SCSI host reset warning: 0x%x\n",
+ status);
} else {
- scmd_printk(KERN_INFO, scp, "SCSI host reset "
- "successful\n");
+ shost_printk(KERN_INFO, shost,
+ "SCSI host reset successful\n");
}
ASC_DBG(1, "after AscInitAsc1000Driver()\n");
@@ -7065,12 +7066,13 @@ static int advansys_reset(struct scsi_cmnd *scp)
ASC_DBG(1, "before AdvResetChipAndSB()\n");
switch (AdvResetChipAndSB(adv_dvc)) {
case ASC_TRUE:
- scmd_printk(KERN_INFO, scp, "SCSI host reset "
- "successful\n");
+ shost_printk(KERN_INFO, shost,
+ "SCSI host reset successful\n");
break;
case ASC_FALSE:
default:
- scmd_printk(KERN_INFO, scp, "SCSI host reset error\n");
+ shost_printk(KERN_INFO, shost,
+ "SCSI host reset error\n");
ret = FAILED;
break;
}
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 9503996c6325..2a88e1c6ffda 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -914,15 +914,14 @@ static int aha1542_dev_reset(struct scsi_cmnd *cmd)
aha1542_outb(sh->io_port, CMD_START_SCSI);
spin_unlock_irqrestore(sh->host_lock, flags);
- scmd_printk(KERN_WARNING, cmd,
+ sdev_printk(KERN_WARNING, sdev,
"Trying device reset for target\n");
return SUCCESS;
}
-static int aha1542_reset(struct scsi_cmnd *cmd, u8 reset_cmd)
+static int aha1542_reset(struct Scsi_Host *sh, u8 reset_cmd)
{
- struct Scsi_Host *sh = cmd->device->host;
struct aha1542_hostdata *aha1542 = shost_priv(sh);
unsigned long flags;
int i;
@@ -934,9 +933,9 @@ static int aha1542_reset(struct scsi_cmnd *cmd, u8 reset_cmd)
* we do this? Try this first, and we can add that later
* if it turns out to be useful.
*/
- outb(reset_cmd, CONTROL(cmd->device->host->io_port));
+ outb(reset_cmd, CONTROL(sh->io_port));
- if (!wait_mask(STATUS(cmd->device->host->io_port),
+ if (!wait_mask(STATUS(sh->io_port),
STATMASK, IDLE, STST | DIAGF | INVDCMD | DF | CDF, 0)) {
spin_unlock_irqrestore(sh->host_lock, flags);
return FAILED;
@@ -947,7 +946,7 @@ static int aha1542_reset(struct scsi_cmnd *cmd, u8 reset_cmd)
* us again after host reset.
*/
if (reset_cmd & HRST)
- setup_mailboxes(cmd->device->host);
+ setup_mailboxes(sh);
/*
* Now try to pick up the pieces. For all pending commands,
@@ -955,7 +954,8 @@ static int aha1542_reset(struct scsi_cmnd *cmd, u8 reset_cmd)
* out. We do not try and restart any commands or anything -
* the strategy handler takes care of that crap.
*/
- shost_printk(KERN_WARNING, cmd->device->host, "Sent BUS RESET to scsi host %d\n", cmd->device->host->host_no);
+ shost_printk(KERN_WARNING, sh, "Sent BUS RESET to scsi host %d\n",
+ sh->host_no);
for (i = 0; i < AHA1542_MAILBOXES; i++) {
if (aha1542->int_cmds[i] != NULL) {
@@ -983,12 +983,12 @@ static int aha1542_reset(struct scsi_cmnd *cmd, u8 reset_cmd)
static int aha1542_bus_reset(struct scsi_cmnd *cmd)
{
- return aha1542_reset(cmd, SCRST);
+ return aha1542_reset(cmd->device->host, SCRST);
}
-static int aha1542_host_reset(struct scsi_cmnd *cmd)
+static int aha1542_host_reset(struct Scsi_Host *sh)
{
- return aha1542_reset(cmd, HRST | SCRST);
+ return aha1542_reset(sh, HRST | SCRST);
}
static int aha1542_biosparam(struct scsi_device *sdev,
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index 0b046e4b395c..ffb518fe7164 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -2631,13 +2631,13 @@ int acornscsi_abort(struct scsi_cmnd *SCpnt)
/*
* Prototype: int acornscsi_reset(struct scsi_cmnd *SCpnt)
* Purpose : reset a command on this host/reset this host
- * Params : SCpnt - command causing reset
+ * Params : shost - host to be reset
* Returns : one of SCSI_RESET_ macros
*/
-int acornscsi_host_reset(struct scsi_cmnd *SCpnt)
+int acornscsi_host_reset(struct Scsi_Host *shost)
{
- AS_Host *host = (AS_Host *)SCpnt->device->host->hostdata;
- struct scsi_cmnd *SCptr;
+ AS_Host *host = (AS_Host *)shost->hostdata;
+ struct scsi_cmnd *SCptr;
host->stats.resets += 1;
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index e6289c6af5ef..38eec967155d 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -2656,9 +2656,9 @@ static void fas216_init_chip(FAS216_Info *info)
* Returns: FAILED if unable to reset.
* Notes: io_request_lock is taken, and irqs are disabled
*/
-int fas216_eh_host_reset(struct scsi_cmnd *SCpnt)
+int fas216_eh_host_reset(struct Scsi_Host *shost)
{
- FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata;
+ FAS216_Info *info = (FAS216_Info *)shost->hostdata;
spin_lock_irq(info->host->host_lock);
diff --git a/drivers/scsi/arm/fas216.h b/drivers/scsi/arm/fas216.h
index 08113277a2a9..f17583f143b3 100644
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
@@ -394,11 +394,11 @@ extern int fas216_eh_device_reset(struct scsi_cmnd *SCpnt);
*/
extern int fas216_eh_bus_reset(struct scsi_cmnd *SCpnt);
-/* Function: int fas216_eh_host_reset(struct scsi_cmnd *SCpnt)
+/* Function: int fas216_eh_host_reset(struct Scsi_Host *shost)
* Purpose : Reset the host associated with this command
- * Params : SCpnt - command specifing host to reset
+ * Params : shost - host to reset
* Returns : FAILED if unable to reset
*/
-extern int fas216_eh_host_reset(struct scsi_cmnd *SCpnt);
+extern int fas216_eh_host_reset(struct Scsi_Host *shost);
#endif /* FAS216_H */
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index d401cf27113a..d967141f366c 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -667,7 +667,7 @@ static void atari_scsi_falcon_reg_write(unsigned int reg, u8 value)
#include "NCR5380.c"
-static int atari_scsi_host_reset(struct scsi_cmnd *cmd)
+static int atari_scsi_host_reset(struct Scsi_Host *shost)
{
int rv;
unsigned long flags;
@@ -684,7 +684,7 @@ static int atari_scsi_host_reset(struct scsi_cmnd *cmd)
atari_dma_orig_addr = NULL;
}
- rv = NCR5380_host_reset(cmd);
+ rv = NCR5380_host_reset(shost);
/* The 5380 raises its IRQ line while _RST is active but the ST DMA
* "lock" has been released so this interrupt may end up handled by
diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index debd36974119..187757ae7c1f 100644
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -2476,7 +2476,7 @@ static int cxlflash_eh_device_reset_handler(struct scsi_cmnd *scp)
/**
* cxlflash_eh_host_reset_handler() - reset the host adapter
- * @scp: SCSI command from stack identifying host.
+ * @host: SCSI host adapter.
*
* Following a reset, the state is evaluated again in case an EEH occurred
* during the reset. In such a scenario, the host reset will either yield
@@ -2487,11 +2487,10 @@ static int cxlflash_eh_device_reset_handler(struct scsi_cmnd *scp)
* SUCCESS as defined in scsi/scsi.h
* FAILED as defined in scsi/scsi.h
*/
-static int cxlflash_eh_host_reset_handler(struct scsi_cmnd *scp)
+static int cxlflash_eh_host_reset_handler(struct Scsi_Host *host)
{
int rc = SUCCESS;
int rcr = 0;
- struct Scsi_Host *host = scp->device->host;
struct cxlflash_cfg *cfg = shost_priv(host);
struct device *dev = &cfg->dev->dev;
diff --git a/drivers/scsi/esas2r/esas2r.h b/drivers/scsi/esas2r/esas2r.h
index ed63f7a9ea54..a104d1a3a9da 100644
--- a/drivers/scsi/esas2r/esas2r.h
+++ b/drivers/scsi/esas2r/esas2r.h
@@ -976,7 +976,7 @@ long esas2r_proc_ioctl(struct file *fp, unsigned int cmd, unsigned long arg);
/* SCSI error handler (eh) functions */
int esas2r_eh_abort(struct scsi_cmnd *cmd);
int esas2r_device_reset(struct scsi_cmnd *cmd);
-int esas2r_host_reset(struct scsi_cmnd *cmd);
+int esas2r_host_reset(struct Scsi_Host *shost);
int esas2r_bus_reset(struct scsi_cmnd *cmd);
int esas2r_target_reset(struct scsi_cmnd *cmd);
diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
index f700a16cd885..168f01a34acc 100644
--- a/drivers/scsi/esas2r/esas2r_main.c
+++ b/drivers/scsi/esas2r/esas2r_main.c
@@ -1062,10 +1062,10 @@ int esas2r_eh_abort(struct scsi_cmnd *cmd)
return SUCCESS;
}
-static int esas2r_host_bus_reset(struct scsi_cmnd *cmd, bool host_reset)
+static int esas2r_host_bus_reset(struct Scsi_Host *shost, bool host_reset)
{
struct esas2r_adapter *a =
- (struct esas2r_adapter *)cmd->device->host->hostdata;
+ (struct esas2r_adapter *)shost->hostdata;
if (test_bit(AF_DEGRADED_MODE, &a->flags))
return FAILED;
@@ -1090,18 +1090,20 @@ static int esas2r_host_bus_reset(struct scsi_cmnd *cmd, bool host_reset)
return SUCCESS;
}
-int esas2r_host_reset(struct scsi_cmnd *cmd)
+int esas2r_host_reset(struct Scsi_Host *shost)
{
- esas2r_log(ESAS2R_LOG_INFO, "host_reset (%p)", cmd);
+ esas2r_log(ESAS2R_LOG_INFO, "host_reset (%p)", shost);
- return esas2r_host_bus_reset(cmd, true);
+ return esas2r_host_bus_reset(shost, true);
}
int esas2r_bus_reset(struct scsi_cmnd *cmd)
{
- esas2r_log(ESAS2R_LOG_INFO, "bus_reset (%p)", cmd);
+ struct Scsi_Host *shost = cmd->device->host;
+
+ esas2r_log(ESAS2R_LOG_INFO, "bus_reset (%p)", shost);
- return esas2r_host_bus_reset(cmd, false);
+ return esas2r_host_bus_reset(shost, false);
}
static int esas2r_dev_targ_reset(struct scsi_cmnd *cmd, bool target_reset)
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 97816a0e6240..355fec046220 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2640,9 +2640,9 @@ static int esp_eh_bus_reset_handler(struct scsi_cmnd *cmd)
}
/* All bets are off, reset the entire device. */
-static int esp_eh_host_reset_handler(struct scsi_cmnd *cmd)
+static int esp_eh_host_reset_handler(struct Scsi_Host *shost)
{
- struct esp *esp = shost_priv(cmd->device->host);
+ struct esp *esp = shost_priv(shost);
unsigned long flags;
spin_lock_irqsave(esp->host->host_lock, flags);
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index 504c4e0c5d17..347fb668bf29 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -456,9 +456,8 @@ static int fdomain_abort(struct scsi_cmnd *cmd)
return SUCCESS;
}
-static int fdomain_host_reset(struct scsi_cmnd *cmd)
+static int fdomain_host_reset(struct Scsi_Host *sh)
{
- struct Scsi_Host *sh = cmd->device->host;
struct fdomain *fd = shost_priv(sh);
unsigned long flags;
diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
index 8ffcafb4687f..2e2b49ba8cdf 100644
--- a/drivers/scsi/fnic/fnic.h
+++ b/drivers/scsi/fnic/fnic.h
@@ -347,7 +347,7 @@ void fnic_update_mac_locked(struct fnic *, u8 *new);
int fnic_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
int fnic_abort_cmd(struct scsi_cmnd *);
int fnic_device_reset(struct scsi_cmnd *);
-int fnic_host_reset(struct scsi_cmnd *);
+int fnic_host_reset(struct Scsi_Host *);
int fnic_reset(struct Scsi_Host *);
void fnic_scsi_cleanup(struct fc_lport *);
void fnic_scsi_abort_io(struct fc_lport *);
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 25af91081baf..324058bd594d 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -2448,11 +2448,10 @@ int fnic_reset(struct Scsi_Host *shost)
* host is offlined by SCSI.
*
*/
-int fnic_host_reset(struct scsi_cmnd *sc)
+int fnic_host_reset(struct Scsi_Host *shost)
{
int ret;
unsigned long wait_host_tmo;
- struct Scsi_Host *shost = sc->device->host;
struct fc_lport *lp = shost_priv(shost);
struct fnic *fnic = lport_priv(lp);
unsigned long flags;
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index f5334ccbf2ca..cc9ed9e6c666 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -1088,12 +1088,12 @@ static int hptiop_reset_hba(struct hptiop_hba *hba)
return 0;
}
-static int hptiop_reset(struct scsi_cmnd *scp)
+static int hptiop_reset(struct Scsi_Host *host)
{
- struct hptiop_hba * hba = (struct hptiop_hba *)scp->device->host->hostdata;
+ struct hptiop_hba * hba = (struct hptiop_hba *)host->hostdata;
printk(KERN_WARNING "hptiop_reset(%d/%d/%d)\n",
- scp->device->host->host_no, -1, -1);
+ host->host_no, -1, -1);
return hptiop_reset_hba(hba)? FAILED : SUCCESS;
}
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 42dc5b7df5d5..cef7333c5586 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -2987,10 +2987,10 @@ static int ibmvfc_eh_target_reset_handler(struct scsi_cmnd *cmd)
* @cmd: struct scsi_cmnd having problems
*
**/
-static int ibmvfc_eh_host_reset_handler(struct scsi_cmnd *cmd)
+static int ibmvfc_eh_host_reset_handler(struct Scsi_Host *shost)
{
int rc;
- struct ibmvfc_host *vhost = shost_priv(cmd->device->host);
+ struct ibmvfc_host *vhost = shost_priv(shost);
dev_err(vhost->dev, "Resetting connection due to error recovery\n");
rc = ibmvfc_issue_fc_host_lip(vhost->host);
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 59599299615d..da131fc34c2a 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1735,10 +1735,10 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
* ibmvscsi_eh_host_reset_handler - Reset the connection to the server
* @cmd: struct scsi_cmnd having problems
*/
-static int ibmvscsi_eh_host_reset_handler(struct scsi_cmnd *cmd)
+static int ibmvscsi_eh_host_reset_handler(struct Scsi_Host *shost)
{
unsigned long wait_switch = 0;
- struct ibmvscsi_host_data *hostdata = shost_priv(cmd->device->host);
+ struct ibmvscsi_host_data *hostdata = shost_priv(shost);
dev_err(hostdata->dev, "Resetting connection due to error recovery\n");
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 07db98161a03..99ddc7e0bf89 100644
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -984,9 +984,9 @@ static void imm_reset_pulse(unsigned int base)
w_ctr(base, 0x04);
}
-static int imm_reset(struct scsi_cmnd *cmd)
+static int imm_reset(struct Scsi_Host *host)
{
- imm_struct *dev = imm_dev(cmd->device->host);
+ imm_struct *dev = imm_dev(host);
if (imm_scsi_pointer(cmd)->phase)
imm_disconnect(dev);
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 4e13797b2a4a..df012977a25e 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -4959,14 +4959,14 @@ static int ipr_wait_for_ops(struct ipr_ioa_cfg *ioa_cfg, void *device,
return SUCCESS;
}
-static int ipr_eh_host_reset(struct scsi_cmnd *cmd)
+static int ipr_eh_host_reset(struct Scsi_Host *shost)
{
struct ipr_ioa_cfg *ioa_cfg;
unsigned long lock_flags = 0;
int rc = SUCCESS;
ENTER;
- ioa_cfg = (struct ipr_ioa_cfg *) cmd->device->host->hostdata;
+ ioa_cfg = (struct ipr_ioa_cfg *) shost->hostdata;
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
if (!ioa_cfg->in_reset_reload && !ioa_cfg->hrrq[IPR_INIT_HRRQ].ioa_is_dead) {
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 10cf5775a939..58978009b151 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -229,7 +229,7 @@ module_param(ips, charp, 0);
* Function prototypes
*/
static int ips_eh_abort(struct scsi_cmnd *);
-static int ips_eh_reset(struct scsi_cmnd *);
+static int ips_eh_reset(struct Scsi_Host *);
static int ips_queue(struct Scsi_Host *, struct scsi_cmnd *);
static const char *ips_info(struct Scsi_Host *);
static irqreturn_t do_ipsintr(int, void *);
@@ -829,7 +829,7 @@ int ips_eh_abort(struct scsi_cmnd *SC)
/* NOTE: this routine is called under the io_request_lock spinlock */
/* */
/****************************************************************************/
-static int __ips_eh_reset(struct scsi_cmnd *SC)
+static int __ips_eh_reset(struct Scsi_Host *shost)
{
int ret;
int i;
@@ -842,13 +842,7 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)
return (FAILED);
#else
- if (!SC) {
- DEBUG(1, "Reset called with NULL scsi command");
-
- return (FAILED);
- }
-
- ha = (ips_ha_t *) SC->device->host->hostdata;
+ ha = (ips_ha_t *) shost->hostdata;
if (!ha) {
DEBUG(1, "Reset called with NULL ha struct");
@@ -994,13 +988,13 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)
}
-static int ips_eh_reset(struct scsi_cmnd *SC)
+static int ips_eh_reset(struct Scsi_Host *shost)
{
int rc;
- spin_lock_irq(SC->device->host->host_lock);
- rc = __ips_eh_reset(SC);
- spin_unlock_irq(SC->device->host->host_lock);
+ spin_lock_irq(shost->host_lock);
+ rc = __ips_eh_reset(shost);
+ spin_unlock_irq(shost->host_lock);
return rc;
}
@@ -1078,7 +1072,7 @@ static int ips_queue_lck(struct scsi_cmnd *SC)
return (0);
}
ha->ioctl_reset = 1; /* This reset request is from an IOCTL */
- __ips_eh_reset(SC);
+ __ips_eh_reset(SC->device->host);
SC->result = DID_OK << 16;
scsi_done(SC);
return (0);
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 945adca5e72f..2ee697dd4ce3 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -2186,11 +2186,10 @@ EXPORT_SYMBOL(fc_eh_device_reset);
/**
* fc_eh_host_reset() - Reset a Scsi_Host.
- * @sc_cmd: The SCSI command that identifies the SCSI host to be reset
+ * @shost: The SCSI host to be reset
*/
-int fc_eh_host_reset(struct scsi_cmnd *sc_cmd)
+int fc_eh_host_reset(struct Scsi_Host *shost)
{
- struct Scsi_Host *shost = sc_cmd->device->host;
struct fc_lport *lport = shost_priv(shost);
unsigned long wait_tmo;
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index d26941b131fd..6ee444ff7532 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -6175,9 +6175,8 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd)
* 0x2002 - Success
**/
static int
-lpfc_host_reset_handler(struct scsi_cmnd *cmnd)
+lpfc_host_reset_handler(struct Scsi_Host *shost)
{
- struct Scsi_Host *shost = cmnd->device->host;
struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
struct lpfc_hba *phba = vport->phba;
int rc, ret = SUCCESS;
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index 6a019132109c..497099158909 100644
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -100,14 +100,14 @@ static int mac53c94_queue_lck(struct scsi_cmnd *cmd)
static DEF_SCSI_QCMD(mac53c94_queue)
-static int mac53c94_host_reset(struct scsi_cmnd *cmd)
+static int mac53c94_host_reset(struct Scsi_Host *shost)
{
- struct fsc_state *state = (struct fsc_state *) cmd->device->host->hostdata;
+ struct fsc_state *state = (struct fsc_state *) shost->hostdata;
struct mac53c94_regs __iomem *regs = state->regs;
struct dbdma_regs __iomem *dma = state->dma;
unsigned long flags;
- spin_lock_irqsave(cmd->device->host->host_lock, flags);
+ spin_lock_irqsave(shost->host_lock, flags);
writel((RUN|PAUSE|FLUSH|WAKE) << 16, &dma->control);
writeb(CMD_SCSI_RESET, ®s->command); /* assert RST */
@@ -117,7 +117,7 @@ static int mac53c94_host_reset(struct scsi_cmnd *cmd)
mac53c94_init(state);
writeb(CMD_NOP, ®s->command);
- spin_unlock_irqrestore(cmd->device->host->host_lock, flags);
+ spin_unlock_irqrestore(shost->host_lock, flags);
return SUCCESS;
}
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 329c3da88416..80493b1ad633 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1876,13 +1876,13 @@ megaraid_abort(struct scsi_cmnd *cmd)
static int
-megaraid_reset(struct scsi_cmnd *cmd)
+megaraid_reset(struct Scsi_Host *shost)
{
adapter_t *adapter;
megacmd_t mc;
int rval;
- adapter = (adapter_t *)cmd->device->host->hostdata;
+ adapter = (adapter_t *)shost->hostdata;
#if MEGA_HAVE_CLUSTERING
mc.cmd = MEGA_CLUSTER_CMD;
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index 013fbfb911b9..43acad67d95f 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -973,7 +973,7 @@ static irqreturn_t megaraid_isr_iomapped(int, void *);
static void mega_free_scb(adapter_t *, scb_t *);
static int megaraid_abort(struct scsi_cmnd *);
-static int megaraid_reset(struct scsi_cmnd *);
+static int megaraid_reset(struct Scsi_Host *);
static int megaraid_abort_and_reset(adapter_t *, struct scsi_cmnd *, int);
static int megaraid_biosparam(struct scsi_device *, struct block_device *,
sector_t, int []);
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index bc867da650b6..8a390677b11a 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -92,7 +92,7 @@ static int megaraid_sysfs_alloc_resources(adapter_t *);
static void megaraid_sysfs_free_resources(adapter_t *);
static int megaraid_abort_handler(struct scsi_cmnd *);
-static int megaraid_reset_handler(struct scsi_cmnd *);
+static int megaraid_reset_handler(struct Scsi_Host *);
static int mbox_post_sync_cmd(adapter_t *, uint8_t []);
static int mbox_post_sync_cmd_fast(adapter_t *, uint8_t []);
@@ -2512,7 +2512,7 @@ megaraid_abort_handler(struct scsi_cmnd *scp)
* host.
**/
static int
-megaraid_reset_handler(struct scsi_cmnd *scp)
+megaraid_reset_handler(struct Scsi_Host *shost)
{
adapter_t *adapter;
scb_t *scb;
@@ -2525,7 +2525,7 @@ megaraid_reset_handler(struct scsi_cmnd *scp)
int i;
uioc_t *kioc;
- adapter = SCP2ADAPTER(scp);
+ adapter = (adapter_t *)SCSIHOST2ADAP(shost);
raid_dev = ADAP2RAIDDEV(adapter);
// return failure if adapter is not responding
@@ -2556,15 +2556,9 @@ megaraid_reset_handler(struct scsi_cmnd *scp)
megaraid_mbox_mm_done(adapter, scb);
} else {
- if (scb->scp == scp) { // Found command
- con_log(CL_ANN, (KERN_WARNING
- "megaraid: %d[%d:%d], reset from pending list\n",
- scb->sno, scb->dev_channel, scb->dev_target));
- } else {
- con_log(CL_ANN, (KERN_WARNING
+ con_log(CL_ANN, (KERN_WARNING
"megaraid: IO packet with %d[%d:%d] being reset\n",
scb->sno, scb->dev_channel, scb->dev_target));
- }
scb->scp->result = (DID_RESET << 16);
scsi_done(scb->scp);
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index b9d46dcb5210..87f6d12dd812 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -2896,15 +2896,14 @@ static int megasas_wait_for_outstanding(struct megasas_instance *instance)
* reset requests. Device, bus and host specific reset handlers can use this
* function after they do their specific tasks.
*/
-static int megasas_generic_reset(struct scsi_cmnd *scmd)
+static int megasas_generic_reset(struct Scsi_Host *shost)
{
int ret_val;
struct megasas_instance *instance;
- instance = (struct megasas_instance *)scmd->device->host->hostdata;
+ instance = (struct megasas_instance *)shost->hostdata;
- scmd_printk(KERN_NOTICE, scmd, "megasas: RESET cmd=%x retries=%x\n",
- scmd->cmnd[0], scmd->retries);
+ shost_printk(KERN_NOTICE, shost, "megasas: RESET\n");
if (atomic_read(&instance->adprecovery) == MEGASAS_HW_CRITICAL_ERROR) {
dev_err(&instance->pdev->dev, "cannot recover from previous reset failures\n");
@@ -3056,31 +3055,30 @@ megasas_dump_sys_regs(void __iomem *reg_set, char *buf)
* megasas_reset_bus_host - Bus & host reset handler entry point
* @scmd: Mid-layer SCSI command
*/
-static int megasas_reset_bus_host(struct scsi_cmnd *scmd)
+static int megasas_reset_bus_host(struct Scsi_Host *shost)
{
int ret;
struct megasas_instance *instance;
- instance = (struct megasas_instance *)scmd->device->host->hostdata;
+ instance = (struct megasas_instance *)shost->hostdata;
- scmd_printk(KERN_INFO, scmd,
+ shost_printk(KERN_INFO, shost,
"OCR is requested due to IO timeout!!\n");
- scmd_printk(KERN_INFO, scmd,
- "SCSI host state: %d SCSI host busy: %d FW outstanding: %d\n",
- scmd->device->host->shost_state,
- scsi_host_busy(scmd->device->host),
+ shost_printk(KERN_INFO, shost,
+ "Controller reset is requested due to IO timeout\n"
+ "SCSI host state: %d\t"
+ " SCSI host busy: %d\t FW outstanding: %d\n",
+ shost->shost_state,
+ scsi_host_busy(shost),
atomic_read(&instance->fw_outstanding));
/*
* First wait for all commands to complete
*/
- if (instance->adapter_type == MFI_SERIES) {
- ret = megasas_generic_reset(scmd);
- } else {
- megasas_dump_fusion_io(scmd);
- ret = megasas_reset_fusion(scmd->device->host,
- SCSIIO_TIMEOUT_OCR);
- }
+ if (instance->adapter_type == MFI_SERIES)
+ ret = megasas_generic_reset(shost);
+ else
+ ret = megasas_reset_fusion(shost, SCSIIO_TIMEOUT_OCR);
return ret;
}
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index e276583c590c..4a7cab3edbdb 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1699,9 +1699,9 @@ static int mesh_abort(struct scsi_cmnd *cmd)
* The midlayer will wait for devices to come back, we don't need
* to do that ourselves
*/
-static int mesh_host_reset(struct scsi_cmnd *cmd)
+static int mesh_host_reset(struct Scsi_Host *shost)
{
- struct mesh_state *ms = (struct mesh_state *) cmd->device->host->hostdata;
+ struct mesh_state *ms = (struct mesh_state *) shost->hostdata;
volatile struct mesh_regs __iomem *mr = ms->mesh;
volatile struct dbdma_regs __iomem *md = ms->dma;
unsigned long flags;
@@ -1718,7 +1718,7 @@ static int mesh_host_reset(struct scsi_cmnd *cmd)
out_8(&mr->exception, 0xff); /* clear all exception bits */
out_8(&mr->error, 0xff); /* clear all error bits */
out_8(&mr->sequence, SEQ_RESETMESH);
- mesh_flush_io(mr);
+ mesh_flush_io(mr);
udelay(1);
out_8(&mr->intr_mask, INT_ERROR | INT_EXCEPTION | INT_CMDDONE);
out_8(&mr->source_id, ms->host->this_id);
@@ -1727,13 +1727,13 @@ static int mesh_host_reset(struct scsi_cmnd *cmd)
/* Reset the bus */
out_8(&mr->bus_status1, BS1_RST); /* assert RST */
- mesh_flush_io(mr);
+ mesh_flush_io(mr);
udelay(30); /* leave it on for >= 25us */
out_8(&mr->bus_status1, 0); /* negate RST */
/* Complete pending commands */
handle_reset(ms);
-
+
spin_unlock_irqrestore(ms->host->host_lock, flags);
return SUCCESS;
}
diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
index 040031eb0c12..d52412870b54 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_os.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
@@ -4010,15 +4010,15 @@ static inline void mpi3mr_setup_divert_ws(struct mpi3mr_ioc *mrioc,
/**
* mpi3mr_eh_host_reset - Host reset error handling callback
- * @scmd: SCSI command reference
+ * @shost: SCSI host reference
*
* Issue controller reset
*
* Return: SUCCESS of successful reset else FAILED
*/
-static int mpi3mr_eh_host_reset(struct scsi_cmnd *scmd)
+static int mpi3mr_eh_host_reset(struct Scsi_Host *shost)
{
- struct mpi3mr_ioc *mrioc = shost_priv(scmd->device->host);
+ struct mpi3mr_ioc *mrioc = shost_priv(shost);
int retval = FAILED, ret;
ret = mpi3mr_soft_reset_handler(mrioc,
@@ -4028,9 +4028,9 @@ static int mpi3mr_eh_host_reset(struct scsi_cmnd *scmd)
retval = SUCCESS;
out:
- sdev_printk(KERN_INFO, scmd->device,
- "Host reset is %s for scmd(%p)\n",
- ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);
+ shost_printk(KERN_INFO, shost,
+ "Host reset is %s\n",
+ ((retval == SUCCESS) ? "SUCCESS" : "FAILED"));
return retval;
}
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index c3c1f466fe01..8344ea122477 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -3525,13 +3525,12 @@ scsih_target_reset(struct scsi_cmnd *scmd)
* Return: SUCCESS if command aborted else FAILED
*/
static int
-scsih_host_reset(struct scsi_cmnd *scmd)
+scsih_host_reset(struct Scsi_Host *shost)
{
- struct MPT3SAS_ADAPTER *ioc = shost_priv(scmd->device->host);
+ struct MPT3SAS_ADAPTER *ioc = shost_priv(shost);
int r, retval;
- ioc_info(ioc, "attempting host reset! scmd(0x%p)\n", scmd);
- scsi_print_command(scmd);
+ ioc_info(ioc, "attempting host reset\n");
if (ioc->is_driver_loading || ioc->remove_host) {
ioc_info(ioc, "Blocking the host reset\n");
@@ -3542,8 +3541,8 @@ scsih_host_reset(struct scsi_cmnd *scmd)
retval = mpt3sas_base_hard_reset_handler(ioc, FORCE_BIG_HAMMER);
r = (retval < 0) ? FAILED : SUCCESS;
out:
- ioc_info(ioc, "host reset: %s scmd(0x%p)\n",
- r == SUCCESS ? "SUCCESS" : "FAILED", scmd);
+ ioc_info(ioc, "host reset: %s\n",
+ r == SUCCESS ? "SUCCESS" : "FAILED");
return r;
}
diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index d9d366ec17dc..905d53a17d79 100644
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -695,14 +695,13 @@ static int mvumi_reset_host_9143(struct mvumi_hba *mhba)
return mvumi_wait_for_outstanding(mhba);
}
-static int mvumi_host_reset(struct scsi_cmnd *scmd)
+static int mvumi_host_reset(struct Scsi_Host *shost)
{
struct mvumi_hba *mhba;
- mhba = (struct mvumi_hba *) scmd->device->host->hostdata;
+ mhba = (struct mvumi_hba *) shost->hostdata;
- scmd_printk(KERN_NOTICE, scmd, "RESET -%u cmd=%x retries=%x\n",
- scsi_cmd_to_rq(scmd)->tag, scmd->cmnd[0], scmd->retries);
+ shost_printk(KERN_NOTICE, shost, "RESET\n");
return mhba->instancet->reset_host(mhba);
}
diff --git a/drivers/scsi/myrb.c b/drivers/scsi/myrb.c
index ca2e932dd9b7..2b81a39e910f 100644
--- a/drivers/scsi/myrb.c
+++ b/drivers/scsi/myrb.c
@@ -1252,9 +1252,8 @@ static void myrb_cleanup(struct myrb_hba *cb)
scsi_host_put(cb->host);
}
-static int myrb_host_reset(struct scsi_cmnd *scmd)
+static int myrb_host_reset(struct Scsi_Host *shost)
{
- struct Scsi_Host *shost = scmd->device->host;
struct myrb_hba *cb = shost_priv(shost);
cb->reset(cb->io_base);
diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c
index a1eec65a9713..2f2470fdfb86 100644
--- a/drivers/scsi/myrs.c
+++ b/drivers/scsi/myrs.c
@@ -1529,9 +1529,8 @@ ATTRIBUTE_GROUPS(myrs_shost);
/*
* SCSI midlayer interface
*/
-static int myrs_host_reset(struct scsi_cmnd *scmd)
+static int myrs_host_reset(struct Scsi_Host *shost)
{
- struct Scsi_Host *shost = scmd->device->host;
struct myrs_hba *cs = shost_priv(shost);
cs->reset(cs->io_base);
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index b7987019686e..38fce90e1780 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -191,7 +191,7 @@ static int nsp32_release (struct Scsi_Host *);
/* SCSI error handler */
static int nsp32_eh_abort (struct scsi_cmnd *);
-static int nsp32_eh_host_reset(struct scsi_cmnd *);
+static int nsp32_eh_host_reset(struct Scsi_Host *);
/* generate SCSI message */
static void nsp32_build_identify(struct scsi_cmnd *);
@@ -2876,23 +2876,21 @@ static void nsp32_do_bus_reset(nsp32_hw_data *data)
data->CurrentSC = NULL;
}
-static int nsp32_eh_host_reset(struct scsi_cmnd *SCpnt)
+static int nsp32_eh_host_reset(struct Scsi_Host *host)
{
- struct Scsi_Host *host = SCpnt->device->host;
- unsigned int base = SCpnt->device->host->io_port;
+ unsigned int base = host->io_port;
nsp32_hw_data *data = (nsp32_hw_data *)host->hostdata;
nsp32_msg(KERN_INFO, "Host Reset");
- nsp32_dbg(NSP32_DEBUG_BUSRESET, "SCpnt=0x%x", SCpnt);
- spin_lock_irq(SCpnt->device->host->host_lock);
+ spin_lock_irq(host->host_lock);
nsp32hw_init(data);
nsp32_write2(base, IRQ_CONTROL, IRQ_CONTROL_ALL_IRQ_MASK);
nsp32_do_bus_reset(data);
nsp32_write2(base, IRQ_CONTROL, 0);
- spin_unlock_irq(SCpnt->device->host->host_lock);
+ spin_unlock_irq(host->host_lock);
return SUCCESS; /* Host reset is succeeded at any time. */
}
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index a5a1406a2bde..104647a6170e 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1495,9 +1495,9 @@ static int nsp_eh_bus_reset(struct scsi_cmnd *SCpnt)
return nsp_bus_reset(data);
}
-static int nsp_eh_host_reset(struct scsi_cmnd *SCpnt)
+static int nsp_eh_host_reset(struct Scsi_Host *host)
{
- nsp_hw_data *data = (nsp_hw_data *)SCpnt->device->host->hostdata;
+ nsp_hw_data *data = (nsp_hw_data *)host->hostdata;
nsp_dbg(NSP_DEBUG_BUSRESET, "in");
diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h
index e1ee8ef90ad3..f532adb5f166 100644
--- a/drivers/scsi/pcmcia/nsp_cs.h
+++ b/drivers/scsi/pcmcia/nsp_cs.h
@@ -300,7 +300,7 @@ static int nsp_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *SCpnt);
/*static int nsp_eh_abort (struct scsi_cmnd *SCpnt);*/
/*static int nsp_eh_device_reset(struct scsi_cmnd *SCpnt);*/
static int nsp_eh_bus_reset (struct scsi_cmnd *SCpnt);
-static int nsp_eh_host_reset (struct scsi_cmnd *SCpnt);
+static int nsp_eh_host_reset (struct Scsi_Host *host);
static int nsp_bus_reset (nsp_hw_data *data);
/* */
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 310d0b6586a6..59893db166c9 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -270,8 +270,8 @@ static int qlogic_resume(struct pcmcia_device *link)
outb(0x24, link->resource[0]->start + 0x9);
outb(0x04, link->resource[0]->start + 0xd);
}
- /* Ugggglllyyyy!!! */
- qlogicfas408_host_reset(NULL);
+
+ qlogicfas408_host_reset(info->host);
return 0;
}
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 278c78d066c4..1c5415ede9b2 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -583,14 +583,14 @@ static int SYM53C500_queue_lck(struct scsi_cmnd *SCpnt)
static DEF_SCSI_QCMD(SYM53C500_queue)
static int
-SYM53C500_host_reset(struct scsi_cmnd *SCpnt)
+SYM53C500_host_reset(struct Scsi_Host *shost)
{
- int port_base = SCpnt->device->host->io_port;
+ int port_base = shost->io_port;
DEB(printk("SYM53C500_host_reset called\n"));
- spin_lock_irq(SCpnt->device->host->host_lock);
+ spin_lock_irq(shost->host_lock);
SYM53C500_int_host_reset(port_base);
- spin_unlock_irq(SCpnt->device->host->host_lock);
+ spin_unlock_irq(shost->host_lock);
return SUCCESS;
}
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index a831b34c08a4..4cf7a0b1c39f 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -3086,19 +3086,19 @@ static int pmcraid_eh_target_reset_handler(struct scsi_cmnd *scmd)
/**
* pmcraid_eh_host_reset_handler - adapter reset handler callback
*
- * @scmd: pointer to scsi_cmd that was sent to a resource of adapter
+ * @shost: pointer to scsi_host
*
* Initiates adapter reset to bring it up to operational state
*
* Return value
* SUCCESS or FAILED
*/
-static int pmcraid_eh_host_reset_handler(struct scsi_cmnd *scmd)
+static int pmcraid_eh_host_reset_handler(struct Scsi_Host *shost)
{
unsigned long interval = 10000; /* 10 seconds interval */
int waits = jiffies_to_msecs(PMCRAID_RESET_HOST_TIMEOUT) / interval;
struct pmcraid_instance *pinstance =
- (struct pmcraid_instance *)(scmd->device->host->hostdata);
+ (struct pmcraid_instance *)(shost->hostdata);
/* wait for an additional 150 seconds just in case firmware could come
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index 19f0b93fa3d8..5974fde3ee2a 100644
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -887,9 +887,9 @@ static void ppa_reset_pulse(unsigned int base)
w_ctr(base, 0xc);
}
-static int ppa_reset(struct scsi_cmnd *cmd)
+static int ppa_reset(struct Scsi_Host *host)
{
- ppa_struct *dev = ppa_dev(cmd->device->host);
+ ppa_struct *dev = ppa_dev(host);
if (ppa_scsi_pointer(cmd)->phase)
ppa_disconnect(dev);
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index 14c6731ec912..413a5a0da433 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -953,12 +953,12 @@ void qedf_ctx_soft_reset(struct fc_lport *lport)
}
/* Reset the host by gracefully logging out and then logging back in */
-static int qedf_eh_host_reset(struct scsi_cmnd *sc_cmd)
+static int qedf_eh_host_reset(struct Scsi_Host *shost)
{
struct fc_lport *lport;
struct qedf_ctx *qedf;
- lport = shost_priv(sc_cmd->device->host);
+ lport = shost_priv(shost);
qedf = lport_priv(lport);
if (atomic_read(&qedf->link_state) == QEDF_LINK_DOWN ||
diff --git a/drivers/scsi/qedi/qedi_iscsi.c b/drivers/scsi/qedi/qedi_iscsi.c
index 6ed8ef97642c..4b3df87cafdf 100644
--- a/drivers/scsi/qedi/qedi_iscsi.c
+++ b/drivers/scsi/qedi/qedi_iscsi.c
@@ -30,9 +30,8 @@ int qedi_recover_all_conns(struct qedi_ctx *qedi)
return SUCCESS;
}
-static int qedi_eh_host_reset(struct scsi_cmnd *cmd)
+static int qedi_eh_host_reset(struct Scsi_Host *shost)
{
- struct Scsi_Host *shost = cmd->device->host;
struct qedi_ctx *qedi;
qedi = iscsi_host_priv(shost);
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 27bce80262c2..178f249057e7 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -995,10 +995,9 @@ qla1280_eh_bus_reset(struct scsi_cmnd *cmd)
* Reset the specified adapter (both channels)
**************************************************************************/
static int
-qla1280_eh_adapter_reset(struct scsi_cmnd *cmd)
+qla1280_eh_adapter_reset(struct Scsi_Host *shost)
{
int rc = SUCCESS;
- struct Scsi_Host *shost = cmd->device->host;
struct scsi_qla_host *ha = (struct scsi_qla_host *)shost->hostdata;
spin_lock_irq(shost->host_lock);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 50db08265c51..bb0323d05640 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1655,8 +1655,7 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
* The reset function will reset the Adapter.
*
* Input:
-* cmd = Linux SCSI command packet of the command that cause the
-* adapter reset.
+* shost = Linux SCSI host to be reset
*
* Returns:
* Either SUCCESS or FAILED.
@@ -1664,13 +1663,11 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
* Note:
**************************************************************************/
static int
-qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
+qla2xxx_eh_host_reset(struct Scsi_Host *shost)
{
- scsi_qla_host_t *vha = shost_priv(cmd->device->host);
+ scsi_qla_host_t *vha = shost_priv(shost);
struct qla_hw_data *ha = vha->hw;
int ret = FAILED;
- unsigned int id;
- uint64_t lun;
scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
if (qla2x00_isp_reg_stat(ha)) {
@@ -1680,11 +1677,8 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
return SUCCESS;
}
- id = cmd->device->id;
- lun = cmd->device->lun;
-
ql_log(ql_log_info, vha, 0x8018,
- "ADAPTER RESET ISSUED nexus=%ld:%d:%llu.\n", vha->host_no, id, lun);
+ "ADAPTER RESET ISSUED host=%ld.\n", vha->host_no);
/*
* No point in issuing another reset if one is active. Also do not
@@ -1730,8 +1724,8 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
eh_host_reset_lock:
ql_log(ql_log_info, vha, 0x8017,
- "ADAPTER RESET %s nexus=%ld:%d:%llu.\n",
- (ret == FAILED) ? "FAILED" : "SUCCEEDED", vha->host_no, id, lun);
+ "ADAPTER RESET %s host=%ld.\n",
+ (ret == FAILED) ? "FAILED" : "SUCCEEDED", vha->host_no);
return ret;
}
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 961fe65bbe65..70757ef5b4fd 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -159,7 +159,7 @@ static int qla4xxx_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *cmd);
static int qla4xxx_eh_abort(struct scsi_cmnd *cmd);
static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd);
static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd);
-static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd);
+static int qla4xxx_eh_host_reset(struct Scsi_Host *shost);
static int qla4xxx_slave_alloc(struct scsi_device *device);
static umode_t qla4_attr_is_visible(int param_type, int param);
static int qla4xxx_host_reset(struct Scsi_Host *shost, int reset_type);
@@ -9421,18 +9421,18 @@ static int qla4xxx_is_eh_active(struct Scsi_Host *shost)
/**
* qla4xxx_eh_host_reset - kernel callback
- * @cmd: Pointer to Linux's SCSI command structure
+ * @host: Pointer to Linux's SCSI host structure
*
* This routine is invoked by the Linux kernel to perform fatal error
* recovery on the specified adapter.
**/
-static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd)
+static int qla4xxx_eh_host_reset(struct Scsi_Host *host)
{
int return_status = FAILED;
struct scsi_qla_host *ha;
int rval;
- ha = to_qla_host(cmd->device->host);
+ ha = to_qla_host(host);
rval = qla4xxx_isp_check_reg(ha);
if (rval != QLA_SUCCESS) {
@@ -9454,20 +9454,18 @@ static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd)
ha->host_no, __func__));
/* Clear outstanding srb in queues */
- if (qla4xxx_is_eh_active(cmd->device->host))
+ if (qla4xxx_is_eh_active(host))
qla4xxx_abort_active_cmds(ha, DID_ABORT << 16);
return FAILED;
}
ql4_printk(KERN_INFO, ha,
- "scsi(%ld:%d:%d:%llu): HOST RESET ISSUED.\n", ha->host_no,
- cmd->device->channel, cmd->device->id, cmd->device->lun);
+ "scsi%ld: HOST RESET ISSUED.\n", ha->host_no);
if (qla4xxx_wait_for_hba_online(ha) != QLA_SUCCESS) {
- DEBUG2(printk("scsi%ld:%d: %s: Unable to reset host. Adapter "
- "DEAD.\n", ha->host_no, cmd->device->channel,
- __func__));
+ DEBUG2(printk("scsi%ld: %s: Unable to reset host. Adapter "
+ "DEAD.\n", ha->host_no, __func__));
return FAILED;
}
diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
index 3e065d5fc80c..008e908e3aff 100644
--- a/drivers/scsi/qlogicfas408.c
+++ b/drivers/scsi/qlogicfas408.c
@@ -525,20 +525,18 @@ int qlogicfas408_abort(struct scsi_cmnd *cmd)
/*
* Reset SCSI bus
- * FIXME: This function is invoked with cmd = NULL directly by
- * the PCMCIA qlogic_stub code. This wants fixing
*/
-int qlogicfas408_host_reset(struct scsi_cmnd *cmd)
+int qlogicfas408_host_reset(struct Scsi_Host *host)
{
- struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
+ struct qlogicfas408_priv *priv = get_priv_by_host(host);
unsigned long flags;
priv->qabort = 2;
- spin_lock_irqsave(cmd->device->host->host_lock, flags);
+ spin_lock_irqsave(host->host_lock, flags);
ql_zap(priv);
- spin_unlock_irqrestore(cmd->device->host->host_lock, flags);
+ spin_unlock_irqrestore(host->host_lock, flags);
return SUCCESS;
}
diff --git a/drivers/scsi/qlogicfas408.h b/drivers/scsi/qlogicfas408.h
index a971db11d293..c1b6e9fea9ce 100644
--- a/drivers/scsi/qlogicfas408.h
+++ b/drivers/scsi/qlogicfas408.h
@@ -109,7 +109,7 @@ int qlogicfas408_biosparam(struct scsi_device * disk,
struct block_device *dev,
sector_t capacity, int ip[]);
int qlogicfas408_abort(struct scsi_cmnd * cmd);
-extern int qlogicfas408_host_reset(struct scsi_cmnd *cmd);
+extern int qlogicfas408_host_reset(struct Scsi_Host *host);
const char *qlogicfas408_info(struct Scsi_Host *host);
int qlogicfas408_get_chip_type(int qbase, int int_type);
void qlogicfas408_setup(int qbase, int id, int int_type);
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 3b95f7a6216f..b7c16bd49f23 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -1261,10 +1261,9 @@ static int qlogicpti_abort(struct scsi_cmnd *Cmnd)
return return_status;
}
-static int qlogicpti_reset(struct scsi_cmnd *Cmnd)
+static int qlogicpti_reset(struct Scsi_Host *host)
{
u_short param[6];
- struct Scsi_Host *host = Cmnd->device->host;
struct qlogicpti *qpti = (struct qlogicpti *) host->hostdata;
int return_status = SUCCESS;
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 9c0af50501f9..fff18af80068 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5371,7 +5371,7 @@ static int scsi_debug_bus_reset(struct scsi_cmnd *SCpnt)
return SUCCESS;
}
-static int scsi_debug_host_reset(struct scsi_cmnd *SCpnt)
+static int scsi_debug_host_reset(struct Scsi_Host *shost)
{
struct sdebug_host_info *sdbg_host;
struct sdebug_dev_info *devip;
@@ -5379,9 +5379,11 @@ static int scsi_debug_host_reset(struct scsi_cmnd *SCpnt)
++num_host_resets;
if (SDEBUG_OPT_ALL_NOISE & sdebug_opts)
- sdev_printk(KERN_INFO, SCpnt->device, "%s\n", __func__);
+ shost_printk(KERN_INFO, shost, "%s\n", __func__);
mutex_lock(&sdebug_host_list_mutex);
list_for_each_entry(sdbg_host, &sdebug_host_list, host_list) {
+ if (sdbg_host->shost != shost)
+ continue;
list_for_each_entry(devip, &sdbg_host->dev_info_list,
dev_list) {
set_bit(SDEBUG_UA_BUS_RESET, devip->uas_bm);
@@ -5391,7 +5393,7 @@ static int scsi_debug_host_reset(struct scsi_cmnd *SCpnt)
mutex_unlock(&sdebug_host_list_mutex);
stop_all_queued();
if (SDEBUG_OPT_RESET_NOISE & sdebug_opts)
- sdev_printk(KERN_INFO, SCpnt->device,
+ shost_printk(KERN_INFO, shost,
"%s: %d device(s) found\n", __func__, k);
return SUCCESS;
}
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index c67cdcdc3ba8..f022bb1c3e4a 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -881,7 +881,7 @@ static enum scsi_disposition scsi_try_host_reset(struct scsi_cmnd *scmd)
if (!hostt->eh_host_reset_handler)
return FAILED;
- rtn = hostt->eh_host_reset_handler(scmd);
+ rtn = hostt->eh_host_reset_handler(host);
if (rtn == SUCCESS) {
if (!hostt->skip_settle_delay)
diff --git a/drivers/scsi/snic/snic.h b/drivers/scsi/snic/snic.h
index 0b7411624bcf..27acc50bd1a5 100644
--- a/drivers/scsi/snic/snic.h
+++ b/drivers/scsi/snic/snic.h
@@ -365,8 +365,7 @@ extern const struct attribute_group *snic_host_groups[];
int snic_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
int snic_abort_cmd(struct scsi_cmnd *);
int snic_device_reset(struct scsi_cmnd *);
-int snic_host_reset(struct scsi_cmnd *);
-int snic_reset(struct Scsi_Host *);
+int snic_host_reset(struct Scsi_Host *);
void snic_shutdown_scsi_cleanup(struct snic *);
diff --git a/drivers/scsi/snic/snic_scsi.c b/drivers/scsi/snic/snic_scsi.c
index 67b78029e557..c167fe55226e 100644
--- a/drivers/scsi/snic/snic_scsi.c
+++ b/drivers/scsi/snic/snic_scsi.c
@@ -2250,8 +2250,15 @@ snic_issue_hba_reset(struct snic *snic)
return ret;
} /* end of snic_issue_hba_reset */
+/*
+ * SCSI Error handling calls driver's eh_host_reset if all prior
+ * error handling levels return FAILED.
+ *
+ * Host Reset is the highest level of error recovery. If this fails, then
+ * host is offlined by SCSI.
+ */
int
-snic_reset(struct Scsi_Host *shost)
+snic_host_reset(struct Scsi_Host *shost)
{
struct snic *snic = shost_priv(shost);
enum snic_state sv_state;
@@ -2297,34 +2304,6 @@ snic_reset(struct Scsi_Host *shost)
ret = SUCCESS;
reset_end:
- return ret;
-} /* end of snic_reset */
-
-/*
- * SCSI Error handling calls driver's eh_host_reset if all prior
- * error handling levels return FAILED.
- *
- * Host Reset is the highest level of error recovery. If this fails, then
- * host is offlined by SCSI.
- */
-int
-snic_host_reset(struct scsi_cmnd *sc)
-{
- struct Scsi_Host *shost = sc->device->host;
- u32 start_time = jiffies;
- int ret;
-
- SNIC_SCSI_DBG(shost,
- "host reset:sc %p sc_cmd 0x%x req %p tag %d flags 0x%llx\n",
- sc, sc->cmnd[0], scsi_cmd_to_rq(sc),
- snic_cmd_tag(sc), CMD_FLAGS(sc));
-
- ret = snic_reset(shost);
-
- SNIC_TRC(shost->host_no, snic_cmd_tag(sc), (ulong) sc,
- jiffies_to_msecs(jiffies - start_time),
- 0, SNIC_TRC_CMD(sc), SNIC_TRC_CMD_STATE_FLAGS(sc));
-
return ret;
} /* end of snic_host_reset */
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 8ffb75be99bc..5e5ecea265ad 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -1438,14 +1438,13 @@ static int stex_do_reset(struct st_hba *hba)
return -1;
}
-static int stex_reset(struct scsi_cmnd *cmd)
+static int stex_reset(struct Scsi_Host *shost)
{
struct st_hba *hba;
- hba = (struct st_hba *) &cmd->device->host->hostdata[0];
+ hba = (struct st_hba *) &shost->hostdata[0];
- shost_printk(KERN_INFO, cmd->device->host,
- "resetting host\n");
+ shost_printk(KERN_INFO, shost, "resetting host\n");
return stex_do_reset(hba) ? FAILED : SUCCESS;
}
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index a95936b18f69..7a71d0526f6d 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1624,9 +1624,9 @@ static int storvsc_get_chs(struct scsi_device *sdev, struct block_device * bdev,
return 0;
}
-static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
+static int storvsc_host_reset_handler(struct Scsi_Host *shost)
{
- struct hv_host_device *host_dev = shost_priv(scmnd->device->host);
+ struct hv_host_device *host_dev = shost_priv(shost);
struct hv_device *device = host_dev->dev;
struct storvsc_device *stor_device;
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index a2560cc807d3..2ecc0ed60084 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -693,9 +693,8 @@ static int sym53c8xx_eh_bus_reset_handler(struct scsi_cmnd *cmd)
return SCSI_SUCCESS;
}
-static int sym53c8xx_eh_host_reset_handler(struct scsi_cmnd *cmd)
+static int sym53c8xx_eh_host_reset_handler(struct Scsi_Host *shost)
{
- struct Scsi_Host *shost = cmd->device->host;
struct sym_data *sym_data = shost_priv(shost);
struct pci_dev *pdev = sym_data->pdev;
struct sym_hcb *np = sym_data->ncb;
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index f88ecdb93a8a..ddf1837babc0 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -894,14 +894,13 @@ static void pvscsi_reset_all(struct pvscsi_adapter *adapter)
}
}
-static int pvscsi_host_reset(struct scsi_cmnd *cmd)
+static int pvscsi_host_reset(struct Scsi_Host *host)
{
- struct Scsi_Host *host = cmd->device->host;
struct pvscsi_adapter *adapter = shost_priv(host);
unsigned long flags;
bool use_msg;
- scmd_printk(KERN_INFO, cmd, "SCSI Host reset\n");
+ shost_printk(KERN_INFO, host, "SCSI Host reset\n");
spin_lock_irqsave(&adapter->hw_lock, flags);
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index e4fafc77bd20..5fe972dd01cf 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -1508,13 +1508,11 @@ reset_wd33c93(struct Scsi_Host *instance)
}
int
-wd33c93_host_reset(struct scsi_cmnd * SCpnt)
+wd33c93_host_reset(struct Scsi_Host * instance)
{
- struct Scsi_Host *instance;
struct WD33C93_hostdata *hostdata;
int i;
- instance = SCpnt->device->host;
spin_lock_irq(instance->host_lock);
hostdata = (struct WD33C93_hostdata *) instance->hostdata;
@@ -1539,7 +1537,6 @@ wd33c93_host_reset(struct scsi_cmnd * SCpnt)
hostdata->outgoing_len = 0;
reset_wd33c93(instance);
- SCpnt->result = DID_RESET << 16;
enable_irq(instance->irq);
spin_unlock_irq(instance->host_lock);
return SUCCESS;
diff --git a/drivers/scsi/wd33c93.h b/drivers/scsi/wd33c93.h
index e5e4254b1477..e3c2d3850f74 100644
--- a/drivers/scsi/wd33c93.h
+++ b/drivers/scsi/wd33c93.h
@@ -336,6 +336,6 @@ int wd33c93_queuecommand (struct Scsi_Host *h, struct scsi_cmnd *cmd);
void wd33c93_intr (struct Scsi_Host *instance);
int wd33c93_show_info(struct seq_file *, struct Scsi_Host *);
int wd33c93_write_info(struct Scsi_Host *, char *, int);
-int wd33c93_host_reset (struct scsi_cmnd *);
+int wd33c93_host_reset (struct Scsi_Host *);
#endif /* WD33C93_H */
diff --git a/drivers/scsi/wd719x.c b/drivers/scsi/wd719x.c
index 5a380eecfc75..42134f9510d5 100644
--- a/drivers/scsi/wd719x.c
+++ b/drivers/scsi/wd719x.c
@@ -520,9 +520,9 @@ static int wd719x_bus_reset(struct scsi_cmnd *cmd)
return wd719x_reset(cmd, WD719X_CMD_BUSRESET, 0);
}
-static int wd719x_host_reset(struct scsi_cmnd *cmd)
+static int wd719x_host_reset(struct Scsi_Host *host)
{
- struct wd719x *wd = shost_priv(cmd->device->host);
+ struct wd719x *wd = shost_priv(host);
struct wd719x_scb *scb, *tmp;
unsigned long flags;
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 93417518c04d..6ccf4d949171 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -264,7 +264,7 @@ static const struct ufs_dev_quirk ufs_fixups[] = {
static irqreturn_t ufshcd_tmc_handler(struct ufs_hba *hba);
static void ufshcd_async_scan(void *data, async_cookie_t cookie);
static int ufshcd_reset_and_restore(struct ufs_hba *hba);
-static int ufshcd_eh_host_reset_handler(struct scsi_cmnd *cmd);
+static int ufshcd_eh_host_reset_handler(struct Scsi_Host *shost);
static int ufshcd_clear_tm_cmd(struct ufs_hba *hba, int tag);
static void ufshcd_hba_exit(struct ufs_hba *hba);
static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params);
@@ -7707,13 +7707,13 @@ static int ufshcd_reset_and_restore(struct ufs_hba *hba)
*
* Return: SUCCESS or FAILED.
*/
-static int ufshcd_eh_host_reset_handler(struct scsi_cmnd *cmd)
+static int ufshcd_eh_host_reset_handler(struct Scsi_Host *shost)
{
int err = SUCCESS;
unsigned long flags;
struct ufs_hba *hba;
- hba = shost_priv(cmd->device->host);
+ hba = shost_priv(shost);
spin_lock_irqsave(hba->host->host_lock, flags);
hba->force_reset = true;
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 8c8fa71c69c4..10cd299d2e7d 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -345,9 +345,9 @@ static int mts_scsi_abort(struct scsi_cmnd *srb)
return FAILED;
}
-static int mts_scsi_host_reset(struct scsi_cmnd *srb)
+static int mts_scsi_host_reset(struct Scsi_Host *shost)
{
- struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
+ struct mts_desc* desc = (struct mts_desc*)(shost->hostdata[0]);
int result;
MTS_DEBUG_GOT_HERE();
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index eca6fd42d7f7..dd71e198b360 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -950,7 +950,7 @@ void fc_fcp_destroy(struct fc_lport *);
int fc_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
int fc_eh_abort(struct scsi_cmnd *);
int fc_eh_device_reset(struct scsi_cmnd *);
-int fc_eh_host_reset(struct scsi_cmnd *);
+int fc_eh_host_reset(struct Scsi_Host *);
int fc_slave_alloc(struct scsi_device *);
/*
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 49f768d0ff37..9e3ec411cdc6 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -153,7 +153,7 @@ struct scsi_host_template {
int (* eh_device_reset_handler)(struct scsi_cmnd *);
int (* eh_target_reset_handler)(struct scsi_cmnd *);
int (* eh_bus_reset_handler)(struct scsi_cmnd *);
- int (* eh_host_reset_handler)(struct scsi_cmnd *);
+ int (* eh_host_reset_handler)(struct Scsi_Host *);
/*
* Before the mid layer attempts to scan for a new device where none
--
2.35.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH 2/7] scsi: Use Scsi_Host and channel number as argument for eh_bus_reset_handler()
2023-10-02 15:59 [PATCHv5 0/7] scsi: EH rework, main part Hannes Reinecke
2023-10-02 15:59 ` [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler Hannes Reinecke
@ 2023-10-02 15:59 ` Hannes Reinecke
2023-10-05 11:54 ` John Garry
2023-10-02 15:59 ` [PATCH 3/7] scsi: Use scsi_target as argument for eh_target_reset_handler() Hannes Reinecke
` (6 subsequent siblings)
8 siblings, 1 reply; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-02 15:59 UTC (permalink / raw)
To: Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig, Hannes Reinecke
The bus reset should not depend on any command, but rather only
use the SCSI Host and the channel/bus number as argument.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
Documentation/scsi/scsi_eh.rst | 2 +-
Documentation/scsi/scsi_mid_low_api.rst | 5 ++--
drivers/message/fusion/mptfc.c | 13 ++++-----
drivers/message/fusion/mptscsih.c | 21 ++++++--------
drivers/message/fusion/mptscsih.h | 2 +-
drivers/scsi/a100u2w.c | 4 +--
drivers/scsi/aacraid/linit.c | 11 ++++----
drivers/scsi/aha152x.c | 4 +--
drivers/scsi/aha1542.c | 4 +--
drivers/scsi/aic7xxx/aic79xx_osm.c | 10 +++----
drivers/scsi/aic7xxx/aic7xxx_osm.c | 6 ++--
drivers/scsi/arcmsr/arcmsr_hba.c | 6 ++--
drivers/scsi/arm/fas216.c | 9 +++---
drivers/scsi/arm/fas216.h | 5 ++--
drivers/scsi/dc395x.c | 25 ++++++++---------
drivers/scsi/esas2r/esas2r.h | 2 +-
drivers/scsi/esas2r/esas2r_main.c | 4 +--
drivers/scsi/esp_scsi.c | 4 +--
drivers/scsi/initio.c | 11 ++++----
drivers/scsi/mpi3mr/mpi3mr_os.c | 37 +++++++++++++++----------
drivers/scsi/ncr53c8xx.c | 4 +--
drivers/scsi/pcmcia/nsp_cs.c | 6 ++--
drivers/scsi/pcmcia/nsp_cs.h | 2 +-
drivers/scsi/pmcraid.c | 7 ++---
drivers/scsi/qla1280.c | 12 ++++----
drivers/scsi/qla2xxx/qla_os.c | 17 ++++--------
drivers/scsi/scsi_debug.c | 9 +++---
drivers/scsi/scsi_error.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_glue.c | 7 ++---
drivers/scsi/vmw_pvscsi.c | 5 ++--
drivers/scsi/wd719x.c | 11 ++++----
drivers/usb/storage/scsiglue.c | 4 +--
include/scsi/scsi_host.h | 2 +-
33 files changed, 133 insertions(+), 140 deletions(-)
diff --git a/Documentation/scsi/scsi_eh.rst b/Documentation/scsi/scsi_eh.rst
index da95971b4f44..dbbfd754a928 100644
--- a/Documentation/scsi/scsi_eh.rst
+++ b/Documentation/scsi/scsi_eh.rst
@@ -216,7 +216,7 @@ considered to fail always.
int (* eh_abort_handler)(struct scsi_cmnd *);
int (* eh_device_reset_handler)(struct scsi_cmnd *);
- int (* eh_bus_reset_handler)(struct scsi_cmnd *);
+ int (* eh_bus_reset_handler)(struct Scsi_Host *, int);
int (* eh_host_reset_handler)(struct Scsi_Host *);
Higher-severity actions are taken only when lower-severity actions
diff --git a/Documentation/scsi/scsi_mid_low_api.rst b/Documentation/scsi/scsi_mid_low_api.rst
index 85b1384ba4fd..88bb3b7578ba 100644
--- a/Documentation/scsi/scsi_mid_low_api.rst
+++ b/Documentation/scsi/scsi_mid_low_api.rst
@@ -741,7 +741,8 @@ Details::
/**
* eh_bus_reset_handler - issue SCSI bus reset
- * @scp: SCSI bus that contains this device should be reset
+ * @host: SCSI Host that contains the channel which should be reset
+ * @channel: channel to be reset
*
* Returns SUCCESS if command aborted else FAILED
*
@@ -754,7 +755,7 @@ Details::
*
* Optionally defined in: LLD
**/
- int eh_bus_reset_handler(struct scsi_cmnd * scp)
+ int eh_bus_reset_handler(struct Scsi_Host * host, int channel)
/**
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index aa6bb764df3e..83718602c1c4 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -103,7 +103,7 @@ static void mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout);
static void mptfc_remove(struct pci_dev *pdev);
static int mptfc_abort(struct scsi_cmnd *SCpnt);
static int mptfc_dev_reset(struct scsi_cmnd *SCpnt);
-static int mptfc_bus_reset(struct scsi_cmnd *SCpnt);
+static int mptfc_bus_reset(struct Scsi_Host *shost, int channel);
static const struct scsi_host_template mptfc_driver_template = {
.module = THIS_MODULE,
@@ -259,11 +259,9 @@ mptfc_dev_reset(struct scsi_cmnd *SCpnt)
}
static int
-mptfc_bus_reset(struct scsi_cmnd *SCpnt)
+mptfc_bus_reset(struct Scsi_Host *shost, int channel)
{
- struct Scsi_Host *shost = SCpnt->device->host;
MPT_SCSI_HOST __maybe_unused *hd = shost_priv(shost);
- int channel = SCpnt->device->channel;
struct mptfc_rport_info *ri;
int rtn;
@@ -280,10 +278,9 @@ mptfc_bus_reset(struct scsi_cmnd *SCpnt)
}
if (rtn == 0) {
dfcprintk (hd->ioc, printk(MYIOC_s_DEBUG_FMT
- "%s.%d: %d:%llu, executing recovery.\n", __func__,
- hd->ioc->name, shost->host_no,
- SCpnt->device->id, SCpnt->device->lun));
- rtn = mptscsih_bus_reset(SCpnt);
+ "%s.%d: 0:0, executing recovery.\n", __func__,
+ hd->ioc->name, shost->host_no));
+ rtn = mptscsih_bus_reset(shost, channel);
}
return rtn;
}
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index caf045cfea0e..591b2858f823 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1913,39 +1913,34 @@ mptscsih_target_reset(struct scsi_cmnd * SCpnt)
* Returns SUCCESS or FAILED.
**/
int
-mptscsih_bus_reset(struct scsi_cmnd * SCpnt)
+mptscsih_bus_reset(struct Scsi_Host * shost, int channel)
{
MPT_SCSI_HOST *hd;
int retval;
- VirtDevice *vdevice;
MPT_ADAPTER *ioc;
/* If we can't locate our host adapter structure, return FAILED status.
*/
- if ((hd = shost_priv(SCpnt->device->host)) == NULL){
+ if ((hd = shost_priv(shost)) == NULL){
printk(KERN_ERR MYNAM ": bus reset: "
- "Can't locate host! (sc=%p)\n", SCpnt);
+ "Can't locate host!\n");
return FAILED;
}
ioc = hd->ioc;
- printk(MYIOC_s_INFO_FMT "attempting bus reset! (sc=%p)\n",
- ioc->name, SCpnt);
- scsi_print_command(SCpnt);
+ printk(MYIOC_s_INFO_FMT "attempting bus reset!\n",
+ ioc->name);
if (ioc->timeouts < -1)
ioc->timeouts++;
- vdevice = SCpnt->device->hostdata;
- if (!vdevice || !vdevice->vtarget)
- return SUCCESS;
retval = mptscsih_IssueTaskMgmt(hd,
MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS,
- vdevice->vtarget->channel, 0, 0, 0,
+ channel, 0, 0, 0,
mptscsih_get_tm_timeout(ioc));
- printk(MYIOC_s_INFO_FMT "bus reset: %s (sc=%p)\n",
- ioc->name, ((retval == 0) ? "SUCCESS" : "FAILED" ), SCpnt);
+ printk(MYIOC_s_INFO_FMT "bus reset: %s\n",
+ ioc->name, ((retval == 0) ? "SUCCESS" : "FAILED" ));
if (retval == 0)
return SUCCESS;
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index 0faefe9c7541..9f3756bd25eb 100644
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -121,7 +121,7 @@ extern int mptscsih_slave_configure(struct scsi_device *device);
extern int mptscsih_abort(struct scsi_cmnd * SCpnt);
extern int mptscsih_dev_reset(struct scsi_cmnd * SCpnt);
extern int mptscsih_target_reset(struct scsi_cmnd * SCpnt);
-extern int mptscsih_bus_reset(struct scsi_cmnd * SCpnt);
+extern int mptscsih_bus_reset(struct Scsi_Host *, int);
extern int mptscsih_host_reset(struct Scsi_Host *sh);
extern int mptscsih_bios_param(struct scsi_device * sdev, struct block_device *bdev, sector_t capacity, int geom[]);
extern int mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index 43b119add2b9..a1f5f8d65e6b 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -934,10 +934,10 @@ static int inia100_abort(struct scsi_cmnd * cmd)
Output : None.
Return : pSRB - Pointer to SCSI request block.
*****************************************************************************/
-static int inia100_bus_reset(struct scsi_cmnd * cmd)
+static int inia100_bus_reset(struct Scsi_Host * shost, int channel)
{ /* I need Host Control Block Information */
struct orc_host *host;
- host = (struct orc_host *) cmd->device->host->hostdata;
+ host = (struct orc_host *) shost->hostdata;
return orc_reset_scsi_bus(host);
}
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 121b6447baa6..f865f8a8f88d 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1034,20 +1034,18 @@ static int aac_eh_target_reset(struct scsi_cmnd *cmd)
/*
* aac_eh_bus_reset - Bus reset command handling
- * @scsi_cmd: SCSI command block causing the reset
+ * @host: SCSI host causing the reset
+ * @channel: Number of the bus to be reset
*
*/
-static int aac_eh_bus_reset(struct scsi_cmnd* cmd)
+static int aac_eh_bus_reset(struct Scsi_Host *host, int channel)
{
- struct scsi_device * dev = cmd->device;
- struct Scsi_Host * host = dev->host;
struct aac_dev * aac = (struct aac_dev *)host->hostdata;
int count;
u32 cmd_bus;
int status = 0;
-
- cmd_bus = aac_logical_to_phys(scmd_channel(cmd));
+ cmd_bus = aac_logical_to_phys(channel);
/* Mark the assoc. FIB to not complete, eh handler does this */
for (count = 0; count < (host->can_queue + AAC_NUM_MGT_FIB); ++count) {
struct fib *fib = &aac->fibs[count];
@@ -1055,6 +1053,7 @@ static int aac_eh_bus_reset(struct scsi_cmnd* cmd)
if (fib->hw_fib_va->header.XferState &&
(fib->flags & FIB_CONTEXT_FLAG) &&
(fib->flags & FIB_CONTEXT_FLAG_SCSI_CMD)) {
+ struct scsi_cmnd *cmd;
struct aac_hba_map_info *info;
u32 bus, cid;
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index 936c9f5c6f23..d8ace084b5a7 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -1192,9 +1192,9 @@ static int aha152x_bus_reset_host(struct Scsi_Host *shpnt)
* Reset the bus
*
*/
-static int aha152x_bus_reset(struct scsi_cmnd *SCpnt)
+static int aha152x_bus_reset(struct Scsi_Host *shpnt, int channel)
{
- return aha152x_bus_reset_host(SCpnt->device->host);
+ return aha152x_bus_reset_host(shpnt);
}
/*
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 2a88e1c6ffda..89c0e2c7d9da 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -981,9 +981,9 @@ static int aha1542_reset(struct Scsi_Host *sh, u8 reset_cmd)
return SUCCESS;
}
-static int aha1542_bus_reset(struct scsi_cmnd *cmd)
+static int aha1542_bus_reset(struct Scsi_Host *sh, int channel)
{
- return aha1542_reset(cmd->device->host, SCRST);
+ return aha1542_reset(sh, SCRST);
}
static int aha1542_host_reset(struct Scsi_Host *sh)
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index b3075a022d99..a43f643622a9 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -863,21 +863,21 @@ ahd_linux_dev_reset(struct scsi_cmnd *cmd)
* Reset the SCSI bus.
*/
static int
-ahd_linux_bus_reset(struct scsi_cmnd *cmd)
+ahd_linux_bus_reset(struct Scsi_Host *shost, int channel)
{
struct ahd_softc *ahd;
int found;
unsigned long flags;
- ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
+ ahd = *(struct ahd_softc **)shost->hostdata;
#ifdef AHD_DEBUG
if ((ahd_debug & AHD_SHOW_RECOVERY) != 0)
- printk("%s: Bus reset called for cmd %p\n",
- ahd_name(ahd), cmd);
+ printk("%s: Bus reset called for channel %d\n",
+ ahd_name(ahd), channel);
#endif
ahd_lock(ahd, &flags);
- found = ahd_reset_channel(ahd, scmd_channel(cmd) + 'A',
+ found = ahd_reset_channel(ahd, channel + 'A',
/*initiate reset*/TRUE);
ahd_unlock(ahd, &flags);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 4ae0a1c4d374..6d42d39806a0 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -753,16 +753,16 @@ ahc_linux_dev_reset(struct scsi_cmnd *cmd)
* Reset the SCSI bus.
*/
static int
-ahc_linux_bus_reset(struct scsi_cmnd *cmd)
+ahc_linux_bus_reset(struct Scsi_Host *shost, int channel)
{
struct ahc_softc *ahc;
int found;
unsigned long flags;
- ahc = *(struct ahc_softc **)cmd->device->host->hostdata;
+ ahc = *(struct ahc_softc **)shost->hostdata;
ahc_lock(ahc, &flags);
- found = ahc_reset_channel(ahc, scmd_channel(cmd) + 'A',
+ found = ahc_reset_channel(ahc, channel + 'A',
/*initiate reset*/TRUE);
ahc_unlock(ahc, &flags);
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index a66221c3b72f..6c9d3a427636 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -110,7 +110,7 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
struct scsi_cmnd *cmd);
static int arcmsr_iop_confirm(struct AdapterControlBlock *acb);
static int arcmsr_abort(struct scsi_cmnd *);
-static int arcmsr_bus_reset(struct scsi_cmnd *);
+static int arcmsr_bus_reset(struct Scsi_Host *, int);
static int arcmsr_bios_param(struct scsi_device *sdev,
struct block_device *bdev, sector_t capacity, int *info);
static int arcmsr_queue_command(struct Scsi_Host *h, struct scsi_cmnd *cmd);
@@ -4571,12 +4571,12 @@ static uint8_t arcmsr_iop_reset(struct AdapterControlBlock *acb)
return rtnval;
}
-static int arcmsr_bus_reset(struct scsi_cmnd *cmd)
+static int arcmsr_bus_reset(struct Scsi_Host *shost, int channel)
{
struct AdapterControlBlock *acb;
int retry_count = 0;
int rtn = FAILED;
- acb = (struct AdapterControlBlock *) cmd->device->host->hostdata;
+ acb = (struct AdapterControlBlock *) shost->hostdata;
if (acb->acb_flags & ACB_F_ADAPTER_REMOVED)
return SUCCESS;
pr_notice("arcmsr: executing bus reset eh.....num_resets = %d,"
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 38eec967155d..c27b49c42c4f 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -2550,15 +2550,16 @@ int fas216_eh_device_reset(struct scsi_cmnd *SCpnt)
/**
* fas216_eh_bus_reset - Reset the bus associated with the command
- * @SCpnt: command specifing bus to reset
+ * @shost: host to be reset
+ * @channel: bus number to reset
*
- * Reset the bus associated with the command.
+ * Reset the bus.
* Returns: FAILED if unable to reset.
* Notes: Further commands are blocked.
*/
-int fas216_eh_bus_reset(struct scsi_cmnd *SCpnt)
+int fas216_eh_bus_reset(struct Scsi_Host *shost, int channel)
{
- FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata;
+ FAS216_Info *info = (FAS216_Info *)shost->hostdata;
unsigned long flags;
struct scsi_device *SDpnt;
diff --git a/drivers/scsi/arm/fas216.h b/drivers/scsi/arm/fas216.h
index f17583f143b3..27a4b564f054 100644
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
@@ -389,10 +389,11 @@ extern int fas216_eh_device_reset(struct scsi_cmnd *SCpnt);
/* Function: int fas216_eh_bus_reset(struct scsi_cmnd *SCpnt)
* Purpose : Reset the complete bus associated with this command
- * Params : SCpnt - command specifing bus to reset
+ * Params : shost - host to be reset
+ * channel - bus to be reset
* Returns : FAILED if unable to reset
*/
-extern int fas216_eh_bus_reset(struct scsi_cmnd *SCpnt);
+extern int fas216_eh_bus_reset(struct Scsi_Host *shost, int channel);
/* Function: int fas216_eh_host_reset(struct Scsi_Host *shost)
* Purpose : Reset the host associated with this command
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index c8e86f8a631e..b4586cb22d1e 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -1144,19 +1144,18 @@ static void reset_dev_param(struct AdapterCtlBlk *acb)
* @cmd - some command for this host (for fetching hooks)
* Returns: SUCCESS (0x2002) on success, else FAILED (0x2003).
*/
-static int __dc395x_eh_bus_reset(struct scsi_cmnd *cmd)
+static int __dc395x_eh_bus_reset(struct Scsi_Host *shost, int channel)
{
struct AdapterCtlBlk *acb =
- (struct AdapterCtlBlk *)cmd->device->host->hostdata;
+ (struct AdapterCtlBlk *)shost->hostdata;
dprintkl(KERN_INFO,
- "eh_bus_reset: (0%p) target=<%02i-%i> cmd=%p\n",
- cmd, cmd->device->id, (u8)cmd->device->lun, cmd);
+ "eh_bus_reset: bus=<%02i>\n", channel);
if (timer_pending(&acb->waiting_timer))
del_timer(&acb->waiting_timer);
/*
- * disable interrupt
+ * disable interrupt
*/
DC395x_write8(acb, TRM_S1040_DMA_INTEN, 0x00);
DC395x_write8(acb, TRM_S1040_SCSI_INTEN, 0x00);
@@ -1172,7 +1171,7 @@ static int __dc395x_eh_bus_reset(struct scsi_cmnd *cmd)
HZ * acb->eeprom.delay_time;
/*
- * re-enable interrupt
+ * re-enable interrupt
*/
/* Clear SCSI FIFO */
DC395x_write8(acb, TRM_S1040_DMA_CONTROL, CLRXFIFO);
@@ -1182,7 +1181,7 @@ static int __dc395x_eh_bus_reset(struct scsi_cmnd *cmd)
set_basic_config(acb);
reset_dev_param(acb);
- doing_srb_done(acb, DID_RESET, cmd, 0);
+ doing_srb_done(acb, DID_RESET, NULL, 0);
acb->active_dcb = NULL;
acb->acb_flag = 0; /* RESET_DETECT, RESET_DONE ,RESET_DEV */
waiting_process_next(acb);
@@ -1190,13 +1189,13 @@ static int __dc395x_eh_bus_reset(struct scsi_cmnd *cmd)
return SUCCESS;
}
-static int dc395x_eh_bus_reset(struct scsi_cmnd *cmd)
+static int dc395x_eh_bus_reset(struct Scsi_Host *shost, int channel)
{
int rc;
- spin_lock_irq(cmd->device->host->host_lock);
- rc = __dc395x_eh_bus_reset(cmd);
- spin_unlock_irq(cmd->device->host->host_lock);
+ spin_lock_irq(shost->host_lock);
+ rc = __dc395x_eh_bus_reset(shost, channel);
+ spin_unlock_irq(shost->host_lock);
return rc;
}
@@ -3338,7 +3337,7 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
/* abort all cmds in our queues */
static void doing_srb_done(struct AdapterCtlBlk *acb, u8 did_flag,
- struct scsi_cmnd *cmd, u8 force)
+ struct scsi_cmnd *cmd, u8 force)
{
struct DeviceCtlBlk *dcb;
dprintkl(KERN_INFO, "doing_srb_done: pids ");
@@ -3386,7 +3385,7 @@ static void doing_srb_done(struct AdapterCtlBlk *acb, u8 did_flag,
set_status_byte(p, SAM_STAT_GOOD);
pci_unmap_srb_sense(acb, srb);
pci_unmap_srb(acb, srb);
- if (force) {
+ if (force && cmd) {
/* For new EH, we normally don't need to give commands back,
* as they all complete or all time out */
scsi_done(cmd);
diff --git a/drivers/scsi/esas2r/esas2r.h b/drivers/scsi/esas2r/esas2r.h
index a104d1a3a9da..5c1eeaffc090 100644
--- a/drivers/scsi/esas2r/esas2r.h
+++ b/drivers/scsi/esas2r/esas2r.h
@@ -977,7 +977,7 @@ long esas2r_proc_ioctl(struct file *fp, unsigned int cmd, unsigned long arg);
int esas2r_eh_abort(struct scsi_cmnd *cmd);
int esas2r_device_reset(struct scsi_cmnd *cmd);
int esas2r_host_reset(struct Scsi_Host *shost);
-int esas2r_bus_reset(struct scsi_cmnd *cmd);
+int esas2r_bus_reset(struct Scsi_Host *shost, int channel);
int esas2r_target_reset(struct scsi_cmnd *cmd);
/* Internal functions */
diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
index 168f01a34acc..ae647e2586d0 100644
--- a/drivers/scsi/esas2r/esas2r_main.c
+++ b/drivers/scsi/esas2r/esas2r_main.c
@@ -1097,10 +1097,8 @@ int esas2r_host_reset(struct Scsi_Host *shost)
return esas2r_host_bus_reset(shost, true);
}
-int esas2r_bus_reset(struct scsi_cmnd *cmd)
+int esas2r_bus_reset(struct Scsi_Host *shost, int channel)
{
- struct Scsi_Host *shost = cmd->device->host;
-
esas2r_log(ESAS2R_LOG_INFO, "bus_reset (%p)", shost);
return esas2r_host_bus_reset(shost, false);
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 355fec046220..c6a5721aef23 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2604,9 +2604,9 @@ static int esp_eh_abort_handler(struct scsi_cmnd *cmd)
return FAILED;
}
-static int esp_eh_bus_reset_handler(struct scsi_cmnd *cmd)
+static int esp_eh_bus_reset_handler(struct Scsi_Host *shost, int channel)
{
- struct esp *esp = shost_priv(cmd->device->host);
+ struct esp *esp = shost_priv(shost);
struct completion eh_reset;
unsigned long flags;
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 2a50fda3a628..863efc80a3b4 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -2625,20 +2625,21 @@ static DEF_SCSI_QCMD(i91u_queuecommand)
/**
* i91u_bus_reset - reset the SCSI bus
- * @cmnd: Command block we want to trigger the reset for
+ * @shost: SCSI host to be reset
+ * @channel: Bus number to be reset
*
* Initiate a SCSI bus reset sequence
*/
-static int i91u_bus_reset(struct scsi_cmnd * cmnd)
+static int i91u_bus_reset(struct Scsi_Host * shost, int channel)
{
struct initio_host *host;
- host = (struct initio_host *) cmnd->device->host->hostdata;
+ host = (struct initio_host *) shost->hostdata;
- spin_lock_irq(cmnd->device->host->host_lock);
+ spin_lock_irq(shost->host_lock);
initio_reset_scsi(host, 0);
- spin_unlock_irq(cmnd->device->host->host_lock);
+ spin_unlock_irq(shost->host_lock);
return SUCCESS;
}
diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
index d52412870b54..63b6ed19e9d1 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_os.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
@@ -4037,39 +4037,46 @@ static int mpi3mr_eh_host_reset(struct Scsi_Host *shost)
/**
* mpi3mr_eh_bus_reset - Bus reset error handling callback
- * @scmd: SCSI command reference
+ * @shost: SCSI host reference
+ * @channel: bus number
*
* Checks whether pending I/Os are present for the RAID volume;
* if not there's no need to reset the adapter.
*
* Return: SUCCESS of successful reset else FAILED
*/
-static int mpi3mr_eh_bus_reset(struct scsi_cmnd *scmd)
+static int mpi3mr_eh_bus_reset(struct Scsi_Host *shost, int channel)
{
- struct mpi3mr_ioc *mrioc = shost_priv(scmd->device->host);
+ struct mpi3mr_ioc *mrioc = shost_priv(shost);
+ struct mpi3mr_tgt_dev *tgtdev;
struct mpi3mr_stgt_priv_data *stgt_priv_data;
- struct mpi3mr_sdev_priv_data *sdev_priv_data;
- u8 dev_type = MPI3_DEVICE_DEVFORM_VD;
int retval = FAILED;
- sdev_priv_data = scmd->device->hostdata;
- if (sdev_priv_data && sdev_priv_data->tgt_priv_data) {
- stgt_priv_data = sdev_priv_data->tgt_priv_data;
- dev_type = stgt_priv_data->dev_type;
+ spin_lock(&mrioc->tgtdev_lock);
+ list_for_each_entry(tgtdev, &mrioc->tgtdev_list, list) {
+ if (!tgtdev->starget || !tgtdev->starget->hostdata)
+ continue;
+ stgt_priv_data = (struct mpi3mr_stgt_priv_data *)
+ tgtdev->starget->hostdata;
+ if (stgt_priv_data->dev_type == MPI3_DEVICE_DEVFORM_VD) {
+ retval = SUCCESS;
+ break;
+ }
}
+ spin_unlock(&mrioc->tgtdev_lock);
- if (dev_type == MPI3_DEVICE_DEVFORM_VD) {
+ if (retval == SUCCESS) {
mpi3mr_wait_for_host_io(mrioc,
MPI3MR_RAID_ERRREC_RESET_TIMEOUT);
- if (!mpi3mr_get_fw_pending_ios(mrioc))
- retval = SUCCESS;
+ if (mpi3mr_get_fw_pending_ios(mrioc))
+ retval = FAILED;
}
if (retval == FAILED)
mpi3mr_print_pending_host_io(mrioc);
- sdev_printk(KERN_INFO, scmd->device,
- "Bus reset is %s for scmd(%p)\n",
- ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);
+ shost_printk(KERN_INFO, shost,
+ "Bus reset is %s\n",
+ ((retval == SUCCESS) ? "SUCCESS" : "FAILED"));
return retval;
}
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index 35869b4f9329..59efe064b304 100644
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -7936,9 +7936,9 @@ static void ncr53c8xx_timeout(struct timer_list *t)
ncr_flush_done_cmds(done_list);
}
-static int ncr53c8xx_bus_reset(struct scsi_cmnd *cmd)
+static int ncr53c8xx_bus_reset(struct Scsi_Host *host, int channel)
{
- struct ncb *np = ((struct host_data *) cmd->device->host->hostdata)->ncb;
+ struct ncb *np = ((struct host_data *) host->hostdata)->ncb;
int sts;
unsigned long flags;
struct scsi_cmnd *done_list;
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 104647a6170e..c709bb955d05 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1486,11 +1486,11 @@ static int nsp_bus_reset(nsp_hw_data *data)
return SUCCESS;
}
-static int nsp_eh_bus_reset(struct scsi_cmnd *SCpnt)
+static int nsp_eh_bus_reset(struct Scsi_Host *host, int channel)
{
- nsp_hw_data *data = (nsp_hw_data *)SCpnt->device->host->hostdata;
+ nsp_hw_data *data = (nsp_hw_data *)host->hostdata;
- nsp_dbg(NSP_DEBUG_BUSRESET, "SCpnt=0x%p", SCpnt);
+ nsp_dbg(NSP_DEBUG_BUSRESET, "channel=0x%d", channel);
return nsp_bus_reset(data);
}
diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h
index f532adb5f166..8636f0053c02 100644
--- a/drivers/scsi/pcmcia/nsp_cs.h
+++ b/drivers/scsi/pcmcia/nsp_cs.h
@@ -299,7 +299,7 @@ static int nsp_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *SCpnt);
/* Error handler */
/*static int nsp_eh_abort (struct scsi_cmnd *SCpnt);*/
/*static int nsp_eh_device_reset(struct scsi_cmnd *SCpnt);*/
-static int nsp_eh_bus_reset (struct scsi_cmnd *SCpnt);
+static int nsp_eh_bus_reset (struct Scsi_Host *host, int channel);
static int nsp_eh_host_reset (struct Scsi_Host *host);
static int nsp_bus_reset (nsp_hw_data *data);
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 4cf7a0b1c39f..f25598a50368 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -3023,9 +3023,8 @@ static int pmcraid_eh_device_reset_handler(struct scsi_cmnd *scmd)
RESET_DEVICE_LUN);
}
-static int pmcraid_eh_bus_reset_handler(struct scsi_cmnd *scmd)
+static int pmcraid_eh_bus_reset_handler(struct Scsi_Host *host, int channel)
{
- struct Scsi_Host *host = scmd->device->host;
struct pmcraid_instance *pinstance =
(struct pmcraid_instance *)host->hostdata;
struct pmcraid_resource_entry *res = NULL;
@@ -3039,11 +3038,11 @@ static int pmcraid_eh_bus_reset_handler(struct scsi_cmnd *scmd)
*/
spin_lock_irqsave(&pinstance->resource_lock, lock_flags);
list_for_each_entry(temp, &pinstance->used_res_q, queue) {
- if (scmd->device->channel == PMCRAID_VSET_BUS_ID &&
+ if (channel == PMCRAID_VSET_BUS_ID &&
RES_IS_VSET(temp->cfg_entry)) {
res = temp;
break;
- } else if (scmd->device->channel == PMCRAID_PHYS_BUS_ID &&
+ } else if (channel == PMCRAID_PHYS_BUS_ID &&
RES_IS_GSCSI(temp->cfg_entry)) {
res = temp;
break;
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 178f249057e7..1df3deb618e4 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -979,13 +979,15 @@ qla1280_eh_device_reset(struct scsi_cmnd *cmd)
* Reset the specified bus.
**************************************************************************/
static int
-qla1280_eh_bus_reset(struct scsi_cmnd *cmd)
+qla1280_eh_bus_reset(struct Scsi_Host *shost, int bus)
{
- int rc;
+ int rc = FAILED;
+ struct scsi_qla_host *ha = (struct scsi_qla_host *)shost->hostdata;
- spin_lock_irq(cmd->device->host->host_lock);
- rc = qla1280_error_action(cmd, BUS_RESET);
- spin_unlock_irq(cmd->device->host->host_lock);
+ spin_lock_irq(shost->host_lock);
+ if (qla1280_bus_reset(ha, bus) == 0)
+ rc = qla1280_wait_for_pending_commands(ha, 1, 0);
+ spin_unlock_irq(shost->host_lock);
return rc;
}
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index bb0323d05640..a9d9d0a9abd7 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1588,7 +1588,7 @@ qla2xxx_eh_target_reset(struct scsi_cmnd *cmd)
* commands.
*
* Input:
-* cmd = Linux SCSI command packet of the command that cause the
+* host = Linux SCSI command packet of the command that cause the
* bus reset.
*
* Returns:
@@ -1596,12 +1596,10 @@ qla2xxx_eh_target_reset(struct scsi_cmnd *cmd)
*
**************************************************************************/
static int
-qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
+qla2xxx_eh_bus_reset(struct Scsi_Host *shost, int channel)
{
- scsi_qla_host_t *vha = shost_priv(cmd->device->host);
+ scsi_qla_host_t *vha = shost_priv(shost);
int ret = FAILED;
- unsigned int id;
- uint64_t lun;
struct qla_hw_data *ha = vha->hw;
if (qla2x00_isp_reg_stat(ha)) {
@@ -1611,14 +1609,11 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
return FAILED;
}
- id = cmd->device->id;
- lun = cmd->device->lun;
-
if (qla2x00_chip_is_down(vha))
return ret;
ql_log(ql_log_info, vha, 0x8012,
- "BUS RESET ISSUED nexus=%ld:%d:%llu.\n", vha->host_no, id, lun);
+ "BUS RESET ISSUED nexus=%ld:%d.\n", vha->host_no, channel);
if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
ql_log(ql_log_fatal, vha, 0x8013,
@@ -1642,8 +1637,8 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
eh_bus_reset_done:
ql_log(ql_log_warn, vha, 0x802b,
- "BUS RESET %s nexus=%ld:%d:%llu.\n",
- (ret == FAILED) ? "FAILED" : "SUCCEEDED", vha->host_no, id, lun);
+ "BUS RESET %s nexus=%ld:%d.\n",
+ (ret == FAILED) ? "FAILED" : "SUCCEEDED", vha->host_no, channel);
return ret;
}
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index fff18af80068..217c65a6b9c6 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5348,17 +5348,16 @@ static int scsi_debug_target_reset(struct scsi_cmnd *SCpnt)
return SUCCESS;
}
-static int scsi_debug_bus_reset(struct scsi_cmnd *SCpnt)
+static int scsi_debug_bus_reset(struct Scsi_Host * hp, int channel)
{
- struct scsi_device *sdp = SCpnt->device;
- struct sdebug_host_info *sdbg_host = shost_to_sdebug_host(sdp->host);
+ struct sdebug_host_info *sdbg_host = shost_to_sdebug_host(hp);
struct sdebug_dev_info *devip;
int k = 0;
++num_bus_resets;
if (SDEBUG_OPT_ALL_NOISE & sdebug_opts)
- sdev_printk(KERN_INFO, sdp, "%s\n", __func__);
+ shost_printk(KERN_INFO, hp, "%s\n", __func__);
list_for_each_entry(devip, &sdbg_host->dev_info_list, dev_list) {
set_bit(SDEBUG_UA_BUS_RESET, devip->uas_bm);
@@ -5366,7 +5365,7 @@ static int scsi_debug_bus_reset(struct scsi_cmnd *SCpnt)
}
if (SDEBUG_OPT_RESET_NOISE & sdebug_opts)
- sdev_printk(KERN_INFO, sdp,
+ shost_printk(KERN_INFO, hp,
"%s: %d device(s) found in host\n", __func__, k);
return SUCCESS;
}
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index f022bb1c3e4a..e3a36a1b57df 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -911,7 +911,7 @@ static enum scsi_disposition scsi_try_bus_reset(struct scsi_cmnd *scmd)
if (!hostt->eh_bus_reset_handler)
return FAILED;
- rtn = hostt->eh_bus_reset_handler(scmd);
+ rtn = hostt->eh_bus_reset_handler(host, scmd_channel(scmd));
if (rtn == SUCCESS) {
if (!hostt->skip_settle_delay)
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 2ecc0ed60084..78c5c654023f 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -670,14 +670,13 @@ static int sym53c8xx_eh_target_reset_handler(struct scsi_cmnd *cmd)
return SCSI_SUCCESS;
}
-static int sym53c8xx_eh_bus_reset_handler(struct scsi_cmnd *cmd)
+static int sym53c8xx_eh_bus_reset_handler(struct Scsi_Host *shost, int channel)
{
- struct Scsi_Host *shost = cmd->device->host;
struct sym_data *sym_data = shost_priv(shost);
struct pci_dev *pdev = sym_data->pdev;
struct sym_hcb *np = sym_data->ncb;
- scmd_printk(KERN_WARNING, cmd, "BUS RESET operation started\n");
+ shost_printk(KERN_WARNING, shost, "BUS RESET operation started\n");
/*
* Escalate to host reset if the PCI bus went down
@@ -689,7 +688,7 @@ static int sym53c8xx_eh_bus_reset_handler(struct scsi_cmnd *cmd)
sym_reset_scsi_bus(np, 1);
spin_unlock_irq(shost->host_lock);
- dev_warn(&cmd->device->sdev_gendev, "BUS RESET operation complete.\n");
+ shost_printk(KERN_WARNING, shost, "BUS RESET operation complete.\n");
return SCSI_SUCCESS;
}
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index ddf1837babc0..9c62d446ea9e 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -947,13 +947,12 @@ static int pvscsi_host_reset(struct Scsi_Host *host)
return SUCCESS;
}
-static int pvscsi_bus_reset(struct scsi_cmnd *cmd)
+static int pvscsi_bus_reset(struct Scsi_Host *host, int channel)
{
- struct Scsi_Host *host = cmd->device->host;
struct pvscsi_adapter *adapter = shost_priv(host);
unsigned long flags;
- scmd_printk(KERN_INFO, cmd, "SCSI Bus reset\n");
+ shost_printk(KERN_INFO, host, "SCSI Bus reset\n");
/*
* We don't want to queue new requests for this bus after
diff --git a/drivers/scsi/wd719x.c b/drivers/scsi/wd719x.c
index 42134f9510d5..bc48152e74b8 100644
--- a/drivers/scsi/wd719x.c
+++ b/drivers/scsi/wd719x.c
@@ -484,11 +484,11 @@ static int wd719x_abort(struct scsi_cmnd *cmd)
return SUCCESS;
}
-static int wd719x_reset(struct scsi_cmnd *cmd, u8 opcode, u8 device)
+static int wd719x_reset(struct Scsi_Host *shost, u8 opcode, u8 device)
{
int result;
unsigned long flags;
- struct wd719x *wd = shost_priv(cmd->device->host);
+ struct wd719x *wd = shost_priv(shost);
struct wd719x_scb *scb, *tmp;
dev_info(&wd->pdev->dev, "%s reset requested\n",
@@ -512,12 +512,13 @@ static int wd719x_reset(struct scsi_cmnd *cmd, u8 opcode, u8 device)
static int wd719x_dev_reset(struct scsi_cmnd *cmd)
{
- return wd719x_reset(cmd, WD719X_CMD_RESET, cmd->device->id);
+ return wd719x_reset(cmd->device->host, WD719X_CMD_RESET,
+ cmd->device->id);
}
-static int wd719x_bus_reset(struct scsi_cmnd *cmd)
+static int wd719x_bus_reset(struct Scsi_Host *host, int channel)
{
- return wd719x_reset(cmd, WD719X_CMD_BUSRESET, 0);
+ return wd719x_reset(host, WD719X_CMD_BUSRESET, 0);
}
static int wd719x_host_reset(struct Scsi_Host *host)
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index c54e9805da53..4b5b10d64931 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -478,9 +478,9 @@ static int device_reset(struct scsi_cmnd *srb)
}
/* Simulate a SCSI bus reset by resetting the device's USB port. */
-static int bus_reset(struct scsi_cmnd *srb)
+static int bus_reset(struct Scsi_Host *shost, int channel)
{
- struct us_data *us = host_to_us(srb->device->host);
+ struct us_data *us = host_to_us(shost);
int result;
usb_stor_dbg(us, "%s called\n", __func__);
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 9e3ec411cdc6..32ef595db028 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -152,7 +152,7 @@ struct scsi_host_template {
int (* eh_abort_handler)(struct scsi_cmnd *);
int (* eh_device_reset_handler)(struct scsi_cmnd *);
int (* eh_target_reset_handler)(struct scsi_cmnd *);
- int (* eh_bus_reset_handler)(struct scsi_cmnd *);
+ int (* eh_bus_reset_handler)(struct Scsi_Host *, int);
int (* eh_host_reset_handler)(struct Scsi_Host *);
/*
--
2.35.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH 3/7] scsi: Use scsi_target as argument for eh_target_reset_handler()
2023-10-02 15:59 [PATCHv5 0/7] scsi: EH rework, main part Hannes Reinecke
2023-10-02 15:59 ` [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler Hannes Reinecke
2023-10-02 15:59 ` [PATCH 2/7] scsi: Use Scsi_Host and channel number as argument for eh_bus_reset_handler() Hannes Reinecke
@ 2023-10-02 15:59 ` Hannes Reinecke
2023-10-05 12:33 ` John Garry
2023-10-02 15:59 ` [PATCH 4/7] scsi: Use scsi_device as argument to eh_device_reset_handler() Hannes Reinecke
` (5 subsequent siblings)
8 siblings, 1 reply; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-02 15:59 UTC (permalink / raw)
To: Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig, Hannes Reinecke
The target reset function should only depend on the scsi target,
not the scsi command.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
Documentation/scsi/scsi_eh.rst | 10 ++++
Documentation/scsi/scsi_mid_low_api.rst | 18 +++++++
drivers/message/fusion/mptsas.c | 12 ++++-
drivers/message/fusion/mptscsih.c | 27 +++++------
drivers/message/fusion/mptscsih.h | 2 +-
drivers/message/fusion/mptspi.c | 10 +++-
drivers/s390/scsi/zfcp_scsi.c | 7 ++-
drivers/scsi/aacraid/linit.c | 9 ++--
drivers/scsi/be2iscsi/be_main.c | 4 +-
drivers/scsi/bfa/bfad_im.c | 5 +-
drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
drivers/scsi/bnx2fc/bnx2fc_io.c | 4 +-
drivers/scsi/esas2r/esas2r.h | 2 +-
drivers/scsi/esas2r/esas2r_main.c | 38 ++++++++-------
drivers/scsi/ibmvscsi/ibmvfc.c | 3 +-
drivers/scsi/libiscsi.c | 4 +-
drivers/scsi/libsas/sas_scsi_host.c | 9 ++--
drivers/scsi/lpfc/lpfc_scsi.c | 10 ++--
drivers/scsi/megaraid/megaraid_sas.h | 3 +-
drivers/scsi/megaraid/megaraid_sas_base.c | 10 ++--
drivers/scsi/megaraid/megaraid_sas_fusion.c | 54 +++++++++++++--------
drivers/scsi/mpi3mr/mpi3mr_os.c | 46 +++++++-----------
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 31 +++++-------
drivers/scsi/pmcraid.c | 8 +--
drivers/scsi/qedf/qedf_main.c | 3 +-
drivers/scsi/qla2xxx/qla_os.c | 24 +++++----
drivers/scsi/qla4xxx/ql4_os.c | 13 ++---
drivers/scsi/scsi_debug.c | 13 +++--
drivers/scsi/scsi_error.c | 5 +-
drivers/scsi/sym53c8xx_2/sym_glue.c | 3 +-
drivers/target/loopback/tcm_loop.c | 9 ++--
include/scsi/libiscsi.h | 2 +-
include/scsi/libsas.h | 2 +-
include/scsi/scsi_host.h | 2 +-
34 files changed, 217 insertions(+), 187 deletions(-)
diff --git a/Documentation/scsi/scsi_eh.rst b/Documentation/scsi/scsi_eh.rst
index dbbfd754a928..85057d451a9f 100644
--- a/Documentation/scsi/scsi_eh.rst
+++ b/Documentation/scsi/scsi_eh.rst
@@ -216,6 +216,7 @@ considered to fail always.
int (* eh_abort_handler)(struct scsi_cmnd *);
int (* eh_device_reset_handler)(struct scsi_cmnd *);
+ int (* eh_target_reset_handler)(struct scsi_target *);
int (* eh_bus_reset_handler)(struct Scsi_Host *, int);
int (* eh_host_reset_handler)(struct Scsi_Host *);
@@ -411,6 +412,15 @@ scmd->allowed.
resetting clears all scmds on the sdev, there is no need
to choose error-completed scmds.
+ 2. If !list_empty(&eh_work_q), invoke scsi_eh_target_reset().
+
+ ``scsi_eh_target_reset``
+
+ hostt->eh_target_reset_handler() is invoked for each target
+ with failed scmds. If bus reset succeeds, all failed
+ scmds on all ready or offline sdevs on the target are
+ EH-finished.
+
3. If !list_empty(&eh_work_q), invoke scsi_eh_bus_reset()
``scsi_eh_bus_reset``
diff --git a/Documentation/scsi/scsi_mid_low_api.rst b/Documentation/scsi/scsi_mid_low_api.rst
index 88bb3b7578ba..0de71d04fdf4 100644
--- a/Documentation/scsi/scsi_mid_low_api.rst
+++ b/Documentation/scsi/scsi_mid_low_api.rst
@@ -758,6 +758,24 @@ Details::
int eh_bus_reset_handler(struct Scsi_Host * host, int channel)
+ /**
+ * eh_target_reset_handler - issue SCSI target reset
+ * @starget: identifies SCSI target to be reset
+ *
+ * Returns SUCCESS if command aborted else FAILED
+ *
+ * Locks: None held
+ *
+ * Calling context: kernel thread
+ *
+ * Notes: Invoked from scsi_eh thread. No other commands will be
+ * queued on current host during eh.
+ *
+ * Optionally defined in: LLD
+ **/
+ int eh_target_reset_handler(struct scsi_target * starget)
+
+
/**
* eh_device_reset_handler - issue SCSI device reset
* @scp: identifies SCSI device to be reset
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 86f16f3ea478..61a060dc7a17 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -1997,7 +1997,15 @@ static enum scsi_timeout_action mptsas_eh_timed_out(struct scsi_cmnd *sc)
}
-static const struct scsi_host_template mptsas_driver_template = {
+static int mptsas_eh_target_reset(struct scsi_target *starget)
+{
+ struct sas_rphy *rphy = dev_to_rphy(starget->dev.parent);
+ MPT_ADAPTER *ioc = rphy_to_ioc(rphy);
+
+ return mptscsih_target_reset(ioc->sh, starget);
+}
+
+static struct scsi_host_template mptsas_driver_template = {
.module = THIS_MODULE,
.proc_name = "mptsas",
.show_info = mptscsih_show_info,
@@ -2012,7 +2020,7 @@ static const struct scsi_host_template mptsas_driver_template = {
.change_queue_depth = mptscsih_change_queue_depth,
.eh_timed_out = mptsas_eh_timed_out,
.eh_abort_handler = mptscsih_abort,
- .eh_device_reset_handler = mptscsih_dev_reset,
+ .eh_target_reset_handler = mptsas_eh_target_reset,
.eh_host_reset_handler = mptscsih_host_reset,
.bios_param = mptscsih_bios_param,
.can_queue = MPT_SAS_CAN_QUEUE,
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 591b2858f823..b31d74ea9cc8 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1853,48 +1853,43 @@ mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
* Returns SUCCESS or FAILED.
**/
int
-mptscsih_target_reset(struct scsi_cmnd * SCpnt)
+mptscsih_target_reset(struct Scsi_Host *shost, struct scsi_target * starget)
{
MPT_SCSI_HOST *hd;
int retval;
- VirtDevice *vdevice;
+ VirtTarget *vtarget;
MPT_ADAPTER *ioc;
/* If we can't locate our host adapter structure, return FAILED status.
*/
- if ((hd = shost_priv(SCpnt->device->host)) == NULL){
- printk(KERN_ERR MYNAM ": target reset: "
- "Can't locate host! (sc=%p)\n", SCpnt);
+ if ((hd = shost_priv(shost)) == NULL){
+ printk(KERN_ERR MYNAM ": target reset: Can't locate host!\n");
return FAILED;
}
ioc = hd->ioc;
- printk(MYIOC_s_INFO_FMT "attempting target reset! (sc=%p)\n",
- ioc->name, SCpnt);
- scsi_print_command(SCpnt);
-
- vdevice = SCpnt->device->hostdata;
- if (!vdevice || !vdevice->vtarget) {
+ printk(MYIOC_s_INFO_FMT "attempting target reset!\n", ioc->name);
+ vtarget = starget->hostdata;
+ if (!vtarget) {
retval = 0;
goto out;
}
/* Target reset to hidden raid component is not supported
*/
- if (vdevice->vtarget->tflags & MPT_TARGET_FLAGS_RAID_COMPONENT) {
+ if (vtarget->tflags & MPT_TARGET_FLAGS_RAID_COMPONENT) {
retval = FAILED;
goto out;
}
retval = mptscsih_IssueTaskMgmt(hd,
MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET,
- vdevice->vtarget->channel,
- vdevice->vtarget->id, 0, 0,
+ vtarget->channel, vtarget->id, 0, 0,
mptscsih_get_tm_timeout(ioc));
out:
- printk (MYIOC_s_INFO_FMT "target reset: %s (sc=%p)\n",
- ioc->name, ((retval == 0) ? "SUCCESS" : "FAILED" ), SCpnt);
+ printk (MYIOC_s_INFO_FMT "target reset: %s\n",
+ ioc->name, ((retval == 0) ? "SUCCESS" : "FAILED" ));
if (retval == 0)
return SUCCESS;
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index 9f3756bd25eb..c4eaf3554c7d 100644
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -120,7 +120,7 @@ extern void mptscsih_slave_destroy(struct scsi_device *device);
extern int mptscsih_slave_configure(struct scsi_device *device);
extern int mptscsih_abort(struct scsi_cmnd * SCpnt);
extern int mptscsih_dev_reset(struct scsi_cmnd * SCpnt);
-extern int mptscsih_target_reset(struct scsi_cmnd * SCpnt);
+extern int mptscsih_target_reset(struct Scsi_Host *, struct scsi_target *);
extern int mptscsih_bus_reset(struct Scsi_Host *, int);
extern int mptscsih_host_reset(struct Scsi_Host *sh);
extern int mptscsih_bios_param(struct scsi_device * sdev, struct block_device *bdev, sector_t capacity, int geom[]);
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 6c5920db1e9d..7f97e034443d 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -820,7 +820,13 @@ static void mptspi_slave_destroy(struct scsi_device *sdev)
mptscsih_slave_destroy(sdev);
}
-static const struct scsi_host_template mptspi_driver_template = {
+static int mptspi_eh_target_reset(struct scsi_target *starget)
+{
+ struct Scsi_Host *shost = dev_to_shost(&starget->dev);
+ return mptscsih_target_reset(shost, starget);
+}
+
+static struct scsi_host_template mptspi_driver_template = {
.module = THIS_MODULE,
.proc_name = "mptspi",
.show_info = mptscsih_show_info,
@@ -834,7 +840,7 @@ static const struct scsi_host_template mptspi_driver_template = {
.slave_destroy = mptspi_slave_destroy,
.change_queue_depth = mptscsih_change_queue_depth,
.eh_abort_handler = mptscsih_abort,
- .eh_device_reset_handler = mptscsih_dev_reset,
+ .eh_target_reset_handler = mptspi_eh_target_reset,
.eh_bus_reset_handler = mptscsih_bus_reset,
.eh_host_reset_handler = mptscsih_host_reset,
.bios_param = mptscsih_bios_param,
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 60ef1e2ab3cd..6bd07f704391 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -340,9 +340,12 @@ static int zfcp_scsi_eh_device_reset_handler(struct scsi_cmnd *scpnt)
return zfcp_scsi_task_mgmt_function(sdev, FCP_TMF_LUN_RESET);
}
-static int zfcp_scsi_eh_target_reset_handler(struct scsi_cmnd *scpnt)
+/*
+ * Note: We need to select a LUN as the storage array doesn't
+ * necessarily supports LUN 0 and might refuse the target reset.
+ */
+static int zfcp_scsi_eh_target_reset_handler(struct scsi_target *starget)
{
- struct scsi_target *starget = scsi_target(scpnt->device);
struct fc_rport *rport = starget_to_rport(starget);
struct Scsi_Host *shost = rport_to_shost(rport);
struct scsi_device *sdev = NULL, *tmp_sdev;
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index f865f8a8f88d..bab5d9c917a8 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -971,10 +971,9 @@ static int aac_eh_dev_reset(struct scsi_cmnd *cmd)
* @scsi_cmd: SCSI command block causing the reset
*
*/
-static int aac_eh_target_reset(struct scsi_cmnd *cmd)
+static int aac_eh_target_reset(struct scsi_target *starget)
{
- struct scsi_device * dev = cmd->device;
- struct Scsi_Host * host = dev->host;
+ struct Scsi_Host * host = dev_to_shost(&starget->dev);
struct aac_dev * aac = (struct aac_dev *)host->hostdata;
struct aac_hba_map_info *info;
int count;
@@ -984,8 +983,8 @@ static int aac_eh_target_reset(struct scsi_cmnd *cmd)
int status;
u8 command;
- bus = aac_logical_to_phys(scmd_channel(cmd));
- cid = scmd_id(cmd);
+ bus = aac_logical_to_phys(starget->channel);
+ cid = starget->id;
if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS)
return FAILED;
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 441ad2ebc5d5..399fbb452740 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -385,11 +385,11 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc)
return rc;
}
-static int beiscsi_eh_session_reset(struct scsi_cmnd *sc)
+static int beiscsi_eh_session_reset(struct scsi_target *starget)
{
struct iscsi_cls_session *cls_session;
- cls_session = starget_to_session(scsi_target(sc->device));
+ cls_session = starget_to_session(starget);
return iscsi_eh_session_reset(cls_session);
}
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index ef352fc59458..87603f9f79db 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -362,11 +362,10 @@ bfad_im_reset_lun_handler(struct scsi_cmnd *cmnd)
* Scsi_Host template entry, resets the target and abort all commands.
*/
static int
-bfad_im_reset_target_handler(struct scsi_cmnd *cmnd)
+bfad_im_reset_target_handler(struct scsi_target *starget)
{
- struct Scsi_Host *shost = cmnd->device->host;
- struct scsi_target *starget = scsi_target(cmnd->device);
struct fc_rport *rport = starget_to_rport(starget);
+ struct Scsi_Host *shost = rport_to_shost(rport);
struct bfad_im_port_s *im_port =
(struct bfad_im_port_s *) shost->hostdata[0];
struct bfad_s *bfad = im_port->bfad;
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 7e74f77da14f..b3ed22d97572 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -551,7 +551,7 @@ void bnx2fc_init_task(struct bnx2fc_cmd *io_req,
void bnx2fc_add_2_sq(struct bnx2fc_rport *tgt, u16 xid);
void bnx2fc_ring_doorbell(struct bnx2fc_rport *tgt);
int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd);
-int bnx2fc_eh_target_reset(struct scsi_cmnd *sc_cmd);
+int bnx2fc_eh_target_reset(struct scsi_target *sc_tgt);
int bnx2fc_eh_device_reset(struct scsi_cmnd *sc_cmd);
void bnx2fc_rport_event_handler(struct fc_lport *lport,
struct fc_rport_priv *rport,
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 33057908f147..0f4a642aca67 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1056,9 +1056,9 @@ int bnx2fc_initiate_cleanup(struct bnx2fc_cmd *io_req)
* Set from SCSI host template to send task mgmt command to the target
* and wait for the response
*/
-int bnx2fc_eh_target_reset(struct scsi_cmnd *sc_cmd)
+int bnx2fc_eh_target_reset(struct scsi_target *sc_tgt)
{
- struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device));
+ struct fc_rport *rport = starget_to_rport(sc_tgt);
struct fc_lport *lport = shost_priv(rport_to_shost(rport));
return bnx2fc_initiate_tmf(lport, rport, 0, FCP_TMF_TGT_RESET);
diff --git a/drivers/scsi/esas2r/esas2r.h b/drivers/scsi/esas2r/esas2r.h
index 5c1eeaffc090..56d8ff63372a 100644
--- a/drivers/scsi/esas2r/esas2r.h
+++ b/drivers/scsi/esas2r/esas2r.h
@@ -978,7 +978,7 @@ int esas2r_eh_abort(struct scsi_cmnd *cmd);
int esas2r_device_reset(struct scsi_cmnd *cmd);
int esas2r_host_reset(struct Scsi_Host *shost);
int esas2r_bus_reset(struct Scsi_Host *shost, int channel);
-int esas2r_target_reset(struct scsi_cmnd *cmd);
+int esas2r_target_reset(struct scsi_target *starget);
/* Internal functions */
int esas2r_init_adapter(struct Scsi_Host *host, struct pci_dev *pcid,
diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
index ae647e2586d0..056feafaf4e7 100644
--- a/drivers/scsi/esas2r/esas2r_main.c
+++ b/drivers/scsi/esas2r/esas2r_main.c
@@ -1104,10 +1104,11 @@ int esas2r_bus_reset(struct Scsi_Host *shost, int channel)
return esas2r_host_bus_reset(shost, false);
}
-static int esas2r_dev_targ_reset(struct scsi_cmnd *cmd, bool target_reset)
+static int esas2r_dev_targ_reset(struct Scsi_Host *shost, int id, u64 lun,
+ bool target_reset)
{
struct esas2r_adapter *a =
- (struct esas2r_adapter *)cmd->device->host->hostdata;
+ (struct esas2r_adapter *)shost->hostdata;
struct esas2r_request *rq;
u8 task_management_status = RS_PENDING;
bool completed;
@@ -1121,34 +1122,30 @@ static int esas2r_dev_targ_reset(struct scsi_cmnd *cmd, bool target_reset)
if (target_reset) {
esas2r_log(ESAS2R_LOG_CRIT,
"unable to allocate a request for a "
- "target reset (%d)!",
- cmd->device->id);
+ "target reset (%d)!", id);
} else {
esas2r_log(ESAS2R_LOG_CRIT,
"unable to allocate a request for a "
- "device reset (%d:%llu)!",
- cmd->device->id,
- cmd->device->lun);
+ "device reset (%d:%llu)!", id, lun);
}
return FAILED;
}
- rq->target_id = cmd->device->id;
- rq->vrq->scsi.flags |= cpu_to_le32(cmd->device->lun);
+ rq->target_id = id;
+ rq->vrq->scsi.flags |= cpu_to_le32(lun);
rq->req_stat = RS_PENDING;
rq->comp_cb = complete_task_management_request;
rq->task_management_status_ptr = &task_management_status;
if (target_reset) {
- esas2r_debug("issuing target reset (%p) to id %d", rq,
- cmd->device->id);
+ esas2r_debug("issuing target reset (%p) to id %d", rq, id);
completed = esas2r_send_task_mgmt(a, rq, 0x20);
} else {
- esas2r_debug("issuing device reset (%p) to id %d lun %d", rq,
- cmd->device->id, cmd->device->lun);
+ esas2r_debug("issuing device reset (%p) to id %d lun %llu", rq,
+ id, lun);
completed = esas2r_send_task_mgmt(a, rq, 0x10);
}
@@ -1182,17 +1179,22 @@ static int esas2r_dev_targ_reset(struct scsi_cmnd *cmd, bool target_reset)
int esas2r_device_reset(struct scsi_cmnd *cmd)
{
- esas2r_log(ESAS2R_LOG_INFO, "device_reset (%p)", cmd);
+ struct scsi_device *sdev = cmd->device;
+ struct Scsi_Host *shost = sdev->host;
+
+ esas2r_log(ESAS2R_LOG_INFO, "device_reset");
- return esas2r_dev_targ_reset(cmd, false);
+ return esas2r_dev_targ_reset(shost, sdev->id, sdev->lun, false);
}
-int esas2r_target_reset(struct scsi_cmnd *cmd)
+int esas2r_target_reset(struct scsi_target *starget)
{
- esas2r_log(ESAS2R_LOG_INFO, "target_reset (%p)", cmd);
+ struct Scsi_Host *shost = dev_to_shost(&starget->dev);
+
+ esas2r_log(ESAS2R_LOG_INFO, "target_reset");
- return esas2r_dev_targ_reset(cmd, true);
+ return esas2r_dev_targ_reset(shost, starget->id, 0, true);
}
void esas2r_log_request_failure(struct esas2r_adapter *a,
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index cef7333c5586..52601c8c16bc 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -2937,9 +2937,8 @@ static void ibmvfc_dev_cancel_all_noreset(struct scsi_device *sdev, void *data)
* Returns:
* SUCCESS / FAST_IO_FAIL / FAILED
**/
-static int ibmvfc_eh_target_reset_handler(struct scsi_cmnd *cmd)
+static int ibmvfc_eh_target_reset_handler(struct scsi_target *starget)
{
- struct scsi_target *starget = scsi_target(cmd->device);
struct fc_rport *rport = starget_to_rport(starget);
struct Scsi_Host *shost = rport_to_shost(rport);
struct ibmvfc_host *vhost = shost_priv(shost);
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index a561eefabb50..cea78a8cc712 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -2743,12 +2743,12 @@ static int iscsi_eh_target_reset(struct iscsi_cls_session *cls_session)
* This will attempt to send a warm target reset. If that fails,
* we will escalate to ERL0 session recovery.
*/
-int iscsi_eh_recover_target(struct scsi_cmnd *sc)
+int iscsi_eh_recover_target(struct scsi_target *starget)
{
struct iscsi_cls_session *cls_session;
int rc;
- cls_session = starget_to_session(scsi_target(sc->device));
+ cls_session = starget_to_session(starget);
rc = iscsi_eh_target_reset(cls_session);
if (rc == FAILED)
rc = iscsi_eh_session_reset(cls_session);
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 9047cfcd1072..3fa0c55a2234 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -478,11 +478,12 @@ int sas_eh_device_reset_handler(struct scsi_cmnd *cmd)
}
EXPORT_SYMBOL_GPL(sas_eh_device_reset_handler);
-int sas_eh_target_reset_handler(struct scsi_cmnd *cmd)
+int sas_eh_target_reset_handler(struct scsi_target *starget)
{
int res;
- struct Scsi_Host *host = cmd->device->host;
- struct domain_device *dev = cmd_to_domain_dev(cmd);
+ struct domain_device *dev = starget_to_domain_dev(starget);
+ struct sas_rphy *rphy = dev->rphy;
+ struct Scsi_Host *host = dev_to_shost(rphy->dev.parent);
struct sas_internal *i = to_sas_internal(host->transportt);
if (current != host->ehandler)
@@ -515,7 +516,7 @@ static int try_to_reset_cmd_device(struct scsi_cmnd *cmd)
try_target_reset:
if (shost->hostt->eh_target_reset_handler)
- return shost->hostt->eh_target_reset_handler(cmd);
+ return shost->hostt->eh_target_reset_handler(scsi_target(cmd->device));
return FAILED;
}
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 6ee444ff7532..e21433394a0e 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -6045,15 +6045,15 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd)
* 0x2002 - Success
**/
static int
-lpfc_target_reset_handler(struct scsi_cmnd *cmnd)
+lpfc_target_reset_handler(struct scsi_target *starget)
{
- struct Scsi_Host *shost = cmnd->device->host;
- struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
+ struct fc_rport *rport = starget_to_rport(starget);
+ struct Scsi_Host *shost = rport_to_shost(rport);
struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
struct lpfc_rport_data *rdata;
struct lpfc_nodelist *pnode;
- unsigned tgt_id = cmnd->device->id;
- uint64_t lun_id = cmnd->device->lun;
+ unsigned tgt_id = starget->id;
+ uint64_t lun_id = 0;
struct lpfc_scsi_event_header scsi_event;
int status;
u32 logit = LOG_FCP;
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index 3554f6b07727..13d417a8621b 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -2725,7 +2725,8 @@ void megasas_setup_jbod_map(struct megasas_instance *instance);
void megasas_update_sdev_properties(struct scsi_device *sdev);
int megasas_reset_fusion(struct Scsi_Host *shost, int reason);
int megasas_task_abort_fusion(struct scsi_cmnd *scmd);
-int megasas_reset_target_fusion(struct scsi_cmnd *scmd);
+int megasas_reset_target_fusion(struct Scsi_Host *shost,
+ struct scsi_target *starget);
u32 mega_mod64(u64 dividend, u32 divisor);
int megasas_alloc_fusion_context(struct megasas_instance *instance);
void megasas_free_fusion_context(struct megasas_instance *instance);
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 87f6d12dd812..f2ce088e193f 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -3110,17 +3110,19 @@ static int megasas_task_abort(struct scsi_cmnd *scmd)
* (supported only for fusion adapters)
* @scmd: SCSI command pointer
*/
-static int megasas_reset_target(struct scsi_cmnd *scmd)
+static int megasas_reset_target(struct scsi_target *starget)
{
+ struct Scsi_Host *shost = dev_to_shost(&starget->dev);
int ret;
struct megasas_instance *instance;
- instance = (struct megasas_instance *)scmd->device->host->hostdata;
+ instance = (struct megasas_instance *)shost->hostdata;
if (instance->adapter_type != MFI_SERIES)
- ret = megasas_reset_target_fusion(scmd);
+ ret = megasas_reset_target_fusion(shost, starget);
else {
- sdev_printk(KERN_NOTICE, scmd->device, "TARGET RESET not supported\n");
+ starget_printk(KERN_NOTICE, starget,
+ "TARGET RESET not supported\n");
ret = FAILED;
}
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 8a83f3fc2b86..0ad6be041298 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -4801,21 +4801,25 @@ int megasas_task_abort_fusion(struct scsi_cmnd *scmd)
/*
* megasas_reset_target_fusion : target reset function for fusion adapters
- * scmd: SCSI command pointer
+ * shost: SCSI host pointer
+ * starget: SCSI target pointer
*
* Returns SUCCESS if all commands associated with target aborted else FAILED
*/
-int megasas_reset_target_fusion(struct scsi_cmnd *scmd)
+int megasas_reset_target_fusion(struct Scsi_Host *shost,
+ struct scsi_target *starget)
{
struct megasas_instance *instance;
+ struct scsi_device *sdev;
int ret = FAILED;
- u16 devhandle;
- struct MR_PRIV_DEVICE *mr_device_priv_data;
- mr_device_priv_data = scmd->device->hostdata;
+ u16 devhandle = USHRT_MAX;
+ struct MR_PRIV_DEVICE *mr_device_priv_data = NULL;
- instance = (struct megasas_instance *)scmd->device->host->hostdata;
+ instance = (struct megasas_instance *)shost->hostdata;
+ starget_printk(KERN_INFO, starget,
+ "target reset called\n");
if (atomic_read(&instance->adprecovery) != MEGASAS_HBA_OPERATIONAL) {
dev_err(&instance->pdev->dev, "Controller is not OPERATIONAL,"
@@ -4824,10 +4828,21 @@ int megasas_reset_target_fusion(struct scsi_cmnd *scmd)
return ret;
}
+ shost_for_each_device(sdev, shost) {
+ if (!sdev->hostdata)
+ continue;
+ if (sdev->sdev_target != starget)
+ continue;
+ mr_device_priv_data = sdev->hostdata;
+ if (mr_device_priv_data->is_tm_capable) {
+ devhandle = megasas_get_tm_devhandle(sdev);
+ break;
+ }
+ }
+
if (!mr_device_priv_data) {
- sdev_printk(KERN_INFO, scmd->device,
- "device been deleted! scmd: (0x%p)\n", scmd);
- scmd->result = DID_NO_CONNECT << 16;
+ starget_printk(KERN_INFO, starget,
+ "all devices have been deleted\n");
ret = SUCCESS;
goto out;
}
@@ -4838,30 +4853,27 @@ int megasas_reset_target_fusion(struct scsi_cmnd *scmd)
}
mutex_lock(&instance->reset_mutex);
- devhandle = megasas_get_tm_devhandle(scmd->device);
- if (devhandle == (u16)ULONG_MAX) {
- ret = FAILED;
- sdev_printk(KERN_INFO, scmd->device,
+ if (devhandle == USHRT_MAX) {
+ starget_printk(KERN_INFO, starget,
"target reset issued for invalid devhandle\n");
mutex_unlock(&instance->reset_mutex);
- goto out;
+ return SUCCESS;
}
- sdev_printk(KERN_INFO, scmd->device,
- "attempting target reset! scmd(0x%p) tm_dev_handle: 0x%x\n",
- scmd, devhandle);
+ starget_printk(KERN_INFO, starget,
+ "attempting target reset! tm_dev_handle: 0x%x\n",
+ devhandle);
mr_device_priv_data->tm_busy = true;
ret = megasas_issue_tm(instance, devhandle,
- scmd->device->channel, scmd->device->id, 0,
+ starget->channel, starget->id, 0,
MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET,
mr_device_priv_data);
mr_device_priv_data->tm_busy = false;
mutex_unlock(&instance->reset_mutex);
- scmd_printk(KERN_NOTICE, scmd, "target reset %s!!\n",
- (ret == SUCCESS) ? "SUCCESS" : "FAILED");
-
out:
+ starget_printk(KERN_NOTICE, starget, "target reset %s!!\n",
+ (ret == SUCCESS) ? "SUCCESS" : "FAILED");
return ret;
}
diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
index 63b6ed19e9d1..11ee2908757b 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_os.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
@@ -4082,7 +4082,7 @@ static int mpi3mr_eh_bus_reset(struct Scsi_Host *shost, int channel)
/**
* mpi3mr_eh_target_reset - Target reset error handling callback
- * @scmd: SCSI command reference
+ * @starget: SCSI target reference
*
* Issue Target reset Task Management and verify the scmd is
* terminated successfully and return status accordingly.
@@ -4090,54 +4090,42 @@ static int mpi3mr_eh_bus_reset(struct Scsi_Host *shost, int channel)
* Return: SUCCESS of successful termination of the scmd else
* FAILED
*/
-static int mpi3mr_eh_target_reset(struct scsi_cmnd *scmd)
+static int mpi3mr_eh_target_reset(struct scsi_target *starget)
{
- struct mpi3mr_ioc *mrioc = shost_priv(scmd->device->host);
+ struct Scsi_Host *shost = dev_to_shost(&starget->dev);
+ struct mpi3mr_ioc *mrioc = shost_priv(shost);
struct mpi3mr_stgt_priv_data *stgt_priv_data;
- struct mpi3mr_sdev_priv_data *sdev_priv_data;
u16 dev_handle;
u8 resp_code = 0;
int retval = FAILED, ret = 0;
- sdev_printk(KERN_INFO, scmd->device,
- "Attempting Target Reset! scmd(%p)\n", scmd);
- scsi_print_command(scmd);
-
- sdev_priv_data = scmd->device->hostdata;
- if (!sdev_priv_data || !sdev_priv_data->tgt_priv_data) {
- sdev_printk(KERN_INFO, scmd->device,
- "SCSI device is not available\n");
- retval = SUCCESS;
- goto out;
- }
+ starget_printk(KERN_INFO, starget,
+ "Attempting Target Reset!\n");
- stgt_priv_data = sdev_priv_data->tgt_priv_data;
+ stgt_priv_data = (struct mpi3mr_stgt_priv_data *)
+ starget->hostdata;
dev_handle = stgt_priv_data->dev_handle;
if (stgt_priv_data->dev_removed) {
- struct scmd_priv *cmd_priv = scsi_cmd_priv(scmd);
- sdev_printk(KERN_INFO, scmd->device,
+ starget_printk(KERN_INFO, starget,
"%s:target(handle = 0x%04x) is removed, target reset is not issued\n",
mrioc->name, dev_handle);
- if (!cmd_priv->in_lld_scope || cmd_priv->host_tag == MPI3MR_HOSTTAG_INVALID)
- retval = SUCCESS;
- else
- retval = FAILED;
+ retval = FAILED;
goto out;
}
- sdev_printk(KERN_INFO, scmd->device,
+ starget_printk(KERN_INFO, starget,
"Target Reset is issued to handle(0x%04x)\n",
dev_handle);
ret = mpi3mr_issue_tm(mrioc,
MPI3_SCSITASKMGMT_TASKTYPE_TARGET_RESET, dev_handle,
- sdev_priv_data->lun_id, MPI3MR_HOSTTAG_BLK_TMS,
- MPI3MR_RESETTM_TIMEOUT, &mrioc->host_tm_cmds, &resp_code, scmd);
+ /* lun */ 0, MPI3MR_HOSTTAG_BLK_TMS,
+ MPI3MR_RESETTM_TIMEOUT, &mrioc->host_tm_cmds, &resp_code, NULL);
if (ret)
goto out;
if (stgt_priv_data->pend_count) {
- sdev_printk(KERN_INFO, scmd->device,
+ starget_printk(KERN_INFO, starget,
"%s: target has %d pending commands, target reset is failed\n",
mrioc->name, stgt_priv_data->pend_count);
goto out;
@@ -4145,9 +4133,9 @@ static int mpi3mr_eh_target_reset(struct scsi_cmnd *scmd)
retval = SUCCESS;
out:
- sdev_printk(KERN_INFO, scmd->device,
- "%s: target reset is %s for scmd(%p)\n", mrioc->name,
- ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);
+ starget_printk(KERN_INFO, starget,
+ "%s: target reset is %s\n", mrioc->name,
+ ((retval == SUCCESS) ? "SUCCESS" : "FAILED"));
return retval;
}
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 8344ea122477..c6dd00b034f4 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -3446,47 +3446,40 @@ scsih_dev_reset(struct scsi_cmnd *scmd)
* Return: SUCCESS if command aborted else FAILED
*/
static int
-scsih_target_reset(struct scsi_cmnd *scmd)
+scsih_target_reset(struct scsi_target *starget)
{
- struct MPT3SAS_ADAPTER *ioc = shost_priv(scmd->device->host);
- struct MPT3SAS_DEVICE *sas_device_priv_data;
+ struct Scsi_Host *shost = dev_to_shost(&starget->dev);
+ struct MPT3SAS_ADAPTER *ioc = shost_priv(shost);
struct _sas_device *sas_device = NULL;
struct _pcie_device *pcie_device = NULL;
u16 handle;
u8 tr_method = 0;
u8 tr_timeout = 30;
int r;
- struct scsi_target *starget = scmd->device->sdev_target;
struct MPT3SAS_TARGET *target_priv_data = starget->hostdata;
starget_printk(KERN_INFO, starget,
- "attempting target reset! scmd(0x%p)\n", scmd);
- _scsih_tm_display_info(ioc, scmd);
+ "attempting target reset!\n");
- sas_device_priv_data = scmd->device->hostdata;
- if (!sas_device_priv_data || !sas_device_priv_data->sas_target ||
- ioc->remove_host) {
+ if (!target_priv_data || ioc->remove_host) {
starget_printk(KERN_INFO, starget,
- "target been deleted! scmd(0x%p)\n", scmd);
- scmd->result = DID_NO_CONNECT << 16;
- scsi_done(scmd);
+ "target been deleted!\n");
r = SUCCESS;
goto out;
}
/* for hidden raid components obtain the volume_handle */
handle = 0;
- if (sas_device_priv_data->sas_target->flags &
+ if (target_priv_data->flags &
MPT_TARGET_FLAGS_RAID_COMPONENT) {
sas_device = mpt3sas_get_sdev_from_target(ioc,
target_priv_data);
if (sas_device)
handle = sas_device->volume_handle;
} else
- handle = sas_device_priv_data->sas_target->handle;
+ handle = target_priv_data->handle;
if (!handle) {
- scmd->result = DID_RESET << 16;
r = FAILED;
goto out;
}
@@ -3499,16 +3492,16 @@ scsih_target_reset(struct scsi_cmnd *scmd)
tr_method = MPI26_SCSITASKMGMT_MSGFLAGS_PROTOCOL_LVL_RST_PCIE;
} else
tr_method = MPI2_SCSITASKMGMT_MSGFLAGS_LINK_RESET;
- r = mpt3sas_scsih_issue_locked_tm(ioc, handle, scmd->device->channel,
- scmd->device->id, 0,
+ r = mpt3sas_scsih_issue_locked_tm(ioc, handle, starget->channel,
+ starget->id, 0,
MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET, 0, 0,
tr_timeout, tr_method);
/* Check for busy commands after reset */
if (r == SUCCESS && atomic_read(&starget->target_busy))
r = FAILED;
out:
- starget_printk(KERN_INFO, starget, "target reset: %s scmd(0x%p)\n",
- ((r == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);
+ starget_printk(KERN_INFO, starget, "target reset: %s\n",
+ ((r == SUCCESS) ? "SUCCESS" : "FAILED"));
if (sas_device)
sas_device_put(sas_device);
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index f25598a50368..d806576edb87 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -3061,14 +3061,14 @@ static int pmcraid_eh_bus_reset_handler(struct Scsi_Host *host, int channel)
RESET_DEVICE_BUS);
}
-static int pmcraid_eh_target_reset_handler(struct scsi_cmnd *scmd)
+static int pmcraid_eh_target_reset_handler(struct scsi_target *starget)
{
- struct Scsi_Host *shost = scmd->device->host;
+ struct Scsi_Host *shost = dev_to_shost(&starget->dev);
struct scsi_device *scsi_dev = NULL, *tmp;
shost_for_each_device(tmp, shost) {
- if ((tmp->channel == scmd->device->channel) &&
- (tmp->id == scmd->device->id)) {
+ if ((tmp->channel == starget->channel) &&
+ (tmp->id == starget->id)) {
scsi_dev = tmp;
break;
}
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index 413a5a0da433..f6876307c304 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -856,9 +856,8 @@ static int qedf_eh_abort(struct scsi_cmnd *sc_cmd)
return rc;
}
-static int qedf_eh_target_reset(struct scsi_cmnd *sc_cmd)
+static int qedf_eh_target_reset(struct scsi_target *starget)
{
- struct scsi_target *starget = scsi_target(sc_cmd->device);
struct fc_rport *rport = starget_to_rport(starget);
QEDF_ERR(NULL, "TARGET RESET Issued...");
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index a9d9d0a9abd7..53bb73e07c3a 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1514,10 +1514,9 @@ qla2xxx_eh_device_reset(struct scsi_cmnd *cmd)
}
static int
-qla2xxx_eh_target_reset(struct scsi_cmnd *cmd)
+qla2xxx_eh_target_reset(struct scsi_target *starget)
{
- struct scsi_device *sdev = cmd->device;
- struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
+ struct fc_rport *rport = starget_to_rport(starget);
scsi_qla_host_t *vha = shost_priv(rport_to_shost(rport));
struct qla_hw_data *ha = vha->hw;
fc_port_t *fcport = *(fc_port_t **)rport->dd_data;
@@ -1542,40 +1541,39 @@ qla2xxx_eh_target_reset(struct scsi_cmnd *cmd)
return FAILED;
ql_log(ql_log_info, vha, 0x8009,
- "TARGET RESET ISSUED nexus=%ld:%d cmd=%p.\n", vha->host_no,
- sdev->id, cmd);
+ "TARGET RESET ISSUED nexus=%ld:%d.\n", vha->host_no,
+ starget->id);
err = 0;
if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
ql_log(ql_log_warn, vha, 0x800a,
- "Wait for hba online failed for cmd=%p.\n", cmd);
+ "Wait for hba online failed.\n");
goto eh_reset_failed;
}
err = 2;
if (ha->isp_ops->target_reset(fcport, 0, 0) != QLA_SUCCESS) {
ql_log(ql_log_warn, vha, 0x800c,
- "target_reset failed for cmd=%p.\n", cmd);
+ "target_reset failed.\n");
goto eh_reset_failed;
}
err = 3;
if (qla2x00_eh_wait_for_pending_commands(vha, fcport->d_id.b24, 0,
WAIT_TARGET) != QLA_SUCCESS) {
ql_log(ql_log_warn, vha, 0x800d,
- "wait for pending cmds failed for cmd=%p.\n", cmd);
+ "wait for pending cmds failed.\n");
goto eh_reset_failed;
}
ql_log(ql_log_info, vha, 0x800e,
- "TARGET RESET SUCCEEDED nexus:%ld:%d cmd=%p.\n",
- vha->host_no, sdev->id, cmd);
+ "TARGET RESET SUCCEEDED nexus:%ld:%d.\n",
+ vha->host_no, starget->id);
return SUCCESS;
eh_reset_failed:
ql_log(ql_log_info, vha, 0x800f,
- "TARGET RESET FAILED: %s nexus=%ld:%d:%llu cmd=%p.\n",
- reset_errors[err], vha->host_no, cmd->device->id, cmd->device->lun,
- cmd);
+ "TARGET RESET FAILED: %s nexus=%ld:%d.\n",
+ reset_errors[err], vha->host_no, starget->id);
vha->reset_cmd_err_cnt++;
return FAILED;
}
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 70757ef5b4fd..6725830855f9 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -158,7 +158,7 @@ static int qla4xxx_get_host_stats(struct Scsi_Host *shost, char *buf, int len);
static int qla4xxx_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *cmd);
static int qla4xxx_eh_abort(struct scsi_cmnd *cmd);
static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd);
-static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd);
+static int qla4xxx_eh_target_reset(struct scsi_target *starget);
static int qla4xxx_eh_host_reset(struct Scsi_Host *shost);
static int qla4xxx_slave_alloc(struct scsi_device *device);
static umode_t qla4_attr_is_visible(int param_type, int param);
@@ -9342,9 +9342,8 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
*
* This routine is called by the Linux OS to reset the target.
**/
-static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd)
+static int qla4xxx_eh_target_reset(struct scsi_target *starget)
{
- 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;
@@ -9366,10 +9365,8 @@ static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd)
"WARM TARGET RESET ISSUED.\n");
DEBUG2(printk(KERN_INFO
- "scsi%ld: TARGET_DEVICE_RESET cmd=%p jiffies = 0x%lx, "
- "to=%x,dpc_flags=%lx, status=%x allowed=%d\n",
- ha->host_no, cmd, jiffies, scsi_cmd_to_rq(cmd)->timeout / HZ,
- ha->dpc_flags, cmd->result, cmd->allowed));
+ "scsi%ld: TARGET_DEVICE_RESET dpc_flags=%lx\n",
+ ha->host_no, ha->dpc_flags));
rval = qla4xxx_isp_check_reg(ha);
if (rval != QLA_SUCCESS) {
@@ -9392,7 +9389,7 @@ static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd)
}
/* Send marker. */
- if (qla4xxx_send_marker_iocb(ha, ddb_entry, cmd->device->lun,
+ if (qla4xxx_send_marker_iocb(ha, ddb_entry, 0,
MM_TGT_WARM_RESET) != QLA_SUCCESS) {
starget_printk(KERN_INFO, starget,
"WARM TARGET DEVICE RESET FAILED - "
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 217c65a6b9c6..e1ba3ca8c89b 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5323,26 +5323,25 @@ static int scsi_debug_device_reset(struct scsi_cmnd *SCpnt)
return SUCCESS;
}
-static int scsi_debug_target_reset(struct scsi_cmnd *SCpnt)
+static int scsi_debug_target_reset(struct scsi_target *starget)
{
- struct scsi_device *sdp = SCpnt->device;
- struct sdebug_host_info *sdbg_host = shost_to_sdebug_host(sdp->host);
+ struct Scsi_Host *hp = dev_to_shost(&starget->dev);
+ struct sdebug_host_info *sdbg_host = shost_to_sdebug_host(hp);
struct sdebug_dev_info *devip;
int k = 0;
++num_target_resets;
if (SDEBUG_OPT_ALL_NOISE & sdebug_opts)
- sdev_printk(KERN_INFO, sdp, "%s\n", __func__);
-
+ starget_printk(KERN_INFO, starget, "%s\n", __func__);
list_for_each_entry(devip, &sdbg_host->dev_info_list, dev_list) {
- if (devip->target == sdp->id) {
+ if (devip->target == starget->id) {
set_bit(SDEBUG_UA_BUS_RESET, devip->uas_bm);
++k;
}
}
if (SDEBUG_OPT_RESET_NOISE & sdebug_opts)
- sdev_printk(KERN_INFO, sdp,
+ starget_printk(KERN_INFO, starget,
"%s: %d device(s) found in target\n", __func__, k);
return SUCCESS;
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index e3a36a1b57df..a5c93b53aa7b 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -946,14 +946,15 @@ static enum scsi_disposition scsi_try_target_reset(struct scsi_cmnd *scmd)
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;
- rtn = hostt->eh_target_reset_handler(scmd);
+ rtn = hostt->eh_target_reset_handler(starget);
if (rtn == SUCCESS) {
spin_lock_irqsave(host->host_lock, flags);
- __starget_for_each_device(scsi_target(scmd->device), NULL,
+ __starget_for_each_device(starget, NULL,
__scsi_report_device_reset);
spin_unlock_irqrestore(host->host_lock, flags);
}
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 78c5c654023f..1b67f9e50940 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -619,9 +619,8 @@ static int sym53c8xx_eh_abort_handler(struct scsi_cmnd *cmd)
return sts ? SCSI_FAILED : SCSI_SUCCESS;
}
-static int sym53c8xx_eh_target_reset_handler(struct scsi_cmnd *cmd)
+static int sym53c8xx_eh_target_reset_handler(struct scsi_target *starget)
{
- struct scsi_target *starget = scsi_target(cmd->device);
struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
struct sym_data *sym_data = shost_priv(shost);
struct pci_dev *pdev = sym_data->pdev;
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 4ec99a55ac30..07565c0ed139 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -267,23 +267,24 @@ static int tcm_loop_device_reset(struct scsi_cmnd *sc)
return (ret == TMR_FUNCTION_COMPLETE) ? SUCCESS : FAILED;
}
-static int tcm_loop_target_reset(struct scsi_cmnd *sc)
+static int tcm_loop_target_reset(struct scsi_target *starget)
{
struct tcm_loop_hba *tl_hba;
struct tcm_loop_tpg *tl_tpg;
+ struct Scsi_Host *shost = dev_to_shost(&starget->dev);
/*
* Locate the tcm_loop_hba_t pointer
*/
- tl_hba = *(struct tcm_loop_hba **)shost_priv(sc->device->host);
+ tl_hba = *(struct tcm_loop_hba **)shost_priv(shost);
if (!tl_hba) {
pr_err("Unable to perform device reset without active I_T Nexus\n");
return FAILED;
}
/*
- * Locate the tl_tpg pointer from TargetID in sc->device->id
+ * Locate the tl_tpg pointer from TargetID in starget->id
*/
- tl_tpg = &tl_hba->tl_hba_tpgs[sc->device->id];
+ tl_tpg = &tl_hba->tl_hba_tpgs[starget->id];
if (tl_tpg) {
tl_tpg->tl_transport_status = TCM_TRANSPORT_ONLINE;
return SUCCESS;
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 7dddf785edd0..73d3c79f86c3 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -389,7 +389,7 @@ struct iscsi_host {
* scsi host template
*/
extern int iscsi_eh_abort(struct scsi_cmnd *sc);
-extern int iscsi_eh_recover_target(struct scsi_cmnd *sc);
+extern int iscsi_eh_recover_target(struct scsi_target *starget);
extern int iscsi_eh_session_reset(struct iscsi_cls_session *cls_session);
extern int iscsi_eh_device_reset(struct scsi_cmnd *sc);
extern int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc);
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 8a43534eea5c..ee535f3d3931 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -716,7 +716,7 @@ void sas_init_dev(struct domain_device *);
void sas_task_abort(struct sas_task *);
int sas_eh_abort_handler(struct scsi_cmnd *cmd);
int sas_eh_device_reset_handler(struct scsi_cmnd *cmd);
-int sas_eh_target_reset_handler(struct scsi_cmnd *cmd);
+int sas_eh_target_reset_handler(struct scsi_target *starget);
extern void sas_target_destroy(struct scsi_target *);
extern int sas_slave_alloc(struct scsi_device *);
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 32ef595db028..fa0bc5b3ead0 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -151,7 +151,7 @@ struct scsi_host_template {
*/
int (* eh_abort_handler)(struct scsi_cmnd *);
int (* eh_device_reset_handler)(struct scsi_cmnd *);
- int (* eh_target_reset_handler)(struct scsi_cmnd *);
+ int (* eh_target_reset_handler)(struct scsi_target *);
int (* eh_bus_reset_handler)(struct Scsi_Host *, int);
int (* eh_host_reset_handler)(struct Scsi_Host *);
--
2.35.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH 4/7] scsi: Use scsi_device as argument to eh_device_reset_handler()
2023-10-02 15:59 [PATCHv5 0/7] scsi: EH rework, main part Hannes Reinecke
` (2 preceding siblings ...)
2023-10-02 15:59 ` [PATCH 3/7] scsi: Use scsi_target as argument for eh_target_reset_handler() Hannes Reinecke
@ 2023-10-02 15:59 ` Hannes Reinecke
2023-10-05 12:59 ` John Garry
2023-10-10 12:12 ` Wenchao Hao
2023-10-02 15:59 ` [PATCH 5/7] scsi: Do not allocate scsi command in scsi_ioctl_reset() Hannes Reinecke
` (4 subsequent siblings)
8 siblings, 2 replies; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-02 15:59 UTC (permalink / raw)
To: Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig, Hannes Reinecke
The device reset function should only depend on the scsi device,
not the scsi command.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
Documentation/scsi/scsi_eh.rst | 2 +-
Documentation/scsi/scsi_mid_low_api.rst | 4 +--
drivers/infiniband/ulp/srp/ib_srp.c | 6 ++--
drivers/message/fusion/mptfc.c | 12 ++++----
drivers/message/fusion/mptscsih.c | 19 +++++-------
drivers/message/fusion/mptscsih.h | 2 +-
drivers/s390/scsi/zfcp_scsi.c | 4 +--
drivers/scsi/a100u2w.c | 7 ++---
drivers/scsi/aacraid/linit.c | 9 +++---
drivers/scsi/aha152x.c | 6 ++--
drivers/scsi/aha1542.c | 8 ++---
drivers/scsi/aic7xxx/aic79xx_osm.c | 27 +++++++----------
drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 +--
drivers/scsi/arm/fas216.c | 5 ++--
drivers/scsi/arm/fas216.h | 6 ++--
drivers/scsi/be2iscsi/be_main.c | 8 ++---
drivers/scsi/bfa/bfad_im.c | 3 +-
drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
drivers/scsi/bnx2fc/bnx2fc_io.c | 6 ++--
drivers/scsi/csiostor/csio_scsi.c | 5 ++--
drivers/scsi/cxlflash/main.c | 5 ++--
drivers/scsi/esas2r/esas2r.h | 2 +-
drivers/scsi/esas2r/esas2r_main.c | 3 +-
drivers/scsi/fnic/fnic.h | 2 +-
drivers/scsi/fnic/fnic_scsi.c | 5 ++--
drivers/scsi/hpsa.c | 14 ++++-----
drivers/scsi/ibmvscsi/ibmvfc.c | 8 ++---
drivers/scsi/ibmvscsi/ibmvscsi.c | 19 ++++++------
drivers/scsi/ipr.c | 22 +++++++-------
drivers/scsi/libfc/fc_fcp.c | 13 ++++----
drivers/scsi/libiscsi.c | 15 +++++-----
drivers/scsi/libsas/sas_scsi_host.c | 12 ++++----
drivers/scsi/lpfc/lpfc_scsi.c | 10 +++----
drivers/scsi/mpi3mr/mpi3mr_os.c | 40 +++++++++++--------------
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 30 ++++++++-----------
drivers/scsi/pcmcia/nsp_cs.h | 2 --
drivers/scsi/pmcraid.c | 6 ++--
drivers/scsi/qedf/qedf_main.c | 6 ++--
drivers/scsi/qla1280.c | 21 +++++++++----
drivers/scsi/qla2xxx/qla_os.c | 24 +++++++--------
drivers/scsi/qla4xxx/ql4_os.c | 23 ++++++--------
drivers/scsi/scsi_debug.c | 3 +-
drivers/scsi/scsi_error.c | 35 +++++++++++++++-------
drivers/scsi/smartpqi/smartpqi.h | 1 -
drivers/scsi/smartpqi/smartpqi_init.c | 19 +++++-------
drivers/scsi/snic/snic.h | 2 +-
drivers/scsi/snic/snic_scsi.c | 4 +--
drivers/scsi/virtio_scsi.c | 12 ++++----
drivers/scsi/vmw_pvscsi.c | 10 +++----
drivers/scsi/wd719x.c | 6 ++--
drivers/scsi/xen-scsifront.c | 6 ++--
drivers/staging/rts5208/rtsx.c | 6 +++-
drivers/target/loopback/tcm_loop.c | 8 ++---
drivers/ufs/core/ufshcd.c | 8 ++---
drivers/usb/storage/scsiglue.c | 4 +--
drivers/usb/storage/uas.c | 3 +-
include/scsi/libfc.h | 2 +-
include/scsi/libiscsi.h | 2 +-
include/scsi/libsas.h | 2 +-
include/scsi/scsi_host.h | 2 +-
60 files changed, 272 insertions(+), 290 deletions(-)
diff --git a/Documentation/scsi/scsi_eh.rst b/Documentation/scsi/scsi_eh.rst
index 85057d451a9f..c4ee5e6cf8de 100644
--- a/Documentation/scsi/scsi_eh.rst
+++ b/Documentation/scsi/scsi_eh.rst
@@ -215,7 +215,7 @@ considered to fail always.
::
int (* eh_abort_handler)(struct scsi_cmnd *);
- int (* eh_device_reset_handler)(struct scsi_cmnd *);
+ int (* eh_device_reset_handler)(struct scsi_device *);
int (* eh_target_reset_handler)(struct scsi_target *);
int (* eh_bus_reset_handler)(struct Scsi_Host *, int);
int (* eh_host_reset_handler)(struct Scsi_Host *);
diff --git a/Documentation/scsi/scsi_mid_low_api.rst b/Documentation/scsi/scsi_mid_low_api.rst
index 0de71d04fdf4..bcea5e065735 100644
--- a/Documentation/scsi/scsi_mid_low_api.rst
+++ b/Documentation/scsi/scsi_mid_low_api.rst
@@ -778,7 +778,7 @@ Details::
/**
* eh_device_reset_handler - issue SCSI device reset
- * @scp: identifies SCSI device to be reset
+ * @sdev: identifies SCSI device to be reset
*
* Returns SUCCESS if command aborted else FAILED
*
@@ -791,7 +791,7 @@ Details::
*
* Optionally defined in: LLD
**/
- int eh_device_reset_handler(struct scsi_cmnd * scp)
+ int eh_device_reset_handler(struct scsi_device * sdev)
/**
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 07a61d238d6b..698e19fe3c87 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -2813,16 +2813,16 @@ static int srp_abort(struct scsi_cmnd *scmnd)
return ret;
}
-static int srp_reset_device(struct scsi_cmnd *scmnd)
+static int srp_reset_device(struct scsi_device *sdev)
{
- struct srp_target_port *target = host_to_target(scmnd->device->host);
+ struct srp_target_port *target = host_to_target(sdev->host);
struct srp_rdma_ch *ch;
u8 status;
shost_printk(KERN_ERR, target->scsi_host, "SRP reset_device called\n");
ch = &target->ch[0];
- if (srp_send_tsk_mgmt(ch, SRP_TAG_NO_REQ, scmnd->device->lun,
+ if (srp_send_tsk_mgmt(ch, SRP_TAG_NO_REQ, sdev->lun,
SRP_TSK_LUN_RESET, &status))
return FAILED;
if (status)
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index 83718602c1c4..fb576e3f9268 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -102,7 +102,7 @@ static void mptfc_target_destroy(struct scsi_target *starget);
static void mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout);
static void mptfc_remove(struct pci_dev *pdev);
static int mptfc_abort(struct scsi_cmnd *SCpnt);
-static int mptfc_dev_reset(struct scsi_cmnd *SCpnt);
+static int mptfc_dev_reset(struct scsi_device *sdev);
static int mptfc_bus_reset(struct Scsi_Host *shost, int channel);
static const struct scsi_host_template mptfc_driver_template = {
@@ -240,10 +240,10 @@ mptfc_abort(struct scsi_cmnd *SCpnt)
}
static int
-mptfc_dev_reset(struct scsi_cmnd *SCpnt)
+mptfc_dev_reset(struct scsi_device *sdev)
{
- struct Scsi_Host *shost = SCpnt->device->host;
- struct fc_rport *rport = starget_to_rport(scsi_target(SCpnt->device));
+ struct Scsi_Host *shost = sdev->host;
+ struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
MPT_SCSI_HOST __maybe_unused *hd = shost_priv(shost);
int rtn;
@@ -252,8 +252,8 @@ mptfc_dev_reset(struct scsi_cmnd *SCpnt)
dfcprintk (hd->ioc, printk(MYIOC_s_DEBUG_FMT
"%s.%d: %d:%llu, executing recovery.\n", __func__,
hd->ioc->name, shost->host_no,
- SCpnt->device->id, SCpnt->device->lun));
- rtn = mptscsih_dev_reset(SCpnt);
+ sdev->id, sdev->lun));
+ rtn = mptscsih_dev_reset(sdev);
}
return rtn;
}
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index b31d74ea9cc8..312ddf43ff9e 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1794,14 +1794,14 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/**
* mptscsih_dev_reset - Perform a SCSI LOGICAL_UNIT_RESET!
- * @SCpnt: Pointer to scsi_cmnd structure, IO which reset is due to
+ * @device: Pointer to scsi_device structure, which reset is due to
*
* (linux scsi_host_template.eh_dev_reset_handler routine)
*
* Returns SUCCESS or FAILED.
**/
int
-mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
+mptscsih_dev_reset(struct scsi_device * device)
{
MPT_SCSI_HOST *hd;
int retval;
@@ -1810,18 +1810,15 @@ mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
/* If we can't locate our host adapter structure, return FAILED status.
*/
- if ((hd = shost_priv(SCpnt->device->host)) == NULL){
- printk(KERN_ERR MYNAM ": lun reset: "
- "Can't locate host! (sc=%p)\n", SCpnt);
+ if ((hd = shost_priv(device->host)) == NULL){
+ printk(KERN_ERR MYNAM ": lun reset: Can't locate host!\n");
return FAILED;
}
ioc = hd->ioc;
- printk(MYIOC_s_INFO_FMT "attempting lun reset! (sc=%p)\n",
- ioc->name, SCpnt);
- scsi_print_command(SCpnt);
+ printk(MYIOC_s_INFO_FMT "attempting lun reset!\n", ioc->name);
- vdevice = SCpnt->device->hostdata;
+ vdevice = device->hostdata;
if (!vdevice || !vdevice->vtarget) {
retval = 0;
goto out;
@@ -1834,8 +1831,8 @@ mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
mptscsih_get_tm_timeout(ioc));
out:
- printk (MYIOC_s_INFO_FMT "lun reset: %s (sc=%p)\n",
- ioc->name, ((retval == 0) ? "SUCCESS" : "FAILED" ), SCpnt);
+ printk (MYIOC_s_INFO_FMT "lun reset: %s\n",
+ ioc->name, ((retval == 0) ? "SUCCESS" : "FAILED" ));
if (retval == 0)
return SUCCESS;
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index c4eaf3554c7d..70ed021bd458 100644
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -119,7 +119,7 @@ extern int mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel,
extern void mptscsih_slave_destroy(struct scsi_device *device);
extern int mptscsih_slave_configure(struct scsi_device *device);
extern int mptscsih_abort(struct scsi_cmnd * SCpnt);
-extern int mptscsih_dev_reset(struct scsi_cmnd * SCpnt);
+extern int mptscsih_dev_reset(struct scsi_device *);
extern int mptscsih_target_reset(struct Scsi_Host *, struct scsi_target *);
extern int mptscsih_bus_reset(struct Scsi_Host *, int);
extern int mptscsih_host_reset(struct Scsi_Host *sh);
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 6bd07f704391..e9ec2d3bd6a1 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -333,10 +333,8 @@ static int zfcp_scsi_task_mgmt_function(struct scsi_device *sdev, u8 tm_flags)
return retval;
}
-static int zfcp_scsi_eh_device_reset_handler(struct scsi_cmnd *scpnt)
+static int zfcp_scsi_eh_device_reset_handler(struct scsi_device *sdev)
{
- struct scsi_device *sdev = scpnt->device;
-
return zfcp_scsi_task_mgmt_function(sdev, FCP_TMF_LUN_RESET);
}
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index a1f5f8d65e6b..41f4b13616bc 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -948,12 +948,11 @@ static int inia100_bus_reset(struct Scsi_Host * shost, int channel)
Output : None.
Return : pSRB - Pointer to SCSI request block.
*****************************************************************************/
-static int inia100_device_reset(struct scsi_cmnd * cmd)
+static int inia100_device_reset(struct scsi_device * dev)
{ /* I need Host Control Block Information */
struct orc_host *host;
- host = (struct orc_host *) cmd->device->host->hostdata;
- return orc_device_reset(host, cmd->device);
-
+ host = (struct orc_host *) dev->host->hostdata;
+ return orc_device_reset(host, dev);
}
/**
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index bab5d9c917a8..ca001a301206 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -905,12 +905,11 @@ static void aac_tmf_callback(void *context, struct fib *fibptr)
/*
* aac_eh_dev_reset - Device reset command handling
- * @scsi_cmd: SCSI command block causing the reset
+ * @dev: SCSI device to be reset
*
*/
-static int aac_eh_dev_reset(struct scsi_cmnd *cmd)
+static int aac_eh_dev_reset(struct scsi_device *dev)
{
- struct scsi_device * dev = cmd->device;
struct Scsi_Host * host = dev->host;
struct aac_dev * aac = (struct aac_dev *)host->hostdata;
struct aac_hba_map_info *info;
@@ -921,8 +920,8 @@ static int aac_eh_dev_reset(struct scsi_cmnd *cmd)
int status;
u8 command;
- bus = aac_logical_to_phys(scmd_channel(cmd));
- cid = scmd_id(cmd);
+ bus = aac_logical_to_phys(sdev_channel(dev));
+ cid = sdev_id(dev);
if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS)
return FAILED;
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index d8ace084b5a7..6bc8ce558c99 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -1068,12 +1068,12 @@ static int aha152x_abort(struct scsi_cmnd *SCpnt)
* Reset a device
*
*/
-static int aha152x_device_reset(struct scsi_cmnd * SCpnt)
+static int aha152x_device_reset(struct scsi_device * sdev)
{
- struct scsi_device *sdev = SCpnt->device;
struct Scsi_Host *shpnt = sdev->host;
+ struct scsi_cmnd *SCpnt;
DECLARE_COMPLETION(done);
- int ret, issued, disconnected;
+ int ret, issued, disconnected = 0;
unsigned char old_cmd_len;
unsigned long flags;
unsigned long timeleft;
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 89c0e2c7d9da..584b08d5c164 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -861,14 +861,14 @@ static int aha1542_release(struct Scsi_Host *sh)
* This is a device reset. This is handled by sending a special command
* to the device.
*/
-static int aha1542_dev_reset(struct scsi_cmnd *cmd)
+static int aha1542_dev_reset(struct scsi_device *sdev)
{
- struct Scsi_Host *sh = cmd->device->host;
+ struct Scsi_Host *sh = sdev->host;
struct aha1542_hostdata *aha1542 = shost_priv(sh);
unsigned long flags;
struct mailbox *mb = aha1542->mb;
- u8 target = cmd->device->id;
- u8 lun = cmd->device->lun;
+ u8 target = sdev->id;
+ u8 lun = sdev->lun;
int mbo;
struct ccb *ccb = aha1542->ccb;
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index a43f643622a9..9390e83557bc 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -767,12 +767,11 @@ ahd_linux_abort(struct scsi_cmnd *cmd)
* Attempt to send a target reset message to the device that timed out.
*/
static int
-ahd_linux_dev_reset(struct scsi_cmnd *cmd)
+ahd_linux_dev_reset(struct scsi_device *sdev)
{
struct ahd_softc *ahd;
struct ahd_linux_device *dev;
struct scb *reset_scb;
- u_int cdb_byte;
int retval = SUCCESS;
struct ahd_initiator_tinfo *tinfo;
struct ahd_tmode_tstate *tstate;
@@ -781,27 +780,22 @@ ahd_linux_dev_reset(struct scsi_cmnd *cmd)
reset_scb = NULL;
- ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
+ ahd = *(struct ahd_softc **)sdev->host->hostdata;
- scmd_printk(KERN_INFO, cmd,
+ sdev_printk(KERN_INFO, sdev,
"Attempting to queue a TARGET RESET message:");
- printk("CDB:");
- for (cdb_byte = 0; cdb_byte < cmd->cmd_len; cdb_byte++)
- printk(" 0x%x", cmd->cmnd[cdb_byte]);
- printk("\n");
-
/*
* Determine if we currently own this command.
*/
- dev = scsi_transport_device_data(cmd->device);
+ dev = scsi_transport_device_data(sdev);
if (dev == NULL) {
/*
* No target device for this command exists,
* so we must not still own the command.
*/
- scmd_printk(KERN_INFO, cmd, "Is not an active device\n");
+ sdev_printk(KERN_INFO, sdev, "Is not an active device\n");
return SUCCESS;
}
@@ -810,12 +804,12 @@ ahd_linux_dev_reset(struct scsi_cmnd *cmd)
*/
reset_scb = ahd_get_scb(ahd, AHD_NEVER_COL_IDX);
if (!reset_scb) {
- scmd_printk(KERN_INFO, cmd, "No SCB available\n");
+ sdev_printk(KERN_INFO, sdev, "No SCB available\n");
return FAILED;
}
tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,
- cmd->device->id, &tstate);
+ sdev->id, &tstate);
reset_scb->io_ctx = NULL;
reset_scb->platform_data->dev = dev;
reset_scb->sg_count = 0;
@@ -823,8 +817,8 @@ ahd_linux_dev_reset(struct scsi_cmnd *cmd)
ahd_set_sense_residual(reset_scb, 0);
reset_scb->platform_data->xfer_len = 0;
reset_scb->hscb->control = 0;
- reset_scb->hscb->scsiid = ahd_build_scsiid(ahd, cmd->device);
- reset_scb->hscb->lun = cmd->device->lun;
+ reset_scb->hscb->scsiid = ahd_build_scsiid(ahd, sdev);
+ reset_scb->hscb->lun = sdev->lun;
reset_scb->hscb->cdb_len = 0;
reset_scb->hscb->task_management = SIU_TASKMGMT_LUN_RESET;
reset_scb->flags |= SCB_DEVICE_RESET|SCB_RECOVERY_SCB|SCB_ACTIVE;
@@ -1790,7 +1784,8 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb)
* was retrieved anytime the first byte of
* the sense buffer looks "sane".
*/
- cmd->sense_buffer[0] = 0;
+ if (cmd)
+ cmd->sense_buffer[0] = 0;
if (ahd_get_transaction_status(scb) == CAM_REQ_INPROG) {
#ifdef AHD_REPORT_UNDERFLOWS
uint32_t amount_xferred;
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 6d42d39806a0..5a3f34e35770 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -739,11 +739,11 @@ ahc_linux_abort(struct scsi_cmnd *cmd)
* Attempt to send a target reset message to the device that timed out.
*/
static int
-ahc_linux_dev_reset(struct scsi_cmnd *cmd)
+ahc_linux_dev_reset(struct scsi_device *sdev)
{
int error;
- error = ahc_linux_queue_recovery_cmd(cmd->device, NULL);
+ error = ahc_linux_queue_recovery_cmd(sdev, NULL);
if (error != SUCCESS)
printk("aic7xxx_dev_reset returns 0x%x\n", error);
return (error);
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index c27b49c42c4f..9015755d26bd 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -2474,16 +2474,15 @@ int fas216_eh_abort(struct scsi_cmnd *SCpnt)
/**
* fas216_eh_device_reset - Reset the device associated with this command
- * @SCpnt: command specifing device to reset
+ * @sdev: device to reset
*
* Reset the device associated with this command.
* Returns: FAILED if unable to reset.
* Notes: We won't be re-entered, so we'll only have one device
* reset on the go at one time.
*/
-int fas216_eh_device_reset(struct scsi_cmnd *SCpnt)
+int fas216_eh_device_reset(struct scsi_device *sdev)
{
- struct scsi_device *sdev = SCpnt->device;
FAS216_Info *info = (FAS216_Info *)sdev->host->hostdata;
unsigned long flags;
int i, res = FAILED, target = sdev->id;
diff --git a/drivers/scsi/arm/fas216.h b/drivers/scsi/arm/fas216.h
index 27a4b564f054..af405ecc2128 100644
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
@@ -380,12 +380,12 @@ extern void fas216_print_devices(FAS216_Info *info, struct seq_file *m);
*/
extern int fas216_eh_abort(struct scsi_cmnd *SCpnt);
-/* Function: int fas216_eh_device_reset(struct scsi_cmnd *SCpnt)
+/* Function: int fas216_eh_device_reset(struct scsi_device *sdev)
* Purpose : Reset the device associated with this command
- * Params : SCpnt - command specifing device to reset
+ * Params : sdev - device to be reset
* Returns : FAILED if unable to reset
*/
-extern int fas216_eh_device_reset(struct scsi_cmnd *SCpnt);
+extern int fas216_eh_device_reset(struct scsi_device *sdev);
/* Function: int fas216_eh_bus_reset(struct scsi_cmnd *SCpnt)
* Purpose : Reset the complete bus associated with this command
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 399fbb452740..aad523e9cfa2 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -274,7 +274,7 @@ static int beiscsi_eh_abort(struct scsi_cmnd *sc)
return iscsi_eh_abort(sc);
}
-static int beiscsi_eh_device_reset(struct scsi_cmnd *sc)
+static int beiscsi_eh_device_reset(struct scsi_device *sdev)
{
struct beiscsi_invldt_cmd_tbl {
struct invldt_cmd_tbl tbl[BE_INVLDT_CMD_TBL_SZ];
@@ -290,7 +290,7 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc)
unsigned int i, nents;
int rc, more = 0;
- cls_session = starget_to_session(scsi_target(sc->device));
+ cls_session = starget_to_session(scsi_target(sdev));
session = cls_session->dd_data;
spin_lock_bh(&session->frwd_lock);
@@ -318,7 +318,7 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc)
if (!task->sc)
continue;
- if (sc->device->lun != task->sc->device->lun)
+ if (sdev->lun != task->sc->device->lun)
continue;
/**
* Can't fit in more cmds? Normally this won't happen b'coz
@@ -381,7 +381,7 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc)
kfree(inv_tbl);
if (rc == SUCCESS)
- rc = iscsi_eh_device_reset(sc);
+ rc = iscsi_eh_device_reset(sdev);
return rc;
}
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index 87603f9f79db..4aac948cbd96 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -283,9 +283,8 @@ bfad_im_target_reset_send(struct bfad_s *bfad,
*
*/
static int
-bfad_im_reset_lun_handler(struct scsi_cmnd *cmnd)
+bfad_im_reset_lun_handler(struct scsi_device *sdev)
{
- struct scsi_device *sdev = cmnd->device;
struct Scsi_Host *shost = sdev->host;
struct bfad_im_port_s *im_port =
(struct bfad_im_port_s *) shost->hostdata[0];
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index b3ed22d97572..8c47e2a39d91 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -552,7 +552,7 @@ void bnx2fc_add_2_sq(struct bnx2fc_rport *tgt, u16 xid);
void bnx2fc_ring_doorbell(struct bnx2fc_rport *tgt);
int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd);
int bnx2fc_eh_target_reset(struct scsi_target *sc_tgt);
-int bnx2fc_eh_device_reset(struct scsi_cmnd *sc_cmd);
+int bnx2fc_eh_device_reset(struct scsi_device *sdev);
void bnx2fc_rport_event_handler(struct fc_lport *lport,
struct fc_rport_priv *rport,
enum fc_rport_event event);
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 0f4a642aca67..9ea0cedb5323 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1072,12 +1072,12 @@ int bnx2fc_eh_target_reset(struct scsi_target *sc_tgt)
* Set from SCSI host template to send task mgmt command to the target
* and wait for the response
*/
-int bnx2fc_eh_device_reset(struct scsi_cmnd *sc_cmd)
+int bnx2fc_eh_device_reset(struct scsi_device *sdev)
{
- struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device));
+ struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
struct fc_lport *lport = shost_priv(rport_to_shost(rport));
- return bnx2fc_initiate_tmf(lport, rport, sc_cmd->device->lun,
+ return bnx2fc_initiate_tmf(lport, rport, sdev->lun,
FCP_TMF_LUN_RESET);
}
diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c
index 08597de49b7f..4c57265b966e 100644
--- a/drivers/scsi/csiostor/csio_scsi.c
+++ b/drivers/scsi/csiostor/csio_scsi.c
@@ -2066,9 +2066,8 @@ csio_tm_cbfn(struct csio_hw *hw, struct csio_ioreq *req)
}
static int
-csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd)
+csio_eh_lun_reset_handler(struct scsi_device *sdev)
{
- struct scsi_device *sdev = cmnd->device;
struct csio_lnode *ln = shost_priv(sdev->host);
struct csio_hw *hw = csio_lnode_to_hw(ln);
struct csio_scsim *scsim = csio_hw_to_scsim(hw);
@@ -2098,7 +2097,7 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd)
}
/* Lnode is ready, now wait on rport node readiness */
- ret = fc_block_scsi_eh(cmnd);
+ ret = fc_block_rport(rn->rport);
if (ret)
return ret;
diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index 187757ae7c1f..7027c580c701 100644
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -2438,16 +2438,15 @@ static int cxlflash_eh_abort_handler(struct scsi_cmnd *scp)
/**
* cxlflash_eh_device_reset_handler() - reset a single LUN
- * @scp: SCSI command to send.
+ * @sdev: SCSI device to be reset.
*
* Return:
* SUCCESS as defined in scsi/scsi.h
* FAILED as defined in scsi/scsi.h
*/
-static int cxlflash_eh_device_reset_handler(struct scsi_cmnd *scp)
+static int cxlflash_eh_device_reset_handler(struct scsi_device *sdev)
{
int rc = SUCCESS;
- struct scsi_device *sdev = scp->device;
struct Scsi_Host *host = sdev->host;
struct cxlflash_cfg *cfg = shost_priv(host);
struct device *dev = &cfg->dev->dev;
diff --git a/drivers/scsi/esas2r/esas2r.h b/drivers/scsi/esas2r/esas2r.h
index 56d8ff63372a..eb5d1dc3049d 100644
--- a/drivers/scsi/esas2r/esas2r.h
+++ b/drivers/scsi/esas2r/esas2r.h
@@ -975,7 +975,7 @@ long esas2r_proc_ioctl(struct file *fp, unsigned int cmd, unsigned long arg);
/* SCSI error handler (eh) functions */
int esas2r_eh_abort(struct scsi_cmnd *cmd);
-int esas2r_device_reset(struct scsi_cmnd *cmd);
+int esas2r_device_reset(struct scsi_device *sdev);
int esas2r_host_reset(struct Scsi_Host *shost);
int esas2r_bus_reset(struct Scsi_Host *shost, int channel);
int esas2r_target_reset(struct scsi_target *starget);
diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
index 056feafaf4e7..b6f68b0b3808 100644
--- a/drivers/scsi/esas2r/esas2r_main.c
+++ b/drivers/scsi/esas2r/esas2r_main.c
@@ -1177,9 +1177,8 @@ static int esas2r_dev_targ_reset(struct Scsi_Host *shost, int id, u64 lun,
return SUCCESS;
}
-int esas2r_device_reset(struct scsi_cmnd *cmd)
+int esas2r_device_reset(struct scsi_device *sdev)
{
- struct scsi_device *sdev = cmd->device;
struct Scsi_Host *shost = sdev->host;
esas2r_log(ESAS2R_LOG_INFO, "device_reset");
diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
index 2e2b49ba8cdf..703594a04b11 100644
--- a/drivers/scsi/fnic/fnic.h
+++ b/drivers/scsi/fnic/fnic.h
@@ -346,7 +346,7 @@ void fnic_update_mac_locked(struct fnic *, u8 *new);
int fnic_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
int fnic_abort_cmd(struct scsi_cmnd *);
-int fnic_device_reset(struct scsi_cmnd *);
+int fnic_device_reset(struct scsi_device *);
int fnic_host_reset(struct Scsi_Host *);
int fnic_reset(struct Scsi_Host *);
void fnic_scsi_cleanup(struct fc_lport *);
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 324058bd594d..d1c53ae72ffa 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -2162,10 +2162,10 @@ static int fnic_clean_pending_aborts(struct fnic *fnic,
* fail to get aborted. It calls driver's eh_device_reset with a SCSI command
* on the LUN.
*/
-int fnic_device_reset(struct scsi_cmnd *sc)
+int fnic_device_reset(struct scsi_device *sdev)
{
- struct scsi_device *sdev = sc->device;
struct request *req;
+ struct scsi_cmnd *sc;
struct fc_lport *lp;
struct fnic *fnic;
struct fnic_io_req *io_req = NULL;
@@ -2193,7 +2193,6 @@ int fnic_device_reset(struct scsi_cmnd *sc)
fnic = lport_priv(lp);
fnic_stats = &fnic->fnic_stats;
reset_stats = &fnic->fnic_stats.reset_stats;
-
atomic64_inc(&reset_stats->device_resets);
FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index af18d20f3079..1cb1f39890d4 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -282,7 +282,7 @@ static int hpsa_scan_finished(struct Scsi_Host *sh,
unsigned long elapsed_time);
static int hpsa_change_queue_depth(struct scsi_device *sdev, int qdepth);
-static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd);
+static int hpsa_eh_device_reset_handler(struct scsi_device *sdev);
static int hpsa_slave_alloc(struct scsi_device *sdev);
static int hpsa_slave_configure(struct scsi_device *sdev);
static void hpsa_slave_destroy(struct scsi_device *sdev);
@@ -6021,7 +6021,7 @@ static int wait_for_device_to_become_ready(struct ctlr_info *h,
/* Need at least one of these error handlers to keep ../scsi/hosts.c from
* complaining. Doing a host- or bus-reset can't do anything good here.
*/
-static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd)
+static int hpsa_eh_device_reset_handler(struct scsi_device *sdev)
{
int rc = SUCCESS;
int i;
@@ -6032,7 +6032,7 @@ static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd)
unsigned long flags;
/* find the controller to which the command to be aborted was sent */
- h = sdev_to_hba(scsicmd->device);
+ h = sdev_to_hba(sdev);
if (h == NULL) /* paranoia */
return FAILED;
@@ -6045,7 +6045,7 @@ static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd)
goto return_reset_status;
}
- dev = scsicmd->device->hostdata;
+ dev = sdev->hostdata;
if (!dev) {
dev_err(&h->pdev->dev, "%s: device lookup failed\n", __func__);
rc = FAILED;
@@ -6060,8 +6060,7 @@ static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd)
/* if controller locked up, we can guarantee command won't complete */
if (lockup_detected(h)) {
snprintf(msg, sizeof(msg),
- "cmd %d RESET FAILED, lockup detected",
- hpsa_get_cmd_index(scsicmd));
+ "RESET FAILED, lockup detected");
hpsa_show_dev_msg(KERN_WARNING, h, dev, msg);
rc = FAILED;
goto return_reset_status;
@@ -6070,8 +6069,7 @@ static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd)
/* this reset request might be the result of a lockup; check */
if (detect_controller_lockup(h)) {
snprintf(msg, sizeof(msg),
- "cmd %d RESET FAILED, new lockup detected",
- hpsa_get_cmd_index(scsicmd));
+ "RESET FAILED, new lockup detected");
hpsa_show_dev_msg(KERN_WARNING, h, dev, msg);
rc = FAILED;
goto return_reset_status;
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 52601c8c16bc..97f8b6a925fb 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -2887,20 +2887,20 @@ static int ibmvfc_eh_abort_handler(struct scsi_cmnd *cmd)
/**
* ibmvfc_eh_device_reset_handler - Reset a single LUN
- * @cmd: scsi command struct
+ * @sdev: scsi devicestruct
*
* Returns:
* SUCCESS / FAST_IO_FAIL / FAILED
**/
-static int ibmvfc_eh_device_reset_handler(struct scsi_cmnd *cmd)
+static int ibmvfc_eh_device_reset_handler(struct scsi_device *sdev)
{
- struct scsi_device *sdev = cmd->device;
+ struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
struct ibmvfc_host *vhost = shost_priv(sdev->host);
int cancel_rc, block_rc, reset_rc = 0;
int rc = FAILED;
ENTER;
- block_rc = fc_block_scsi_eh(cmd);
+ block_rc = fc_block_rport(rport);
ibmvfc_wait_while_resetting(vhost);
if (block_rc != FAST_IO_FAIL) {
cancel_rc = ibmvfc_cancel_all(sdev, IBMVFC_TMF_LUN_RESET);
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index da131fc34c2a..e227de98734a 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1624,16 +1624,16 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
* template send this over to the server and wait synchronously for the
* response
*/
-static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
+static int ibmvscsi_eh_device_reset_handler(struct scsi_device *sdev)
{
- struct ibmvscsi_host_data *hostdata = shost_priv(cmd->device->host);
+ struct ibmvscsi_host_data *hostdata = shost_priv(sdev->host);
struct srp_tsk_mgmt *tsk_mgmt;
struct srp_event_struct *evt;
struct srp_event_struct *tmp_evt, *pos;
union viosrp_iu srp_rsp;
int rsp_rc;
unsigned long flags;
- u16 lun = lun_from_dev(cmd->device);
+ u16 lun = lun_from_dev(sdev);
unsigned long wait_switch = 0;
spin_lock_irqsave(hostdata->host->host_lock, flags);
@@ -1642,7 +1642,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
evt = get_event_struct(&hostdata->pool);
if (evt == NULL) {
spin_unlock_irqrestore(hostdata->host->host_lock, flags);
- sdev_printk(KERN_ERR, cmd->device,
+ sdev_printk(KERN_ERR, sdev,
"failed to allocate reset event\n");
return FAILED;
}
@@ -1676,12 +1676,12 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
spin_unlock_irqrestore(hostdata->host->host_lock, flags);
if (rsp_rc != 0) {
- sdev_printk(KERN_ERR, cmd->device,
+ sdev_printk(KERN_ERR, sdev,
"failed to send reset event. rc=%d\n", rsp_rc);
return FAILED;
}
- sdev_printk(KERN_INFO, cmd->device, "resetting device. lun 0x%llx\n",
+ sdev_printk(KERN_INFO, sdev, "resetting device. lun 0x%llx\n",
(((u64) lun) << 48));
wait_for_completion(&evt->comp);
@@ -1689,7 +1689,8 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
/* make sure we got a good response */
if (unlikely(srp_rsp.srp.rsp.opcode != SRP_RSP)) {
if (printk_ratelimit())
- sdev_printk(KERN_WARNING, cmd->device, "reset bad SRP RSP type %d\n",
+ sdev_printk(KERN_WARNING, sdev,
+ "reset bad SRP RSP type %d\n",
srp_rsp.srp.rsp.opcode);
return FAILED;
}
@@ -1701,7 +1702,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
if (rsp_rc) {
if (printk_ratelimit())
- sdev_printk(KERN_WARNING, cmd->device,
+ sdev_printk(KERN_WARNING, sdev,
"reset code %d for task tag 0x%llx\n",
rsp_rc, tsk_mgmt->task_tag);
return FAILED;
@@ -1712,7 +1713,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
*/
spin_lock_irqsave(hostdata->host->host_lock, flags);
list_for_each_entry_safe(tmp_evt, pos, &hostdata->sent, list) {
- if ((tmp_evt->cmnd) && (tmp_evt->cmnd->device == cmd->device)) {
+ if ((tmp_evt->cmnd) && (tmp_evt->cmnd->device == sdev)) {
if (tmp_evt->cmnd)
tmp_evt->cmnd->result = (DID_RESET << 16);
list_del(&tmp_evt->list);
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index df012977a25e..8e0696448590 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -5037,7 +5037,7 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg,
/**
* __ipr_eh_dev_reset - Reset the device
- * @scsi_cmd: scsi command struct
+ * @scsi_dev: scsi device struct
*
* This function issues a device reset to the affected device.
* A LUN reset will be sent to the device first. If that does
@@ -5046,15 +5046,15 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg,
* Return value:
* SUCCESS / FAILED
**/
-static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd)
+static int __ipr_eh_dev_reset(struct scsi_device *scsi_dev)
{
struct ipr_ioa_cfg *ioa_cfg;
struct ipr_resource_entry *res;
int rc = 0;
ENTER;
- ioa_cfg = (struct ipr_ioa_cfg *) scsi_cmd->device->host->hostdata;
- res = scsi_cmd->device->hostdata;
+ ioa_cfg = (struct ipr_ioa_cfg *) scsi_dev->host->hostdata;
+ res = scsi_dev->hostdata;
/*
* If we are currently going through reset/reload, return failed. This will force the
@@ -5067,7 +5067,7 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd)
return FAILED;
res->resetting_device = 1;
- scmd_printk(KERN_ERR, scsi_cmd, "Resetting device\n");
+ sdev_printk(KERN_ERR, scsi_dev, "Resetting device\n");
rc = ipr_device_reset(ioa_cfg, res);
res->resetting_device = 0;
@@ -5077,21 +5077,21 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd)
return rc ? FAILED : SUCCESS;
}
-static int ipr_eh_dev_reset(struct scsi_cmnd *cmd)
+static int ipr_eh_dev_reset(struct scsi_device *sdev)
{
int rc;
struct ipr_ioa_cfg *ioa_cfg;
struct ipr_resource_entry *res;
- ioa_cfg = (struct ipr_ioa_cfg *) cmd->device->host->hostdata;
- res = cmd->device->hostdata;
+ ioa_cfg = (struct ipr_ioa_cfg *) sdev->host->hostdata;
+ res = sdev->hostdata;
if (!res)
return FAILED;
- spin_lock_irq(cmd->device->host->host_lock);
- rc = __ipr_eh_dev_reset(cmd);
- spin_unlock_irq(cmd->device->host->host_lock);
+ spin_lock_irq(sdev->host->host_lock);
+ rc = __ipr_eh_dev_reset(sdev);
+ spin_unlock_irq(sdev->host->host_lock);
if (rc == SUCCESS)
rc = ipr_wait_for_ops(ioa_cfg, cmd->device, ipr_match_lun);
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 2ee697dd4ce3..52db6587cbc4 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -2135,24 +2135,23 @@ EXPORT_SYMBOL(fc_eh_abort);
/**
* fc_eh_device_reset() - Reset a single LUN
- * @sc_cmd: The SCSI command which identifies the device whose
- * LUN is to be reset
+ * @sdev: The SCSI device whose LUN is to be reset
*
* Set from SCSI host template.
*/
-int fc_eh_device_reset(struct scsi_cmnd *sc_cmd)
+int fc_eh_device_reset(struct scsi_device *sdev)
{
struct fc_lport *lport;
struct fc_fcp_pkt *fsp;
- struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device));
+ struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
int rc = FAILED;
int rval;
- rval = fc_block_scsi_eh(sc_cmd);
+ rval = fc_block_rport(rport);
if (rval)
return rval;
- lport = shost_priv(sc_cmd->device->host);
+ lport = shost_priv(sdev->host);
if (lport->state != LPORT_ST_READY)
return rc;
@@ -2175,7 +2174,7 @@ int fc_eh_device_reset(struct scsi_cmnd *sc_cmd)
/*
* flush outstanding commands
*/
- rc = fc_lun_reset(lport, fsp, scmd_id(sc_cmd), sc_cmd->device->lun);
+ rc = fc_lun_reset(lport, fsp, sdev->id, sdev->lun);
fsp->state = FC_SRB_FREE;
fc_fcp_pkt_release(fsp);
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index cea78a8cc712..82742aca5625 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -2496,17 +2496,17 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
}
EXPORT_SYMBOL_GPL(iscsi_eh_abort);
-static void iscsi_prep_lun_reset_pdu(struct scsi_cmnd *sc, struct iscsi_tm *hdr)
+static void iscsi_prep_lun_reset_pdu(struct scsi_device *sdev, struct iscsi_tm *hdr)
{
memset(hdr, 0, sizeof(*hdr));
hdr->opcode = ISCSI_OP_SCSI_TMFUNC | ISCSI_OP_IMMEDIATE;
hdr->flags = ISCSI_TM_FUNC_LOGICAL_UNIT_RESET & ISCSI_FLAG_TM_FUNC_MASK;
hdr->flags |= ISCSI_FLAG_CMD_FINAL;
- int_to_scsilun(sc->device->lun, &hdr->lun);
+ int_to_scsilun(sdev->lun, &hdr->lun);
hdr->rtt = RESERVED_ITT;
}
-int iscsi_eh_device_reset(struct scsi_cmnd *sc)
+int iscsi_eh_device_reset(struct scsi_device *sdev)
{
struct iscsi_cls_session *cls_session;
struct iscsi_session *session;
@@ -2514,11 +2514,10 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)
struct iscsi_tm *hdr;
int rc = FAILED;
- cls_session = starget_to_session(scsi_target(sc->device));
+ cls_session = starget_to_session(scsi_target(sdev));
session = cls_session->dd_data;
- ISCSI_DBG_EH(session, "LU Reset [sc %p lun %llu]\n", sc,
- sc->device->lun);
+ ISCSI_DBG_EH(session, "LU Reset [lun %llu]\n", sdev->lun);
mutex_lock(&session->eh_mutex);
spin_lock_bh(&session->frwd_lock);
@@ -2536,7 +2535,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)
session->tmf_state = TMF_QUEUED;
hdr = &session->tmhdr;
- iscsi_prep_lun_reset_pdu(sc, hdr);
+ iscsi_prep_lun_reset_pdu(sdev, hdr);
if (iscsi_exec_task_mgmt_fn(conn, hdr, session->age,
session->lu_reset_timeout)) {
@@ -2563,7 +2562,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)
spin_lock_bh(&session->frwd_lock);
memset(hdr, 0, sizeof(*hdr));
- fail_scsi_tasks(conn, sc->device->lun, DID_ERROR);
+ fail_scsi_tasks(conn, sdev->lun, DID_ERROR);
session->tmf_state = TMF_INITIAL;
spin_unlock_bh(&session->frwd_lock);
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 3fa0c55a2234..34cdfc456fd7 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -454,18 +454,18 @@ int sas_eh_abort_handler(struct scsi_cmnd *cmd)
EXPORT_SYMBOL_GPL(sas_eh_abort_handler);
/* Attempt to send a LUN reset message to a device */
-int sas_eh_device_reset_handler(struct scsi_cmnd *cmd)
+int sas_eh_device_reset_handler(struct scsi_device *sdev)
{
int res;
struct scsi_lun lun;
- struct Scsi_Host *host = cmd->device->host;
- struct domain_device *dev = cmd_to_domain_dev(cmd);
+ struct Scsi_Host *host = sdev->host;
+ struct domain_device *dev = sdev_to_domain_dev(sdev);
struct sas_internal *i = to_sas_internal(host->transportt);
if (current != host->ehandler)
- return sas_queue_reset(dev, SAS_DEV_LU_RESET, cmd->device->lun);
+ return sas_queue_reset(dev, SAS_DEV_LU_RESET, sdev->lun);
- int_to_scsilun(cmd->device->lun, &lun);
+ int_to_scsilun(sdev->lun, &lun);
if (!i->dft->lldd_lu_reset)
return FAILED;
@@ -510,7 +510,7 @@ static int try_to_reset_cmd_device(struct scsi_cmnd *cmd)
if (!shost->hostt->eh_device_reset_handler)
goto try_target_reset;
- res = shost->hostt->eh_device_reset_handler(cmd);
+ res = shost->hostt->eh_device_reset_handler(cmd->device);
if (res == SUCCESS)
return res;
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index e21433394a0e..3176de7ef8fe 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -5967,15 +5967,15 @@ lpfc_reset_flush_io_context(struct lpfc_vport *vport, uint16_t tgt_id,
* 0x2002 - Success
**/
static int
-lpfc_device_reset_handler(struct scsi_cmnd *cmnd)
+lpfc_device_reset_handler(struct scsi_device *sdev)
{
- struct Scsi_Host *shost = cmnd->device->host;
- struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
+ struct Scsi_Host *shost = sdev->host;
+ struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
struct lpfc_rport_data *rdata;
struct lpfc_nodelist *pnode;
- unsigned tgt_id = cmnd->device->id;
- uint64_t lun_id = cmnd->device->lun;
+ unsigned tgt_id = sdev->id;
+ uint64_t lun_id = sdev->lun;
struct lpfc_scsi_event_header scsi_event;
int status;
u32 logit = LOG_FCP;
diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
index 11ee2908757b..114ef1c0f812 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_os.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
@@ -4142,30 +4142,28 @@ static int mpi3mr_eh_target_reset(struct scsi_target *starget)
/**
* mpi3mr_eh_dev_reset- Device reset error handling callback
- * @scmd: SCSI command reference
+ * @sdev: SCSI device reference
*
- * Issue lun reset Task Management and verify the scmd is
- * terminated successfully and return status accordingly.
+ * Issue lun reset Task Management and return status accordingly.
*
- * Return: SUCCESS of successful termination of the scmd else
+ * Return: SUCCESS of successful lun reset else
* FAILED
*/
-static int mpi3mr_eh_dev_reset(struct scsi_cmnd *scmd)
+static int mpi3mr_eh_dev_reset(struct scsi_device *sdev)
{
- struct mpi3mr_ioc *mrioc = shost_priv(scmd->device->host);
+ struct mpi3mr_ioc *mrioc = shost_priv(sdev->host);
struct mpi3mr_stgt_priv_data *stgt_priv_data;
struct mpi3mr_sdev_priv_data *sdev_priv_data;
u16 dev_handle;
u8 resp_code = 0;
int retval = FAILED, ret = 0;
- sdev_printk(KERN_INFO, scmd->device,
- "Attempting Device(lun) Reset! scmd(%p)\n", scmd);
- scsi_print_command(scmd);
+ sdev_printk(KERN_INFO, sdev,
+ "Attempting Device(lun) Reset!\n");
- sdev_priv_data = scmd->device->hostdata;
+ sdev_priv_data = sdev->hostdata;
if (!sdev_priv_data || !sdev_priv_data->tgt_priv_data) {
- sdev_printk(KERN_INFO, scmd->device,
+ sdev_printk(KERN_INFO, sdev,
"SCSI device is not available\n");
retval = SUCCESS;
goto out;
@@ -4174,38 +4172,34 @@ static int mpi3mr_eh_dev_reset(struct scsi_cmnd *scmd)
stgt_priv_data = sdev_priv_data->tgt_priv_data;
dev_handle = stgt_priv_data->dev_handle;
if (stgt_priv_data->dev_removed) {
- struct scmd_priv *cmd_priv = scsi_cmd_priv(scmd);
- sdev_printk(KERN_INFO, scmd->device,
+ sdev_printk(KERN_INFO, sdev,
"%s: device(handle = 0x%04x) is removed, device(LUN) reset is not issued\n",
mrioc->name, dev_handle);
- if (!cmd_priv->in_lld_scope || cmd_priv->host_tag == MPI3MR_HOSTTAG_INVALID)
- retval = SUCCESS;
- else
- retval = FAILED;
+ retval = FAILED;
goto out;
}
- sdev_printk(KERN_INFO, scmd->device,
+ sdev_printk(KERN_INFO, sdev,
"Device(lun) Reset is issued to handle(0x%04x)\n", dev_handle);
ret = mpi3mr_issue_tm(mrioc,
MPI3_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET, dev_handle,
sdev_priv_data->lun_id, MPI3MR_HOSTTAG_BLK_TMS,
- MPI3MR_RESETTM_TIMEOUT, &mrioc->host_tm_cmds, &resp_code, scmd);
+ MPI3MR_RESETTM_TIMEOUT, &mrioc->host_tm_cmds, &resp_code, NULL);
if (ret)
goto out;
if (sdev_priv_data->pend_count) {
- sdev_printk(KERN_INFO, scmd->device,
+ sdev_printk(KERN_INFO, sdev,
"%s: device has %d pending commands, device(LUN) reset is failed\n",
mrioc->name, sdev_priv_data->pend_count);
goto out;
}
retval = SUCCESS;
out:
- sdev_printk(KERN_INFO, scmd->device,
- "%s: device(LUN) reset is %s for scmd(%p)\n", mrioc->name,
- ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);
+ sdev_printk(KERN_INFO, sdev,
+ "%s: device(LUN) reset is %s\n", mrioc->name,
+ ((retval == SUCCESS) ? "SUCCESS" : "FAILED"));
return retval;
}
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index c6dd00b034f4..530a043e40d2 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -3365,9 +3365,9 @@ scsih_abort(struct scsi_cmnd *scmd)
* Return: SUCCESS if command aborted else FAILED
*/
static int
-scsih_dev_reset(struct scsi_cmnd *scmd)
+scsih_dev_reset(struct scsi_device *sdev)
{
- struct MPT3SAS_ADAPTER *ioc = shost_priv(scmd->device->host);
+ struct MPT3SAS_ADAPTER *ioc = shost_priv(sdev->host);
struct MPT3SAS_DEVICE *sas_device_priv_data;
struct _sas_device *sas_device = NULL;
struct _pcie_device *pcie_device = NULL;
@@ -3376,20 +3376,17 @@ scsih_dev_reset(struct scsi_cmnd *scmd)
u8 tr_timeout = 30;
int r;
- struct scsi_target *starget = scmd->device->sdev_target;
+ struct scsi_target *starget = sdev->sdev_target;
struct MPT3SAS_TARGET *target_priv_data = starget->hostdata;
- sdev_printk(KERN_INFO, scmd->device,
- "attempting device reset! scmd(0x%p)\n", scmd);
- _scsih_tm_display_info(ioc, scmd);
+ sdev_printk(KERN_INFO, sdev,
+ "attempting device reset!\n");
- sas_device_priv_data = scmd->device->hostdata;
+ sas_device_priv_data = sdev->hostdata;
if (!sas_device_priv_data || !sas_device_priv_data->sas_target ||
ioc->remove_host) {
- sdev_printk(KERN_INFO, scmd->device,
- "device been deleted! scmd(0x%p)\n", scmd);
- scmd->result = DID_NO_CONNECT << 16;
- scsi_done(scmd);
+ sdev_printk(KERN_INFO, sdev,
+ "device been deleted!\n");
r = SUCCESS;
goto out;
}
@@ -3406,7 +3403,6 @@ scsih_dev_reset(struct scsi_cmnd *scmd)
handle = sas_device_priv_data->sas_target->handle;
if (!handle) {
- scmd->result = DID_RESET << 16;
r = FAILED;
goto out;
}
@@ -3420,16 +3416,16 @@ scsih_dev_reset(struct scsi_cmnd *scmd)
} else
tr_method = MPI2_SCSITASKMGMT_MSGFLAGS_LINK_RESET;
- r = mpt3sas_scsih_issue_locked_tm(ioc, handle, scmd->device->channel,
- scmd->device->id, scmd->device->lun,
+ r = mpt3sas_scsih_issue_locked_tm(ioc, handle, sdev->channel,
+ sdev->id, sdev->lun,
MPI2_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET, 0, 0,
tr_timeout, tr_method);
/* Check for busy commands after reset */
- if (r == SUCCESS && scsi_device_busy(scmd->device))
+ if (r == SUCCESS && scsi_device_busy(sdev))
r = FAILED;
out:
- sdev_printk(KERN_INFO, scmd->device, "device reset: %s scmd(0x%p)\n",
- ((r == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);
+ sdev_printk(KERN_INFO, sdev, "device reset: %s\n",
+ ((r == SUCCESS) ? "SUCCESS" : "FAILED"));
if (sas_device)
sas_device_put(sas_device);
diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h
index 8636f0053c02..c2b522a194fc 100644
--- a/drivers/scsi/pcmcia/nsp_cs.h
+++ b/drivers/scsi/pcmcia/nsp_cs.h
@@ -297,8 +297,6 @@ static int nsp_show_info (struct seq_file *m,
static int nsp_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *SCpnt);
/* Error handler */
-/*static int nsp_eh_abort (struct scsi_cmnd *SCpnt);*/
-/*static int nsp_eh_device_reset(struct scsi_cmnd *SCpnt);*/
static int nsp_eh_bus_reset (struct Scsi_Host *host, int channel);
static int nsp_eh_host_reset (struct Scsi_Host *host);
static int nsp_bus_reset (nsp_hw_data *data);
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index d806576edb87..92ed0b86ad80 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -3014,11 +3014,11 @@ static int pmcraid_eh_abort_handler(struct scsi_cmnd *scsi_cmd)
* Return value
* SUCCESS or FAILED
*/
-static int pmcraid_eh_device_reset_handler(struct scsi_cmnd *scmd)
+static int pmcraid_eh_device_reset_handler(struct scsi_device *sdev)
{
- scmd_printk(KERN_INFO, scmd,
+ sdev_printk(KERN_INFO, sdev,
"resetting device due to an I/O command timeout.\n");
- return pmcraid_reset_device(scmd->device,
+ return pmcraid_reset_device(sdev,
PMCRAID_INTERNAL_TIMEOUT,
RESET_DEVICE_LUN);
}
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index f6876307c304..bf169950834c 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -864,12 +864,12 @@ static int qedf_eh_target_reset(struct scsi_target *starget)
return qedf_initiate_tmf(rport, 0, FCP_TMF_TGT_RESET);
}
-static int qedf_eh_device_reset(struct scsi_cmnd *sc_cmd)
+static int qedf_eh_device_reset(struct scsi_device *sdev)
{
- struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device));
+ struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
QEDF_ERR(NULL, "LUN RESET Issued...\n");
- return qedf_initiate_tmf(rport, sc_cmd->device->lun, FCP_TMF_LUN_RESET);
+ return qedf_initiate_tmf(rport, sdev->lun, FCP_TMF_LUN_RESET);
}
bool qedf_wait_for_upload(struct qedf_ctx *qedf)
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 1df3deb618e4..cb010aa271ce 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -963,13 +963,24 @@ qla1280_eh_abort(struct scsi_cmnd * cmd)
* Reset the specified SCSI device
**************************************************************************/
static int
-qla1280_eh_device_reset(struct scsi_cmnd *cmd)
+qla1280_eh_device_reset(struct scsi_device *sdev)
{
- int rc;
+ struct Scsi_Host *shost = sdev->host;
+ struct scsi_qla_host *ha = (struct scsi_qla_host *)shost->hostdata;
+ int rc = FAILED;
- spin_lock_irq(cmd->device->host->host_lock);
- rc = qla1280_error_action(cmd, DEVICE_RESET);
- spin_unlock_irq(cmd->device->host->host_lock);
+ spin_lock_irq(shost->host_lock);
+ if (qla1280_verbose)
+ printk(KERN_INFO
+ "scsi(%ld:%d:%d:%llu): Queueing device reset "
+ "command.\n", ha->host_no, sdev->channel,
+ sdev->id, sdev->lun);
+ if (qla1280_device_reset(ha, sdev->channel, sdev->id) == 0) {
+ /* issued device reset, set wait conditions */
+ rc = qla1280_wait_for_pending_commands(ha,
+ sdev->channel, sdev->id);
+ }
+ spin_unlock_irq(shost->host_lock);
return rc;
}
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 53bb73e07c3a..5c160f8ef013 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1445,9 +1445,8 @@ static char *reset_errors[] = {
};
static int
-qla2xxx_eh_device_reset(struct scsi_cmnd *cmd)
+qla2xxx_eh_device_reset(struct scsi_device *sdev)
{
- struct scsi_device *sdev = cmd->device;
scsi_qla_host_t *vha = shost_priv(sdev->host);
struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
fc_port_t *fcport = (struct fc_port *) sdev->hostdata;
@@ -1473,42 +1472,41 @@ qla2xxx_eh_device_reset(struct scsi_cmnd *cmd)
return FAILED;
ql_log(ql_log_info, vha, 0x8009,
- "DEVICE RESET ISSUED nexus=%ld:%d:%llu cmd=%p.\n", vha->host_no,
- sdev->id, sdev->lun, cmd);
+ "DEVICE RESET ISSUED nexus=%ld:%d:%llu.\n", vha->host_no,
+ sdev->id, sdev->lun);
err = 0;
if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
ql_log(ql_log_warn, vha, 0x800a,
- "Wait for hba online failed for cmd=%p.\n", cmd);
+ "Wait for hba online failed.\n");
goto eh_reset_failed;
}
err = 2;
if (ha->isp_ops->lun_reset(fcport, sdev->lun, 1)
!= QLA_SUCCESS) {
ql_log(ql_log_warn, vha, 0x800c,
- "do_reset failed for cmd=%p.\n", cmd);
+ "do_reset failed.\n");
goto eh_reset_failed;
}
err = 3;
if (qla2x00_eh_wait_for_pending_commands(vha, fcport->d_id.b24,
- cmd->device->lun,
+ sdev->lun,
WAIT_LUN) != QLA_SUCCESS) {
ql_log(ql_log_warn, vha, 0x800d,
- "wait for pending cmds failed for cmd=%p.\n", cmd);
+ "wait for pending cmds failed.\n");
goto eh_reset_failed;
}
ql_log(ql_log_info, vha, 0x800e,
- "DEVICE RESET SUCCEEDED nexus:%ld:%d:%llu cmd=%p.\n",
- vha->host_no, sdev->id, sdev->lun, cmd);
+ "DEVICE RESET SUCCEEDED nexus:%ld:%d:%llu.\n",
+ vha->host_no, sdev->id, sdev->lun);
return SUCCESS;
eh_reset_failed:
ql_log(ql_log_info, vha, 0x800f,
- "DEVICE RESET FAILED: %s nexus=%ld:%d:%llu cmd=%p.\n",
- reset_errors[err], vha->host_no, sdev->id, sdev->lun,
- cmd);
+ "DEVICE RESET FAILED: %s nexus=%ld:%d:%llu.\n",
+ reset_errors[err], vha->host_no, sdev->id, sdev->lun);
vha->reset_cmd_err_cnt++;
return FAILED;
}
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 6725830855f9..f99f0dd8686c 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -157,7 +157,7 @@ static int qla4xxx_get_host_stats(struct Scsi_Host *shost, char *buf, int len);
*/
static int qla4xxx_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *cmd);
static int qla4xxx_eh_abort(struct scsi_cmnd *cmd);
-static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd);
+static int qla4xxx_eh_device_reset(struct scsi_device *sdev);
static int qla4xxx_eh_target_reset(struct scsi_target *starget);
static int qla4xxx_eh_host_reset(struct Scsi_Host *shost);
static int qla4xxx_slave_alloc(struct scsi_device *device);
@@ -9270,9 +9270,8 @@ static int qla4xxx_eh_abort(struct scsi_cmnd *cmd)
* This routine is called by the Linux OS to reset all luns on the
* specified target.
**/
-static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
+static int qla4xxx_eh_device_reset(struct scsi_device *sdev)
{
- 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;
@@ -9290,13 +9289,11 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
ql4_printk(KERN_INFO, ha,
"scsi%ld:%d:%d:%llu: DEVICE RESET ISSUED.\n", ha->host_no,
- cmd->device->channel, cmd->device->id, cmd->device->lun);
+ sdev->channel, sdev->id, sdev->lun);
DEBUG2(printk(KERN_INFO
- "scsi%ld: DEVICE_RESET cmd=%p jiffies = 0x%lx, to=%x,"
- "dpc_flags=%lx, status=%x allowed=%d\n", ha->host_no,
- cmd, jiffies, scsi_cmd_to_rq(cmd)->timeout / HZ,
- ha->dpc_flags, cmd->result, cmd->allowed));
+ "scsi%ld: DEVICE_RESET dpc_flags=%lx\n",
+ ha->host_no, ha->dpc_flags));
rval = qla4xxx_isp_check_reg(ha);
if (rval != QLA_SUCCESS) {
@@ -9305,14 +9302,13 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
}
/* FIXME: wait for hba to go online */
- stat = qla4xxx_reset_lun(ha, ddb_entry, cmd->device->lun);
+ stat = qla4xxx_reset_lun(ha, ddb_entry, sdev->lun);
if (stat != QLA_SUCCESS) {
ql4_printk(KERN_INFO, ha, "DEVICE RESET FAILED. %d\n", stat);
goto eh_dev_reset_done;
}
- if (qla4xxx_eh_wait_for_commands(ha, scsi_target(cmd->device),
- cmd->device)) {
+ if (qla4xxx_eh_wait_for_commands(ha, scsi_target(sdev), sdev)) {
ql4_printk(KERN_INFO, ha,
"DEVICE RESET FAILED - waiting for "
"commands.\n");
@@ -9320,14 +9316,13 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
}
/* Send marker. */
- if (qla4xxx_send_marker_iocb(ha, ddb_entry, cmd->device->lun,
+ if (qla4xxx_send_marker_iocb(ha, ddb_entry, sdev->lun,
MM_LUN_RESET) != QLA_SUCCESS)
goto eh_dev_reset_done;
ql4_printk(KERN_INFO, ha,
"scsi(%ld:%d:%d:%llu): DEVICE RESET SUCCEEDED.\n",
- ha->host_no, cmd->device->channel, cmd->device->id,
- cmd->device->lun);
+ ha->host_no, sdev->channel, sdev->id, sdev->lun);
ret = SUCCESS;
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index e1ba3ca8c89b..15a5d4bed51a 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5306,9 +5306,8 @@ static void scsi_debug_stop_all_queued(struct scsi_device *sdp)
scsi_debug_stop_all_queued_iter, sdp);
}
-static int scsi_debug_device_reset(struct scsi_cmnd *SCpnt)
+static int scsi_debug_device_reset(struct scsi_device *sdp)
{
- struct scsi_device *sdp = SCpnt->device;
struct sdebug_dev_info *devip = sdp->hostdata;
++num_dev_resets;
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index a5c93b53aa7b..3e312601cf22 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -980,7 +980,7 @@ static enum scsi_disposition scsi_try_bus_device_reset(struct scsi_cmnd *scmd)
if (!hostt->eh_device_reset_handler)
return FAILED;
- rtn = hostt->eh_device_reset_handler(scmd);
+ rtn = hostt->eh_device_reset_handler(scmd->device);
if (rtn == SUCCESS)
__scsi_report_device_reset(scmd->device, NULL);
return rtn;
@@ -1265,6 +1265,7 @@ scsi_eh_action(struct scsi_cmnd *scmd, enum scsi_disposition rtn)
* scsi_eh_finish_cmd - Handle a cmd that eh is finished with.
* @scmd: Original SCSI cmd that eh has finished.
* @done_q: Queue for processed commands.
+ * @result: Final command status to be set
*
* Notes:
* We don't want to use the normal command completion while we are are
@@ -1273,10 +1274,18 @@ scsi_eh_action(struct scsi_cmnd *scmd, enum scsi_disposition rtn)
* keep a list of pending commands for final completion, and once we
* are ready to leave error handling we handle completion for real.
*/
-void scsi_eh_finish_cmd(struct scsi_cmnd *scmd, struct list_head *done_q)
+void __scsi_eh_finish_cmd(struct scsi_cmnd *scmd, struct list_head *done_q,
+ int host_byte)
{
+ if (host_byte)
+ set_host_byte(scmd, host_byte);
list_move_tail(&scmd->eh_entry, done_q);
}
+
+void scsi_eh_finish_cmd(struct scsi_cmnd *scmd, struct list_head *done_q)
+{
+ __scsi_eh_finish_cmd(scmd, done_q, 0);
+}
EXPORT_SYMBOL(scsi_eh_finish_cmd);
/**
@@ -1451,7 +1460,8 @@ static int scsi_eh_test_devices(struct list_head *cmd_list,
if (finish_cmds &&
(try_stu ||
scsi_eh_action(scmd, SUCCESS) == SUCCESS))
- scsi_eh_finish_cmd(scmd, done_q);
+ __scsi_eh_finish_cmd(scmd, done_q,
+ DID_RESET);
else
list_move_tail(&scmd->eh_entry, work_q);
}
@@ -1600,8 +1610,9 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
work_q, eh_entry) {
if (scmd->device == sdev &&
scsi_eh_action(scmd, rtn) != FAILED)
- scsi_eh_finish_cmd(scmd,
- done_q);
+ __scsi_eh_finish_cmd(scmd,
+ done_q,
+ DID_RESET);
}
}
} else {
@@ -1669,7 +1680,8 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,
if (rtn == SUCCESS)
list_move_tail(&scmd->eh_entry, &check_list);
else if (rtn == FAST_IO_FAIL)
- scsi_eh_finish_cmd(scmd, done_q);
+ __scsi_eh_finish_cmd(scmd, done_q,
+ DID_TRANSPORT_DISRUPTED);
else
/* push back on work queue for further processing */
list_move(&scmd->eh_entry, work_q);
@@ -1734,8 +1746,9 @@ static int scsi_eh_bus_reset(struct Scsi_Host *shost,
list_for_each_entry_safe(scmd, next, work_q, eh_entry) {
if (channel == scmd_channel(scmd)) {
if (rtn == FAST_IO_FAIL)
- scsi_eh_finish_cmd(scmd,
- done_q);
+ __scsi_eh_finish_cmd(scmd,
+ done_q,
+ DID_TRANSPORT_DISRUPTED);
else
list_move_tail(&scmd->eh_entry,
&check_list);
@@ -1778,9 +1791,9 @@ static int scsi_eh_host_reset(struct Scsi_Host *shost,
if (rtn == SUCCESS) {
list_splice_init(work_q, &check_list);
} else if (rtn == FAST_IO_FAIL) {
- list_for_each_entry_safe(scmd, next, work_q, eh_entry) {
- scsi_eh_finish_cmd(scmd, done_q);
- }
+ list_for_each_entry_safe(scmd, next, work_q, eh_entry)
+ __scsi_eh_finish_cmd(scmd, done_q,
+ DID_TRANSPORT_DISRUPTED);
} else {
SCSI_LOG_ERROR_RECOVERY(3,
shost_printk(KERN_INFO, shost,
diff --git a/drivers/scsi/smartpqi/smartpqi.h b/drivers/scsi/smartpqi/smartpqi.h
index 041940183516..93339f7e2bbd 100644
--- a/drivers/scsi/smartpqi/smartpqi.h
+++ b/drivers/scsi/smartpqi/smartpqi.h
@@ -1093,7 +1093,6 @@ struct pqi_tmf_work {
struct pqi_ctrl_info *ctrl_info;
struct pqi_scsi_dev *device;
u8 lun;
- u8 scsi_opcode;
};
struct pqi_scsi_dev {
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 9a58df9312fa..4da9b1d59f17 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -6351,15 +6351,15 @@ static int pqi_device_reset(struct pqi_ctrl_info *ctrl_info, struct pqi_scsi_dev
return rc;
}
-static int pqi_device_reset_handler(struct pqi_ctrl_info *ctrl_info, struct pqi_scsi_dev *device, u8 lun, struct scsi_cmnd *scmd, u8 scsi_opcode)
+static int pqi_device_reset_handler(struct pqi_ctrl_info *ctrl_info, struct pqi_scsi_dev *device, u8 lun)
{
int rc;
mutex_lock(&ctrl_info->lun_reset_mutex);
dev_err(&ctrl_info->pci_dev->dev,
- "resetting scsi %d:%d:%d:%u SCSI cmd at %p due to cmd opcode 0x%02x\n",
- ctrl_info->scsi_host->host_no, device->bus, device->target, lun, scmd, scsi_opcode);
+ "resetting scsi %d:%d:%d:%u\n",
+ ctrl_info->scsi_host->host_no, device->bus, device->target, lun);
pqi_check_ctrl_health(ctrl_info);
if (pqi_ctrl_offline(ctrl_info))
@@ -6377,19 +6377,17 @@ static int pqi_device_reset_handler(struct pqi_ctrl_info *ctrl_info, struct pqi_
return rc;
}
-static int pqi_eh_device_reset_handler(struct scsi_cmnd *scmd)
+static int pqi_eh_device_reset_handler(struct scsi_device *sdev)
{
struct Scsi_Host *shost;
struct pqi_ctrl_info *ctrl_info;
struct pqi_scsi_dev *device;
- u8 scsi_opcode;
- shost = scmd->device->host;
+ shost = sdev->host;
ctrl_info = shost_to_hba(shost);
- device = scmd->device->hostdata;
- scsi_opcode = scmd->cmd_len > 0 ? scmd->cmnd[0] : 0xff;
+ device = sdev->hostdata;
- return pqi_device_reset_handler(ctrl_info, device, (u8)scmd->device->lun, scmd, scsi_opcode);
+ return pqi_device_reset_handler(ctrl_info, device, (u8)sdev->lun);
}
static void pqi_tmf_worker(struct work_struct *work)
@@ -6400,7 +6398,7 @@ static void pqi_tmf_worker(struct work_struct *work)
tmf_work = container_of(work, struct pqi_tmf_work, work_struct);
scmd = (struct scsi_cmnd *)xchg(&tmf_work->scmd, NULL);
- pqi_device_reset_handler(tmf_work->ctrl_info, tmf_work->device, tmf_work->lun, scmd, tmf_work->scsi_opcode);
+ pqi_device_reset_handler(tmf_work->ctrl_info, tmf_work->device, tmf_work->lun);
}
static int pqi_eh_abort_handler(struct scsi_cmnd *scmd)
@@ -6433,7 +6431,6 @@ static int pqi_eh_abort_handler(struct scsi_cmnd *scmd)
tmf_work->ctrl_info = ctrl_info;
tmf_work->device = device;
tmf_work->lun = (u8)scmd->device->lun;
- tmf_work->scsi_opcode = scmd->cmd_len > 0 ? scmd->cmnd[0] : 0xff;
schedule_work(&tmf_work->work_struct);
}
diff --git a/drivers/scsi/snic/snic.h b/drivers/scsi/snic/snic.h
index 27acc50bd1a5..52eab57d8cd0 100644
--- a/drivers/scsi/snic/snic.h
+++ b/drivers/scsi/snic/snic.h
@@ -364,7 +364,7 @@ extern const struct attribute_group *snic_host_groups[];
int snic_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
int snic_abort_cmd(struct scsi_cmnd *);
-int snic_device_reset(struct scsi_cmnd *);
+int snic_device_reset(struct scsi_device *);
int snic_host_reset(struct Scsi_Host *);
void snic_shutdown_scsi_cleanup(struct snic *);
diff --git a/drivers/scsi/snic/snic_scsi.c b/drivers/scsi/snic/snic_scsi.c
index c167fe55226e..defae60f88b2 100644
--- a/drivers/scsi/snic/snic_scsi.c
+++ b/drivers/scsi/snic/snic_scsi.c
@@ -2089,9 +2089,8 @@ snic_unlink_and_release_req(struct snic *snic, struct scsi_cmnd *sc, int flag)
* command on the LUN.
*/
int
-snic_device_reset(struct scsi_cmnd *sc)
+snic_device_reset(struct scsi_device *sdev)
{
- struct scsi_device *sdev = sc->device;
struct Scsi_Host *shost = sdev->host;
struct snic *snic = shost_priv(shost);
struct request *req;
@@ -2099,6 +2098,7 @@ snic_device_reset(struct scsi_cmnd *sc)
int start_time = jiffies;
int ret = FAILED;
int dr_supp = 0;
+ struct scsi_cmnd tmf_sc, *sc = &tmf_sc;
SNIC_SCSI_DBG(shost, "dev_reset\n");
dr_supp = snic_dev_reset_supported(sdev);
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 9d1bdcdc1331..1826fdc3ed36 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -638,12 +638,12 @@ static int virtscsi_tmf(struct virtio_scsi *vscsi, struct virtio_scsi_cmd *cmd)
return ret;
}
-static int virtscsi_device_reset(struct scsi_cmnd *sc)
+static int virtscsi_device_reset(struct scsi_device *sdev)
{
- struct virtio_scsi *vscsi = shost_priv(sc->device->host);
+ struct virtio_scsi *vscsi = shost_priv(sdev->host);
struct virtio_scsi_cmd *cmd;
- sdev_printk(KERN_INFO, sc->device, "device reset\n");
+ sdev_printk(KERN_INFO, sdev, "device reset\n");
cmd = mempool_alloc(virtscsi_cmd_pool, GFP_NOIO);
if (!cmd)
return FAILED;
@@ -654,9 +654,9 @@ static int virtscsi_device_reset(struct scsi_cmnd *sc)
.subtype = cpu_to_virtio32(vscsi->vdev,
VIRTIO_SCSI_T_TMF_LOGICAL_UNIT_RESET),
.lun[0] = 1,
- .lun[1] = sc->device->id,
- .lun[2] = (sc->device->lun >> 8) | 0x40,
- .lun[3] = sc->device->lun & 0xff,
+ .lun[1] = sdev->id,
+ .lun[2] = (sdev->lun >> 8) | 0x40,
+ .lun[3] = sdev->lun & 0xff,
};
return virtscsi_tmf(vscsi, cmd);
}
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index 9c62d446ea9e..1624c9b400e9 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -971,14 +971,14 @@ static int pvscsi_bus_reset(struct Scsi_Host *host, int channel)
return SUCCESS;
}
-static int pvscsi_device_reset(struct scsi_cmnd *cmd)
+static int pvscsi_device_reset(struct scsi_device *sdev)
{
- struct Scsi_Host *host = cmd->device->host;
+ struct Scsi_Host *host = sdev->host;
struct pvscsi_adapter *adapter = shost_priv(host);
unsigned long flags;
- scmd_printk(KERN_INFO, cmd, "SCSI device reset on scsi%u:%u\n",
- host->host_no, cmd->device->id);
+ sdev_printk(KERN_INFO, sdev, "SCSI device reset on scsi%u:%u\n",
+ host->host_no, sdev->id);
/*
* We don't want to queue new requests for this device after flushing
@@ -988,7 +988,7 @@ static int pvscsi_device_reset(struct scsi_cmnd *cmd)
spin_lock_irqsave(&adapter->hw_lock, flags);
pvscsi_process_request_ring(adapter);
- ll_device_reset(adapter, cmd->device->id);
+ ll_device_reset(adapter, sdev->id);
pvscsi_process_completion_ring(adapter);
spin_unlock_irqrestore(&adapter->hw_lock, flags);
diff --git a/drivers/scsi/wd719x.c b/drivers/scsi/wd719x.c
index bc48152e74b8..18a12b17e4b1 100644
--- a/drivers/scsi/wd719x.c
+++ b/drivers/scsi/wd719x.c
@@ -510,10 +510,10 @@ static int wd719x_reset(struct Scsi_Host *shost, u8 opcode, u8 device)
return SUCCESS;
}
-static int wd719x_dev_reset(struct scsi_cmnd *cmd)
+static int wd719x_dev_reset(struct scsi_device *sdev)
{
- return wd719x_reset(cmd->device->host, WD719X_CMD_RESET,
- cmd->device->id);
+ return wd719x_reset(sdev->host, WD719X_CMD_RESET,
+ sdev->id);
}
static int wd719x_bus_reset(struct Scsi_Host *host, int channel)
diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c
index 26dd229aeb22..e5ef3e880dbf 100644
--- a/drivers/scsi/xen-scsifront.c
+++ b/drivers/scsi/xen-scsifront.c
@@ -698,7 +698,7 @@ static int scsifront_action_handler(struct scsi_device *sdev, struct scsi_cmnd *
if (scsifront_enter(info))
goto fail;
- if (!scsifront_do_request(sc->device, info, shadow))
+ if (!scsifront_do_request(sdev, info, shadow))
break;
scsifront_return(info);
@@ -742,10 +742,10 @@ static int scsifront_eh_abort_handler(struct scsi_cmnd *sc)
return scsifront_action_handler(sc->device, sc);
}
-static int scsifront_dev_reset_handler(struct scsi_cmnd *sc)
+static int scsifront_dev_reset_handler(struct scsi_device *sdev)
{
pr_debug("%s\n", __func__);
- return scsifront_action_handler(sc->device, NULL);
+ return scsifront_action_handler(sdev, NULL);
}
static int scsifront_sdev_configure(struct scsi_device *sdev)
diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
index 08543a3936da..8ddc0f8e68b3 100644
--- a/drivers/staging/rts5208/rtsx.c
+++ b/drivers/staging/rts5208/rtsx.c
@@ -182,8 +182,12 @@ static int command_abort(struct scsi_cmnd *srb)
* This invokes the transport reset mechanism to reset the state of the
* device
*/
-static int device_reset(struct scsi_cmnd *srb)
+static int device_reset(struct scsi_device *sdev)
{
+ struct rtsx_dev *dev = host_to_rtsx(sdev->host);
+
+ dev_info(&dev->pci->dev, "%s called\n", __func__);
+
return SUCCESS;
}
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 07565c0ed139..e36d7500b5da 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -250,7 +250,7 @@ static int tcm_loop_abort_task(struct scsi_cmnd *sc)
* Called from SCSI EH process context to issue a LUN_RESET TMR
* to struct scsi_device
*/
-static int tcm_loop_device_reset(struct scsi_cmnd *sc)
+static int tcm_loop_device_reset(struct scsi_device *sdev)
{
struct tcm_loop_hba *tl_hba;
struct tcm_loop_tpg *tl_tpg;
@@ -259,10 +259,10 @@ static int tcm_loop_device_reset(struct scsi_cmnd *sc)
/*
* Locate the tcm_loop_hba_t pointer
*/
- tl_hba = *(struct tcm_loop_hba **)shost_priv(sc->device->host);
- tl_tpg = &tl_hba->tl_hba_tpgs[sc->device->id];
+ tl_hba = *(struct tcm_loop_hba **)shost_priv(sdev->host);
+ tl_tpg = &tl_hba->tl_hba_tpgs[sdev->id];
- ret = tcm_loop_issue_tmr(tl_tpg, sc->device->lun,
+ ret = tcm_loop_issue_tmr(tl_tpg, sdev->lun,
0, TMR_LUN_RESET);
return (ret == TMR_FUNCTION_COMPLETE) ? SUCCESS : FAILED;
}
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 6ccf4d949171..fd8db6a2dbc9 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -7300,11 +7300,11 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *r
/**
* ufshcd_eh_device_reset_handler() - Reset a single logical unit.
- * @cmd: SCSI command pointer
+ * @sdev: SCSI device pointer
*
* Return: SUCCESS or FAILED.
*/
-static int ufshcd_eh_device_reset_handler(struct scsi_cmnd *cmd)
+static int ufshcd_eh_device_reset_handler(struct scsi_device *sdev)
{
unsigned long flags, pending_reqs = 0, not_cleared = 0;
struct Scsi_Host *host;
@@ -7315,10 +7315,10 @@ static int ufshcd_eh_device_reset_handler(struct scsi_cmnd *cmd)
int err;
u8 resp = 0xF, lun;
- host = cmd->device->host;
+ host = sdev->host;
hba = shost_priv(host);
- lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun);
+ lun = ufshcd_scsi_to_upiu_lun(sdev->lun);
err = ufshcd_issue_tm_cmd(hba, lun, 0, UFS_LOGICAL_RESET, &resp);
if (err || resp != UPIU_TASK_MANAGEMENT_FUNC_COMPL) {
if (!err)
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 4b5b10d64931..e1ae5d9d8b72 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -459,9 +459,9 @@ static int command_abort(struct scsi_cmnd *srb)
* This invokes the transport reset mechanism to reset the state of the
* device
*/
-static int device_reset(struct scsi_cmnd *srb)
+static int device_reset(struct scsi_device *sdev)
{
- struct us_data *us = host_to_us(srb->device->host);
+ struct us_data *us = host_to_us(sdev->host);
int result;
usb_stor_dbg(us, "%s called\n", __func__);
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 2583ee9815c5..518e07148816 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -762,9 +762,8 @@ static int uas_eh_abort_handler(struct scsi_cmnd *cmnd)
return FAILED;
}
-static int uas_eh_device_reset_handler(struct scsi_cmnd *cmnd)
+static int uas_eh_device_reset_handler(struct scsi_device *sdev)
{
- struct scsi_device *sdev = cmnd->device;
struct uas_dev_info *devinfo = sdev->hostdata;
struct usb_device *udev = devinfo->udev;
unsigned long flags;
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index dd71e198b360..6f91254847b3 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -949,7 +949,7 @@ void fc_fcp_destroy(struct fc_lport *);
*****************************/
int fc_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
int fc_eh_abort(struct scsi_cmnd *);
-int fc_eh_device_reset(struct scsi_cmnd *);
+int fc_eh_device_reset(struct scsi_device *);
int fc_eh_host_reset(struct Scsi_Host *);
int fc_slave_alloc(struct scsi_device *);
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 73d3c79f86c3..a55ce76ee060 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -391,7 +391,7 @@ struct iscsi_host {
extern int iscsi_eh_abort(struct scsi_cmnd *sc);
extern int iscsi_eh_recover_target(struct scsi_target *starget);
extern int iscsi_eh_session_reset(struct iscsi_cls_session *cls_session);
-extern int iscsi_eh_device_reset(struct scsi_cmnd *sc);
+extern int iscsi_eh_device_reset(struct scsi_device *sdev);
extern int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc);
extern enum scsi_timeout_action iscsi_eh_cmd_timed_out(struct scsi_cmnd *sc);
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index ee535f3d3931..79b2fc5620b1 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -715,7 +715,7 @@ void sas_init_dev(struct domain_device *);
void sas_task_abort(struct sas_task *);
int sas_eh_abort_handler(struct scsi_cmnd *cmd);
-int sas_eh_device_reset_handler(struct scsi_cmnd *cmd);
+int sas_eh_device_reset_handler(struct scsi_device *sdev);
int sas_eh_target_reset_handler(struct scsi_target *starget);
extern void sas_target_destroy(struct scsi_target *);
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index fa0bc5b3ead0..be3099c9373e 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -150,7 +150,7 @@ struct scsi_host_template {
* Status: REQUIRED (at least one of them)
*/
int (* eh_abort_handler)(struct scsi_cmnd *);
- int (* eh_device_reset_handler)(struct scsi_cmnd *);
+ int (* eh_device_reset_handler)(struct scsi_device *);
int (* eh_target_reset_handler)(struct scsi_target *);
int (* eh_bus_reset_handler)(struct Scsi_Host *, int);
int (* eh_host_reset_handler)(struct Scsi_Host *);
--
2.35.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH 5/7] scsi: Do not allocate scsi command in scsi_ioctl_reset()
2023-10-02 15:59 [PATCHv5 0/7] scsi: EH rework, main part Hannes Reinecke
` (3 preceding siblings ...)
2023-10-02 15:59 ` [PATCH 4/7] scsi: Use scsi_device as argument to eh_device_reset_handler() Hannes Reinecke
@ 2023-10-02 15:59 ` Hannes Reinecke
2023-10-03 17:39 ` Bart Van Assche
2023-10-02 15:59 ` [PATCH 6/7] scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL Hannes Reinecke
` (3 subsequent siblings)
8 siblings, 1 reply; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-02 15:59 UTC (permalink / raw)
To: Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig, Hannes Reinecke
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.de>
---
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 3e312601cf22..21d84940c9cb 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);
}
/**
@@ -1601,7 +1605,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 ||
@@ -1666,7 +1670,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,
@@ -1741,7 +1745,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)) {
@@ -1787,7 +1791,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) {
@@ -2397,7 +2401,7 @@ void scsi_report_bus_reset(struct Scsi_Host *shost, 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);
}
}
@@ -2445,9 +2449,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;
@@ -2462,23 +2465,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);
@@ -2488,22 +2474,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;
@@ -2529,9 +2515,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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH 6/7] scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL
2023-10-02 15:59 [PATCHv5 0/7] scsi: EH rework, main part Hannes Reinecke
` (4 preceding siblings ...)
2023-10-02 15:59 ` [PATCH 5/7] scsi: Do not allocate scsi command in scsi_ioctl_reset() Hannes Reinecke
@ 2023-10-02 15:59 ` Hannes Reinecke
2023-10-03 17:34 ` Bart Van Assche
2023-10-02 15:59 ` [PATCH 7/7] scsi_error: streamline scsi_eh_bus_device_reset() Hannes Reinecke
` (2 subsequent siblings)
8 siblings, 1 reply; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-02 15:59 UTC (permalink / raw)
To: Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig, Hannes Reinecke
Unused now.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/scsi_lib.c | 2 --
include/scsi/scsi_cmnd.h | 1 -
2 files changed, 3 deletions(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ca5eb058d5c7..6525fe10b0ee 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1619,8 +1619,6 @@ static void scsi_done_internal(struct scsi_cmnd *cmd, bool complete_directly)
break;
case SUBMITTED_BY_SCSI_ERROR_HANDLER:
return scsi_eh_done(cmd);
- case SUBMITTED_BY_SCSI_RESET_IOCTL:
- return;
}
if (unlikely(blk_should_fake_timeout(scsi_cmd_to_rq(cmd)->q)))
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 526def14e7fb..d681510724aa 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -68,7 +68,6 @@ struct scsi_pointer {
enum scsi_cmnd_submitter {
SUBMITTED_BY_BLOCK_LAYER = 0,
SUBMITTED_BY_SCSI_ERROR_HANDLER = 1,
- SUBMITTED_BY_SCSI_RESET_IOCTL = 2,
} __packed;
struct scsi_cmnd {
--
2.35.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH 7/7] scsi_error: streamline scsi_eh_bus_device_reset()
2023-10-02 15:59 [PATCHv5 0/7] scsi: EH rework, main part Hannes Reinecke
` (5 preceding siblings ...)
2023-10-02 15:59 ` [PATCH 6/7] scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL Hannes Reinecke
@ 2023-10-02 15:59 ` Hannes Reinecke
2023-10-03 17:45 ` Bart Van Assche
2023-10-12 7:48 ` Wenchao Hao
2023-10-04 6:20 ` [PATCHv5 0/7] scsi: EH rework, main part Johannes Thumshirn
2023-10-11 16:35 ` Wenchao Hao
8 siblings, 2 replies; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-02 15:59 UTC (permalink / raw)
To: Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig, Hannes Reinecke
Streamline to use a similar code flow as the other reset functions.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/scsi_error.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 21d84940c9cb..81b38f5da3b6 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1581,6 +1581,7 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
{
struct scsi_cmnd *scmd, *bdr_scmd, *next;
struct scsi_device *sdev;
+ LIST_HEAD(check_list);
enum scsi_disposition rtn;
shost_for_each_device(sdev, shost) {
@@ -1606,27 +1607,22 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
sdev_printk(KERN_INFO, sdev,
"%s: Sending BDR\n", current->comm));
rtn = scsi_try_bus_device_reset(sdev);
- if (rtn == SUCCESS || rtn == FAST_IO_FAIL) {
- if (!scsi_device_online(sdev) ||
- rtn == FAST_IO_FAIL ||
- !scsi_eh_tur(bdr_scmd)) {
- list_for_each_entry_safe(scmd, next,
- work_q, eh_entry) {
- if (scmd->device == sdev &&
- scsi_eh_action(scmd, rtn) != FAILED)
- __scsi_eh_finish_cmd(scmd,
- done_q,
- DID_RESET);
- }
- }
- } else {
+ if (rtn != SUCCESS && rtn != FAST_IO_FAIL)
SCSI_LOG_ERROR_RECOVERY(3,
sdev_printk(KERN_INFO, sdev,
"%s: BDR failed\n", current->comm));
+ list_for_each_entry_safe(scmd, next, work_q, eh_entry) {
+ if (scmd->device != sdev)
+ continue;
+ if (rtn == SUCCESS)
+ list_move_tail(&scmd->eh_entry, &check_list);
+ else if (rtn == FAST_IO_FAIL)
+ __scsi_eh_finish_cmd(scmd, done_q,
+ DID_TRANSPORT_DISRUPTED);
}
}
- return list_empty(work_q);
+ return scsi_eh_test_devices(&check_list, work_q, done_q, 0);
}
/**
--
2.35.3
^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler
2023-10-02 15:59 ` [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler Hannes Reinecke
@ 2023-10-03 17:33 ` Bart Van Assche
2023-10-04 6:32 ` Hannes Reinecke
2023-10-09 14:05 ` Hannes Reinecke
2023-10-05 11:14 ` John Garry
1 sibling, 2 replies; 28+ messages in thread
From: Bart Van Assche @ 2023-10-03 17:33 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 10/2/23 08:59, Hannes Reinecke wrote:
> + if ((hd = shost_priv(sh)) == NULL){
> + printk(KERN_ERR MYNAM ": host reset: Can't locate host!\n");
> return FAILED;
> }
In the above example and in multiple other cases formatting does not
follow the kernel coding style. Please consider to run git clang-format
HEAD^ on this patch. Otherwise this patch looks good to me.
Thanks,
Bart.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 6/7] scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL
2023-10-02 15:59 ` [PATCH 6/7] scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL Hannes Reinecke
@ 2023-10-03 17:34 ` Bart Van Assche
0 siblings, 0 replies; 28+ messages in thread
From: Bart Van Assche @ 2023-10-03 17:34 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 10/2/23 08:59, Hannes Reinecke wrote:
> Unused now.
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 5/7] scsi: Do not allocate scsi command in scsi_ioctl_reset()
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
0 siblings, 0 replies; 28+ messages in thread
From: Bart Van Assche @ 2023-10-03 17:39 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 10/2/23 08:59, Hannes Reinecke wrote:
> 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().
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 7/7] scsi_error: streamline scsi_eh_bus_device_reset()
2023-10-02 15:59 ` [PATCH 7/7] scsi_error: streamline scsi_eh_bus_device_reset() Hannes Reinecke
@ 2023-10-03 17:45 ` Bart Van Assche
2023-10-04 6:50 ` Hannes Reinecke
2023-10-12 7:48 ` Wenchao Hao
1 sibling, 1 reply; 28+ messages in thread
From: Bart Van Assche @ 2023-10-03 17:45 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 10/2/23 08:59, Hannes Reinecke wrote:
> Streamline to use a similar code flow as the other reset functions.
>
> Signed-off-by: Hannes Reinecke <hare@suse.de>
> ---
> drivers/scsi/scsi_error.c | 26 +++++++++++---------------
> 1 file changed, 11 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
> index 21d84940c9cb..81b38f5da3b6 100644
> --- a/drivers/scsi/scsi_error.c
> +++ b/drivers/scsi/scsi_error.c
> @@ -1581,6 +1581,7 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
> {
> struct scsi_cmnd *scmd, *bdr_scmd, *next;
> struct scsi_device *sdev;
> + LIST_HEAD(check_list);
> enum scsi_disposition rtn;
>
> shost_for_each_device(sdev, shost) {
> @@ -1606,27 +1607,22 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
> sdev_printk(KERN_INFO, sdev,
> "%s: Sending BDR\n", current->comm));
> rtn = scsi_try_bus_device_reset(sdev);
> - if (rtn == SUCCESS || rtn == FAST_IO_FAIL) {
> - if (!scsi_device_online(sdev) ||
> - rtn == FAST_IO_FAIL ||
> - !scsi_eh_tur(bdr_scmd)) {
> - list_for_each_entry_safe(scmd, next,
> - work_q, eh_entry) {
> - if (scmd->device == sdev &&
> - scsi_eh_action(scmd, rtn) != FAILED)
> - __scsi_eh_finish_cmd(scmd,
> - done_q,
> - DID_RESET);
> - }
> - }
> - } else {
> + if (rtn != SUCCESS && rtn != FAST_IO_FAIL)
> SCSI_LOG_ERROR_RECOVERY(3,
> sdev_printk(KERN_INFO, sdev,
> "%s: BDR failed\n", current->comm));
> + list_for_each_entry_safe(scmd, next, work_q, eh_entry) {
> + if (scmd->device != sdev)
> + continue;
> + if (rtn == SUCCESS)
> + list_move_tail(&scmd->eh_entry, &check_list);
> + else if (rtn == FAST_IO_FAIL)
> + __scsi_eh_finish_cmd(scmd, done_q,
> + DID_TRANSPORT_DISRUPTED);
> }
> }
>
> - return list_empty(work_q);
> + return scsi_eh_test_devices(&check_list, work_q, done_q, 0);
> }
I think the description of this patch is too brief. The following
information is missing from the patch description:
- Why the scsi_device_online() and scsi_eh_tur() checks have been left
out.
- Why DID_RESET has been changed into DID_TRANSPORT_DISRUPTED.
- Why the list_move_tail() call has been introduced.
- Why the scsi_eh_test_devices() call has been introduced.
Thanks,
Bart.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCHv5 0/7] scsi: EH rework, main part
2023-10-02 15:59 [PATCHv5 0/7] scsi: EH rework, main part Hannes Reinecke
` (6 preceding siblings ...)
2023-10-02 15:59 ` [PATCH 7/7] scsi_error: streamline scsi_eh_bus_device_reset() Hannes Reinecke
@ 2023-10-04 6:20 ` Johannes Thumshirn
2023-10-11 16:35 ` Wenchao Hao
8 siblings, 0 replies; 28+ messages in thread
From: Johannes Thumshirn @ 2023-10-04 6:20 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
Apart from Bart's comments
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler
2023-10-03 17:33 ` Bart Van Assche
@ 2023-10-04 6:32 ` Hannes Reinecke
2023-10-09 14:05 ` Hannes Reinecke
1 sibling, 0 replies; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-04 6:32 UTC (permalink / raw)
To: Bart Van Assche, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 10/3/23 19:33, Bart Van Assche wrote:
> On 10/2/23 08:59, Hannes Reinecke wrote:
>> + if ((hd = shost_priv(sh)) == NULL){
>> + printk(KERN_ERR MYNAM ": host reset: Can't locate host!\n");
>> return FAILED;
>> }
>
> In the above example and in multiple other cases formatting does not
> follow the kernel coding style. Please consider to run git clang-format
> HEAD^ on this patch. Otherwise this patch looks good to me.
>
Will be doing so for the next round.
Cheers,
Hannes
--
Dr. Hannes Reinecke Kernel Storage Architect
hare@suse.de +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew
Myers, Andrew McDonald, Martje Boudien Moerman
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 7/7] scsi_error: streamline scsi_eh_bus_device_reset()
2023-10-03 17:45 ` Bart Van Assche
@ 2023-10-04 6:50 ` Hannes Reinecke
0 siblings, 0 replies; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-04 6:50 UTC (permalink / raw)
To: Bart Van Assche, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 10/3/23 19:45, Bart Van Assche wrote:
> On 10/2/23 08:59, Hannes Reinecke wrote:
>> Streamline to use a similar code flow as the other reset functions.
>>
>> Signed-off-by: Hannes Reinecke <hare@suse.de>
>> ---
>> drivers/scsi/scsi_error.c | 26 +++++++++++---------------
>> 1 file changed, 11 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
>> index 21d84940c9cb..81b38f5da3b6 100644
>> --- a/drivers/scsi/scsi_error.c
>> +++ b/drivers/scsi/scsi_error.c
>> @@ -1581,6 +1581,7 @@ static int scsi_eh_bus_device_reset(struct
>> Scsi_Host *shost,
>> {
>> struct scsi_cmnd *scmd, *bdr_scmd, *next;
>> struct scsi_device *sdev;
>> + LIST_HEAD(check_list);
>> enum scsi_disposition rtn;
>> shost_for_each_device(sdev, shost) {
>> @@ -1606,27 +1607,22 @@ static int scsi_eh_bus_device_reset(struct
>> Scsi_Host *shost,
>> sdev_printk(KERN_INFO, sdev,
>> "%s: Sending BDR\n", current->comm));
>> rtn = scsi_try_bus_device_reset(sdev);
>> - if (rtn == SUCCESS || rtn == FAST_IO_FAIL) {
>> - if (!scsi_device_online(sdev) ||
>> - rtn == FAST_IO_FAIL ||
>> - !scsi_eh_tur(bdr_scmd)) {
>> - list_for_each_entry_safe(scmd, next,
>> - work_q, eh_entry) {
>> - if (scmd->device == sdev &&
>> - scsi_eh_action(scmd, rtn) != FAILED)
>> - __scsi_eh_finish_cmd(scmd,
>> - done_q,
>> - DID_RESET);
>> - }
>> - }
>> - } else {
>> + if (rtn != SUCCESS && rtn != FAST_IO_FAIL)
>> SCSI_LOG_ERROR_RECOVERY(3,
>> sdev_printk(KERN_INFO, sdev,
>> "%s: BDR failed\n", current->comm));
>> + list_for_each_entry_safe(scmd, next, work_q, eh_entry) {
>> + if (scmd->device != sdev)
>> + continue;
>> + if (rtn == SUCCESS)
>> + list_move_tail(&scmd->eh_entry, &check_list);
>> + else if (rtn == FAST_IO_FAIL)
>> + __scsi_eh_finish_cmd(scmd, done_q,
>> + DID_TRANSPORT_DISRUPTED);
>> }
>> }
>> - return list_empty(work_q);
>> + return scsi_eh_test_devices(&check_list, work_q, done_q, 0);
>> }
>
> I think the description of this patch is too brief. The following
> information is missing from the patch description:
> - Why the scsi_device_online() and scsi_eh_tur() checks have been left
> out.
> - Why DID_RESET has been changed into DID_TRANSPORT_DISRUPTED.
> - Why the list_move_tail() call has been introduced.
> - Why the scsi_eh_test_devices() call has been introduced.
>
Okay, will be doing so.
Cheers,
Hannes
--
Dr. Hannes Reinecke Kernel Storage Architect
hare@suse.de +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew
Myers, Andrew McDonald, Martje Boudien Moerman
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler
2023-10-02 15:59 ` [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler Hannes Reinecke
2023-10-03 17:33 ` Bart Van Assche
@ 2023-10-05 11:14 ` John Garry
1 sibling, 0 replies; 28+ messages in thread
From: John Garry @ 2023-10-05 11:14 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
>
> Higher-severity actions are taken only when lower-severity actions
> cannot recover some of failed scmds. Also, note that failure of the
> diff --git a/Documentation/scsi/scsi_mid_low_api.rst b/Documentation/scsi/scsi_mid_low_api.rst
> index 022198c51350..85b1384ba4fd 100644
> --- a/Documentation/scsi/scsi_mid_low_api.rst
> +++ b/Documentation/scsi/scsi_mid_low_api.rst
> @@ -777,7 +777,7 @@ Details::
>
> /**
> * eh_host_reset_handler - reset host (host bus adapter)
> - * @scp: SCSI host that contains this device should be reset
> + * @shp: SCSI host that contains this device should be reset
Which device are we referring to here? The current comment does not even
make sense to me as it is being passed a scsi_cmnd
> *
> * Returns SUCCESS if command aborted else FAILED
> *
> @@ -794,7 +794,7 @@ Details::
> *
> * Optionally defined in: LLD
> **/
> - int eh_host_reset_handler(struct scsi_cmnd * scp)
> + int eh_host_reset_handler(struct Scsi_Host * shp)
>
>
...
>
> -static int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt)
> +static int zfcp_scsi_eh_host_reset_handler(struct Scsi_Host *host)
> {
> - struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(scpnt->device);
> - struct zfcp_adapter *adapter = zfcp_sdev->port->adapter;
> + struct zfcp_adapter *adapter = (struct zfcp_adapter *)host->hostdata[0]; > int ret = SUCCESS, fc_ret;
>
> if (!(adapter->connection_features & FSF_FEATURE_NPIV_MODE)) {
> diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
> index f925f8664c2c..f0efdfcdac44 100644
> --- a/drivers/scsi/3w-9xxx.c
> +++ b/drivers/scsi/3w-9xxx.c
> @@ -1717,18 +1717,19 @@ static int twa_scsi_biosparam(struct scsi_device *sdev, struct block_device *bde
> } /* End twa_scsi_biosparam() */
>
> /* This is the new scsi eh reset function */
> -static int twa_scsi_eh_reset(struct scsi_cmnd *SCpnt)
> +static int twa_scsi_eh_reset(struct Scsi_Host *shost)
> {
> TW_Device_Extension *tw_dev = NULL;
> int retval = FAILED;
>
> - tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata;
> + tw_dev = (TW_Device_Extension *)shost->hostdata;
>
> tw_dev->num_resets++;
>
> - sdev_printk(KERN_WARNING, SCpnt->device,
> - "WARNING: (0x%02X:0x%04X): Command (0x%x) timed out, resetting card.\n",
> - TW_DRIVER, 0x2c, SCpnt->cmnd[0]);
> + shost_printk(KERN_WARNING, shost,
> + "WARNING: (0x%02X:0x%04X): "
> + "Command timed out, resetting card.\n",
> + TW_DRIVER, 0x2c);
>
> /* Make sure we are not issuing an ioctl or resetting from ioctl */
> mutex_lock(&tw_dev->ioctl_lock);
> diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
> index 55989eaa2d9f..80885200ba52 100644
> --- a/drivers/scsi/3w-sas.c
> +++ b/drivers/scsi/3w-sas.c
> @@ -1423,18 +1423,19 @@ static int twl_scsi_biosparam(struct scsi_device *sdev, struct block_device *bde
> } /* End twl_scsi_biosparam() */
>
> /* This is the new scsi eh reset function */
> -static int twl_scsi_eh_reset(struct scsi_cmnd *SCpnt)
> +static int twl_scsi_eh_reset(struct Scsi_Host *shost)
> {
> TW_Device_Extension *tw_dev = NULL;
> int retval = FAILED;
>
> - tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata;
> + tw_dev = (TW_Device_Extension *)shost->hostdata;
>
> tw_dev->num_resets++;
>
> - sdev_printk(KERN_WARNING, SCpnt->device,
> - "WARNING: (0x%02X:0x%04X): Command (0x%x) timed out, resetting card.\n",
> - TW_DRIVER, 0x2c, SCpnt->cmnd[0]);
> + shost_printk(KERN_WARNING, shost,
> + "WARNING: (0x%02X:0x%04X): "
> + "Command timed out, resetting card.\n",
nit: I think that these lines can be united to make grepping easier.
This comment applies elsewhere.
...
> diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
> index 9503996c6325..2a88e1c6ffda 100644
> --- a/drivers/scsi/aha1542.c
> +++ b/drivers/scsi/aha1542.c
> @@ -914,15 +914,14 @@ static int aha1542_dev_reset(struct scsi_cmnd *cmd)
> aha1542_outb(sh->io_port, CMD_START_SCSI);
> spin_unlock_irqrestore(sh->host_lock, flags);
>
> - scmd_printk(KERN_WARNING, cmd,
> + sdev_printk(KERN_WARNING, sdev,
I'm not sure if this is a related change
> "Trying device reset for target\n");
>
> return SUCCESS;
> }
...
> static int esas2r_dev_targ_reset(struct scsi_cmnd *cmd, bool target_reset)
> diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
> index 97816a0e6240..355fec046220 100644
> --- a/drivers/scsi/esp_scsi.c
> +++ b/drivers/scsi/esp_scsi.c
> @@ -2640,9 +2640,9 @@ static int esp_eh_bus_reset_handler(struct scsi_cmnd *cmd)
> }
>
> /* All bets are off, reset the entire device. */
> -static int esp_eh_host_reset_handler(struct scsi_cmnd *cmd)
> +static int esp_eh_host_reset_handler(struct Scsi_Host *shost)
> {
> - struct esp *esp = shost_priv(cmd->device->host);
> + struct esp *esp = shost_priv(shost);
Why are we not just using shost_priv() everywhere (instead of
shost->hostdata[])? It would save all the casting to the driver host
structure also.
> unsigned long flags;
>
> spin_lock_irqsave(esp->host->host_lock, flags);
> diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
> index 504c4e0c5d17..347fb668bf29 100644
> --- a/drivers/scsi/fdomain.c
> +++ b/drivers/scsi/fdomain.c
> @@ -456,9 +456,8 @@ static int fdomain_abort(struct scsi_cmnd *cmd)
> return SUCCESS;
> }
>
> -static int fdomain_host_reset(struct scsi_cmnd *cmd)
> +static int fdomain_host_reset(struct Scsi_Host *sh)
> {
> - struct Scsi_Host *sh = cmd->device->host;
> struct fdomain *fd = shost_priv(sh);
> unsigned long flags;
>
> diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
> index 8ffcafb4687f..2e2b49ba8cdf 100644
> --- a/drivers/scsi/fnic/fnic.h
> +++ b/drivers/scsi/fnic/fnic.h
> @@ -347,7 +347,7 @@ void fnic_update_mac_locked(struct fnic *, u8 *new);
> int fnic_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
> int fnic_abort_cmd(struct scsi_cmnd *);
> int fnic_device_reset(struct scsi_cmnd *);
> -int fnic_host_reset(struct scsi_cmnd *);
> +int fnic_host_reset(struct Scsi_Host *);
> int fnic_reset(struct Scsi_Host *);
> void fnic_scsi_cleanup(struct fc_lport *);
> void fnic_scsi_abort_io(struct fc_lport *);
> diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
> index 25af91081baf..324058bd594d 100644
> --- a/drivers/scsi/fnic/fnic_scsi.c
> +++ b/drivers/scsi/fnic/fnic_scsi.c
> @@ -2448,11 +2448,10 @@ int fnic_reset(struct Scsi_Host *shost)
> * host is offlined by SCSI.
> *
> */
> -int fnic_host_reset(struct scsi_cmnd *sc)
> +int fnic_host_reset(struct Scsi_Host *shost)
> {
> int ret;
> unsigned long wait_host_tmo;
> - struct Scsi_Host *shost = sc->device->host;
> struct fc_lport *lp = shost_priv(shost);
> struct fnic *fnic = lport_priv(lp);
> unsigned long flags;
> diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
> index f5334ccbf2ca..cc9ed9e6c666 100644
> --- a/drivers/scsi/hptiop.c
> +++ b/drivers/scsi/hptiop.c
> @@ -1088,12 +1088,12 @@ static int hptiop_reset_hba(struct hptiop_hba *hba)
> return 0;
> }
>
...
> scb_t *scb;
> @@ -2525,7 +2525,7 @@ megaraid_reset_handler(struct scsi_cmnd *scp)
> int i;
> uioc_t *kioc;
>
> - adapter = SCP2ADAPTER(scp);
> + adapter = (adapter_t *)SCSIHOST2ADAP(shost);
SCSIHOST2ADAP is a re-definition of shost_priv() really (so it can be
removed)
..
*/
>
> /* Complete pending commands */
> handle_reset(ms);
> -
> +
we seem to have double blank line now, I'm not sure
> spin_unlock_irqrestore(ms->host->host_lock, flags);
> return SUCCESS;
> }
> diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
> index 040031eb0c12..d52412870b54 100644
> --- a/drivers/scsi/mpi3mr/mpi3mr_os.c
> +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
> @@ -4010,15 +4010,15 @@ static inline void mpi3mr_setup_divert_ws(struct mpi3mr_ioc *mrioc,
>
...
>
> /* */
> diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
> index 310d0b6586a6..59893db166c9 100644
> --- a/drivers/scsi/pcmcia/qlogic_stub.c
> +++ b/drivers/scsi/pcmcia/qlogic_stub.c
> @@ -270,8 +270,8 @@ static int qlogic_resume(struct pcmcia_device *link)
> outb(0x24, link->resource[0]->start + 0x9);
> outb(0x04, link->resource[0]->start + 0xd);
> }
> - /* Ugggglllyyyy!!! */
> - qlogicfas408_host_reset(NULL);
I had a quick check of qlogicfas408_host_reset(), and it does not even
seem safe to pass NULL as the arg (which was a Scsi_cmd) as it is
dereferenced there. Has this ever worked?
> +
> + qlogicfas408_host_reset(info->host);
>
> return 0;
> }
> diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
> index 278c78d066c4..1c5415ede9b2 100644
> --- a/drivers/scsi/pcmcia/sym53c500_cs.c
> +++ b/drivers/scsi/pcmcia/sym53c500_cs.c
> @@ -583,14 +583,14 @@ static int SYM53C500_queue_lck(struct scsi_cmnd *SCpnt)
> static DEF_SCSI_QCMD(SYM53C500_queue)
..
> return FAILED;
> }
> diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
> index 3e065d5fc80c..008e908e3aff 100644
> --- a/drivers/scsi/qlogicfas408.c
> +++ b/drivers/scsi/qlogicfas408.c
> @@ -525,20 +525,18 @@ int qlogicfas408_abort(struct scsi_cmnd *cmd)
>
> /*
> * Reset SCSI bus
> - * FIXME: This function is invoked with cmd = NULL directly by
> - * the PCMCIA qlogic_stub code. This wants fixing
This seems to answer my question, above. I am still not sure if this is
the proper approach, since we don't know it works properly now (instead
of just crashing).
> */
>
> -int qlogicfas408_host_reset(struct scsi_cmnd *cmd)
> +int qlogicfas408_host_reset(struct Scsi_Host *host)
> {
> - struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
> + struct qlogicfas408_priv *priv = get_priv_by_host(host);
> unsigned long flags;
>
> priv->qabort = 2;
>
> - spin_lock_irqsave(cmd->device->host->host_lock, flags);
> + spin_lock_irqsave(host->host_lock, flags);
> ql_zap(priv);
> - spin_unlock_irqrestore(cmd->device->host->host_lock, flags);
> + spin_unlock_irqrestore(host->host_lock, flags);
>
> return SUCCESS;
...
>
> -static int scsi_debug_host_reset(struct scsi_cmnd *SCpnt)
> +static int scsi_debug_host_reset(struct Scsi_Host *shost)
> {
> struct sdebug_host_info *sdbg_host;
> struct sdebug_dev_info *devip;
> @@ -5379,9 +5379,11 @@ static int scsi_debug_host_reset(struct scsi_cmnd *SCpnt)
>
> ++num_host_resets;
> if (SDEBUG_OPT_ALL_NOISE & sdebug_opts)
> - sdev_printk(KERN_INFO, SCpnt->device, "%s\n", __func__);
> + shost_printk(KERN_INFO, shost, "%s\n", __func__);
> mutex_lock(&sdebug_host_list_mutex);
> list_for_each_entry(sdbg_host, &sdebug_host_list, host_list) {
> + if (sdbg_host->shost != shost)
> + continue;
This seems to be a change in behaviour, but the current behaviour is
quite odd to begin with. I mean, the current code never uses SCpnt to
decide which devip to set SDEBUG_UA_BUS_RESET for, so I don't know why
we do it now partially per shost.
> list_for_each_entry(devip, &sdbg_host->dev_info_list,
> dev_list) {
> set_bit(SDEBUG_UA_BUS_RESET, devip->uas_bm);
> @@ -5391,7 +5393,7 @@ static int scsi_debug_host_reset(struct scsi_cmnd *SCpnt)
> mutex_unlock(&sdebug_host_list_mutex);
> stop_all_queued();
> if (SDEBUG_OPT_RESET_NOISE & sdebug_opts)
> - sdev_printk(KERN_INFO, SCpnt->device,
> + shost_printk(KERN_INFO, shost,
> "%s: %d device(s) found\n", __func__, k);
Again, I am not sure about this...
> return SUCCESS;
> }
> diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
> index c67cdcdc3ba8..f022bb1c3e4a 100644
> --- a/drivers/scsi/scsi_error.c
> +++ b/drivers/scsi/scsi_error.c
> @@ -881,7 +881,7 @@ static enum scsi_disposition scsi_try_host_reset(struct scsi_cmnd *scmd)
> if (!hostt->eh_host_reset_handler)
> return FAILED;
>
> - rtn = hostt->eh_host_reset_handler(scmd);
> + rtn = hostt->eh_host_reset_handler(host);
>
> if (rtn == SUCCESS) {
> if (!hostt->skip_settle_delay)
> diff --git a/drivers/scsi/snic/snic.h b/drivers/scsi/snic/snic.h
> index 0b7411624bcf..27acc50bd1a5 100644
> --- a/drivers/scsi/snic/snic.h
> +++ b/drivers/scsi/snic/snic.h
> @@ -365,8 +365,7 @@ extern const struct attribute_group *snic_host_groups[];
> int snic_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
> int snic_abort_cmd(struct scsi_cmnd *);
...
>
> +/*
> + * SCSI Error handling calls driver's eh_host_reset if all prior
> + * error handling levels return FAILED.
> + *
> + * Host Reset is the highest level of error recovery. If this fails, then
> + * host is offlined by SCSI.
"is offlined by SCSI" sounds odd. Do you mean "SCSI core"?
> + */
> int
> -snic_reset(struct Scsi_Host *shost)
> +snic_host_reset(struct Scsi_Host *shost)
> {
> struct snic *snic = shost_priv(shost);
> enum snic_state sv_state;
> @@ -2297,34 +2304,6 @@ snic_reset(struct Scsi_Host *shost)
> ret = SUCCESS;
>
> reset_end:
> - return ret;
> -} /* end of snic_reset */
> -
> -/*
> - * SCSI Error handling calls driver's eh_host_reset if all prior
> - * error handling levels return FAILED.
> - *
> - * Host Reset is the highest level of error recovery. If this fails, then
> - * host is offlined by SCSI.
> - */
> -int
> -snic_host_reset(struct scsi_cmnd *sc)
> -{
> - struct Scsi_Host *shost = sc->device->host;
> - u32 start_time = jiffies;
> - int ret;
> -
> - SNIC_SCSI_DBG(shost,
> - "host reset:sc %p sc_cmd 0x%x req %p tag %d flags 0x%llx\n",
> - sc, sc->cmnd[0], scsi_cmd_to_rq(sc),
> - snic_cmd_tag(sc), CMD_FLAGS(sc));
> -
> - ret = snic_reset(shost);
> -
> - SNIC_TRC(shost->host_no, snic_cmd_tag(sc), (ulong) sc,
> - jiffies_to_msecs(jiffies - start_time),
> - 0, SNIC_TRC_CMD(sc), SNIC_TRC_CMD_STATE_FLAGS(sc));
> -
> return ret;
> } /* end of snic_host_reset */
>
> diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
> index 8ffb75be99bc..5e5ecea265ad 100644
> --- a/drivers/scsi/stex.c
> +++ b/drivers/scsi/stex.c
> @@ -1438,14 +1438,13 @@ static int stex_do_reset(struct st_hba *hba)
> return -1;
> }
>
> -static int stex_reset(struct scsi_cmnd *cmd)
> +static int stex_reset(struct Scsi_Host *shost)
> {
> struct st_hba *hba;
>
> - hba = (struct st_hba *) &cmd->device->host->hostdata[0];
> + hba = (struct st_hba *) &shost->hostdata[0];
Again, can shost_priv() be used for all of these?
>
> - shost_printk(KERN_INFO, cmd->device->host,
> - "resetting host\n");
> + shost_printk(KERN_INFO, shost, "resetting host\n");
>
> return stex_do_reset(hba) ? FAILED : SUCCESS;
> }
> diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
> index a95936b18f69..7a71d0526f6d 100644
> --- a/drivers/scsi/storvsc_drv.c
> +++ b/drivers/scsi/storvsc_drv.c
> @@ -1624,9 +1624,9 @@ static int storvsc_get_chs(struct scsi_device *sdev, struct block_device * bdev,
> return 0;
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 2/7] scsi: Use Scsi_Host and channel number as argument for eh_bus_reset_handler()
2023-10-02 15:59 ` [PATCH 2/7] scsi: Use Scsi_Host and channel number as argument for eh_bus_reset_handler() Hannes Reinecke
@ 2023-10-05 11:54 ` John Garry
0 siblings, 0 replies; 28+ messages in thread
From: John Garry @ 2023-10-05 11:54 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
> diff --git a/Documentation/scsi/scsi_eh.rst b/Documentation/scsi/scsi_eh.rst
> index da95971b4f44..dbbfd754a928 100644
> --- a/Documentation/scsi/scsi_eh.rst
> +++ b/Documentation/scsi/scsi_eh.rst
> @@ -216,7 +216,7 @@ considered to fail always.
>
> int (* eh_abort_handler)(struct scsi_cmnd *);
> int (* eh_device_reset_handler)(struct scsi_cmnd *);
> - int (* eh_bus_reset_handler)(struct scsi_cmnd *);
> + int (* eh_bus_reset_handler)(struct Scsi_Host *, int);
scsi_device.channel and scsi_target.channel are both unsigned int, so
could this also be unsigned int?
> int (* eh_host_reset_handler)(struct Scsi_Host *);
>
> Higher-severity actions are taken only when lower-severity actions
> diff --git a/Documentation/scsi/scsi_mid_low_api.rst b/Documentation/scsi/scsi_mid_low_api.rst
> index 85b1384ba4fd..88bb3b7578ba 100644
> --- a/Documentation/scsi/scsi_mid_low_api.rst
> +++ b/Documentation/scsi/scsi_mid_low_api.rst
> @@ -741,7 +741,8 @@ Details::
...
>
> /* If we can't locate our host adapter structure, return FAILED status.
> */
> - if ((hd = shost_priv(SCpnt->device->host)) == NULL){
> + if ((hd = shost_priv(shost)) == NULL){
> printk(KERN_ERR MYNAM ": bus reset: "
> - "Can't locate host! (sc=%p)\n", SCpnt);
> + "Can't locate host!\n");
> return FAILED;
> }
>
> ioc = hd->ioc;
> - printk(MYIOC_s_INFO_FMT "attempting bus reset! (sc=%p)\n",
> - ioc->name, SCpnt);
> - scsi_print_command(SCpnt);
> + printk(MYIOC_s_INFO_FMT "attempting bus reset!\n",
maybe printing the channel number may be helpful
> + ioc->name);
>
> if (ioc->timeouts < -1)
> ioc->timeouts++;
>
> - vdevice = SCpnt->device->hostdata;
> - if (!vdevice || !vdevice->vtarget)
> - return SUCCESS;
> retval = mptscsih_IssueTaskMgmt(hd,
> MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS,
> - vdevice->vtarget->channel, 0, 0, 0,
> + channel, 0, 0, 0,
> mptscsih_get_tm_timeout(ioc));
>
> - printk(MYIOC_s_INFO_FMT "bus reset: %s (sc=%p)\n",
> - ioc->name, ((retval == 0) ? "SUCCESS" : "FAILED" ), SCpnt);
> + printk(MYIOC_s_INFO_FMT "bus reset: %s\n",
> + ioc->name, ((retval == 0) ? "SUCCESS" : "FAILED" ));
Outer () can be removed
>
> if (retval == 0)
> return SUCCESS;
> diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
...
> struct AdapterCtlBlk *acb =
> - (struct AdapterCtlBlk *)cmd->device->host->hostdata;
> + (struct AdapterCtlBlk *)shost->hostdata;
> dprintkl(KERN_INFO,
> - "eh_bus_reset: (0%p) target=<%02i-%i> cmd=%p\n",
> - cmd, cmd->device->id, (u8)cmd->device->lun, cmd);
> + "eh_bus_reset: bus=<%02i>\n", channel);
>
> if (timer_pending(&acb->waiting_timer))
> del_timer(&acb->waiting_timer);
>
> /*
> - * disable interrupt
> + * disable interrupt
what changed here?
> */
> DC395x_write8(acb, TRM_S1040_DMA_INTEN, 0x00);
> DC395x_write8(acb, TRM_S1040_SCSI_INTEN, 0x00);
> @@ -1172,7 +1171,7 @@ static int __dc395x_eh_bus_reset(struct scsi_cmnd *cmd)
> HZ * acb->eeprom.delay_time;
>
> /*
> - * re-enable interrupt
> + * re-enable interrupt
> */
...
>
> /* Internal functions */
> diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
> index 168f01a34acc..ae647e2586d0 100644
> --- a/drivers/scsi/esas2r/esas2r_main.c
> +++ b/drivers/scsi/esas2r/esas2r_main.c
> @@ -1097,10 +1097,8 @@ int esas2r_host_reset(struct Scsi_Host *shost)
> return esas2r_host_bus_reset(shost, true);
> }
>
> -int esas2r_bus_reset(struct scsi_cmnd *cmd)
> +int esas2r_bus_reset(struct Scsi_Host *shost, int channel)
> {
> - struct Scsi_Host *shost = cmd->device->host;
> -
> esas2r_log(ESAS2R_LOG_INFO, "bus_reset (%p)", shost);
surely printing the channel would be better than the shost pointer
>
> return esas2r_host_bus_reset(shost, false);
> diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
> index 355fec046220..c6a5721aef23 100644
> --- a/drivers/scsi/esp_scsi.c
> +++ b/drivers/scsi/esp_scsi.c
> @@ -2604,9 +2604,9 @@ static int esp_eh_abort_handler(struct scsi_cmnd *cmd)
> return FAILED;
> }
>
...
>
> - sdev_printk(KERN_INFO, scmd->device,
> - "Bus reset is %s for scmd(%p)\n",
> - ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);
> + shost_printk(KERN_INFO, shost,
> + "Bus reset is %s\n",
> + ((retval == SUCCESS) ? "SUCCESS" : "FAILED"));
again, () can be removed
> return retval;
> }
>
> diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
> index 35869b4f9329..59efe064b304 100644
> --- a/drivers/scsi/ncr53c8xx.c
> +++ b/drivers/scsi/ncr53c8xx.c
> @@ -7936,9 +7936,9 @@ static void ncr53c8xx_timeout(struct timer_list *t)
> ncr_flush_done_cmds(done_list);
> }
>
> -static int ncr53c8xx_bus_reset(struct scsi_cmnd *cmd)
> +static int ncr53c8xx_bus_reset(struct Scsi_Host *host, int channel)
> {
> - struct ncb *np = ((struct host_data *) cmd->device->host->hostdata)->ncb;
> + struct ncb *np = ((struct host_data *) host->hostdata)->ncb;
> int sts;
> unsigned long flags;
> struct scsi_cmnd *done_list;
> diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
> index 104647a6170e..c709bb955d05 100644
> --- a/drivers/scsi/pcmcia/nsp_cs.c
> +++ b/drivers/scsi/pcmcia/nsp_cs.c
> @@ -1486,11 +1486,11 @@ static int nsp_bus_reset(nsp_hw_data *data)
> return SUCCESS;
> }
>
> -static int nsp_eh_bus_reset(struct scsi_cmnd *SCpnt)
> +static int nsp_eh_bus_reset(struct Scsi_Host *host, int channel)
> {
> - nsp_hw_data *data = (nsp_hw_data *)SCpnt->device->host->hostdata;
> + nsp_hw_data *data = (nsp_hw_data *)host->hostdata;
>
> - nsp_dbg(NSP_DEBUG_BUSRESET, "SCpnt=0x%p", SCpnt);
> + nsp_dbg(NSP_DEBUG_BUSRESET, "channel=0x%d", channel);
0x%x, and I am not sure that is even better than printing in decimal
>
> return nsp_bus_reset(data);
> }
> diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h
> index f532adb5f166..8636f0053c02 100644
> --- a/drivers/scsi/pcmcia/nsp_cs.h
> +++ b/drivers/scsi/pcmcia/nsp_cs.h
> @@ -299,7 +299,7 @@ static int nsp_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *SCpnt);
...
> return rc;
> }
> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
> index bb0323d05640..a9d9d0a9abd7 100644
> --- a/drivers/scsi/qla2xxx/qla_os.c
> +++ b/drivers/scsi/qla2xxx/qla_os.c
> @@ -1588,7 +1588,7 @@ qla2xxx_eh_target_reset(struct scsi_cmnd *cmd)
> * commands.
> *
> * Input:
> -* cmd = Linux SCSI command packet of the command that cause the
> +* host = Linux SCSI command packet of the command that cause the
> * bus reset.
"Linux SCSI command packet " - really?
> *
> * Returns:
> @@ -1596,12 +1596,10 @@ qla2xxx_eh_target_reset(struct scsi_cmnd *cmd)
> *
> **************************************************************************/
...
>
> - scmd_printk(KERN_INFO, cmd, "SCSI Bus reset\n");
> + shost_printk(KERN_INFO, host, "SCSI Bus reset\n");
how about this the channel #?
>
> /*
> * We don't want to queue new requests for this bus after
> diff --git a/drivers/scsi/wd719x.c b/drivers/scsi/wd719x.c
> index 42134f9510d5..bc48152e74b8 100644
> --- a/drivers/scsi/wd719x.c
> +++ b/drivers/scsi/wd719x.c
> @@ -484,11 +484,11 @@ static int wd719x_abort(struct scsi_cmnd *cmd)
> return SUCCESS;
> }
> /* Simulate a SCSI bus reset by resetting the device's USB port. */
> -static int bus_reset(struct scsi_cmnd *srb)
> +static int bus_reset(struct Scsi_Host *shost, int channel)
> {
> - struct us_data *us = host_to_us(srb->device->host);
> + struct us_data *us = host_to_us(shost);
Incidentally host_to_us() seems a copy of shost_priv()
> int result;
>
> usb_stor_dbg(us, "%s called\n", __func__);
> diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
> index 9e3ec411cdc6..32ef595db028 100644
> --- a/include/scsi/scsi_host.h
> +++ b/include/scsi/scsi_host.h
> @@ -152,7 +152,7 @@ struct scsi_host_template {
> int (* eh_abort_handler)(struct scsi_cmnd *);
> int (* eh_device_reset_handler)(struct scsi_cmnd *);
> int (* eh_target_reset_handler)(struct scsi_cmnd *);
> - int (* eh_bus_reset_handler)(struct scsi_cmnd *);
> + int (* eh_bus_reset_handler)(struct Scsi_Host *, int);
> int (* eh_host_reset_handler)(struct Scsi_Host *);
>
> /*
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 3/7] scsi: Use scsi_target as argument for eh_target_reset_handler()
2023-10-02 15:59 ` [PATCH 3/7] scsi: Use scsi_target as argument for eh_target_reset_handler() Hannes Reinecke
@ 2023-10-05 12:33 ` John Garry
0 siblings, 0 replies; 28+ messages in thread
From: John Garry @ 2023-10-05 12:33 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
> /**
> * eh_device_reset_handler - issue SCSI device reset
> * @scp: identifies SCSI device to be reset
> diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
> index 86f16f3ea478..61a060dc7a17 100644
> --- a/drivers/message/fusion/mptsas.c
> +++ b/drivers/message/fusion/mptsas.c
> @@ -1997,7 +1997,15 @@ static enum scsi_timeout_action mptsas_eh_timed_out(struct scsi_cmnd *sc)
> }
>
>
> -static const struct scsi_host_template mptsas_driver_template = {
> +static int mptsas_eh_target_reset(struct scsi_target *starget)
> +{
> + struct sas_rphy *rphy = dev_to_rphy(starget->dev.parent);
> + MPT_ADAPTER *ioc = rphy_to_ioc(rphy);
> +
> + return mptscsih_target_reset(ioc->sh, starget);
> +}
> +
> +static struct scsi_host_template mptsas_driver_template = {
was dropping the const intentional?
> .module = THIS_MODULE,
> .proc_name = "mptsas",
> .show_info = mptscsih_show_info,
> @@ -2012,7 +2020,7 @@ static const struct scsi_host_template mptsas_driver_template = {
> .change_queue_depth = mptscsih_change_queue_depth,
> .eh_timed_out = mptsas_eh_timed_out,
> .eh_abort_handler = mptscsih_abort,
> - .eh_device_reset_handler = mptscsih_dev_reset,
> + .eh_target_reset_handler = mptsas_eh_target_reset,
> .eh_host_reset_handler = mptscsih_host_reset,
> .bios_param = mptscsih_bios_param,
> .can_queue = MPT_SAS_CAN_QUEUE,
> diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
> index 591b2858f823..b31d74ea9cc8 100644
> --- a/drivers/message/fusion/mptscsih.c
> +++ b/drivers/message/fusion/mptscsih.c
> @@ -1853,48 +1853,43 @@ mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
> * Returns SUCCESS or FAILED.
> **/
> int
> -mptscsih_target_reset(struct scsi_cmnd * SCpnt)
> +mptscsih_target_reset(struct Scsi_Host *shost, struct scsi_target * starget)
> {
> MPT_SCSI_HOST *hd;
> int retval;
> - VirtDevice *vdevice;
> + VirtTarget *vtarget;
> MPT_ADAPTER *ioc;
>
> /* If we can't locate our host adapter structure, return FAILED status.
> */
> - if ((hd = shost_priv(SCpnt->device->host)) == NULL){
> - printk(KERN_ERR MYNAM ": target reset: "
> - "Can't locate host! (sc=%p)\n", SCpnt);
> + if ((hd = shost_priv(shost)) == NULL){
Is shost_priv(shost) == NULL even possible?
Doesn't shost_priv() just return the address to the driver shost priv
data, which is at a fixed offset to shost pointer
...
> }
>
> -static const struct scsi_host_template mptspi_driver_template = {
> +static int mptspi_eh_target_reset(struct scsi_target *starget)
> +{
> + struct Scsi_Host *shost = dev_to_shost(&starget->dev);
> + return mptscsih_target_reset(shost, starget);
> +}
> +
> +static struct scsi_host_template mptspi_driver_template = {
> .module = THIS_MODULE,
> .proc_name = "mptspi",
> .show_info = mptscsih_show_info,
> @@ -834,7 +840,7 @@ static const struct scsi_host_template mptspi_driver_template = {
> .slave_destroy = mptspi_slave_destroy,
> .change_queue_depth = mptscsih_change_queue_depth,
> .eh_abort_handler = mptscsih_abort,
> - .eh_device_reset_handler = mptscsih_dev_reset,
> + .eh_target_reset_handler = mptspi_eh_target_reset,
> .eh_bus_reset_handler = mptscsih_bus_reset,
> .eh_host_reset_handler = mptscsih_host_reset,
> .bios_param = mptscsih_bios_param,
> diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
> index 60ef1e2ab3cd..6bd07f704391 100644
> --- a/drivers/s390/scsi/zfcp_scsi.c
> +++ b/drivers/s390/scsi/zfcp_scsi.c
> @@ -340,9 +340,12 @@ static int zfcp_scsi_eh_device_reset_handler(struct scsi_cmnd *scpnt)
> return zfcp_scsi_task_mgmt_function(sdev, FCP_TMF_LUN_RESET);
> }
...
>
> -int sas_eh_target_reset_handler(struct scsi_cmnd *cmd)
> +int sas_eh_target_reset_handler(struct scsi_target *starget)
> {
> int res;
> - struct Scsi_Host *host = cmd->device->host;
> - struct domain_device *dev = cmd_to_domain_dev(cmd);
> + struct domain_device *dev = starget_to_domain_dev(starget);
> + struct sas_rphy *rphy = dev->rphy;
> + struct Scsi_Host *host = dev_to_shost(rphy->dev.parent);
> struct sas_internal *i = to_sas_internal(host->transportt);
>
> if (current != host->ehandler)
> @@ -515,7 +516,7 @@ static int try_to_reset_cmd_device(struct scsi_cmnd *cmd)
>
> try_target_reset:
> if (shost->hostt->eh_target_reset_handler)
> - return shost->hostt->eh_target_reset_handler(cmd);
> + return shost->hostt->eh_target_reset_handler(scsi_target(cmd->device));
this line looks too long
>
> return FAILED;
> }
...
>
> diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
> index 8a83f3fc2b86..0ad6be041298 100644
> --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
> +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
> @@ -4801,21 +4801,25 @@ int megasas_task_abort_fusion(struct scsi_cmnd *scmd)
>
> /*
> * megasas_reset_target_fusion : target reset function for fusion adapters
> - * scmd: SCSI command pointer
> + * shost: SCSI host pointer
> + * starget: SCSI target pointer
> *
> * Returns SUCCESS if all commands associated with target aborted else FAILED
> */
>
> -int megasas_reset_target_fusion(struct scsi_cmnd *scmd)
> +int megasas_reset_target_fusion(struct Scsi_Host *shost,
> + struct scsi_target *starget)
> {
>
> struct megasas_instance *instance;
> + struct scsi_device *sdev;
> int ret = FAILED;
> - u16 devhandle;
> - struct MR_PRIV_DEVICE *mr_device_priv_data;
> - mr_device_priv_data = scmd->device->hostdata;
> + u16 devhandle = USHRT_MAX;
> + struct MR_PRIV_DEVICE *mr_device_priv_data = NULL;
>
> - instance = (struct megasas_instance *)scmd->device->host->hostdata;
> + instance = (struct megasas_instance *)shost->hostdata;
> + starget_printk(KERN_INFO, starget,
> + "target reset called\n");
>
> if (atomic_read(&instance->adprecovery) != MEGASAS_HBA_OPERATIONAL) {
> dev_err(&instance->pdev->dev, "Controller is not OPERATIONAL,"
> @@ -4824,10 +4828,21 @@ int megasas_reset_target_fusion(struct scsi_cmnd *scmd)
> return ret;
> }
>
> + shost_for_each_device(sdev, shost) {
> + if (!sdev->hostdata)
> + continue;
> + if (sdev->sdev_target != starget)
> + continue;
> + mr_device_priv_data = sdev->hostdata;
> + if (mr_device_priv_data->is_tm_capable) {
> + devhandle = megasas_get_tm_devhandle(sdev);
> + break;
> + }
> + }
Do you require scsi_device_put(sdev)?
> +
> if (!mr_device_priv_data) {
> - sdev_printk(KERN_INFO, scmd->device,
> - "device been deleted! scmd: (0x%p)\n", scmd);
> - scmd->result = DID_NO_CONNECT << 16;
> + starget_printk(KERN_INFO, starget,
> + "all devices have been deleted\n");
> ret = SUCCESS;
> goto out;
...
>
> - stgt_priv_data = sdev_priv_data->tgt_priv_data;
> + stgt_priv_data = (struct mpi3mr_stgt_priv_data *)
> + starget->hostdata;
starget->hostdata is a void *, so no need for casting
...
>
> -static int pmcraid_eh_target_reset_handler(struct scsi_cmnd *scmd)
> +static int pmcraid_eh_target_reset_handler(struct scsi_target *starget)
> {
> - struct Scsi_Host *shost = scmd->device->host;
> + struct Scsi_Host *shost = dev_to_shost(&starget->dev);
> struct scsi_device *scsi_dev = NULL, *tmp;
>
> shost_for_each_device(tmp, shost) {
> - if ((tmp->channel == scmd->device->channel) &&
> - (tmp->id == scmd->device->id)) {
> + if ((tmp->channel == starget->channel) &&
> + (tmp->id == starget->id)) {
> scsi_dev = tmp;
> break;
> }
> diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
> index 413a5a0da433..f6876307c304 100644
> --- a/drivers/scsi/qedf/qedf_main.c
> +++ b/drivers/scsi/qedf/qedf_main.c
> @@ -856,9 +856,8 @@ static int qedf_eh_abort(struct scsi_cmnd *sc_cmd)
> return rc;
> }
>
> -static int qedf_eh_target_reset(struct scsi_cmnd *sc_cmd)
> +static int qedf_eh_target_reset(struct scsi_target *starget)
> {
> - struct scsi_target *starget = scsi_target(sc_cmd->device);
> struct fc_rport *rport = starget_to_rport(starget);
>
> QEDF_ERR(NULL, "TARGET RESET Issued...");
> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
> index a9d9d0a9abd7..53bb73e07c3a 100644
> --- a/drivers/scsi/qla2xxx/qla_os.c
> +++ b/drivers/scsi/qla2xxx/qla_os.c
> @@ -1514,10 +1514,9 @@ qla2xxx_eh_device_reset(struct scsi_cmnd *cmd)
> }
>
> static int
> -qla2xxx_eh_target_reset(struct scsi_cmnd *cmd)
> +qla2xxx_eh_target_reset(struct scsi_target *starget)
> {
> - struct scsi_device *sdev = cmd->device;
> - struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
> + struct fc_rport *rport = starget_to_rport(starget);
> scsi_qla_host_t *vha = shost_priv(rport_to_shost(rport));
> struct qla_hw_data *ha = vha->hw;
> fc_port_t *fcport = *(fc_port_t **)rport->dd_data;
> @@ -1542,40 +1541,39 @@ qla2xxx_eh_target_reset(struct scsi_cmnd *cmd)
> return FAILED;
>
> ql_log(ql_log_info, vha, 0x8009,
> - "TARGET RESET ISSUED nexus=%ld:%d cmd=%p.\n", vha->host_no,
> - sdev->id, cmd);
> + "TARGET RESET ISSUED nexus=%ld:%d.\n", vha->host_no,
> + starget->id);
>
> err = 0;
> if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
> ql_log(ql_log_warn, vha, 0x800a,
> - "Wait for hba online failed for cmd=%p.\n", cmd);
> + "Wait for hba online failed.\n");
sidenote: maybe the maintainer for this driver would like a different
log message, but they are not even cc'ed
...
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 4/7] scsi: Use scsi_device as argument to eh_device_reset_handler()
2023-10-02 15:59 ` [PATCH 4/7] scsi: Use scsi_device as argument to eh_device_reset_handler() Hannes Reinecke
@ 2023-10-05 12:59 ` John Garry
2023-10-10 12:12 ` Wenchao Hao
1 sibling, 0 replies; 28+ messages in thread
From: John Garry @ 2023-10-05 12:59 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 02/10/2023 16:59, Hannes Reinecke wrote:
> mptscsih_dev_reset(struct scsi_device * device)
> {
> MPT_SCSI_HOST *hd;
> int retval;
> @@ -1810,18 +1810,15 @@ mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
>
> /* If we can't locate our host adapter structure, return FAILED status.
> */
> - if ((hd = shost_priv(SCpnt->device->host)) == NULL){
> - printk(KERN_ERR MYNAM ": lun reset: "
> - "Can't locate host! (sc=%p)\n", SCpnt);
> + if ((hd = shost_priv(device->host)) == NULL){
> + printk(KERN_ERR MYNAM ": lun reset: Can't locate host!\n");
> return FAILED;
again, I don't think that this is possible
> @@ -2887,20 +2887,20 @@ static int ibmvfc_eh_abort_handler(struct scsi_cmnd *cmd)
>
> /**
> * ibmvfc_eh_device_reset_handler - Reset a single LUN
> - * @cmd: scsi command struct
> + * @sdev: scsi devicestruct
nit: device struct
> *
..
> @@ -1676,12 +1676,12 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
> spin_unlock_irqrestore(hostdata->host->host_lock, flags);
>
> if (rsp_rc != 0) {
> - sdev_printk(KERN_ERR, cmd->device,
> + sdev_printk(KERN_ERR, sdev,
> "failed to send reset event. rc=%d\n", rsp_rc);
> return FAILED;
> }
>
> - sdev_printk(KERN_INFO, cmd->device, "resetting device. lun 0x%llx\n",
> + sdev_printk(KERN_INFO, sdev, "resetting device. lun 0x%llx\n",
> (((u64) lun) << 48));
>
...
> *
> - * Return: SUCCESS of successful termination of the scmd else
> + * Return: SUCCESS of successful lun reset else
> * FAILED
this can be united with the previous line
> @@ -4174,38 +4172,34 @@ static int mpi3mr_eh_dev_reset(struct scsi_cmnd *scmd)
> stgt_priv_data = sdev_priv_data->tgt_priv_data;
> dev_handle = stgt_priv_data->dev_handle;
> if (stgt_priv_data->dev_removed) {
> - struct scmd_priv *cmd_priv = scsi_cmd_priv(scmd);
> - sdev_printk(KERN_INFO, scmd->device,
> + sdev_printk(KERN_INFO, sdev,
> "%s: device(handle = 0x%04x) is removed, device(LUN) reset is not issued\n",
> mrioc->name, dev_handle);
> - if (!cmd_priv->in_lld_scope || cmd_priv->host_tag == MPI3MR_HOSTTAG_INVALID)
> - retval = SUCCESS;
> - else
> - retval = FAILED;
> + retval = FAILED;
> goto out;
> }
> - sdev_printk(KERN_INFO, scmd->device,
> + sdev_printk(KERN_INFO, sdev,
> "Device(lun) Reset is issued to handle(0x%04x)\n", dev_handle);
>
> ret = mpi3mr_issue_tm(mrioc,
> MPI3_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET, dev_handle,
> sdev_priv_data->lun_id, MPI3MR_HOSTTAG_BLK_TMS,
> - MPI3MR_RESETTM_TIMEOUT, &mrioc->host_tm_cmds, &resp_code, scmd);
> + MPI3MR_RESETTM_TIMEOUT, &mrioc->host_tm_cmds, &resp_code, NULL);
>
> if (ret)
> goto out;
>
> if (sdev_priv_data->pend_count) {
> - sdev_printk(KERN_INFO, scmd->device,
> + sdev_printk(KERN_INFO, sdev,
> "%s: device has %d pending commands, device(LUN) reset is failed\n",
> mrioc->name, sdev_priv_data->pend_count);
> goto out;
> }
> retval = SUCCESS;
> out:
> - sdev_printk(KERN_INFO, scmd->device,
> - "%s: device(LUN) reset is %s for scmd(%p)\n", mrioc->name,
> - ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);
> + sdev_printk(KERN_INFO, sdev,
> + "%s: device(LUN) reset is %s\n", mrioc->name,
> + ((retval == SUCCESS) ? "SUCCESS" : "FAILED"));
>
> return retval;
> }
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> index c6dd00b034f4..530a043e40d2 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> @@ -3365,9 +3365,9 @@ scsih_abort(struct scsi_cmnd *scmd)
> * Return: SUCCESS if command aborted else FAILED
> */
> static int
> -scsih_dev_reset(struct scsi_cmnd *scmd)
> +scsih_dev_reset(struct scsi_device *sdev)
> {
> - struct MPT3SAS_ADAPTER *ioc = shost_priv(scmd->device->host);
> + struct MPT3SAS_ADAPTER *ioc = shost_priv(sdev->host);
> struct MPT3SAS_DEVICE *sas_device_priv_data;
> struct _sas_device *sas_device = NULL;
> struct _pcie_device *pcie_device = NULL;
> @@ -3376,20 +3376,17 @@ scsih_dev_reset(struct scsi_cmnd *scmd)
> u8 tr_timeout = 30;
> int r;
>
> - struct scsi_target *starget = scmd->device->sdev_target;
> + struct scsi_target *starget = sdev->sdev_target;
> struct MPT3SAS_TARGET *target_priv_data = starget->hostdata;
>
> - sdev_printk(KERN_INFO, scmd->device,
> - "attempting device reset! scmd(0x%p)\n", scmd);
> - _scsih_tm_display_info(ioc, scmd);
> + sdev_printk(KERN_INFO, sdev,
> + "attempting device reset!\n");
>
> - sas_device_priv_data = scmd->device->hostdata;
> + sas_device_priv_data = sdev->hostdata;
> if (!sas_device_priv_data || !sas_device_priv_data->sas_target ||
> ioc->remove_host) {
> - sdev_printk(KERN_INFO, scmd->device,
> - "device been deleted! scmd(0x%p)\n", scmd);
> - scmd->result = DID_NO_CONNECT << 16;
> - scsi_done(scmd);
> + sdev_printk(KERN_INFO, sdev,
> + "device been deleted!\n");
> r = SUCCESS;
> goto out;
> }
> @@ -3406,7 +3403,6 @@ scsih_dev_reset(struct scsi_cmnd *scmd)
> handle = sas_device_priv_data->sas_target->handle;
>
> if (!handle) {
> - scmd->result = DID_RESET << 16;
> r = FAILED;
> goto out;
> }
> @@ -3420,16 +3416,16 @@ scsih_dev_reset(struct scsi_cmnd *scmd)
> } else
> tr_method = MPI2_SCSITASKMGMT_MSGFLAGS_LINK_RESET;
>
> - r = mpt3sas_scsih_issue_locked_tm(ioc, handle, scmd->device->channel,
> - scmd->device->id, scmd->device->lun,
> + r = mpt3sas_scsih_issue_locked_tm(ioc, handle, sdev->channel,
> + sdev->id, sdev->lun,
> MPI2_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET, 0, 0,
> tr_timeout, tr_method);
> /* Check for busy commands after reset */
> - if (r == SUCCESS && scsi_device_busy(scmd->device))
> + if (r == SUCCESS && scsi_device_busy(sdev))
> r = FAILED;
> out:
> - sdev_printk(KERN_INFO, scmd->device, "device reset: %s scmd(0x%p)\n",
> - ((r == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);
> + sdev_printk(KERN_INFO, sdev, "device reset: %s\n",
> + ((r == SUCCESS) ? "SUCCESS" : "FAILED"));
>
> if (sas_device)
> sas_device_put(sas_device);
> diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h
> index 8636f0053c02..c2b522a194fc 100644
> --- a/drivers/scsi/pcmcia/nsp_cs.h
> +++ b/drivers/scsi/pcmcia/nsp_cs.h
> @@ -297,8 +297,6 @@ static int nsp_show_info (struct seq_file *m,
> static int nsp_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *SCpnt);
>
> /* Error handler */
> -/*static int nsp_eh_abort (struct scsi_cmnd *SCpnt);*/
> -/*static int nsp_eh_device_reset(struct scsi_cmnd *SCpnt);*/
> static int nsp_eh_bus_reset (struct Scsi_Host *host, int channel);
> static int nsp_eh_host_reset (struct Scsi_Host *host);
> static int nsp_bus_reset (nsp_hw_data *data);
> diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
> index d806576edb87..92ed0b86ad80 100644
> --- a/drivers/scsi/pmcraid.c
> +++ b/drivers/scsi/pmcraid.c
> @@ -3014,11 +3014,11 @@ static int pmcraid_eh_abort_handler(struct scsi_cmnd *scsi_cmd)
> * Return value
> * SUCCESS or FAILED
> */
> -static int pmcraid_eh_device_reset_handler(struct scsi_cmnd *scmd)
> +static int pmcraid_eh_device_reset_handler(struct scsi_device *sdev)
> {
> - scmd_printk(KERN_INFO, scmd,
> + sdev_printk(KERN_INFO, sdev,
> "resetting device due to an I/O command timeout.\n");
> - return pmcraid_reset_device(scmd->device,
> + return pmcraid_reset_device(sdev,
> PMCRAID_INTERNAL_TIMEOUT,
> RESET_DEVICE_LUN);
> }
> diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
> index f6876307c304..bf169950834c 100644
> --- a/drivers/scsi/qedf/qedf_main.c
> +++ b/drivers/scsi/qedf/qedf_main.c
> @@ -864,12 +864,12 @@ static int qedf_eh_target_reset(struct scsi_target *starget)
> return qedf_initiate_tmf(rport, 0, FCP_TMF_TGT_RESET);
> }
>
> -static int qedf_eh_device_reset(struct scsi_cmnd *sc_cmd)
> +static int qedf_eh_device_reset(struct scsi_device *sdev)
> {
> - struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device));
> + struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
>
> QEDF_ERR(NULL, "LUN RESET Issued...\n");
> - return qedf_initiate_tmf(rport, sc_cmd->device->lun, FCP_TMF_LUN_RESET);
> + return qedf_initiate_tmf(rport, sdev->lun, FCP_TMF_LUN_RESET);
> }
>
> bool qedf_wait_for_upload(struct qedf_ctx *qedf)
> diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
> index 1df3deb618e4..cb010aa271ce 100644
> --- a/drivers/scsi/qla1280.c
> +++ b/drivers/scsi/qla1280.c
> @@ -963,13 +963,24 @@ qla1280_eh_abort(struct scsi_cmnd * cmd)
> * Reset the specified SCSI device
> **************************************************************************/
> static int
> -qla1280_eh_device_reset(struct scsi_cmnd *cmd)
> +qla1280_eh_device_reset(struct scsi_device *sdev)
> {
> - int rc;
> + struct Scsi_Host *shost = sdev->host;
> + struct scsi_qla_host *ha = (struct scsi_qla_host *)shost->hostdata;
> + int rc = FAILED;
>
> - spin_lock_irq(cmd->device->host->host_lock);
> - rc = qla1280_error_action(cmd, DEVICE_RESET);
> - spin_unlock_irq(cmd->device->host->host_lock);
> + spin_lock_irq(shost->host_lock);
> + if (qla1280_verbose)
> + printk(KERN_INFO
> + "scsi(%ld:%d:%d:%llu): Queueing device reset "
> + "command.\n", ha->host_no, sdev->channel,
> + sdev->id, sdev->lun);
> + if (qla1280_device_reset(ha, sdev->channel, sdev->id) == 0) {
> + /* issued device reset, set wait conditions */
> + rc = qla1280_wait_for_pending_commands(ha,
> + sdev->channel, sdev->id);
> + }
I am not sure why you are inlined what is done in qla1280_error_action().
> + spin_unlock_irq(shost->host_lock);
>
> return rc;
> }
> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
> index 53bb73e07c3a..5c160f8ef013 100644
> --- a/drivers/scsi/qla2xxx/qla_os.c
> +++ b/drivers/scsi/qla2xxx/qla_os.c
> @@ -1445,9 +1445,8 @@ static char *reset_errors[] = {
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler
2023-10-03 17:33 ` Bart Van Assche
2023-10-04 6:32 ` Hannes Reinecke
@ 2023-10-09 14:05 ` Hannes Reinecke
2023-10-09 15:23 ` Bart Van Assche
1 sibling, 1 reply; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-09 14:05 UTC (permalink / raw)
To: Bart Van Assche, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 10/3/23 19:33, Bart Van Assche wrote:
> On 10/2/23 08:59, Hannes Reinecke wrote:
>> + if ((hd = shost_priv(sh)) == NULL){
>> + printk(KERN_ERR MYNAM ": host reset: Can't locate host!\n");
>> return FAILED;
>> }
>
> In the above example and in multiple other cases formatting does not
> follow the kernel coding style. Please consider to run git clang-format
> HEAD^ on this patch. Otherwise this patch looks good to me.
>
That is correct, but I'm merely following the existing indentation
within that driver.
Reformatting the driver to align with current linux standards would be
a different patch.
Cheers,
Hannes
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler
2023-10-09 14:05 ` Hannes Reinecke
@ 2023-10-09 15:23 ` Bart Van Assche
0 siblings, 0 replies; 28+ messages in thread
From: Bart Van Assche @ 2023-10-09 15:23 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 10/9/23 07:05, Hannes Reinecke wrote:
> On 10/3/23 19:33, Bart Van Assche wrote:
>> On 10/2/23 08:59, Hannes Reinecke wrote:
>>> + if ((hd = shost_priv(sh)) == NULL){
>>> + printk(KERN_ERR MYNAM ": host reset: Can't locate host!\n");
>>> return FAILED;
>>> }
>>
>> In the above example and in multiple other cases formatting does not
>> follow the kernel coding style. Please consider to run git clang-format
>> HEAD^ on this patch. Otherwise this patch looks good to me.
>>
> That is correct, but I'm merely following the existing indentation
> within that driver.
> Reformatting the driver to align with current linux standards would be
> a different patch.
As you may know I'm against reformatting code that is not modified.
What I proposed is to reformat only the lines that have been changed.
Thanks,
Bart.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 4/7] scsi: Use scsi_device as argument to eh_device_reset_handler()
2023-10-02 15:59 ` [PATCH 4/7] scsi: Use scsi_device as argument to eh_device_reset_handler() Hannes Reinecke
2023-10-05 12:59 ` John Garry
@ 2023-10-10 12:12 ` Wenchao Hao
2023-10-10 12:16 ` Hannes Reinecke
1 sibling, 1 reply; 28+ messages in thread
From: Wenchao Hao @ 2023-10-10 12:12 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 2023/10/2 23:59, Hannes Reinecke wrote:
> The device reset function should only depend on the scsi device,
> not the scsi command.
>
> Signed-off-by: Hannes Reinecke <hare@suse.de>
> ---
> Documentation/scsi/scsi_eh.rst | 2 +-
> Documentation/scsi/scsi_mid_low_api.rst | 4 +--
> drivers/infiniband/ulp/srp/ib_srp.c | 6 ++--
> drivers/message/fusion/mptfc.c | 12 ++++----
> drivers/message/fusion/mptscsih.c | 19 +++++-------
> drivers/message/fusion/mptscsih.h | 2 +-
> drivers/s390/scsi/zfcp_scsi.c | 4 +--
> drivers/scsi/a100u2w.c | 7 ++---
> drivers/scsi/aacraid/linit.c | 9 +++---
> drivers/scsi/aha152x.c | 6 ++--
> drivers/scsi/aha1542.c | 8 ++---
> drivers/scsi/aic7xxx/aic79xx_osm.c | 27 +++++++----------
> drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 +--
> drivers/scsi/arm/fas216.c | 5 ++--
> drivers/scsi/arm/fas216.h | 6 ++--
> drivers/scsi/be2iscsi/be_main.c | 8 ++---
> drivers/scsi/bfa/bfad_im.c | 3 +-
> drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
> drivers/scsi/bnx2fc/bnx2fc_io.c | 6 ++--
> drivers/scsi/csiostor/csio_scsi.c | 5 ++--
> drivers/scsi/cxlflash/main.c | 5 ++--
> drivers/scsi/esas2r/esas2r.h | 2 +-
> drivers/scsi/esas2r/esas2r_main.c | 3 +-
> drivers/scsi/fnic/fnic.h | 2 +-
> drivers/scsi/fnic/fnic_scsi.c | 5 ++--
> drivers/scsi/hpsa.c | 14 ++++-----
> drivers/scsi/ibmvscsi/ibmvfc.c | 8 ++---
> drivers/scsi/ibmvscsi/ibmvscsi.c | 19 ++++++------
> drivers/scsi/ipr.c | 22 +++++++-------
> drivers/scsi/libfc/fc_fcp.c | 13 ++++----
> drivers/scsi/libiscsi.c | 15 +++++-----
> drivers/scsi/libsas/sas_scsi_host.c | 12 ++++----
> drivers/scsi/lpfc/lpfc_scsi.c | 10 +++----
> drivers/scsi/mpi3mr/mpi3mr_os.c | 40 +++++++++++--------------
> drivers/scsi/mpt3sas/mpt3sas_scsih.c | 30 ++++++++-----------
> drivers/scsi/pcmcia/nsp_cs.h | 2 --
> drivers/scsi/pmcraid.c | 6 ++--
> drivers/scsi/qedf/qedf_main.c | 6 ++--
> drivers/scsi/qla1280.c | 21 +++++++++----
> drivers/scsi/qla2xxx/qla_os.c | 24 +++++++--------
> drivers/scsi/qla4xxx/ql4_os.c | 23 ++++++--------
> drivers/scsi/scsi_debug.c | 3 +-
> drivers/scsi/scsi_error.c | 35 +++++++++++++++-------
> drivers/scsi/smartpqi/smartpqi.h | 1 -
> drivers/scsi/smartpqi/smartpqi_init.c | 19 +++++-------
> drivers/scsi/snic/snic.h | 2 +-
> drivers/scsi/snic/snic_scsi.c | 4 +--
> drivers/scsi/virtio_scsi.c | 12 ++++----
> drivers/scsi/vmw_pvscsi.c | 10 +++----
> drivers/scsi/wd719x.c | 6 ++--
> drivers/scsi/xen-scsifront.c | 6 ++--
> drivers/staging/rts5208/rtsx.c | 6 +++-
> drivers/target/loopback/tcm_loop.c | 8 ++---
> drivers/ufs/core/ufshcd.c | 8 ++---
> drivers/usb/storage/scsiglue.c | 4 +--
> drivers/usb/storage/uas.c | 3 +-
> include/scsi/libfc.h | 2 +-
> include/scsi/libiscsi.h | 2 +-
> include/scsi/libsas.h | 2 +-
> include/scsi/scsi_host.h | 2 +-
> 60 files changed, 272 insertions(+), 290 deletions(-)
>
> diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
> index df012977a25e..8e0696448590 100644
> --- a/drivers/scsi/ipr.c
> +++ b/drivers/scsi/ipr.c
> @@ -5037,7 +5037,7 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg,
>
> /**
> * __ipr_eh_dev_reset - Reset the device
> - * @scsi_cmd: scsi command struct
> + * @scsi_dev: scsi device struct
> *
> * This function issues a device reset to the affected device.
> * A LUN reset will be sent to the device first. If that does
> @@ -5046,15 +5046,15 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg,
> * Return value:
> * SUCCESS / FAILED
> **/
> -static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd)
> +static int __ipr_eh_dev_reset(struct scsi_device *scsi_dev)
> {
> struct ipr_ioa_cfg *ioa_cfg;
> struct ipr_resource_entry *res;
> int rc = 0;
>
> ENTER;
> - ioa_cfg = (struct ipr_ioa_cfg *) scsi_cmd->device->host->hostdata;
> - res = scsi_cmd->device->hostdata;
> + ioa_cfg = (struct ipr_ioa_cfg *) scsi_dev->host->hostdata;
> + res = scsi_dev->hostdata;
>
> /*
> * If we are currently going through reset/reload, return failed. This will force the
> @@ -5067,7 +5067,7 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd)
> return FAILED;
>
> res->resetting_device = 1;
> - scmd_printk(KERN_ERR, scsi_cmd, "Resetting device\n");
> + sdev_printk(KERN_ERR, scsi_dev, "Resetting device\n");
>
> rc = ipr_device_reset(ioa_cfg, res);
> res->resetting_device = 0;
> @@ -5077,21 +5077,21 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd)
> return rc ? FAILED : SUCCESS;
> }
>
> -static int ipr_eh_dev_reset(struct scsi_cmnd *cmd)
> +static int ipr_eh_dev_reset(struct scsi_device *sdev)
> {
> int rc;
> struct ipr_ioa_cfg *ioa_cfg;
> struct ipr_resource_entry *res;
>
> - ioa_cfg = (struct ipr_ioa_cfg *) cmd->device->host->hostdata;
> - res = cmd->device->hostdata;
> + ioa_cfg = (struct ipr_ioa_cfg *) sdev->host->hostdata;
> + res = sdev->hostdata;
>
> if (!res)
> return FAILED;
>
> - spin_lock_irq(cmd->device->host->host_lock);
> - rc = __ipr_eh_dev_reset(cmd);
> - spin_unlock_irq(cmd->device->host->host_lock);
> + spin_lock_irq(sdev->host->host_lock);
> + rc = __ipr_eh_dev_reset(sdev);
> + spin_unlock_irq(sdev->host->host_lock);
>
> if (rc == SUCCESS)
> rc = ipr_wait_for_ops(ioa_cfg, cmd->device, ipr_match_lun);
This line should also be updated:
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 8e0696448590..a94babec74eb 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -5094,7 +5094,7 @@ static int ipr_eh_dev_reset(struct scsi_device *sdev)
spin_unlock_irq(sdev->host->host_lock);
if (rc == SUCCESS)
- rc = ipr_wait_for_ops(ioa_cfg, cmd->device, ipr_match_lun);
+ rc = ipr_wait_for_ops(ioa_cfg, sdev, ipr_match_lun);
return rc;
}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH 4/7] scsi: Use scsi_device as argument to eh_device_reset_handler()
2023-10-10 12:12 ` Wenchao Hao
@ 2023-10-10 12:16 ` Hannes Reinecke
0 siblings, 0 replies; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-10 12:16 UTC (permalink / raw)
To: Wenchao Hao, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 10/10/23 14:12, Wenchao Hao wrote:
> On 2023/10/2 23:59, Hannes Reinecke wrote:
>> The device reset function should only depend on the scsi device,
>> not the scsi command.
>>
>> Signed-off-by: Hannes Reinecke <hare@suse.de>
>> ---
>> Documentation/scsi/scsi_eh.rst | 2 +-
>> Documentation/scsi/scsi_mid_low_api.rst | 4 +--
>> drivers/infiniband/ulp/srp/ib_srp.c | 6 ++--
>> drivers/message/fusion/mptfc.c | 12 ++++----
>> drivers/message/fusion/mptscsih.c | 19 +++++-------
>> drivers/message/fusion/mptscsih.h | 2 +-
>> drivers/s390/scsi/zfcp_scsi.c | 4 +--
>> drivers/scsi/a100u2w.c | 7 ++---
>> drivers/scsi/aacraid/linit.c | 9 +++---
>> drivers/scsi/aha152x.c | 6 ++--
>> drivers/scsi/aha1542.c | 8 ++---
>> drivers/scsi/aic7xxx/aic79xx_osm.c | 27 +++++++----------
>> drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 +--
>> drivers/scsi/arm/fas216.c | 5 ++--
>> drivers/scsi/arm/fas216.h | 6 ++--
>> drivers/scsi/be2iscsi/be_main.c | 8 ++---
>> drivers/scsi/bfa/bfad_im.c | 3 +-
>> drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
>> drivers/scsi/bnx2fc/bnx2fc_io.c | 6 ++--
>> drivers/scsi/csiostor/csio_scsi.c | 5 ++--
>> drivers/scsi/cxlflash/main.c | 5 ++--
>> drivers/scsi/esas2r/esas2r.h | 2 +-
>> drivers/scsi/esas2r/esas2r_main.c | 3 +-
>> drivers/scsi/fnic/fnic.h | 2 +-
>> drivers/scsi/fnic/fnic_scsi.c | 5 ++--
>> drivers/scsi/hpsa.c | 14 ++++-----
>> drivers/scsi/ibmvscsi/ibmvfc.c | 8 ++---
>> drivers/scsi/ibmvscsi/ibmvscsi.c | 19 ++++++------
>> drivers/scsi/ipr.c | 22 +++++++-------
>> drivers/scsi/libfc/fc_fcp.c | 13 ++++----
>> drivers/scsi/libiscsi.c | 15 +++++-----
>> drivers/scsi/libsas/sas_scsi_host.c | 12 ++++----
>> drivers/scsi/lpfc/lpfc_scsi.c | 10 +++----
>> drivers/scsi/mpi3mr/mpi3mr_os.c | 40 +++++++++++--------------
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c | 30 ++++++++-----------
>> drivers/scsi/pcmcia/nsp_cs.h | 2 --
>> drivers/scsi/pmcraid.c | 6 ++--
>> drivers/scsi/qedf/qedf_main.c | 6 ++--
>> drivers/scsi/qla1280.c | 21 +++++++++----
>> drivers/scsi/qla2xxx/qla_os.c | 24 +++++++--------
>> drivers/scsi/qla4xxx/ql4_os.c | 23 ++++++--------
>> drivers/scsi/scsi_debug.c | 3 +-
>> drivers/scsi/scsi_error.c | 35 +++++++++++++++-------
>> drivers/scsi/smartpqi/smartpqi.h | 1 -
>> drivers/scsi/smartpqi/smartpqi_init.c | 19 +++++-------
>> drivers/scsi/snic/snic.h | 2 +-
>> drivers/scsi/snic/snic_scsi.c | 4 +--
>> drivers/scsi/virtio_scsi.c | 12 ++++----
>> drivers/scsi/vmw_pvscsi.c | 10 +++----
>> drivers/scsi/wd719x.c | 6 ++--
>> drivers/scsi/xen-scsifront.c | 6 ++--
>> drivers/staging/rts5208/rtsx.c | 6 +++-
>> drivers/target/loopback/tcm_loop.c | 8 ++---
>> drivers/ufs/core/ufshcd.c | 8 ++---
>> drivers/usb/storage/scsiglue.c | 4 +--
>> drivers/usb/storage/uas.c | 3 +-
>> include/scsi/libfc.h | 2 +-
>> include/scsi/libiscsi.h | 2 +-
>> include/scsi/libsas.h | 2 +-
>> include/scsi/scsi_host.h | 2 +-
>> 60 files changed, 272 insertions(+), 290 deletions(-)
>>
>
>> diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
>> index df012977a25e..8e0696448590 100644
>> --- a/drivers/scsi/ipr.c
>> +++ b/drivers/scsi/ipr.c
>> @@ -5037,7 +5037,7 @@ static int ipr_device_reset(struct ipr_ioa_cfg
>> *ioa_cfg,
>> /**
>> * __ipr_eh_dev_reset - Reset the device
>> - * @scsi_cmd: scsi command struct
>> + * @scsi_dev: scsi device struct
>> *
>> * This function issues a device reset to the affected device.
>> * A LUN reset will be sent to the device first. If that does
>> @@ -5046,15 +5046,15 @@ static int ipr_device_reset(struct ipr_ioa_cfg
>> *ioa_cfg,
>> * Return value:
>> * SUCCESS / FAILED
>> **/
>> -static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd)
>> +static int __ipr_eh_dev_reset(struct scsi_device *scsi_dev)
>> {
>> struct ipr_ioa_cfg *ioa_cfg;
>> struct ipr_resource_entry *res;
>> int rc = 0;
>> ENTER;
>> - ioa_cfg = (struct ipr_ioa_cfg *) scsi_cmd->device->host->hostdata;
>> - res = scsi_cmd->device->hostdata;
>> + ioa_cfg = (struct ipr_ioa_cfg *) scsi_dev->host->hostdata;
>> + res = scsi_dev->hostdata;
>> /*
>> * If we are currently going through reset/reload, return
>> failed. This will force the
>> @@ -5067,7 +5067,7 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd
>> *scsi_cmd)
>> return FAILED;
>> res->resetting_device = 1;
>> - scmd_printk(KERN_ERR, scsi_cmd, "Resetting device\n");
>> + sdev_printk(KERN_ERR, scsi_dev, "Resetting device\n");
>> rc = ipr_device_reset(ioa_cfg, res);
>> res->resetting_device = 0;
>> @@ -5077,21 +5077,21 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd
>> *scsi_cmd)
>> return rc ? FAILED : SUCCESS;
>> }
>> -static int ipr_eh_dev_reset(struct scsi_cmnd *cmd)
>> +static int ipr_eh_dev_reset(struct scsi_device *sdev)
>> {
>> int rc;
>> struct ipr_ioa_cfg *ioa_cfg;
>> struct ipr_resource_entry *res;
>> - ioa_cfg = (struct ipr_ioa_cfg *) cmd->device->host->hostdata;
>> - res = cmd->device->hostdata;
>> + ioa_cfg = (struct ipr_ioa_cfg *) sdev->host->hostdata;
>> + res = sdev->hostdata;
>> if (!res)
>> return FAILED;
>> - spin_lock_irq(cmd->device->host->host_lock);
>> - rc = __ipr_eh_dev_reset(cmd);
>> - spin_unlock_irq(cmd->device->host->host_lock);
>> + spin_lock_irq(sdev->host->host_lock);
>> + rc = __ipr_eh_dev_reset(sdev);
>> + spin_unlock_irq(sdev->host->host_lock);
>> if (rc == SUCCESS)
>> rc = ipr_wait_for_ops(ioa_cfg, cmd->device, ipr_match_lun);
>
> This line should also be updated:
>
> diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
> index 8e0696448590..a94babec74eb 100644
> --- a/drivers/scsi/ipr.c
> +++ b/drivers/scsi/ipr.c
> @@ -5094,7 +5094,7 @@ static int ipr_eh_dev_reset(struct scsi_device *sdev)
> spin_unlock_irq(sdev->host->host_lock);
>
> if (rc == SUCCESS)
> - rc = ipr_wait_for_ops(ioa_cfg, cmd->device, ipr_match_lun);
> + rc = ipr_wait_for_ops(ioa_cfg, sdev, ipr_match_lun);
>
> return rc;
> }
>
>
Yeah, noticed that already.
Will be fixed in the next round.
Cheers,
Hannes
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCHv5 0/7] scsi: EH rework, main part
2023-10-02 15:59 [PATCHv5 0/7] scsi: EH rework, main part Hannes Reinecke
` (7 preceding siblings ...)
2023-10-04 6:20 ` [PATCHv5 0/7] scsi: EH rework, main part Johannes Thumshirn
@ 2023-10-11 16:35 ` Wenchao Hao
2023-10-12 6:19 ` Hannes Reinecke
8 siblings, 1 reply; 28+ messages in thread
From: Wenchao Hao @ 2023-10-11 16:35 UTC (permalink / raw)
To: Hannes Reinecke
Cc: Martin K. Petersen, James Bottomley, linux-scsi, Christoph Hellwig
On Tue, Oct 3, 2023 at 12:57 AM Hannes Reinecke <hare@suse.de> wrote:
>
> Hi all,
>
> (taking up an old thread:)
> here's now the main part of my EH rework.
> It modifies the reset callbacks for SCSI EH such that
> each callback (eh_host_reset_handler, eh_bus_reset_handler,
> eh_target_reset_handler, eh_device_reset_handler) only
> references the actual entity it needs to work on
> (ie 'Scsi_Host', (scsi bus), 'scsi_target', 'scsi_device'),
> and the 'struct scsi_cmnd' is dropped from the argument list.
> This simplifies the handler themselves as they don't need to
> exclude some 'magic' command, and we don't need to allocate
> a mock 'struct scsi_cmnd' when issuing a reset via SCSI ioctl.
>
> The entire patchset can be found at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/hare/scsi-devel.git
> branch eh-rework.v5
>
> As usual, comments and reviews are welcome.
>
Hi, Hannes, I reviewed your patches and have some questions
to consult.
It seems your patches can be divided into 2 parts, the first part
modifies various LLDDs, decouple each driver's TMFs and scsi_cmnd,
in addition fixes some driver eh_reset function like device_reset
callback actually does target_reset should do things and so on.
The second part modifies the SCSI middle layer by passing
Scsi_host/bus ID/scsi_target/scsi_device to the TMF callback of
LLDDs during error handling, so as to avoid using scsi_cmnd as
parameter during error handling.
But I haven't seen any changes to support concurrent TMF, and
from what I understand, concurrent TMF still needs to be supported
by devices like virtio-scsi, which is designed to naturally support
concurrent TMF.
Is my understanding correct? Or I left out some important details?
Thanks.
> Hannes Reinecke (7):
> scsi: Use Scsi_Host as argument for eh_host_reset_handler
> scsi: Use Scsi_Host and channel number as argument for
> eh_bus_reset_handler()
> scsi: Use scsi_target as argument for eh_target_reset_handler()
> scsi: Use scsi_device as argument to eh_device_reset_handler()
> scsi: Do not allocate scsi command in scsi_ioctl_reset()
> scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL
> scsi_error: streamline scsi_eh_bus_device_reset()
>
> Documentation/scsi/scsi_eh.rst | 16 +-
> Documentation/scsi/scsi_mid_low_api.rst | 31 +++-
> drivers/infiniband/ulp/srp/ib_srp.c | 12 +-
> drivers/message/fusion/mptfc.c | 25 ++--
> drivers/message/fusion/mptsas.c | 12 +-
> drivers/message/fusion/mptscsih.c | 86 +++++------
> drivers/message/fusion/mptscsih.h | 8 +-
> drivers/message/fusion/mptspi.c | 10 +-
> drivers/s390/scsi/zfcp_scsi.c | 16 +-
> drivers/scsi/3w-9xxx.c | 11 +-
> drivers/scsi/3w-sas.c | 11 +-
> drivers/scsi/3w-xxxx.c | 11 +-
> drivers/scsi/53c700.c | 39 ++---
> drivers/scsi/BusLogic.c | 14 +-
> drivers/scsi/NCR5380.c | 3 +-
> drivers/scsi/a100u2w.c | 11 +-
> drivers/scsi/aacraid/linit.c | 35 ++---
> drivers/scsi/advansys.c | 26 ++--
> drivers/scsi/aha152x.c | 10 +-
> drivers/scsi/aha1542.c | 30 ++--
> drivers/scsi/aic7xxx/aic79xx_osm.c | 37 ++---
> drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 +-
> drivers/scsi/arcmsr/arcmsr_hba.c | 6 +-
> drivers/scsi/arm/acornscsi.c | 8 +-
> drivers/scsi/arm/fas216.c | 18 +--
> drivers/scsi/arm/fas216.h | 17 ++-
> drivers/scsi/atari_scsi.c | 4 +-
> drivers/scsi/be2iscsi/be_main.c | 12 +-
> drivers/scsi/bfa/bfad_im.c | 8 +-
> drivers/scsi/bnx2fc/bnx2fc.h | 4 +-
> drivers/scsi/bnx2fc/bnx2fc_io.c | 10 +-
> drivers/scsi/csiostor/csio_scsi.c | 5 +-
> drivers/scsi/cxlflash/main.c | 10 +-
> drivers/scsi/dc395x.c | 25 ++--
> drivers/scsi/esas2r/esas2r.h | 8 +-
> drivers/scsi/esas2r/esas2r_main.c | 55 +++----
> drivers/scsi/esp_scsi.c | 8 +-
> drivers/scsi/fdomain.c | 3 +-
> drivers/scsi/fnic/fnic.h | 4 +-
> drivers/scsi/fnic/fnic_scsi.c | 8 +-
> drivers/scsi/hpsa.c | 14 +-
> drivers/scsi/hptiop.c | 6 +-
> drivers/scsi/ibmvscsi/ibmvfc.c | 15 +-
> drivers/scsi/ibmvscsi/ibmvscsi.c | 23 +--
> drivers/scsi/imm.c | 4 +-
> drivers/scsi/initio.c | 11 +-
> drivers/scsi/ipr.c | 26 ++--
> drivers/scsi/ips.c | 22 +--
> drivers/scsi/libfc/fc_fcp.c | 18 +--
> drivers/scsi/libiscsi.c | 19 ++-
> drivers/scsi/libsas/sas_scsi_host.c | 21 +--
> drivers/scsi/lpfc/lpfc_scsi.c | 23 ++-
> drivers/scsi/mac53c94.c | 8 +-
> drivers/scsi/megaraid.c | 4 +-
> drivers/scsi/megaraid.h | 2 +-
> drivers/scsi/megaraid/megaraid_mbox.c | 14 +-
> drivers/scsi/megaraid/megaraid_sas.h | 3 +-
> drivers/scsi/megaraid/megaraid_sas_base.c | 44 +++---
> drivers/scsi/megaraid/megaraid_sas_fusion.c | 54 ++++---
> drivers/scsi/mesh.c | 10 +-
> drivers/scsi/mpi3mr/mpi3mr_os.c | 135 ++++++++---------
> drivers/scsi/mpt3sas/mpt3sas_scsih.c | 72 ++++-----
> drivers/scsi/mvumi.c | 7 +-
> drivers/scsi/myrb.c | 3 +-
> drivers/scsi/myrs.c | 3 +-
> drivers/scsi/ncr53c8xx.c | 4 +-
> drivers/scsi/nsp32.c | 12 +-
> drivers/scsi/pcmcia/nsp_cs.c | 10 +-
> drivers/scsi/pcmcia/nsp_cs.h | 6 +-
> drivers/scsi/pcmcia/qlogic_stub.c | 4 +-
> drivers/scsi/pcmcia/sym53c500_cs.c | 8 +-
> drivers/scsi/pmcraid.c | 27 ++--
> drivers/scsi/ppa.c | 4 +-
> drivers/scsi/qedf/qedf_main.c | 13 +-
> drivers/scsi/qedi/qedi_iscsi.c | 3 +-
> drivers/scsi/qla1280.c | 36 +++--
> drivers/scsi/qla2xxx/qla_os.c | 83 +++++------
> drivers/scsi/qla4xxx/ql4_os.c | 54 +++----
> drivers/scsi/qlogicfas408.c | 10 +-
> drivers/scsi/qlogicfas408.h | 2 +-
> drivers/scsi/qlogicpti.c | 3 +-
> drivers/scsi/scsi_debug.c | 33 ++---
> drivers/scsi/scsi_error.c | 153 ++++++++++----------
> drivers/scsi/scsi_lib.c | 2 -
> drivers/scsi/smartpqi/smartpqi.h | 1 -
> drivers/scsi/smartpqi/smartpqi_init.c | 19 +--
> drivers/scsi/snic/snic.h | 5 +-
> drivers/scsi/snic/snic_scsi.c | 41 ++----
> drivers/scsi/stex.c | 7 +-
> drivers/scsi/storvsc_drv.c | 4 +-
> drivers/scsi/sym53c8xx_2/sym_glue.c | 13 +-
> drivers/scsi/virtio_scsi.c | 12 +-
> drivers/scsi/vmw_pvscsi.c | 20 ++-
> drivers/scsi/wd33c93.c | 5 +-
> drivers/scsi/wd33c93.h | 2 +-
> drivers/scsi/wd719x.c | 17 ++-
> drivers/scsi/xen-scsifront.c | 6 +-
> drivers/staging/rts5208/rtsx.c | 6 +-
> drivers/target/loopback/tcm_loop.c | 17 ++-
> drivers/ufs/core/ufshcd.c | 14 +-
> drivers/usb/image/microtek.c | 4 +-
> drivers/usb/storage/scsiglue.c | 8 +-
> drivers/usb/storage/uas.c | 3 +-
> include/scsi/libfc.h | 4 +-
> include/scsi/libiscsi.h | 4 +-
> include/scsi/libsas.h | 4 +-
> include/scsi/scsi_cmnd.h | 1 -
> include/scsi/scsi_host.h | 8 +-
> 108 files changed, 921 insertions(+), 1009 deletions(-)
>
> --
> 2.35.3
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCHv5 0/7] scsi: EH rework, main part
2023-10-11 16:35 ` Wenchao Hao
@ 2023-10-12 6:19 ` Hannes Reinecke
2023-10-12 7:30 ` Wenchao Hao
0 siblings, 1 reply; 28+ messages in thread
From: Hannes Reinecke @ 2023-10-12 6:19 UTC (permalink / raw)
To: Wenchao Hao
Cc: Martin K. Petersen, James Bottomley, linux-scsi, Christoph Hellwig
On 10/11/23 18:35, Wenchao Hao wrote:
> On Tue, Oct 3, 2023 at 12:57 AM Hannes Reinecke <hare@suse.de> wrote:
>>
>> Hi all,
>>
>> (taking up an old thread:)
>> here's now the main part of my EH rework.
>> It modifies the reset callbacks for SCSI EH such that
>> each callback (eh_host_reset_handler, eh_bus_reset_handler,
>> eh_target_reset_handler, eh_device_reset_handler) only
>> references the actual entity it needs to work on
>> (ie 'Scsi_Host', (scsi bus), 'scsi_target', 'scsi_device'),
>> and the 'struct scsi_cmnd' is dropped from the argument list.
>> This simplifies the handler themselves as they don't need to
>> exclude some 'magic' command, and we don't need to allocate
>> a mock 'struct scsi_cmnd' when issuing a reset via SCSI ioctl.
>>
>> The entire patchset can be found at:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/hare/scsi-devel.git
>> branch eh-rework.v5
>>
>> As usual, comments and reviews are welcome.
>>
>
> Hi, Hannes, I reviewed your patches and have some questions
> to consult.
>
> It seems your patches can be divided into 2 parts, the first part
> modifies various LLDDs, decouple each driver's TMFs and scsi_cmnd,
> in addition fixes some driver eh_reset function like device_reset
> callback actually does target_reset should do things and so on.
>
> The second part modifies the SCSI middle layer by passing
> Scsi_host/bus ID/scsi_target/scsi_device to the TMF callback of
> LLDDs during error handling, so as to avoid using scsi_cmnd as
> parameter during error handling.
>
> But I haven't seen any changes to support concurrent TMF, and
> from what I understand, concurrent TMF still needs to be supported
> by devices like virtio-scsi, which is designed to naturally support
> concurrent TMF.
>
> Is my understanding correct? Or I left out some important details?
>
Your understanding is entirely correct.
These patches do not modify the behaviour regarding concurrent TMFs.
However, for aborts we already do concurrent TMFs, as for most drivers
abort TMFs are sent directly after a command timeout triggers.
Concurrent 'device reset' (or higher) TMFs are not implemented, and
will be hard to support in general. One would need to redesign the
SCSI EH flow, and find a way on how to 'coalesce' TMFs results when
escalating to the next level; eg when 'device reset' fails for one
device, you would have to wait for all 'device reset' TMFs on the
same target to complete before you can advance to 'target reset'.
With current SCSI EH you can escalate directly, with no need to
wait for any other TMFs (as there won't be any).
So I think the gains for doing concurrent TMFs are offset by the
losses incurred by having to wait for TMF timeouts.
Cheers,
Hannes
> Thanks.
>
>> Hannes Reinecke (7):
>> scsi: Use Scsi_Host as argument for eh_host_reset_handler
>> scsi: Use Scsi_Host and channel number as argument for
>> eh_bus_reset_handler()
>> scsi: Use scsi_target as argument for eh_target_reset_handler()
>> scsi: Use scsi_device as argument to eh_device_reset_handler()
>> scsi: Do not allocate scsi command in scsi_ioctl_reset()
>> scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL
>> scsi_error: streamline scsi_eh_bus_device_reset()
>>
>> Documentation/scsi/scsi_eh.rst | 16 +-
>> Documentation/scsi/scsi_mid_low_api.rst | 31 +++-
>> drivers/infiniband/ulp/srp/ib_srp.c | 12 +-
>> drivers/message/fusion/mptfc.c | 25 ++--
>> drivers/message/fusion/mptsas.c | 12 +-
>> drivers/message/fusion/mptscsih.c | 86 +++++------
>> drivers/message/fusion/mptscsih.h | 8 +-
>> drivers/message/fusion/mptspi.c | 10 +-
>> drivers/s390/scsi/zfcp_scsi.c | 16 +-
>> drivers/scsi/3w-9xxx.c | 11 +-
>> drivers/scsi/3w-sas.c | 11 +-
>> drivers/scsi/3w-xxxx.c | 11 +-
>> drivers/scsi/53c700.c | 39 ++---
>> drivers/scsi/BusLogic.c | 14 +-
>> drivers/scsi/NCR5380.c | 3 +-
>> drivers/scsi/a100u2w.c | 11 +-
>> drivers/scsi/aacraid/linit.c | 35 ++---
>> drivers/scsi/advansys.c | 26 ++--
>> drivers/scsi/aha152x.c | 10 +-
>> drivers/scsi/aha1542.c | 30 ++--
>> drivers/scsi/aic7xxx/aic79xx_osm.c | 37 ++---
>> drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 +-
>> drivers/scsi/arcmsr/arcmsr_hba.c | 6 +-
>> drivers/scsi/arm/acornscsi.c | 8 +-
>> drivers/scsi/arm/fas216.c | 18 +--
>> drivers/scsi/arm/fas216.h | 17 ++-
>> drivers/scsi/atari_scsi.c | 4 +-
>> drivers/scsi/be2iscsi/be_main.c | 12 +-
>> drivers/scsi/bfa/bfad_im.c | 8 +-
>> drivers/scsi/bnx2fc/bnx2fc.h | 4 +-
>> drivers/scsi/bnx2fc/bnx2fc_io.c | 10 +-
>> drivers/scsi/csiostor/csio_scsi.c | 5 +-
>> drivers/scsi/cxlflash/main.c | 10 +-
>> drivers/scsi/dc395x.c | 25 ++--
>> drivers/scsi/esas2r/esas2r.h | 8 +-
>> drivers/scsi/esas2r/esas2r_main.c | 55 +++----
>> drivers/scsi/esp_scsi.c | 8 +-
>> drivers/scsi/fdomain.c | 3 +-
>> drivers/scsi/fnic/fnic.h | 4 +-
>> drivers/scsi/fnic/fnic_scsi.c | 8 +-
>> drivers/scsi/hpsa.c | 14 +-
>> drivers/scsi/hptiop.c | 6 +-
>> drivers/scsi/ibmvscsi/ibmvfc.c | 15 +-
>> drivers/scsi/ibmvscsi/ibmvscsi.c | 23 +--
>> drivers/scsi/imm.c | 4 +-
>> drivers/scsi/initio.c | 11 +-
>> drivers/scsi/ipr.c | 26 ++--
>> drivers/scsi/ips.c | 22 +--
>> drivers/scsi/libfc/fc_fcp.c | 18 +--
>> drivers/scsi/libiscsi.c | 19 ++-
>> drivers/scsi/libsas/sas_scsi_host.c | 21 +--
>> drivers/scsi/lpfc/lpfc_scsi.c | 23 ++-
>> drivers/scsi/mac53c94.c | 8 +-
>> drivers/scsi/megaraid.c | 4 +-
>> drivers/scsi/megaraid.h | 2 +-
>> drivers/scsi/megaraid/megaraid_mbox.c | 14 +-
>> drivers/scsi/megaraid/megaraid_sas.h | 3 +-
>> drivers/scsi/megaraid/megaraid_sas_base.c | 44 +++---
>> drivers/scsi/megaraid/megaraid_sas_fusion.c | 54 ++++---
>> drivers/scsi/mesh.c | 10 +-
>> drivers/scsi/mpi3mr/mpi3mr_os.c | 135 ++++++++---------
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c | 72 ++++-----
>> drivers/scsi/mvumi.c | 7 +-
>> drivers/scsi/myrb.c | 3 +-
>> drivers/scsi/myrs.c | 3 +-
>> drivers/scsi/ncr53c8xx.c | 4 +-
>> drivers/scsi/nsp32.c | 12 +-
>> drivers/scsi/pcmcia/nsp_cs.c | 10 +-
>> drivers/scsi/pcmcia/nsp_cs.h | 6 +-
>> drivers/scsi/pcmcia/qlogic_stub.c | 4 +-
>> drivers/scsi/pcmcia/sym53c500_cs.c | 8 +-
>> drivers/scsi/pmcraid.c | 27 ++--
>> drivers/scsi/ppa.c | 4 +-
>> drivers/scsi/qedf/qedf_main.c | 13 +-
>> drivers/scsi/qedi/qedi_iscsi.c | 3 +-
>> drivers/scsi/qla1280.c | 36 +++--
>> drivers/scsi/qla2xxx/qla_os.c | 83 +++++------
>> drivers/scsi/qla4xxx/ql4_os.c | 54 +++----
>> drivers/scsi/qlogicfas408.c | 10 +-
>> drivers/scsi/qlogicfas408.h | 2 +-
>> drivers/scsi/qlogicpti.c | 3 +-
>> drivers/scsi/scsi_debug.c | 33 ++---
>> drivers/scsi/scsi_error.c | 153 ++++++++++----------
>> drivers/scsi/scsi_lib.c | 2 -
>> drivers/scsi/smartpqi/smartpqi.h | 1 -
>> drivers/scsi/smartpqi/smartpqi_init.c | 19 +--
>> drivers/scsi/snic/snic.h | 5 +-
>> drivers/scsi/snic/snic_scsi.c | 41 ++----
>> drivers/scsi/stex.c | 7 +-
>> drivers/scsi/storvsc_drv.c | 4 +-
>> drivers/scsi/sym53c8xx_2/sym_glue.c | 13 +-
>> drivers/scsi/virtio_scsi.c | 12 +-
>> drivers/scsi/vmw_pvscsi.c | 20 ++-
>> drivers/scsi/wd33c93.c | 5 +-
>> drivers/scsi/wd33c93.h | 2 +-
>> drivers/scsi/wd719x.c | 17 ++-
>> drivers/scsi/xen-scsifront.c | 6 +-
>> drivers/staging/rts5208/rtsx.c | 6 +-
>> drivers/target/loopback/tcm_loop.c | 17 ++-
>> drivers/ufs/core/ufshcd.c | 14 +-
>> drivers/usb/image/microtek.c | 4 +-
>> drivers/usb/storage/scsiglue.c | 8 +-
>> drivers/usb/storage/uas.c | 3 +-
>> include/scsi/libfc.h | 4 +-
>> include/scsi/libiscsi.h | 4 +-
>> include/scsi/libsas.h | 4 +-
>> include/scsi/scsi_cmnd.h | 1 -
>> include/scsi/scsi_host.h | 8 +-
>> 108 files changed, 921 insertions(+), 1009 deletions(-)
>>
>> --
>> 2.35.3
>>
--
Dr. Hannes Reinecke Kernel Storage Architect
hare@suse.de +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew
Myers, Andrew McDonald, Martje Boudien Moerman
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCHv5 0/7] scsi: EH rework, main part
2023-10-12 6:19 ` Hannes Reinecke
@ 2023-10-12 7:30 ` Wenchao Hao
0 siblings, 0 replies; 28+ messages in thread
From: Wenchao Hao @ 2023-10-12 7:30 UTC (permalink / raw)
To: Hannes Reinecke
Cc: Martin K. Petersen, James Bottomley, linux-scsi, Christoph Hellwig
On 2023/10/12 14:19, Hannes Reinecke wrote:
> On 10/11/23 18:35, Wenchao Hao wrote:
>> On Tue, Oct 3, 2023 at 12:57 AM Hannes Reinecke <hare@suse.de> wrote:
>>>
>>> Hi all,
>>>
>>> (taking up an old thread:)
>>> here's now the main part of my EH rework.
>>> It modifies the reset callbacks for SCSI EH such that
>>> each callback (eh_host_reset_handler, eh_bus_reset_handler,
>>> eh_target_reset_handler, eh_device_reset_handler) only
>>> references the actual entity it needs to work on
>>> (ie 'Scsi_Host', (scsi bus), 'scsi_target', 'scsi_device'),
>>> and the 'struct scsi_cmnd' is dropped from the argument list.
>>> This simplifies the handler themselves as they don't need to
>>> exclude some 'magic' command, and we don't need to allocate
>>> a mock 'struct scsi_cmnd' when issuing a reset via SCSI ioctl.
>>>
>>> The entire patchset can be found at:
>>>
>>> https://git.kernel.org/pub/scm/linux/kernel/git/hare/scsi-devel.git
>>> branch eh-rework.v5
>>>
>>> As usual, comments and reviews are welcome.
>>>
>>
>> Hi, Hannes, I reviewed your patches and have some questions
>> to consult.
>>
>> It seems your patches can be divided into 2 parts, the first part
>> modifies various LLDDs, decouple each driver's TMFs and scsi_cmnd,
>> in addition fixes some driver eh_reset function like device_reset
>> callback actually does target_reset should do things and so on.
>>
>> The second part modifies the SCSI middle layer by passing
>> Scsi_host/bus ID/scsi_target/scsi_device to the TMF callback of
>> LLDDs during error handling, so as to avoid using scsi_cmnd as
>> parameter during error handling.
>>
>> But I haven't seen any changes to support concurrent TMF, and
>> from what I understand, concurrent TMF still needs to be supported
>> by devices like virtio-scsi, which is designed to naturally support
>> concurrent TMF.
>>
>> Is my understanding correct? Or I left out some important details?
>>
> Your understanding is entirely correct.
> These patches do not modify the behaviour regarding concurrent TMFs.
> However, for aborts we already do concurrent TMFs, as for most drivers
> abort TMFs are sent directly after a command timeout triggers.
>
Yes, from some of the drivers I've analyzed so far, these drivers support
fake concurrent TMFs. In most cases, there's a mutex lock used to mutex in
a complete TMFs, this kind of concurrent TMFs does not mean multiple
processes can execute TMFs simultaneously.
> Concurrent 'device reset' (or higher) TMFs are not implemented, and
> will be hard to support in general. One would need to redesign the
> SCSI EH flow, and find a way on how to 'coalesce' TMFs results when
> escalating to the next level; eg when 'device reset' fails for one
> device, you would have to wait for all 'device reset' TMFs on the
> same target to complete before you can advance to 'target reset'.
I totally agree that it seems unlikely to support real concurrent
TMFs in general.
In fact, I start focus on concurrent TMFs because we need introduce
a new EH mechanism which do not block whole host's IO in EH.
In my design, escalating to the next level of recovery still need wait for
other devices in the same level to complete.
For example, if driver enables device-based EH, sda and sdb belong to a same
target, both sda and sdb triggered EH. If EH of sda failed and need to
escalate to the next-level reset, the next-level recovery would not be waked
up until sdb's EH completed.
The previous patchset I posted earlier has some issues in the fallback logic.
After your patch applied, I will adapt and repost the patch based on your
modification.
Thanks.
> With current SCSI EH you can escalate directly, with no need to
> wait for any other TMFs (as there won't be any).
>
> So I think the gains for doing concurrent TMFs are offset by the
> losses incurred by having to wait for TMF timeouts.
>
> Cheers,
>
> Hannes
>
>> Thanks.
>>
>>> Hannes Reinecke (7):
>>> scsi: Use Scsi_Host as argument for eh_host_reset_handler
>>> scsi: Use Scsi_Host and channel number as argument for
>>> eh_bus_reset_handler()
>>> scsi: Use scsi_target as argument for eh_target_reset_handler()
>>> scsi: Use scsi_device as argument to eh_device_reset_handler()
>>> scsi: Do not allocate scsi command in scsi_ioctl_reset()
>>> scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL
>>> scsi_error: streamline scsi_eh_bus_device_reset()
>>>
>>> Documentation/scsi/scsi_eh.rst | 16 +-
>>> Documentation/scsi/scsi_mid_low_api.rst | 31 +++-
>>> drivers/infiniband/ulp/srp/ib_srp.c | 12 +-
>>> drivers/message/fusion/mptfc.c | 25 ++--
>>> drivers/message/fusion/mptsas.c | 12 +-
>>> drivers/message/fusion/mptscsih.c | 86 +++++------
>>> drivers/message/fusion/mptscsih.h | 8 +-
>>> drivers/message/fusion/mptspi.c | 10 +-
>>> drivers/s390/scsi/zfcp_scsi.c | 16 +-
>>> drivers/scsi/3w-9xxx.c | 11 +-
>>> drivers/scsi/3w-sas.c | 11 +-
>>> drivers/scsi/3w-xxxx.c | 11 +-
>>> drivers/scsi/53c700.c | 39 ++---
>>> drivers/scsi/BusLogic.c | 14 +-
>>> drivers/scsi/NCR5380.c | 3 +-
>>> drivers/scsi/a100u2w.c | 11 +-
>>> drivers/scsi/aacraid/linit.c | 35 ++---
>>> drivers/scsi/advansys.c | 26 ++--
>>> drivers/scsi/aha152x.c | 10 +-
>>> drivers/scsi/aha1542.c | 30 ++--
>>> drivers/scsi/aic7xxx/aic79xx_osm.c | 37 ++---
>>> drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 +-
>>> drivers/scsi/arcmsr/arcmsr_hba.c | 6 +-
>>> drivers/scsi/arm/acornscsi.c | 8 +-
>>> drivers/scsi/arm/fas216.c | 18 +--
>>> drivers/scsi/arm/fas216.h | 17 ++-
>>> drivers/scsi/atari_scsi.c | 4 +-
>>> drivers/scsi/be2iscsi/be_main.c | 12 +-
>>> drivers/scsi/bfa/bfad_im.c | 8 +-
>>> drivers/scsi/bnx2fc/bnx2fc.h | 4 +-
>>> drivers/scsi/bnx2fc/bnx2fc_io.c | 10 +-
>>> drivers/scsi/csiostor/csio_scsi.c | 5 +-
>>> drivers/scsi/cxlflash/main.c | 10 +-
>>> drivers/scsi/dc395x.c | 25 ++--
>>> drivers/scsi/esas2r/esas2r.h | 8 +-
>>> drivers/scsi/esas2r/esas2r_main.c | 55 +++----
>>> drivers/scsi/esp_scsi.c | 8 +-
>>> drivers/scsi/fdomain.c | 3 +-
>>> drivers/scsi/fnic/fnic.h | 4 +-
>>> drivers/scsi/fnic/fnic_scsi.c | 8 +-
>>> drivers/scsi/hpsa.c | 14 +-
>>> drivers/scsi/hptiop.c | 6 +-
>>> drivers/scsi/ibmvscsi/ibmvfc.c | 15 +-
>>> drivers/scsi/ibmvscsi/ibmvscsi.c | 23 +--
>>> drivers/scsi/imm.c | 4 +-
>>> drivers/scsi/initio.c | 11 +-
>>> drivers/scsi/ipr.c | 26 ++--
>>> drivers/scsi/ips.c | 22 +--
>>> drivers/scsi/libfc/fc_fcp.c | 18 +--
>>> drivers/scsi/libiscsi.c | 19 ++-
>>> drivers/scsi/libsas/sas_scsi_host.c | 21 +--
>>> drivers/scsi/lpfc/lpfc_scsi.c | 23 ++-
>>> drivers/scsi/mac53c94.c | 8 +-
>>> drivers/scsi/megaraid.c | 4 +-
>>> drivers/scsi/megaraid.h | 2 +-
>>> drivers/scsi/megaraid/megaraid_mbox.c | 14 +-
>>> drivers/scsi/megaraid/megaraid_sas.h | 3 +-
>>> drivers/scsi/megaraid/megaraid_sas_base.c | 44 +++---
>>> drivers/scsi/megaraid/megaraid_sas_fusion.c | 54 ++++---
>>> drivers/scsi/mesh.c | 10 +-
>>> drivers/scsi/mpi3mr/mpi3mr_os.c | 135 ++++++++---------
>>> drivers/scsi/mpt3sas/mpt3sas_scsih.c | 72 ++++-----
>>> drivers/scsi/mvumi.c | 7 +-
>>> drivers/scsi/myrb.c | 3 +-
>>> drivers/scsi/myrs.c | 3 +-
>>> drivers/scsi/ncr53c8xx.c | 4 +-
>>> drivers/scsi/nsp32.c | 12 +-
>>> drivers/scsi/pcmcia/nsp_cs.c | 10 +-
>>> drivers/scsi/pcmcia/nsp_cs.h | 6 +-
>>> drivers/scsi/pcmcia/qlogic_stub.c | 4 +-
>>> drivers/scsi/pcmcia/sym53c500_cs.c | 8 +-
>>> drivers/scsi/pmcraid.c | 27 ++--
>>> drivers/scsi/ppa.c | 4 +-
>>> drivers/scsi/qedf/qedf_main.c | 13 +-
>>> drivers/scsi/qedi/qedi_iscsi.c | 3 +-
>>> drivers/scsi/qla1280.c | 36 +++--
>>> drivers/scsi/qla2xxx/qla_os.c | 83 +++++------
>>> drivers/scsi/qla4xxx/ql4_os.c | 54 +++----
>>> drivers/scsi/qlogicfas408.c | 10 +-
>>> drivers/scsi/qlogicfas408.h | 2 +-
>>> drivers/scsi/qlogicpti.c | 3 +-
>>> drivers/scsi/scsi_debug.c | 33 ++---
>>> drivers/scsi/scsi_error.c | 153 ++++++++++----------
>>> drivers/scsi/scsi_lib.c | 2 -
>>> drivers/scsi/smartpqi/smartpqi.h | 1 -
>>> drivers/scsi/smartpqi/smartpqi_init.c | 19 +--
>>> drivers/scsi/snic/snic.h | 5 +-
>>> drivers/scsi/snic/snic_scsi.c | 41 ++----
>>> drivers/scsi/stex.c | 7 +-
>>> drivers/scsi/storvsc_drv.c | 4 +-
>>> drivers/scsi/sym53c8xx_2/sym_glue.c | 13 +-
>>> drivers/scsi/virtio_scsi.c | 12 +-
>>> drivers/scsi/vmw_pvscsi.c | 20 ++-
>>> drivers/scsi/wd33c93.c | 5 +-
>>> drivers/scsi/wd33c93.h | 2 +-
>>> drivers/scsi/wd719x.c | 17 ++-
>>> drivers/scsi/xen-scsifront.c | 6 +-
>>> drivers/staging/rts5208/rtsx.c | 6 +-
>>> drivers/target/loopback/tcm_loop.c | 17 ++-
>>> drivers/ufs/core/ufshcd.c | 14 +-
>>> drivers/usb/image/microtek.c | 4 +-
>>> drivers/usb/storage/scsiglue.c | 8 +-
>>> drivers/usb/storage/uas.c | 3 +-
>>> include/scsi/libfc.h | 4 +-
>>> include/scsi/libiscsi.h | 4 +-
>>> include/scsi/libsas.h | 4 +-
>>> include/scsi/scsi_cmnd.h | 1 -
>>> include/scsi/scsi_host.h | 8 +-
>>> 108 files changed, 921 insertions(+), 1009 deletions(-)
>>>
>>> --
>>> 2.35.3
>>>
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 7/7] scsi_error: streamline scsi_eh_bus_device_reset()
2023-10-02 15:59 ` [PATCH 7/7] scsi_error: streamline scsi_eh_bus_device_reset() Hannes Reinecke
2023-10-03 17:45 ` Bart Van Assche
@ 2023-10-12 7:48 ` Wenchao Hao
2023-10-12 7:54 ` Wenchao Hao
1 sibling, 1 reply; 28+ messages in thread
From: Wenchao Hao @ 2023-10-12 7:48 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 2023/10/2 23:59, Hannes Reinecke wrote:
> Streamline to use a similar code flow as the other reset functions.
>
> Signed-off-by: Hannes Reinecke <hare@suse.de>
> ---
> drivers/scsi/scsi_error.c | 26 +++++++++++---------------
> 1 file changed, 11 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
> index 21d84940c9cb..81b38f5da3b6 100644
> --- a/drivers/scsi/scsi_error.c
> +++ b/drivers/scsi/scsi_error.c
> @@ -1581,6 +1581,7 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
> {
> struct scsi_cmnd *scmd, *bdr_scmd, *next;
> struct scsi_device *sdev;
> + LIST_HEAD(check_list);
> enum scsi_disposition rtn;
>
> shost_for_each_device(sdev, shost) {
> @@ -1606,27 +1607,22 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
> sdev_printk(KERN_INFO, sdev,
> "%s: Sending BDR\n", current->comm));
> rtn = scsi_try_bus_device_reset(sdev);
> - if (rtn == SUCCESS || rtn == FAST_IO_FAIL) {
> - if (!scsi_device_online(sdev) ||
> - rtn == FAST_IO_FAIL ||
> - !scsi_eh_tur(bdr_scmd)) {
> - list_for_each_entry_safe(scmd, next,
> - work_q, eh_entry) {
> - if (scmd->device == sdev &&
> - scsi_eh_action(scmd, rtn) != FAILED)
> - __scsi_eh_finish_cmd(scmd,
> - done_q,
> - DID_RESET);
> - }
> - }
> - } else {
> + if (rtn != SUCCESS && rtn != FAST_IO_FAIL)
> SCSI_LOG_ERROR_RECOVERY(3,
> sdev_printk(KERN_INFO, sdev,
> "%s: BDR failed\n", current->comm));
> + list_for_each_entry_safe(scmd, next, work_q, eh_entry) {
> + if (scmd->device != sdev)
> + continue;
> + if (rtn == SUCCESS)
> + list_move_tail(&scmd->eh_entry, &check_list);
> + else if (rtn == FAST_IO_FAIL)
> + __scsi_eh_finish_cmd(scmd, done_q,
> + DID_TRANSPORT_DISRUPTED);
> }
> }
>
> - return list_empty(work_q);
> + return scsi_eh_test_devices(&check_list, work_q, done_q, 0);
> }
>
> /**
I think the bdr_scmd related lines should also be removed like following:
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 81b38f5da3b6..e3b0ac270dd9 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1579,7 +1579,7 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
struct list_head *work_q,
struct list_head *done_q)
{
- struct scsi_cmnd *scmd, *bdr_scmd, *next;
+ struct scsi_cmnd *scmd, *next;
struct scsi_device *sdev;
LIST_HEAD(check_list);
enum scsi_disposition rtn;
@@ -1593,15 +1593,6 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
scsi_device_put(sdev);
break;
}
- bdr_scmd = NULL;
- list_for_each_entry(scmd, work_q, eh_entry)
- if (scmd->device == sdev) {
- bdr_scmd = scmd;
- break;
- }
-
- if (!bdr_scmd)
- continue;
SCSI_LOG_ERROR_RECOVERY(3,
sdev_printk(KERN_INFO, sdev,
^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH 7/7] scsi_error: streamline scsi_eh_bus_device_reset()
2023-10-12 7:48 ` Wenchao Hao
@ 2023-10-12 7:54 ` Wenchao Hao
0 siblings, 0 replies; 28+ messages in thread
From: Wenchao Hao @ 2023-10-12 7:54 UTC (permalink / raw)
To: Hannes Reinecke, Martin K. Petersen
Cc: James Bottomley, linux-scsi, Christoph Hellwig
On 2023/10/12 15:48, Wenchao Hao wrote:
> On 2023/10/2 23:59, Hannes Reinecke wrote:
>> Streamline to use a similar code flow as the other reset functions.
>>
>> Signed-off-by: Hannes Reinecke <hare@suse.de>
>> ---
>> drivers/scsi/scsi_error.c | 26 +++++++++++---------------
>> 1 file changed, 11 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
>> index 21d84940c9cb..81b38f5da3b6 100644
>> --- a/drivers/scsi/scsi_error.c
>> +++ b/drivers/scsi/scsi_error.c
>> @@ -1581,6 +1581,7 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
>> {
>> struct scsi_cmnd *scmd, *bdr_scmd, *next;
>> struct scsi_device *sdev;
>> + LIST_HEAD(check_list);
>> enum scsi_disposition rtn;
>> shost_for_each_device(sdev, shost) {
>> @@ -1606,27 +1607,22 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
>> sdev_printk(KERN_INFO, sdev,
>> "%s: Sending BDR\n", current->comm));
>> rtn = scsi_try_bus_device_reset(sdev);
>> - if (rtn == SUCCESS || rtn == FAST_IO_FAIL) {
>> - if (!scsi_device_online(sdev) ||
>> - rtn == FAST_IO_FAIL ||
>> - !scsi_eh_tur(bdr_scmd)) {
>> - list_for_each_entry_safe(scmd, next,
>> - work_q, eh_entry) {
>> - if (scmd->device == sdev &&
>> - scsi_eh_action(scmd, rtn) != FAILED)
>> - __scsi_eh_finish_cmd(scmd,
>> - done_q,
>> - DID_RESET);
>> - }
>> - }
>> - } else {
>> + if (rtn != SUCCESS && rtn != FAST_IO_FAIL)
>> SCSI_LOG_ERROR_RECOVERY(3,
>> sdev_printk(KERN_INFO, sdev,
>> "%s: BDR failed\n", current->comm));
>> + list_for_each_entry_safe(scmd, next, work_q, eh_entry) {
>> + if (scmd->device != sdev)
>> + continue;
>> + if (rtn == SUCCESS)
>> + list_move_tail(&scmd->eh_entry, &check_list);
>> + else if (rtn == FAST_IO_FAIL)
>> + __scsi_eh_finish_cmd(scmd, done_q,
>> + DID_TRANSPORT_DISRUPTED);
>> }
>> }
>> - return list_empty(work_q);
>> + return scsi_eh_test_devices(&check_list, work_q, done_q, 0);
>> }
>> /**
>
> I think the bdr_scmd related lines should also be removed like following:
>
> diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
> index 81b38f5da3b6..e3b0ac270dd9 100644
> --- a/drivers/scsi/scsi_error.c
> +++ b/drivers/scsi/scsi_error.c
> @@ -1579,7 +1579,7 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
> struct list_head *work_q,
> struct list_head *done_q)
> {
> - struct scsi_cmnd *scmd, *bdr_scmd, *next;
> + struct scsi_cmnd *scmd, *next;
> struct scsi_device *sdev;
> LIST_HEAD(check_list);
> enum scsi_disposition rtn;
> @@ -1593,15 +1593,6 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
> scsi_device_put(sdev);
> break;
> }
> - bdr_scmd = NULL;
> - list_for_each_entry(scmd, work_q, eh_entry)
> - if (scmd->device == sdev) {
> - bdr_scmd = scmd;
> - break;
> - }
> -
> - if (!bdr_scmd)
> - continue;
>
> SCSI_LOG_ERROR_RECOVERY(3,
> sdev_printk(KERN_INFO, sdev,
>
>
>
>
>
Sorry, please ignore this message. If remove these lines we would reset
device with no failed command.
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2023-10-12 7:54 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-02 15:59 [PATCHv5 0/7] scsi: EH rework, main part Hannes Reinecke
2023-10-02 15:59 ` [PATCH 1/7] scsi: Use Scsi_Host as argument for eh_host_reset_handler Hannes Reinecke
2023-10-03 17:33 ` Bart Van Assche
2023-10-04 6:32 ` Hannes Reinecke
2023-10-09 14:05 ` Hannes Reinecke
2023-10-09 15:23 ` Bart Van Assche
2023-10-05 11:14 ` John Garry
2023-10-02 15:59 ` [PATCH 2/7] scsi: Use Scsi_Host and channel number as argument for eh_bus_reset_handler() Hannes Reinecke
2023-10-05 11:54 ` John Garry
2023-10-02 15:59 ` [PATCH 3/7] scsi: Use scsi_target as argument for eh_target_reset_handler() Hannes Reinecke
2023-10-05 12:33 ` John Garry
2023-10-02 15:59 ` [PATCH 4/7] scsi: Use scsi_device as argument to eh_device_reset_handler() Hannes Reinecke
2023-10-05 12:59 ` John Garry
2023-10-10 12:12 ` Wenchao Hao
2023-10-10 12:16 ` 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
2023-10-02 15:59 ` [PATCH 6/7] scsi: remove SUBMITTED_BY_SCSI_RESET_IOCTL Hannes Reinecke
2023-10-03 17:34 ` Bart Van Assche
2023-10-02 15:59 ` [PATCH 7/7] scsi_error: streamline scsi_eh_bus_device_reset() Hannes Reinecke
2023-10-03 17:45 ` Bart Van Assche
2023-10-04 6:50 ` Hannes Reinecke
2023-10-12 7:48 ` Wenchao Hao
2023-10-12 7:54 ` Wenchao Hao
2023-10-04 6:20 ` [PATCHv5 0/7] scsi: EH rework, main part Johannes Thumshirn
2023-10-11 16:35 ` Wenchao Hao
2023-10-12 6:19 ` Hannes Reinecke
2023-10-12 7:30 ` Wenchao Hao
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.