scsi: EH rework prep patches, part 1
Subsystems (12)
Hannes Reinecke
maintainerv4 cover scsi: EH rework prep patches, part 1
Hi all,
here's the first batch of patches for my EH rework. It modifies the host reset callback for SCSI drivers such that the final conversion to have 'struct Scsi_host' as argument becomes possible.
As usual, comments and reviews are welcome.
Changes to v3:
- Move fnic and snic patches to the next patchset
- Include reviews from Ewan Milne
Changes to v2:
- Include reviews from John Garry
- move mpi3mr, zfcp, sym53c8xx_2, and qla1280 patches to the next patchset
Changes to the initial version:
- Include reviews from Christoph
- Fixup build robot issues
Hannes Reinecke (16):
csiostor: use fc_block_rport()
fc_fcp: use fc_block_rport()
mptfc: simplify mpt_fc_block_error_handler()
mptfusion: correct definitions for mptscsih_dev_reset()
mptfc: open-code mptfc_block_error_handler() for bus reset
qedf: use fc rport as argument for qedf_initiate_tmf()
bnx2fc: Do not rely on a scsi command for lun or target reset
ibmvfc: open-code reset loop for target reset
ibmvfc: use fc_block_rport()
fnic: use fc_block_rport() correctly
aic7xxx: make BUILD_SCSIID() a function
aic79xx: make BUILD_SCSIID() a function
aic7xxx: do not reference scsi command when resetting device
aic79xx: do not reference scsi command when resetting device
ips: Do not try to abort command from host reset
megaraid: pass in NULL scb for host reset
drivers/message/fusion/mptfc.c | 96 +++++++++++++++------- drivers/message/fusion/mptsas.c | 2 +- drivers/message/fusion/mptscsih.c | 55 ++++++++++++- drivers/message/fusion/mptscsih.h | 1 + drivers/message/fusion/mptspi.c | 2 +- drivers/scsi/aic7xxx/aic79xx_osm.c | 32 +++++--- drivers/scsi/aic7xxx/aic7xxx_osm.c | 127 ++++++++++++++++------------- drivers/scsi/bnx2fc/bnx2fc.h | 1 + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 14 ++-- drivers/scsi/bnx2fc/bnx2fc_io.c | 94 ++++++++++----------- drivers/scsi/csiostor/csio_scsi.c | 2 +- drivers/scsi/fnic/fnic_scsi.c | 7 +- drivers/scsi/ibmvscsi/ibmvfc.c | 47 ++++++----- drivers/scsi/ips.c | 18 ---- drivers/scsi/libfc/fc_fcp.c | 2 +- drivers/scsi/megaraid.c | 42 ++++------ drivers/scsi/qedf/qedf.h | 3 +- drivers/scsi/qedf/qedf_io.c | 69 +++++----------- drivers/scsi/qedf/qedf_main.c | 19 +++-- 19 files changed, 352 insertions(+), 281 deletions(-)
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 1/16 csiostor: use fc_block_rport()
Use fc_block_rport() instead of fc_block_scsi_eh() as the SCSI command will be removed as argument for SCSI EH functions.
--- drivers/scsi/csiostor/csio_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/csiostor/csio_scsi.c +1 -1
@@ -2088,7 +2088,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;
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 2/16 fc_fcp: use fc_block_rport()
In reply to Hannes ReineckeUse fc_block_rport() instead of fc_block_scsi_eh() as the SCSI command will be removed as argument for SCSI EH functions.
--- drivers/scsi/libfc/fc_fcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/libfc/fc_fcp.c +1 -1
@@ -2157,7 +2157,7 @@ int fc_eh_device_reset(struct scsi_cmnd *sc_cmd)int rc =FAILED ;int rval; - rval =fc_block_scsi_eh (sc_cmd); + rval =fc_block_rport (rport);if (rval)return rval;
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 3/16 mptfc: simplify mpt_fc_block_error_handler()
In reply to Hannes ReineckeInstead of passing the a function we can as well return a status and call the function directly afterwards.
--- drivers/message/fusion/mptfc.c | 83 ++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 29 deletions(-)
drivers/message/fusion/mptfc.c +54 -29
@@ -183,73 +183,98 @@ static struct fc_function_template mptfc_transport_functions = { };static int -mptfc_block_error_handler (struct scsi_cmnd *SCpnt, -int (*func)(struct scsi_cmnd *SCpnt), -const char *caller) +mptfc_block_error_handler (struct fc_rport *rport) {MPT_SCSI_HOST *hd; -struct scsi_device *sdev = SCpnt->device; -struct Scsi_Host *shost = sdev->host; -struct fc_rport *rport =starget_to_rport (scsi_target (sdev)); +struct Scsi_Host *shost =rport_to_shost (rport);unsigned long flags;int ready; -MPT_ADAPTER *ioc; +MPT_ADAPTER *ioc;int loops =40 ;/* seconds */ - hd =shost_priv (SCpnt->device->host); + hd =shost_priv (shost); ioc = hd->ioc;spin_lock_irqsave (shost->host_lock, flags);while ((ready =fc_remote_port_chkready (rport) >>16 ) ==DID_IMM_RETRY || (loops >0 && ioc->active ==0 )) {spin_unlock_irqrestore (shost->host_lock, flags);dfcprintk (ioc,printk (MYIOC_s_DEBUG_FMT -"mptfc_block_error_handler.%d: %d:%llu, port status is " -"%x, active flag %d, deferring %s recovery.\n" , +"mptfc_block_error_handler.%d: %s, port status is " +"%x, active flag %d, deferring recovery.\n" , ioc->name, ioc->sh->host_no, - SCpnt->device->id, SCpnt->device->lun, - ready, ioc->active, caller)); +dev_name (&rport->dev), ready, ioc->active));msleep (1000 );spin_lock_irqsave (shost->host_lock, flags); loops --; }spin_unlock_irqrestore (shost->host_lock, flags); -if (ready ==DID_NO_CONNECT || !SCpnt->device->hostdata - || ioc->active ==0 ) { +if (ready ==DID_NO_CONNECT || ioc->active ==0 ) {dfcprintk (ioc,printk (MYIOC_s_DEBUG_FMT -"%s.%d: %d:%llu, failing recovery, " -"port state %x, active %d, vdevice %p.\n" , caller, +"mpt_block_error_handler.%d: %s, failing recovery, " +"port state %x, active %d.\n" , ioc->name, ioc->sh->host_no, - SCpnt->device->id, SCpnt->device->lun, ready, - ioc->active, SCpnt->device->hostdata)); +dev_name (&rport->dev), ready, ioc->active));return FAILED ; } -dfcprintk (ioc,printk (MYIOC_s_DEBUG_FMT -"%s.%d: %d:%llu, executing recovery.\n" , caller, - ioc->name, ioc->sh->host_no, - SCpnt->device->id, SCpnt->device->lun)); -return (*func)(SCpnt); +return SUCCESS ; }static int mptfc_abort (struct scsi_cmnd *SCpnt) { -return -mptfc_block_error_handler (SCpnt, mptscsih_abort, __func__); +struct Scsi_Host *shost = SCpnt->device->host; +struct fc_rport *rport =starget_to_rport (scsi_target (SCpnt->device)); +MPT_SCSI_HOST __maybe_unused *hd =shost_priv (shost); +int rtn; + + rtn =mptfc_block_error_handler (rport); +if (rtn ==SUCCESS ) { +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_abort (SCpnt); + } +return rtn; }static int mptfc_dev_reset (struct scsi_cmnd *SCpnt) { -return -mptfc_block_error_handler (SCpnt, mptscsih_dev_reset, __func__); +struct Scsi_Host *shost = SCpnt->device->host; +struct fc_rport *rport =starget_to_rport (scsi_target (SCpnt->device)); +MPT_SCSI_HOST __maybe_unused *hd =shost_priv (shost); +int rtn; + + rtn =mptfc_block_error_handler (rport); +if (rtn ==SUCCESS ) { +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); + } +return rtn; }static int mptfc_bus_reset (struct scsi_cmnd *SCpnt) { -return -mptfc_block_error_handler (SCpnt, mptscsih_bus_reset, __func__); +struct Scsi_Host *shost = SCpnt->device->host; +struct fc_rport *rport =starget_to_rport (scsi_target (SCpnt->device)); +MPT_SCSI_HOST __maybe_unused *hd =shost_priv (shost); +int rtn; + + rtn =mptfc_block_error_handler (rport); +if (rtn ==SUCCESS ) { +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); + } +return rtn; } static void
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 4/16 mptfusion: correct definitions for mptscsih_dev_reset()
In reply to Hannes ReineckeFrom: Hannes Reinecke <[email protected]>
mptscsih_dev_reset() is _not_ a device reset, but rather a target reset. Nevertheless it's being used for either purpose. This patch adds a correct implementation for mptscsih_dev_reset(), and renames the original function to mptscsih_target_reset(). And modifies mptsas and mptspi to call mptscsih_target_reset().
--- drivers/message/fusion/mptsas.c | 2 +- drivers/message/fusion/mptscsih.c | 55 ++++++++++++++++++++++++++++++- drivers/message/fusion/mptscsih.h | 1 + drivers/message/fusion/mptspi.c | 2 +- 4 files changed, 57 insertions(+), 3 deletions(-)
drivers/message/fusion/mptsas.c +1 -1
@@ -2012,7 +2012,7 @@ static 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 = mptscsih_target_reset, .eh_host_reset_handler = mptscsih_host_reset, .bios_param = mptscsih_bios_param, .can_queue = MPT_SAS_CAN_QUEUE,
drivers/message/fusion/mptscsih.c +54 -1
73 lines not on this page · raw message
drivers/message/fusion/mptscsih.h +1 -0
@@ -120,6 +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_bus_reset (struct scsi_cmnd * SCpnt);extern int mptscsih_host_reset (struct scsi_cmnd *SCpnt);extern int mptscsih_bios_param (struct scsi_device * sdev,struct block_device *bdev,sector_t capacity,int geom[]);
drivers/message/fusion/mptspi.c +1 -1
@@ -834,7 +834,7 @@ static 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 = mptscsih_target_reset, .eh_bus_reset_handler = mptscsih_bus_reset, .eh_host_reset_handler = mptscsih_host_reset, .bios_param = mptscsih_bios_param,
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 5/16 mptfc: open-code mptfc_block_error_handler() for bus reset
In reply to Hannes ReineckeWhen calling bus_reset we have potentially several ports to be reset, so this patch open-codes the existing mptfc_block_error_handler() to wait for all ports attached to this bus.
--- drivers/message/fusion/mptfc.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/message/fusion/mptfc.c +16 -3
@@ -262,12 +262,25 @@ static int mptfc_bus_reset(struct scsi_cmnd *SCpnt) {struct Scsi_Host *shost = SCpnt->device->host; -struct fc_rport *rport =starget_to_rport (scsi_target (SCpnt->device));MPT_SCSI_HOST __maybe_unused *hd =shost_priv (shost); +int channel = SCpnt->device->channel; +struct mptfc_rport_info *ri;int rtn; - rtn =mptfc_block_error_handler (rport); -if (rtn ==SUCCESS ) { +list_for_each_entry (ri, &hd->ioc->fc_rports, list) { +if (ri->flags &MPT_RPORT_INFO_FLAGS_REGISTERED ) { +VirtTarget *vtarget = ri->starget->hostdata; + +if (!vtarget || vtarget->channel != channel) +continue ; + rtn =fc_block_rport (ri->rport); +if (rtn !=0 ) +break ; +if (hd->ioc->active !=0 ) +break ; + } + } +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,
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 6/16 qedf: use fc rport as argument for qedf_initiate_tmf()
In reply to Hannes ReineckeWhen sending a TMF we're only concerned with the rport and the LUN ID, so use struct fc_rport as argument for qedf_initiate_tmf().
--- drivers/scsi/qedf/qedf.h | 3 +- drivers/scsi/qedf/qedf_io.c | 69 ++++++++++------------------------- drivers/scsi/qedf/qedf_main.c | 19 +++++----- 3 files changed, 31 insertions(+), 60 deletions(-)
drivers/scsi/qedf/qedf.h +2 -1
@@ -112,6 +112,7 @@ struct qedf_ioreq {#define QEDF_CMD_ERR_SCSI_DONE 0x5u8 io_req_flags;uint8_t tm_flags; +u64 tm_lun;struct qedf_rport *fcport;#define QEDF_CMD_ST_INACTIVE 0#define QEDFC_CMD_ST_IO_ACTIVE 1
@@ -522,7 +523,7 @@ extern int qedf_initiate_cleanup(struct qedf_ioreq *io_req, bool return_scsi_cmd_on_abts);extern void qedf_process_cleanup_compl (struct qedf_ctx *qedf,struct fcoe_cqe *cqe,struct qedf_ioreq *io_req); -extern int qedf_initiate_tmf (struct scsi_cmnd *sc_cmd,u8 tm_flags); +extern int qedf_initiate_tmf (struct fc_rport *rport,u64 lun,u8 tm_flags);extern void qedf_process_tmf_compl (struct qedf_ctx *qedf,struct fcoe_cqe *cqe,struct qedf_ioreq *io_req);extern void qedf_process_cqe (struct qedf_ctx *qedf,struct fcoe_cqe *cqe);
drivers/scsi/qedf/qedf_io.c +19 -50
155 lines not on this page · raw message
drivers/scsi/qedf/qedf_main.c +10 -9
@@ -773,7 +773,7 @@ static int qedf_eh_abort(struct scsi_cmnd *sc_cmd) goto drop_rdata_kref; } - rc =fc_block_scsi_eh (sc_cmd); + rc =fc_block_rport (rport);if (rc) goto drop_rdata_kref;
@@ -857,18 +857,19 @@ static int qedf_eh_abort(struct scsi_cmnd *sc_cmd)static int qedf_eh_target_reset (struct scsi_cmnd *sc_cmd) { -QEDF_ERR (NULL ,"%d:0:%d:%lld: TARGET RESET Issued..." , - sc_cmd->device->host->host_no, sc_cmd->device->id, - sc_cmd->device->lun); -return qedf_initiate_tmf (sc_cmd,FCP_TMF_TGT_RESET ); +struct scsi_target *starget =scsi_target (sc_cmd->device); +struct fc_rport *rport =starget_to_rport (starget); + +QEDF_ERR (NULL ,"TARGET RESET Issued..." ); +return qedf_initiate_tmf (rport,0 ,FCP_TMF_TGT_RESET ); }static int qedf_eh_device_reset (struct scsi_cmnd *sc_cmd) { -QEDF_ERR (NULL ,"%d:0:%d:%lld: LUN RESET Issued... " , - sc_cmd->device->host->host_no, sc_cmd->device->id, - sc_cmd->device->lun); -return qedf_initiate_tmf (sc_cmd,FCP_TMF_LUN_RESET ); +struct fc_rport *rport =starget_to_rport (scsi_target (sc_cmd->device)); + +QEDF_ERR (NULL ,"LUN RESET Issued...\n" ); +return qedf_initiate_tmf (rport, sc_cmd->device->lun,FCP_TMF_LUN_RESET ); }bool qedf_wait_for_upload (struct qedf_ctx *qedf)
Signature · 1 line
2.29.2
Re: [PATCH 06/16] qedf: use fc rport as argument for qedf_initiate_tmf()
Quoted 42 lines · Hannes Reinecke
When sending a TMF we're only concerned with the rport and the LUN ID, so use struct
fc_rportas argument forqedf_initiate_tmf().Signed-off-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Reviewed-by Johannes Thumshirn <[email protected]>Cc Saurav Kashyap <[email protected]>--- drivers/scsi/qedf/qedf.h | 3 +- drivers/scsi/qedf/qedf_io.c | 69 ++++++++++------------------------- drivers/scsi/qedf/qedf_main.c | 19 +++++----- 3 files changed, 31 insertions(+), 60 deletions(-)drivers/scsi/qedf/qedf_io.c +1
-16@@ -2432,33 +2425,10 @@ int qedf_initiate_tmf(struct scsi_cmnd *sc_cmd, u8 tm_flags) (tm_flags ==FCP_TMF_TGT_RESET ) ?"TARGET RESET" : "LUN RESET"); -if (qedf_priv (sc_cmd)->io_req) { - io_req =qedf_priv (sc_cmd)->io_req; - ref_cnt =kref_read (&io_req->refcount); -QEDF_ERR (NULL , -"orig io_req = %p xid = 0x%x ref_cnt = %d.\n" , - io_req, io_req->xid, ref_cnt); - } - - rval =fc_remote_port_chkready (rport); -if (rval) { -QEDF_ERR (NULL ,"device_reset rport not ready\n" ); - rc =FAILED ; - goto tmf_err; - } - - rc =fc_block_scsi_eh (sc_cmd); + rc =fc_block_rport (rport);drivers/scsi/qedf/qedf_main.c +0
-0
drivers/scsi/qedf/qedf_main.c static int qedf_eh_abort(struct scsi_cmnd *sc_cmd) · line 779
Quoted 8 lines
drivers/scsi/qedf/qedf_main.c +1
-1@@ -773,7 +773,7 @@ static int qedf_eh_abort(struct scsi_cmnd *sc_cmd) goto drop_rdata_kref; } - rc =fc_block_scsi_eh (sc_cmd); + rc =fc_block_rport (rport);if (rc) goto drop_rdata_kref;
Why replace the fc_block helper here in the abort handler?
Isn't the scope of the abort hander exactly the one scsi_cmnd?
The description of this patch is about changes to TMF (so I understand the change in qedf_initiate_tmf() above for device or target reset), i.e. not abort. Admittedly, it shouldn't be a problem functional-wise, as fc_block_scsi_eh() delegates internally to fc_block_rport(), but it looks odd to me nonetheless.
This change seems inconsistent with the other patches in this series. You don't plan to get rid of fc_block_scsi_eh(), do you?
Oh, later in patch 09 you write:
"Use fc_block_rport() instead of fc_block_scsi_eh() as the latter will be deprecated."
Why?
Then all FCP HBA abort handlers need to convert their scsi_cmnd to fc_rport themselves.
E.g. zfcp_scsi_eh_abort_handler() does not deal with fc_rport so far as there was no need. From what I've seen you haven't touched that part in [PATCH v2 03/24] zfcp: open-code fc_block_scsi_eh() for host reset
when zfcp was still part of the series, so I smell an inconsistency.
Haven't seen that coming. Did I miss this having been announced explicitly somewhere else earlier? If not, I would find it interesting to being made explicit. In retrospectice, I found some hints hidden in individual patches of earlier version in this series, but I had completely missed it. Also, it seems a separate topic, not necessarily related to changing the scsi_eh callback API for dev/target/bus/host reset to get rid of their unsuitable argument scsi_cmnd.
Signature · 11 lines
Mit freundlichen Gruessen / Kind regards Steffen Maier Linux on IBM Z and LinuxONE https://www.ibm.com/privacy/us/en/ IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Gregor Pillen Geschaeftsfuehrung: David Faller Sitz der Gesellschaft: Boeblingen Registergericht: Amtsgericht Stuttgart, HRB 243294
Hannes Reinecke
maintainerRe: [PATCH 06/16] qedf: use fc rport as argument for qedf_initiate_tmf()
Quoted 58 lines · Steffen Maier
Quoted 43 lines · Hannes Reinecke
When sending a TMF we're only concerned with the rport and the LUN ID, so use struct
fc_rportas argument forqedf_initiate_tmf().Signed-off-by Hannes Reinecke <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Reviewed-by Johannes Thumshirn <[email protected]>Cc Saurav Kashyap <[email protected]>---
drivers/scsi/qedf/qedf.h | 3 +- drivers/scsi/qedf/qedf_io.c | 69 ++++++++++-------------------------drivers/scsi/qedf/qedf_main.c| 19 +++++-----3 files changed, 31 insertions(+), 60 deletions(-)(quoted diff) +0
-0@@ -2432,33 +2425,10 @@ int qedf_initiate_tmf(struct scsi_cmnd *sc_cmd, u8 tm_flags)(
tm_flags==FCP_TMF_TGT_RESET) ? "TARGET RESET" :
"LUN RESET");- if (qedf_priv(sc_cmd)->io_req) {
-io_req= qedf_priv(sc_cmd)->io_req;
-ref_cnt=kref_read(&io_req->refcount);
- QEDF_ERR(NULL,
- "origio_req= %p xid = 0x%xref_cnt= %d.\n", -io_req,io_req->xid,ref_cnt);
- }drivers/scsi/qedf/qedf_io.c +1
-9- - rval = fc_remote_port_chkready(rport); - if (rval) { - QEDF_ERR(NULL, "device_reset rport not ready\n"); - rc = FAILED; - goto tmf_err; - } - - rc = fc_block_scsi_eh(sc_cmd); + rc = fc_block_rport(rport);drivers/scsi/qedf/qedf_main.c +0
-0drivers/scsi/qedf/qedf_main.c static int qedf_eh_abort(struct scsi_cmnd *sc_cmd) · line 779
Quoted 8 lines
drivers/scsi/qedf/qedf_main.c +1
-1@@ -773,7 +773,7 @@ static int qedf_eh_abort(struct scsi_cmnd *sc_cmd) goto drop_rdata_kref; } - rc = fc_block_scsi_eh(sc_cmd); + rc = fc_block_rport(rport); if (rc) goto drop_rdata_kref;Why replace the
fc_blockhelper here in the abort handler?
Isn't the scope of the abort hander exactly the onescsi_cmnd?
The description of this patch is about changes to TMF (so I understand the change inqedf_initiate_tmf()above for device or target reset), i.e. not abort. Admittedly, it shouldn't be a problem functional-wise, asfc_block_scsi_eh()delegates internally tofc_block_rport(), but it looks odd to me nonetheless.
Quoted 8 lines
This change seems inconsistent with the other patches in this series. You don't plan to get rid of
fc_block_scsi_eh(), do you?Oh, later in patch 09 you write:
"Usefc_block_rport()instead offc_block_scsi_eh()as the latter will be deprecated."Why?
Yeah, sorry, that is misleading. I had an earlier patchset where I tried to phase it out, only to find out that this is not the best of ideas.
So no worries, everything will stay as-is in that area.
Will be modifying the patch (and the description) for the next round.
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +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
Hannes Reinecke
maintainerPATCH v4 7/16 bnx2fc: Do not rely on a scsi command for lun or target reset
In reply to Hannes ReineckeWhen a LUN or target reset is issued we should not rely on a scsi command to be present; we'll have to reset the entire device or target anyway.
--- drivers/scsi/bnx2fc/bnx2fc.h | 1 + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 14 +++-- drivers/scsi/bnx2fc/bnx2fc_io.c | 94 ++++++++++++++++---------------- 3 files changed, 57 insertions(+), 52 deletions(-)
drivers/scsi/bnx2fc/bnx2fc.h +1 -0
@@ -384,6 +384,7 @@ struct bnx2fc_rport { };struct bnx2fc_mp_req { +u64 tm_lun;u8 tm_flags;u32 req_len;
drivers/scsi/bnx2fc/bnx2fc_hwi.c +9 -5
@@ -1709,7 +1709,8 @@ void bnx2fc_init_task(struct bnx2fc_cmd *io_req,struct fcoe_cached_sge_ctx *cached_sge;struct fcoe_ext_mul_sges_ctx *sgl;int dev_type = tgt->dev_type; -u64 *fcp_cmnd; +struct fcp_cmnd *fcp_cmnd; +u64 *raw_fcp_cmnd;u64 tmp_fcp_cmnd[4 ];u32 context_id;int cnt, i;
@@ -1778,16 +1779,19 @@ void bnx2fc_init_task(struct bnx2fc_cmd *io_req, task->txwr_rxrd.union_ctx.tx_seq.ctx.seq_cnt =1 ;/* Fill FCP_CMND IU */ - fcp_cmnd = (u64 *) + fcp_cmnd = (struct fcp_cmnd *)&tmp_fcp_cmnd; +bnx2fc_build_fcp_cmnd (io_req, fcp_cmnd); +int_to_scsilun (sc_cmd->device->lun, &fcp_cmnd->fc_lun); +memcpy (fcp_cmnd->fc_cdb, sc_cmd->cmnd, sc_cmd->cmd_len); + raw_fcp_cmnd = (u64 *) task->txwr_rxrd.union_ctx.fcp_cmd.opaque; -bnx2fc_build_fcp_cmnd (io_req, (struct fcp_cmnd *)&tmp_fcp_cmnd);/* swap fcp_cmnd */ cnt =sizeof (struct fcp_cmnd ) /sizeof (u64);for (i =0 ; i < cnt; i++) { - *fcp_cmnd =cpu_to_be64 (tmp_fcp_cmnd[i]); - fcp_cmnd++; + *raw_fcp_cmnd =cpu_to_be64 (tmp_fcp_cmnd[i]); + raw_fcp_cmnd++; }/* Rx Write Tx Read */
drivers/scsi/bnx2fc/bnx2fc_io.c +47 -47
192 lines not on this page · raw message
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 8/16 ibmvfc: open-code reset loop for target reset
In reply to Hannes ReineckeFrom: Hannes Reinecke <[email protected]>
For target reset we need a device to send the target reset to, so open-code the loop in target reset to send the target reset TMF to the correct device.
--- drivers/scsi/ibmvscsi/ibmvfc.c | 41 ++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 19 deletions(-)
drivers/scsi/ibmvscsi/ibmvfc.c +22 -19
@@ -2925,18 +2925,6 @@ static void ibmvfc_dev_cancel_all_noreset(struct scsi_device *sdev, void *data) *rc |=ibmvfc_cancel_all (sdev,IBMVFC_TMF_SUPPRESS_ABTS ); } -/** -* ibmvfc_dev_cancel_all_reset - Device iterated cancel all function -* @sdev: scsi device struct -* @data: return code -* -**/ -static void ibmvfc_dev_cancel_all_reset (struct scsi_device *sdev,void *data) -{ -unsigned long *rc = data; - *rc |=ibmvfc_cancel_all (sdev,IBMVFC_TMF_TGT_RESET ); -} -/** * ibmvfc_eh_target_reset_handler - Reset the target * @cmd: scsi command struct
@@ -2946,22 +2934,37 @@ static void ibmvfc_dev_cancel_all_reset(struct scsi_device *sdev, void *data)**/ static int ibmvfc_eh_target_reset_handler (struct scsi_cmnd *cmd) { -struct scsi_device *sdev = cmd->device; -struct ibmvfc_host *vhost =shost_priv (sdev->host); -struct scsi_target *starget =scsi_target (sdev); +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);int block_rc;int reset_rc =0 ;int rc =FAILED ;unsigned long cancel_rc =0 ;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 ) { -starget_for_each_device (starget, &cancel_rc, ibmvfc_dev_cancel_all_reset); - reset_rc =ibmvfc_reset_device (sdev,IBMVFC_TARGET_RESET ,"target" ); +struct scsi_device *sdev, *reset_sdev =NULL ; + +shost_for_each_device (sdev, shost) { +if ((sdev->channel != starget->channel) || + (sdev->id != starget->id)) +continue ; + + cancel_rc |=ibmvfc_cancel_all (sdev, +IBMVFC_TMF_TGT_RESET ); +if (!reset_sdev) + reset_sdev = sdev; + } +if (reset_sdev) + reset_rc =ibmvfc_reset_device (reset_sdev, +IBMVFC_TARGET_RESET ,"target" ); }else -starget_for_each_device (starget, &cancel_rc, ibmvfc_dev_cancel_all_noreset); +starget_for_each_device (starget, &cancel_rc, + ibmvfc_dev_cancel_all_noreset);if (!cancel_rc && !reset_rc) rc =ibmvfc_wait_for_ops (vhost, starget, ibmvfc_match_target);
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 9/16 ibmvfc: use fc_block_rport()
In reply to Hannes ReineckeUse fc_block_rport() instead of fc_block_scsi_eh() as the latter will be deprecated.
--- drivers/scsi/ibmvscsi/ibmvfc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/ibmvscsi/ibmvfc.c +4 -2
@@ -2857,12 +2857,13 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev)static int ibmvfc_eh_abort_handler (struct scsi_cmnd *cmd) {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;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_ABORT_TASK_SET );
@@ -2890,12 +2891,13 @@ static int ibmvfc_eh_abort_handler(struct scsi_cmnd *cmd)static int ibmvfc_eh_device_reset_handler (struct scsi_cmnd *cmd) {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 );
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 10/16 fnic: use fc_block_rport() correctly
In reply to Hannes ReineckeUse fc_block_rport() instead of fc_block_scsi_eh() and evaluate the return value to avoid issuing TMF commands when the port is still blocked.
--- drivers/scsi/fnic/fnic_scsi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/scsi/fnic/fnic_scsi.c +4 -3
@@ -1733,9 +1733,6 @@ int fnic_abort_cmd(struct scsi_cmnd *sc)unsigned long abt_issued_time;DECLARE_COMPLETION_ONSTACK (tm_done); -/* Wait for rport to unblock */ -fc_block_scsi_eh (sc); -/* Get local-port, check ready and link up */ lp =shost_priv (sc->device->host);
@@ -1745,6 +1742,10 @@ int fnic_abort_cmd(struct scsi_cmnd *sc) term_stats = &fnic->fnic_stats.term_stats; rport =starget_to_rport (scsi_target (sc->device)); + ret =fc_block_rport (rport); +if (ret) +return ret; + FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, "Abort Cmd called FCID 0x%x, LUN 0x%llx TAG %x flags %x\n",
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 11/16 aic7xxx: make BUILD_SCSIID() a function
In reply to Hannes ReineckeConvert BUILD_SCSIID() into a function and add a scsi_device argument.
--- drivers/scsi/aic7xxx/aic7xxx_osm.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/scsi/aic7xxx/aic7xxx_osm.c +13 -6
@@ -798,11 +798,18 @@ struct scsi_host_template aic7xxx_driver_template = {/**************************** Tasklet Handler *********************************/ -/******************************** Macros **************************************/ -#define BUILD_SCSIID (ahc, cmd) \ - ((((cmd)->device->id << TID_SHIFT) & TID) \ - | (((cmd)->device->channel == 0) ? (ahc)->our_id : (ahc)->our_id_b) \ - | (((cmd)->device->channel == 0) ? 0 : TWIN_CHNLB)) + +static inline unsigned int ahc_build_scsiid (struct ahc_softc *ahc, +struct scsi_device *sdev) +{ +unsigned int scsiid = (sdev->id <<TID_SHIFT ) &TID ; + +if (sdev->channel ==0 ) + scsiid |= ahc->our_id; +else + scsiid |= ahc->our_id_b |TWIN_CHNLB ; +return scsiid; +}/******************************** Bus DMA *************************************/ int
@@ -1457,7 +1464,7 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev,* Fill out basics of the HSCB. */ hscb->control =0 ; - hscb->scsiid =BUILD_SCSIID (ahc, cmd); + hscb->scsiid =ahc_build_scsiid (ahc, cmd->device); hscb->lun = cmd->device->lun; mask =SCB_GET_TARGET_MASK (ahc, scb); tinfo = ahc_fetch_transinfo(ahc, SCB_GET_CHANNEL(ahc, scb),
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 12/16 aic79xx: make BUILD_SCSIID() a function
In reply to Hannes ReineckeConvert BUILD_SCSIID() into a function and add a scsi_device argument.
--- drivers/scsi/aic7xxx/aic79xx_osm.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/scsi/aic7xxx/aic79xx_osm.c +7 -4
@@ -541,8 +541,11 @@ ahd_linux_unmap_scb(struct ahd_softc *ahd, struct scb *scb) }/******************************** Macros **************************************/ -#define BUILD_SCSIID (ahd, cmd) \ - (((scmd_id(cmd) << TID_SHIFT) & TID) | (ahd)->our_id) +static inline unsigned int ahd_build_scsiid (struct ahd_softc *ahd, +struct scsi_device *sdev) +{ +return ((sdev_id (sdev) <<TID_SHIFT ) &TID ) | (ahd)->our_id; +}/* * Return a string describing the driver.
@@ -818,7 +821,7 @@ 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 =BUILD_SCSIID (ahd,cmd); + reset_scb->hscb->scsiid =ahd_build_scsiid (ahd, cmd->device); reset_scb->hscb->lun = cmd->device->lun; reset_scb->hscb->cdb_len =0 ; reset_scb->hscb->task_management =SIU_TASKMGMT_LUN_RESET ;
@@ -1577,7 +1580,7 @@ ahd_linux_run_command(struct ahd_softc *ahd, struct ahd_linux_device *dev,* Fill out basics of the HSCB. */ hscb->control =0 ; - hscb->scsiid =BUILD_SCSIID (ahd, cmd); + hscb->scsiid =ahd_build_scsiid (ahd, cmd->device); hscb->lun = cmd->device->lun; scb->hscb->task_management =0 ; mask =SCB_GET_TARGET_MASK (ahd, scb);
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 13/16 aic7xxx: do not reference scsi command when resetting device
In reply to Hannes ReineckeWhen sending a device reset we should not take a reference to the scsi command.
--- drivers/scsi/aic7xxx/aic7xxx_osm.c | 108 +++++++++++++++-------------- 1 file changed, 57 insertions(+), 51 deletions(-)
drivers/scsi/aic7xxx/aic7xxx_osm.c +57 -51
@@ -366,7 +366,8 @@ static void ahc_linux_queue_cmd_complete(struct ahc_softc *ahc, struct scsi_cmnd *cmd);static void ahc_linux_freeze_simq (struct ahc_softc *ahc);static void ahc_linux_release_simq (struct ahc_softc *ahc); -static int ahc_linux_queue_recovery_cmd (struct scsi_cmnd *cmd,scb_flag flag); +static int ahc_linux_queue_recovery_cmd (struct scsi_device *sdev, +struct scsi_cmnd *cmd);static void ahc_linux_initialize_scsi_bus (struct ahc_softc *ahc);static u_int ahc_linux_user_tagdepth (struct ahc_softc *ahc,struct ahc_devinfo *devinfo);
@@ -728,7 +729,7 @@ ahc_linux_abort(struct scsi_cmnd *cmd) {int error; - error =ahc_linux_queue_recovery_cmd (cmd,SCB_ABORT ); + error =ahc_linux_queue_recovery_cmd (cmd->device, cmd);if (error !=SUCCESS )printk ("aic7xxx_abort returns 0x%x\n" , error);return (error);
@@ -742,7 +743,7 @@ ahc_linux_dev_reset(struct scsi_cmnd *cmd) {int error; - error =ahc_linux_queue_recovery_cmd (cmd,SCB_DEVICE_RESET ); + error =ahc_linux_queue_recovery_cmd (cmd->device,NULL );if (error !=SUCCESS )printk ("aic7xxx_dev_reset returns 0x%x\n" , error);return (error);
@@ -2036,11 +2037,12 @@ ahc_linux_release_simq(struct ahc_softc *ahc) }static int -ahc_linux_queue_recovery_cmd (struct scsi_cmnd *cmd,scb_flag flag) +ahc_linux_queue_recovery_cmd (struct scsi_device *sdev, +struct scsi_cmnd *cmd) {struct ahc_softc *ahc;struct ahc_linux_device *dev; -struct scb *pending_scb; +struct scb *pending_scb =NULL , *scb;u_int saved_scbptr;u_int active_scb_index;u_int last_phase;
@@ -2053,18 +2055,19 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)int disconnected;unsigned long flags; - pending_scb =NULL ; paused = FALSE; wait = FALSE; - ahc = *(struct ahc_softc **)cmd->device->host->hostdata; + ahc = *(struct ahc_softc **)sdev->host->hostdata; -scmd_printk (KERN_INFO , cmd,"Attempting to queue a%s message\n" , - flag ==SCB_ABORT ?"n ABORT" :" TARGET RESET" ); +sdev_printk (KERN_INFO , sdev,"Attempting to queue a%s message\n" , + cmd ?"n ABORT" :" TARGET RESET" ); -printk ("CDB:" ); -for (cdb_byte =0 ; cdb_byte < cmd->cmd_len; cdb_byte++) -printk (" 0x%x" , cmd->cmnd[cdb_byte]); -printk ("\n" ); +if (cmd) { +printk ("CDB:" ); +for (cdb_byte =0 ; cdb_byte < cmd->cmd_len; cdb_byte++) +printk (" 0x%x" , cmd->cmnd[cdb_byte]); +printk ("\n" ); + }ahc_lock (ahc, &flags);
@@ -2075,7 +2078,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)* at all, and the system wanted us to just abort the * command, return success. */ - dev =scsi_transport_device_data (cmd->device); + dev =scsi_transport_device_data (sdev);if (dev ==NULL ) {/*
@@ -2083,13 +2086,12 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)* so we must not still own the command. */ printk ("%s:%d:%d:%d: Is not an active device\n" , -ahc_name (ahc), cmd->device->channel, cmd->device->id, - (u8 )cmd->device->lun); +ahc_name (ahc), sdev->channel, sdev->id, (u8 )sdev->lun); retval =SUCCESS ; goto no_cmd; } -if ((dev->flags & (AHC_DEV_Q_BASIC |AHC_DEV_Q_TAGGED )) ==0 +if (cmd && (dev->flags & (AHC_DEV_Q_BASIC |AHC_DEV_Q_TAGGED )) ==0 && ahc_search_untagged_queues(ahc, cmd, cmd->device->id, cmd->device->channel + 'A', (u8)cmd->device->lun,
@@ -2104,25 +2106,28 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)/* * See if we can find a matching cmd in the pending list. */ - LIST_FOREACH(pending_scb, &ahc->pending_scbs, pending_links) { -if (pending_scb->io_ctx == cmd) -break ; - } - -if (pending_scb ==NULL && flag ==SCB_DEVICE_RESET ) { - +if (cmd) { + LIST_FOREACH(scb, &ahc->pending_scbs, pending_links) { +if (scb->io_ctx == cmd) { + pending_scb = scb; +break ; + } + } + }else {/* Any SCB for this device will do for a target reset */ - LIST_FOREACH(pending_scb, &ahc->pending_scbs, pending_links) { -if (ahc_match_scb (ahc, pending_scb,scmd_id (cmd), -scmd_channel (cmd) +'A' , + LIST_FOREACH(scb, &ahc->pending_scbs, pending_links) { +if (ahc_match_scb (ahc, scb, sdev->id, + sdev->channel +'A' ,CAM_LUN_WILDCARD , -SCB_LIST_NULL ,ROLE_INITIATOR )) +SCB_LIST_NULL ,ROLE_INITIATOR )) { + pending_scb = scb;break ; + } } }if (pending_scb ==NULL ) { -scmd_printk (KERN_INFO , cmd,"Command not found\n" ); +sdev_printk (KERN_INFO , sdev,"Command not found\n" ); goto no_cmd; }
@@ -2153,22 +2158,22 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)ahc_dump_card_state (ahc); disconnected = TRUE; -if (flag ==SCB_ABORT ) { -if (ahc_search_qinfifo (ahc, cmd->device->id, - cmd->device->channel +'A' , - cmd->device->lun, +if (cmd) { +if (ahc_search_qinfifo (ahc, sdev->id, + sdev->channel +'A' , + sdev->lun, pending_scb->hscb->tag,ROLE_INITIATOR ,CAM_REQ_ABORTED ,SEARCH_COMPLETE ) >0 ) {printk ("%s:%d:%d:%d: Cmd aborted from QINFIFO\n" , -ahc_name (ahc), cmd->device->channel, - cmd->device->id, (u8 )cmd->device->lun); +ahc_name (ahc), sdev->channel, + sdev->id, (u8 )sdev->lun); retval =SUCCESS ; goto done; } - }else if (ahc_search_qinfifo (ahc, cmd->device->id, - cmd->device->channel +'A' , - cmd->device->lun, + }else if (ahc_search_qinfifo (ahc, sdev->id, + sdev->channel +'A' , + sdev->lun, pending_scb->hscb->tag,ROLE_INITIATOR ,/*status*/ 0 ,SEARCH_COUNT ) >0 ) {
@@ -2181,7 +2186,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag) bus_scb =ahc_lookup_scb (ahc,ahc_inb (ahc,SCB_TAG ));if (bus_scb == pending_scb) disconnected = FALSE; -else if (flag !=SCB_ABORT +else if (!cmd &&ahc_inb (ahc,SAVED_SCSIID ) == pending_scb->hscb->scsiid &&ahc_inb (ahc,SAVED_LUN ) ==SCB_GET_LUN (pending_scb)) disconnected = FALSE;
@@ -2201,18 +2206,18 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag) saved_scsiid =ahc_inb (ahc,SAVED_SCSIID );if (last_phase !=P_BUSFREE && (pending_scb->hscb->tag == active_scb_index - || (flag ==SCB_DEVICE_RESET - &&SCSIID_TARGET (ahc, saved_scsiid) ==scmd_id (cmd)))) { + || (!cmd &&SCSIID_TARGET (ahc, saved_scsiid) == sdev->id))) {/* * We're active on the bus, so assert ATN * and hope that the target responds. */ pending_scb =ahc_lookup_scb (ahc, active_scb_index); - pending_scb->flags |=SCB_RECOVERY_SCB |flag; + pending_scb->flags |=SCB_RECOVERY_SCB ; + pending_scb->flags |= cmd ?SCB_ABORT :SCB_DEVICE_RESET ;ahc_outb (ahc,MSG_OUT ,HOST_MSG );ahc_outb (ahc,SCSISIGO , last_phase|ATNO ); -scmd_printk (KERN_INFO , cmd,"Device is active, asserting ATN\n" ); +sdev_printk (KERN_INFO , sdev,"Device is active, asserting ATN\n" ); wait = TRUE; }else if (disconnected) {
@@ -2233,7 +2238,8 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)* an unsolicited reselection occurred. */ pending_scb->hscb->control |=MK_MESSAGE |DISCONNECTED ; - pending_scb->flags |=SCB_RECOVERY_SCB |flag; + pending_scb->flags |=SCB_RECOVERY_SCB ; + pending_scb->flags |= cmd ?SCB_ABORT :SCB_DEVICE_RESET ;/* * Remove any cached copy of this SCB in the
@@ -2242,9 +2248,9 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)* same element in the SCB, SCB_NEXT, for * both the qinfifo and the disconnected list. */ -ahc_search_disc_list (ahc, cmd->device->id, - cmd->device->channel +'A' , - cmd->device->lun, pending_scb->hscb->tag, +ahc_search_disc_list (ahc, sdev->id, + sdev->channel +'A' , + sdev->lun, pending_scb->hscb->tag,/*stop_on_first*/ TRUE,/*remove*/ TRUE,/*save_state*/ FALSE);
@@ -2267,9 +2273,9 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)* so we are the next SCB for this target * to run. */ -ahc_search_qinfifo (ahc, cmd->device->id, - cmd->device->channel +'A' , - cmd->device->lun,SCB_LIST_NULL , +ahc_search_qinfifo (ahc, sdev->id, + sdev->channel +'A' , + (u8 )sdev->lun,SCB_LIST_NULL ,ROLE_INITIATOR ,CAM_REQUEUE_REQ ,SEARCH_COMPLETE );ahc_qinfifo_requeue_tail (ahc, pending_scb);
@@ -2278,7 +2284,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)printk ("Device is disconnected, re-queuing SCB\n" ); wait = TRUE; }else { -scmd_printk (KERN_INFO , cmd,"Unable to deliver message\n" ); +sdev_printk (KERN_INFO , sdev,"Unable to deliver message\n" ); retval =FAILED ; goto done; }
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 14/16 aic79xx: do not reference scsi command when resetting device
In reply to Hannes ReineckeWhen sending a device reset we should not take a reference to the scsi command.
--- drivers/scsi/aic7xxx/aic79xx_osm.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/scsi/aic7xxx/aic79xx_osm.c +15 -6
@@ -536,8 +536,10 @@ ahd_linux_unmap_scb(struct ahd_softc *ahd, struct scb *scb)struct scsi_cmnd *cmd; cmd = scb->io_ctx; -ahd_sync_sglist (ahd, scb,BUS_DMASYNC_POSTWRITE ); -scsi_dma_unmap (cmd); +if (cmd) { +ahd_sync_sglist (ahd, scb,BUS_DMASYNC_POSTWRITE ); +scsi_dma_unmap (cmd); + } }/******************************** Macros **************************************/
@@ -814,7 +816,7 @@ ahd_linux_dev_reset(struct scsi_cmnd *cmd) tinfo =ahd_fetch_transinfo (ahd,'A' , ahd->our_id, cmd->device->id, &tstate); - reset_scb->io_ctx = cmd; + reset_scb->io_ctx =NULL ; reset_scb->platform_data->dev = dev; reset_scb->sg_count =0 ;ahd_set_residual (reset_scb,0 );
@@ -1769,9 +1771,16 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb) dev = scb->platform_data->dev; dev->active--; dev->openings++; -if ((cmd->result & (CAM_DEV_QFRZN <<16 )) !=0 ) { - cmd->result &= ~(CAM_DEV_QFRZN <<16 ); - dev->qfrozen--; +if (cmd) { +if ((cmd->result & (CAM_DEV_QFRZN <<16 )) !=0 ) { + cmd->result &= ~(CAM_DEV_QFRZN <<16 ); + dev->qfrozen--; + } + }else if (scb->flags &SCB_DEVICE_RESET ) { +if (ahd->platform_data->eh_done) +complete (ahd->platform_data->eh_done); +ahd_free_scb (ahd, scb); +return ; }ahd_linux_unmap_scb (ahd, scb);
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 15/16 ips: Do not try to abort command from host reset
In reply to Hannes ReineckeThe code for aborting an outstanding command is a copy of the functionality from command abort. As we already have called this function once we reach host reset there's no point in trying to do so again.
--- drivers/scsi/ips.c | 18 ------------------ 1 file changed, 18 deletions(-)
drivers/scsi/ips.c +0 -18
@@ -835,7 +835,6 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)int i;ips_ha_t *ha;ips_scb_t *scb; -ips_copp_wait_item_t *item;METHOD_TRACE ("ips_eh_reset" ,1 );
@@ -860,23 +859,6 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)if (!ha->active)return (FAILED ); -/* See if the command is on the copp queue */ - item = ha->copp_waitlist.head; -while ((item) && (item->scsi_cmd !=SC )) - item = item->next; - -if (item) { -/* Found it */ -ips_removeq_copp (&ha->copp_waitlist, item); -return (SUCCESS ); - } - -/* See if the command is on the wait queue */ -if (ips_removeq_wait (&ha->scb_waitlist,SC )) { -/* command not sent yet */ -return (SUCCESS ); - } -/* An explanation for the casual observer: */ /* Part of the function of a RAID controller is automatic error */ /* detection and recovery. As such, the only problem that physically */
Signature · 1 line
2.29.2
Hannes Reinecke
maintainerPATCH v4 16/16 megaraid: pass in NULL scb for host reset
In reply to Hannes ReineckeWhen calling a host reset we shouldn't rely on the command triggering the reset, so allow megaraid_abort_and_reset() to be called with a NULL scb.
And drop the pointless 'bus_reset' and 'target_reset' handlers, which just call the same function as host_reset.
--- drivers/scsi/megaraid.c | 42 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 26 deletions(-)
drivers/scsi/megaraid.c +16 -26
@@ -1897,7 +1897,7 @@ megaraid_reset(struct scsi_cmnd *cmd)spin_lock_irq (&adapter->lock); - rval =megaraid_abort_and_reset (adapter, cmd,SCB_RESET ); + rval =megaraid_abort_and_reset (adapter,NULL ,SCB_RESET );/* * This is required here to complete any completed requests
@@ -1936,7 +1936,7 @@ megaraid_abort_and_reset(adapter_t *adapter, struct scsi_cmnd *cmd, int aor) scb =list_entry (pos, scb_t, list); -if (scb->cmd == cmd) {/* Found command */ +if (!cmd || scb->cmd == cmd) {/* Found command */ scb->state |= aor;
@@ -1955,31 +1955,23 @@ megaraid_abort_and_reset(adapter_t *adapter, struct scsi_cmnd *cmd, int aor)return FAILED ; } -else { - -/* -* Not yet issued! Remove from the pending -* list -*/ -dev_warn (&adapter->dev->dev, -"%s-[%x], driver owner\n" , - (aor==SCB_ABORT ) ?"ABORTING" :"RESET" , - scb->idx); - -mega_free_scb (adapter, scb); - -if ( aor ==SCB_ABORT ) { - cmd->result = (DID_ABORT <<16 ); - } -else { - cmd->result = (DID_RESET <<16 ); - } +/* +* Not yet issued! Remove from the pending +* list +*/ +dev_warn (&adapter->dev->dev, +"%s-[%x], driver owner\n" , + (cmd) ?"ABORTING" :"RESET" , + scb->idx); +mega_free_scb (adapter, scb); +if (cmd) { + cmd->result = (DID_ABORT <<16 );list_add_tail (SCSI_LIST (cmd), - &adapter->completed_list); - -return SUCCESS ; + &adapter->completed_list); } + +return SUCCESS ; } }
@@ -4113,8 +4105,6 @@ static struct scsi_host_template megaraid_template = { .sg_tablesize = MAX_SGLIST, .cmd_per_lun = DEF_CMD_PER_LUN, .eh_abort_handler = megaraid_abort, - .eh_device_reset_handler = megaraid_reset, - .eh_bus_reset_handler = megaraid_reset, .eh_host_reset_handler = megaraid_reset, .no_write_same = 1, .cmd_size = sizeof(struct megaraid_cmd_priv),
Signature · 1 line
2.29.2