| Message ID | 20220512111236.109851-7-hare@suse.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | scsi: EH rework prep patches, part 1 | expand |
The patch changes the data type of the 'lun' argument to qedf_flush_active_ios() to a u64, but the remaining code still uses a wildcard of -1, perhaps this needs a #define or enum of a value that is unsigned also? Removing the call to fc_remote_port_chkready() in qedf_initiate_tmf() will result in different semantics for whether the TMF will be issued. Changing the debug logging in qedf_eh_target_reset() and qedf_eh_device_reset() might make identifying the target more difficult, although qedf_initiate_tmf() will also log a message, the rport->scsi_target_id is not the same value as the sdev->id. -Ewan On Thu, May 12, 2022 at 7:13 AM Hannes Reinecke <hare@suse.de> wrote: > > When 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(). > > Signed-off-by: Hannes Reinecke <hare@suse.com> > Reviewed-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> > Cc: Saurav Kashyap <skashyap@marvell.com> > --- > drivers/scsi/qedf/qedf.h | 5 ++- > drivers/scsi/qedf/qedf_io.c | 75 ++++++++++------------------------- > drivers/scsi/qedf/qedf_main.c | 19 ++++----- > 3 files changed, 33 insertions(+), 66 deletions(-) > > diff --git a/drivers/scsi/qedf/qedf.h b/drivers/scsi/qedf/qedf.h > index c5c0bbdafc4e..80814bcf4db1 100644 > --- a/drivers/scsi/qedf/qedf.h > +++ b/drivers/scsi/qedf/qedf.h > @@ -112,6 +112,7 @@ struct qedf_ioreq { > #define QEDF_CMD_ERR_SCSI_DONE 0x5 > u8 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 > @@ -497,7 +498,7 @@ extern void qedf_process_warning_compl(struct qedf_ctx *qedf, > struct fcoe_cqe *cqe, struct qedf_ioreq *io_req); > extern void qedf_process_error_detect(struct qedf_ctx *qedf, > struct fcoe_cqe *cqe, struct qedf_ioreq *io_req); > -extern void qedf_flush_active_ios(struct qedf_rport *fcport, int lun); > +extern void qedf_flush_active_ios(struct qedf_rport *fcport, u64 lun); > extern void qedf_release_cmd(struct kref *ref); > extern int qedf_initiate_abts(struct qedf_ioreq *io_req, > bool return_scsi_cmd_on_abts); > @@ -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); > diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c > index 2ec1f710fd1d..5d82fd95e74c 100644 > --- a/drivers/scsi/qedf/qedf_io.c > +++ b/drivers/scsi/qedf/qedf_io.c > @@ -546,7 +546,7 @@ static int qedf_build_bd_list_from_sg(struct qedf_ioreq *io_req) > } > > static void qedf_build_fcp_cmnd(struct qedf_ioreq *io_req, > - struct fcp_cmnd *fcp_cmnd) > + struct fcp_cmnd *fcp_cmnd) > { > struct scsi_cmnd *sc_cmd = io_req->sc_cmd; > > @@ -554,8 +554,12 @@ static void qedf_build_fcp_cmnd(struct qedf_ioreq *io_req, > memset(fcp_cmnd, 0, FCP_CMND_LEN); > > /* 8 bytes: SCSI LUN info */ > - int_to_scsilun(sc_cmd->device->lun, > - (struct scsi_lun *)&fcp_cmnd->fc_lun); > + if (io_req->cmd_type == QEDF_TASK_MGMT_CMD) > + int_to_scsilun(io_req->tm_lun, > + (struct scsi_lun *)&fcp_cmnd->fc_lun); > + else > + int_to_scsilun(sc_cmd->device->lun, > + (struct scsi_lun *)&fcp_cmnd->fc_lun); > > /* 4 bytes: flag info */ > fcp_cmnd->fc_pri_ta = 0; > @@ -1096,7 +1100,7 @@ static void qedf_parse_fcp_rsp(struct qedf_ioreq *io_req, > } > > /* The sense buffer can be NULL for TMF commands */ > - if (sc_cmd->sense_buffer) { > + if (sc_cmd && sc_cmd->sense_buffer) { > memset(sc_cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE); > if (fcp_sns_len) > memcpy(sc_cmd->sense_buffer, sense_data, > @@ -1581,7 +1585,7 @@ static void qedf_flush_els_req(struct qedf_ctx *qedf, > /* A value of -1 for lun is a wild card that means flush all > * active SCSI I/Os for the target. > */ > -void qedf_flush_active_ios(struct qedf_rport *fcport, int lun) > +void qedf_flush_active_ios(struct qedf_rport *fcport, u64 lun) > { > struct qedf_ioreq *io_req; > struct qedf_ctx *qedf; > @@ -1769,10 +1773,6 @@ void qedf_flush_active_ios(struct qedf_rport *fcport, int lun) > kref_put(&io_req->refcount, qedf_release_cmd); > continue; > } > - if (lun > -1) { > - if (io_req->lun != lun) > - continue; > - } > > /* > * Use kref_get_unless_zero in the unlikely case the command > @@ -2282,7 +2282,7 @@ void qedf_process_cleanup_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe, > complete(&io_req->cleanup_done); > } > > -static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, > +static int qedf_execute_tmf(struct qedf_rport *fcport, u64 tm_lun, > uint8_t tm_flags) > { > struct qedf_ioreq *io_req; > @@ -2292,17 +2292,10 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, > int rc = 0; > uint16_t xid; > int tmo = 0; > - int lun = 0; > unsigned long flags; > struct fcoe_wqe *sqe; > u16 sqe_idx; > > - if (!sc_cmd) { > - QEDF_ERR(&qedf->dbg_ctx, "sc_cmd is NULL\n"); > - return FAILED; > - } > - > - lun = (int)sc_cmd->device->lun; > if (!test_bit(QEDF_RPORT_SESSION_READY, &fcport->flags)) { > QEDF_ERR(&(qedf->dbg_ctx), "fcport not offloaded\n"); > rc = FAILED; > @@ -2322,7 +2315,7 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, > qedf->target_resets++; > > /* Initialize rest of io_req fields */ > - io_req->sc_cmd = sc_cmd; > + io_req->sc_cmd = NULL; > io_req->fcport = fcport; > io_req->cmd_type = QEDF_TASK_MGMT_CMD; > > @@ -2336,6 +2329,7 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, > > /* Default is to return a SCSI command when an error occurs */ > io_req->return_scsi_cmd_on_abts = false; > + io_req->tm_lun = tm_lun; > > /* Obtain exchange id */ > xid = io_req->xid; > @@ -2390,7 +2384,7 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, > > > if (tm_flags == FCP_TMF_LUN_RESET) > - qedf_flush_active_ios(fcport, lun); > + qedf_flush_active_ios(fcport, tm_lun); > else > qedf_flush_active_ios(fcport, -1); > > @@ -2405,23 +2399,18 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, > return rc; > } > > -int qedf_initiate_tmf(struct scsi_cmnd *sc_cmd, u8 tm_flags) > +int qedf_initiate_tmf(struct fc_rport *rport, u64 lun, u8 tm_flags) > { > - struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device)); > struct fc_rport_libfc_priv *rp = rport->dd_data; > struct qedf_rport *fcport = (struct qedf_rport *)&rp[1]; > - struct qedf_ctx *qedf; > - struct fc_lport *lport = shost_priv(sc_cmd->device->host); > + struct qedf_ctx *qedf = fcport->qedf; > + struct fc_lport *lport = rp->local_port; > int rc = SUCCESS; > - int rval; > - struct qedf_ioreq *io_req = NULL; > - int ref_cnt = 0; > struct fc_rport_priv *rdata = fcport->rdata; > > QEDF_ERR(NULL, > - "tm_flags 0x%x sc_cmd %p op = 0x%02x target_id = 0x%x lun=%d\n", > - tm_flags, sc_cmd, sc_cmd->cmd_len ? sc_cmd->cmnd[0] : 0xff, > - rport->scsi_target_id, (int)sc_cmd->device->lun); > + "tm_flags 0x%x target_id = 0x%x lun=%llu\n", > + tm_flags, rport->scsi_target_id, lun); > > if (!rdata || !kref_get_unless_zero(&rdata->kref)) { > QEDF_ERR(NULL, "stale rport\n"); > @@ -2432,33 +2421,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); > if (rc) > goto tmf_err; > > - if (!fcport) { > - QEDF_ERR(NULL, "device_reset: rport is NULL\n"); > - rc = FAILED; > - goto tmf_err; > - } > - > - qedf = fcport->qedf; > - > if (!qedf) { > QEDF_ERR(NULL, "qedf is NULL.\n"); > rc = FAILED; > @@ -2495,7 +2461,7 @@ int qedf_initiate_tmf(struct scsi_cmnd *sc_cmd, u8 tm_flags) > goto tmf_err; > } > > - rc = qedf_execute_tmf(fcport, sc_cmd, tm_flags); > + rc = qedf_execute_tmf(fcport, lun, tm_flags); > > tmf_err: > kref_put(&rdata->kref, fc_rport_destroy); > @@ -2512,7 +2478,6 @@ void qedf_process_tmf_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe, > fcp_rsp = &cqe->cqe_info.rsp_info; > qedf_parse_fcp_rsp(io_req, fcp_rsp); > > - io_req->sc_cmd = NULL; > complete(&io_req->tm_done); > } > > diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c > index 18dc68d577b6..85ccfbc5cd26 100644 > --- a/drivers/scsi/qedf/qedf_main.c > +++ b/drivers/scsi/qedf/qedf_main.c > @@ -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) > -- > 2.29.2 >
On 5/19/22 11:22, Ewan Milne wrote: > The patch changes the data type of the 'lun' argument to qedf_flush_active_ios() > to a u64, but the remaining code still uses a wildcard of -1, perhaps > this needs a > #define or enum of a value that is unsigned also? > Ah, no, I went slightly overboard there. That needs to be changed back to be an 'int'. > Removing the call to fc_remote_port_chkready() in qedf_initiate_tmf() > will result > in different semantics for whether the TMF will be issued. > Really? 'fc_remote_port_chkready()' just evaluates the port state; this is also done by fc_block_rport(). So dropping the first shouldn't make a difference. > Changing the debug logging in qedf_eh_target_reset() and qedf_eh_device_reset() > might make identifying the target more difficult, although > qedf_initiate_tmf() will > also log a message, the rport->scsi_target_id is not the same value as > the sdev->id. > Sigh. Yes, the error logging is suboptimal. Will be updating it. Cheers, Hannes
Well, fc_remote_port_chkready() has in the _ONLINE and _MARGINAL case:
if (rport->roles & FC_PORT_ROLE_FCP_TARGET)
result = 0;
else if (rport->flags & FC_RPORT_DEVLOSS_PENDING)
result = DID_IMM_RETRY << 16;
else
result = DID_NO_CONNECT << 16;
break;
which fc_block_rport() does not have. Admittedly, I would have thought that
the rport would be blocked while devloss was pending but there is code in
fc_timeout_deleted_rport() that indicates otherwise, maybe this only happens
if there is a role change.
-Ewan
On Fri, May 20, 2022 at 2:50 AM Hannes Reinecke <hare@suse.de> wrote:
>
> On 5/19/22 11:22, Ewan Milne wrote:
> > The patch changes the data type of the 'lun' argument to qedf_flush_active_ios()
> > to a u64, but the remaining code still uses a wildcard of -1, perhaps
> > this needs a
> > #define or enum of a value that is unsigned also?
> >
> Ah, no, I went slightly overboard there. That needs to be changed back
> to be an 'int'.
>
> > Removing the call to fc_remote_port_chkready() in qedf_initiate_tmf()
> > will result
> > in different semantics for whether the TMF will be issued.
> >
> Really? 'fc_remote_port_chkready()' just evaluates the port state;
> this is also done by fc_block_rport().
> So dropping the first shouldn't make a difference.
>
> > Changing the debug logging in qedf_eh_target_reset() and qedf_eh_device_reset()
> > might make identifying the target more difficult, although
> > qedf_initiate_tmf() will
> > also log a message, the rport->scsi_target_id is not the same value as
> > the sdev->id.
> >
> Sigh. Yes, the error logging is suboptimal.
> Will be updating it.
>
> 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
>
On 5/25/22 21:06, Ewan Milne wrote: > Well, fc_remote_port_chkready() has in the _ONLINE and _MARGINAL case: > > if (rport->roles & FC_PORT_ROLE_FCP_TARGET) > result = 0; > else if (rport->flags & FC_RPORT_DEVLOSS_PENDING) > result = DID_IMM_RETRY << 16; > else > result = DID_NO_CONNECT << 16; > break; > > which fc_block_rport() does not have. Admittedly, I would have thought that > the rport would be blocked while devloss was pending but there is code in > fc_timeout_deleted_rport() that indicates otherwise, maybe this only happens > if there is a role change. > Sort of. But the code in qedf only deals with FCP target ports, so we'll always take the first branch and the entire code is pointless. Am I wrong? Cheers, Hannes
diff --git a/drivers/scsi/qedf/qedf.h b/drivers/scsi/qedf/qedf.h index c5c0bbdafc4e..80814bcf4db1 100644 --- a/drivers/scsi/qedf/qedf.h +++ b/drivers/scsi/qedf/qedf.h @@ -112,6 +112,7 @@ struct qedf_ioreq { #define QEDF_CMD_ERR_SCSI_DONE 0x5 u8 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 @@ -497,7 +498,7 @@ extern void qedf_process_warning_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe, struct qedf_ioreq *io_req); extern void qedf_process_error_detect(struct qedf_ctx *qedf, struct fcoe_cqe *cqe, struct qedf_ioreq *io_req); -extern void qedf_flush_active_ios(struct qedf_rport *fcport, int lun); +extern void qedf_flush_active_ios(struct qedf_rport *fcport, u64 lun); extern void qedf_release_cmd(struct kref *ref); extern int qedf_initiate_abts(struct qedf_ioreq *io_req, bool return_scsi_cmd_on_abts); @@ -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); diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c index 2ec1f710fd1d..5d82fd95e74c 100644 --- a/drivers/scsi/qedf/qedf_io.c +++ b/drivers/scsi/qedf/qedf_io.c @@ -546,7 +546,7 @@ static int qedf_build_bd_list_from_sg(struct qedf_ioreq *io_req) } static void qedf_build_fcp_cmnd(struct qedf_ioreq *io_req, - struct fcp_cmnd *fcp_cmnd) + struct fcp_cmnd *fcp_cmnd) { struct scsi_cmnd *sc_cmd = io_req->sc_cmd; @@ -554,8 +554,12 @@ static void qedf_build_fcp_cmnd(struct qedf_ioreq *io_req, memset(fcp_cmnd, 0, FCP_CMND_LEN); /* 8 bytes: SCSI LUN info */ - int_to_scsilun(sc_cmd->device->lun, - (struct scsi_lun *)&fcp_cmnd->fc_lun); + if (io_req->cmd_type == QEDF_TASK_MGMT_CMD) + int_to_scsilun(io_req->tm_lun, + (struct scsi_lun *)&fcp_cmnd->fc_lun); + else + int_to_scsilun(sc_cmd->device->lun, + (struct scsi_lun *)&fcp_cmnd->fc_lun); /* 4 bytes: flag info */ fcp_cmnd->fc_pri_ta = 0; @@ -1096,7 +1100,7 @@ static void qedf_parse_fcp_rsp(struct qedf_ioreq *io_req, } /* The sense buffer can be NULL for TMF commands */ - if (sc_cmd->sense_buffer) { + if (sc_cmd && sc_cmd->sense_buffer) { memset(sc_cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE); if (fcp_sns_len) memcpy(sc_cmd->sense_buffer, sense_data, @@ -1581,7 +1585,7 @@ static void qedf_flush_els_req(struct qedf_ctx *qedf, /* A value of -1 for lun is a wild card that means flush all * active SCSI I/Os for the target. */ -void qedf_flush_active_ios(struct qedf_rport *fcport, int lun) +void qedf_flush_active_ios(struct qedf_rport *fcport, u64 lun) { struct qedf_ioreq *io_req; struct qedf_ctx *qedf; @@ -1769,10 +1773,6 @@ void qedf_flush_active_ios(struct qedf_rport *fcport, int lun) kref_put(&io_req->refcount, qedf_release_cmd); continue; } - if (lun > -1) { - if (io_req->lun != lun) - continue; - } /* * Use kref_get_unless_zero in the unlikely case the command @@ -2282,7 +2282,7 @@ void qedf_process_cleanup_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe, complete(&io_req->cleanup_done); } -static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, +static int qedf_execute_tmf(struct qedf_rport *fcport, u64 tm_lun, uint8_t tm_flags) { struct qedf_ioreq *io_req; @@ -2292,17 +2292,10 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, int rc = 0; uint16_t xid; int tmo = 0; - int lun = 0; unsigned long flags; struct fcoe_wqe *sqe; u16 sqe_idx; - if (!sc_cmd) { - QEDF_ERR(&qedf->dbg_ctx, "sc_cmd is NULL\n"); - return FAILED; - } - - lun = (int)sc_cmd->device->lun; if (!test_bit(QEDF_RPORT_SESSION_READY, &fcport->flags)) { QEDF_ERR(&(qedf->dbg_ctx), "fcport not offloaded\n"); rc = FAILED; @@ -2322,7 +2315,7 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, qedf->target_resets++; /* Initialize rest of io_req fields */ - io_req->sc_cmd = sc_cmd; + io_req->sc_cmd = NULL; io_req->fcport = fcport; io_req->cmd_type = QEDF_TASK_MGMT_CMD; @@ -2336,6 +2329,7 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, /* Default is to return a SCSI command when an error occurs */ io_req->return_scsi_cmd_on_abts = false; + io_req->tm_lun = tm_lun; /* Obtain exchange id */ xid = io_req->xid; @@ -2390,7 +2384,7 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, if (tm_flags == FCP_TMF_LUN_RESET) - qedf_flush_active_ios(fcport, lun); + qedf_flush_active_ios(fcport, tm_lun); else qedf_flush_active_ios(fcport, -1); @@ -2405,23 +2399,18 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, return rc; } -int qedf_initiate_tmf(struct scsi_cmnd *sc_cmd, u8 tm_flags) +int qedf_initiate_tmf(struct fc_rport *rport, u64 lun, u8 tm_flags) { - struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device)); struct fc_rport_libfc_priv *rp = rport->dd_data; struct qedf_rport *fcport = (struct qedf_rport *)&rp[1]; - struct qedf_ctx *qedf; - struct fc_lport *lport = shost_priv(sc_cmd->device->host); + struct qedf_ctx *qedf = fcport->qedf; + struct fc_lport *lport = rp->local_port; int rc = SUCCESS; - int rval; - struct qedf_ioreq *io_req = NULL; - int ref_cnt = 0; struct fc_rport_priv *rdata = fcport->rdata; QEDF_ERR(NULL, - "tm_flags 0x%x sc_cmd %p op = 0x%02x target_id = 0x%x lun=%d\n", - tm_flags, sc_cmd, sc_cmd->cmd_len ? sc_cmd->cmnd[0] : 0xff, - rport->scsi_target_id, (int)sc_cmd->device->lun); + "tm_flags 0x%x target_id = 0x%x lun=%llu\n", + tm_flags, rport->scsi_target_id, lun); if (!rdata || !kref_get_unless_zero(&rdata->kref)) { QEDF_ERR(NULL, "stale rport\n"); @@ -2432,33 +2421,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); if (rc) goto tmf_err; - if (!fcport) { - QEDF_ERR(NULL, "device_reset: rport is NULL\n"); - rc = FAILED; - goto tmf_err; - } - - qedf = fcport->qedf; - if (!qedf) { QEDF_ERR(NULL, "qedf is NULL.\n"); rc = FAILED; @@ -2495,7 +2461,7 @@ int qedf_initiate_tmf(struct scsi_cmnd *sc_cmd, u8 tm_flags) goto tmf_err; } - rc = qedf_execute_tmf(fcport, sc_cmd, tm_flags); + rc = qedf_execute_tmf(fcport, lun, tm_flags); tmf_err: kref_put(&rdata->kref, fc_rport_destroy); @@ -2512,7 +2478,6 @@ void qedf_process_tmf_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe, fcp_rsp = &cqe->cqe_info.rsp_info; qedf_parse_fcp_rsp(io_req, fcp_rsp); - io_req->sc_cmd = NULL; complete(&io_req->tm_done); } diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c index 18dc68d577b6..85ccfbc5cd26 100644 --- a/drivers/scsi/qedf/qedf_main.c +++ b/drivers/scsi/qedf/qedf_main.c @@ -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)