scsi: fnic: use scsi_host_busy_iter to walk scsi commands
Subsystems (2)
v2 cover scsi: fnic: use scsi_host_busy_iter to walk scsi commands
Hello Guys,
fnic uses the following way to walk scsi commands in failure handling, which is obvious wrong, because caller of scsi_host_find_tag has to guarantee that the tag is active.
for (tag = 0; tag < fnic->fnic_max_tag_id; tag++) {
...
sc = scsi_host_find_tag(fnic->lport->host, tag);
...
}Fix the issue by using scsi_host_busy_iter() to walk request/scsi_command.
Hannes has posted similar patch[1] before, however which depends on the scsi reserved command patchset, so post them out in one standalone patchset, another difference is that this one is splited to 5 single patches for easy review.
[1] https://marc.info/?l=linux-scsi&m=161400059528859&w=2
V2:
- use scsi_host_busy_iter
Ming Lei (5):
scsi: fnic: use scsi_host_busy_iter in fnic_terminate_rport_io
scsi: fnic: use scsi_host_busy_iter in fnic_clean_pending_aborts
scsi: fnic: use scsi_host_busy_iter in fnic_cleanup_io
scsi: fnic: use scsi_host_busy_iter in fnic_rport_exch_reset
scsi: fnic: use scsi_host_busy_iter in fnic_is_abts_pending
drivers/scsi/fnic/fnic_scsi.c | 924 ++++++++++++++++++---------------- 1 file changed, 484 insertions(+), 440 deletions(-)
Signature · 1 line
2.29.2
PATCH v2 1/5 scsi: fnic: use scsi_host_busy_iter in fnic_terminate_rport_io
So far, scsi_host_find_tag() is supposed to use in fast path and the passed tag has to be active.
Convert the scsi command walking into scsi_host_busy_iter(), which has been one common pattern for handling failure.
--- drivers/scsi/fnic/fnic_scsi.c | 216 +++++++++++++++++----------------- 1 file changed, 109 insertions(+), 107 deletions(-)
drivers/scsi/fnic/fnic_scsi.c +109 -107
@@ -1678,24 +1678,124 @@ static void fnic_rport_exch_reset(struct fnic *fnic, u32 port_id) } -void fnic_terminate_rport_io (struct fc_rport *rport) +static bool fnic_terminate_cmd (struct scsi_cmnd *sc,void *data,bool rsvd) {int tag;int abt_tag; -int term_cnt =0 ; +int *term_cnt = data;struct fnic_io_req *io_req;spinlock_t *io_lock;unsigned long flags; -struct scsi_cmnd *sc;struct scsi_lun fc_lun; -struct fc_rport_libfc_priv *rdata; -struct fc_lport *lport; -struct fnic *fnic;struct fc_rport *cmd_rport; +struct fc_lport *lp =shost_priv (sc->device->host); +struct fnic *fnic =lport_priv (lp); +struct fc_rport *rport;struct reset_stats *reset_stats;struct terminate_stats *term_stats;enum fnic_ioreq_state old_ioreq_state; + term_stats = &fnic->fnic_stats.term_stats; + reset_stats = &fnic->fnic_stats.reset_stats; + tag = sc->request->tag; + io_lock =fnic_io_lock_tag (fnic, tag); + +spin_lock_irqsave (io_lock, flags); + rport =starget_to_rport (scsi_target (sc->device)); + abt_tag = tag; + io_req = (struct fnic_io_req *)CMD_SP (sc); +if (!io_req) + goto unlock; + + cmd_rport =starget_to_rport (scsi_target (sc->device)); +if (rport != cmd_rport) + goto unlock; + +if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && + (!(CMD_FLAGS (sc) &FNIC_DEV_RST_ISSUED ))) { +FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, +"fnic_terminate_rport_io dev rst not pending sc 0x%p\n" , + sc); + goto unlock; + } +/* +* Found IO that is still pending with firmware and +* belongs to rport that went away +*/ +if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) + goto unlock; + +if (io_req->abts_done) { +shost_printk (KERN_ERR , fnic->lport->host, +"fnic_terminate_rport_io: io_req->abts_done is set " +"state is %s\n" , +fnic_ioreq_state_to_str (CMD_STATE (sc))); + } +if (!(CMD_FLAGS (sc) &FNIC_IO_ISSUED )) { +FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, +"fnic_terminate_rport_io " +"IO not yet issued %p tag 0x%x flags " +"%x state %d\n" , + sc, tag,CMD_FLAGS (sc),CMD_STATE (sc)); + } + old_ioreq_state =CMD_STATE (sc); +CMD_STATE (sc) =FNIC_IOREQ_ABTS_PENDING ; +CMD_ABTS_STATUS (sc) =FCPIO_INVALID_CODE ; +if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { +atomic64_inc (&reset_stats->device_reset_terminates); + abt_tag = (tag |FNIC_TAG_DEV_RST ); +FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, +"fnic_terminate_rport_io dev rst sc 0x%p\n" , sc); + } + +BUG_ON (io_req->abts_done); + +FNIC_SCSI_DBG (KERN_DEBUG , + fnic->lport->host, +"fnic_terminate_rport_io: Issuing abts\n" ); + +spin_unlock_irqrestore (io_lock, flags); + +/* Now queue the abort command to firmware */ +int_to_scsilun (sc->device->lun, &fc_lun); + +if (fnic_queue_abort_io_req (fnic, abt_tag, +FCPIO_ITMF_ABT_TASK_TERM , + fc_lun.scsi_lun, io_req)) { +/* +* Revert the cmd state back to old state, if +* it hasn't changed in between. This cmd will get +* aborted later by scsi_eh, or cleaned up during +* lun reset +*/ +spin_lock_irqsave (io_lock, flags); +if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) +CMD_STATE (sc) = old_ioreq_state; +spin_unlock_irqrestore (io_lock, flags); + }else { +spin_lock_irqsave (io_lock, flags); +if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) +CMD_FLAGS (sc) |=FNIC_DEV_RST_TERM_ISSUED ; +else +CMD_FLAGS (sc) |=FNIC_IO_INTERNAL_TERM_ISSUED ; +spin_unlock_irqrestore (io_lock, flags); +atomic64_inc (&term_stats->terminates); + (*term_cnt)++; + } + +return true; + unlock: +spin_unlock_irqrestore (io_lock, flags); +return true; +} + +void fnic_terminate_rport_io (struct fc_rport *rport) +{ +int term_cnt =0 ; +struct fc_rport_libfc_priv *rdata; +struct fc_lport *lport; +struct fnic *fnic; +if (!rport) {printk (KERN_ERR "fnic_terminate_rport_io: rport is NULL\n" );return ;
@@ -1722,108 +1822,10 @@ void fnic_terminate_rport_io(struct fc_rport *rport)if (fnic->in_remove)return ; - reset_stats = &fnic->fnic_stats.reset_stats; - term_stats = &fnic->fnic_stats.term_stats; - -for (tag =0 ; tag < fnic->fnic_max_tag_id; tag++) { - abt_tag = tag; - io_lock =fnic_io_lock_tag (fnic, tag); -spin_lock_irqsave (io_lock, flags); - sc =scsi_host_find_tag (fnic->lport->host, tag); -if (!sc) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } - - io_req = (struct fnic_io_req *)CMD_SP (sc); -if (!io_req) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } - - cmd_rport =starget_to_rport (scsi_target (sc->device)); -if (rport != cmd_rport) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } - -if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && - (!(CMD_FLAGS (sc) &FNIC_DEV_RST_ISSUED ))) { -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"fnic_terminate_rport_io dev rst not pending sc 0x%p\n" , - sc); -spin_unlock_irqrestore (io_lock, flags); -continue ; - } -/* -* Found IO that is still pending with firmware and -* belongs to rport that went away -*/ -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } -if (io_req->abts_done) { -shost_printk (KERN_ERR , fnic->lport->host, -"fnic_terminate_rport_io: io_req->abts_done is set " -"state is %s\n" , -fnic_ioreq_state_to_str (CMD_STATE (sc))); - } -if (!(CMD_FLAGS (sc) &FNIC_IO_ISSUED )) { -FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, -"fnic_terminate_rport_io " -"IO not yet issued %p tag 0x%x flags " -"%x state %d\n" , - sc, tag,CMD_FLAGS (sc),CMD_STATE (sc)); - } - old_ioreq_state =CMD_STATE (sc); -CMD_STATE (sc) =FNIC_IOREQ_ABTS_PENDING ; -CMD_ABTS_STATUS (sc) =FCPIO_INVALID_CODE ; -if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { -atomic64_inc (&reset_stats->device_reset_terminates); - abt_tag = (tag |FNIC_TAG_DEV_RST ); -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"fnic_terminate_rport_io dev rst sc 0x%p\n" , sc); - } - -BUG_ON (io_req->abts_done); - -FNIC_SCSI_DBG (KERN_DEBUG , - fnic->lport->host, -"fnic_terminate_rport_io: Issuing abts\n" ); - -spin_unlock_irqrestore (io_lock, flags); - -/* Now queue the abort command to firmware */ -int_to_scsilun (sc->device->lun, &fc_lun); - -if (fnic_queue_abort_io_req (fnic, abt_tag, -FCPIO_ITMF_ABT_TASK_TERM , - fc_lun.scsi_lun, io_req)) { -/* -* Revert the cmd state back to old state, if -* it hasn't changed in between. This cmd will get -* aborted later by scsi_eh, or cleaned up during -* lun reset -*/ -spin_lock_irqsave (io_lock, flags); -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) -CMD_STATE (sc) = old_ioreq_state; -spin_unlock_irqrestore (io_lock, flags); - }else { -spin_lock_irqsave (io_lock, flags); -if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) -CMD_FLAGS (sc) |=FNIC_DEV_RST_TERM_ISSUED ; -else -CMD_FLAGS (sc) |=FNIC_IO_INTERNAL_TERM_ISSUED ; -spin_unlock_irqrestore (io_lock, flags); -atomic64_inc (&term_stats->terminates); - term_cnt++; - } - } -if (term_cnt >atomic64_read (&term_stats->max_terminates)) -atomic64_set (&term_stats->max_terminates, term_cnt); +scsi_host_busy_iter (fnic->lport->host, fnic_terminate_cmd, &term_cnt); +if (term_cnt >atomic64_read (&fnic->fnic_stats.term_stats.max_terminates)) +atomic64_set (&fnic->fnic_stats.term_stats.max_terminates, term_cnt); }/*
Signature · 1 line
2.29.2
PATCH v2 2/5 scsi: fnic: use scsi_host_busy_iter in fnic_clean_pending_aborts
In reply to Ming LeiSo far, scsi_host_find_tag() is supposed to use in fast path and the passed tag has to be active.
Convert the scsi command walking into scsi_host_busy_iter() in fnic_terminate_rport_io, which has been one common pattern for handling failure.
--- drivers/scsi/fnic/fnic_scsi.c | 282 ++++++++++++++++++---------------- 1 file changed, 152 insertions(+), 130 deletions(-)
drivers/scsi/fnic/fnic_scsi.c +152 -130
@@ -2120,164 +2120,187 @@ static inline int fnic_queue_dr_io_req(struct fnic *fnic,return ret; } -/* -* Clean up any pending aborts on the lun -* For each outstanding IO on this lun, whose abort is not completed by fw, -* issue a local abort. Wait for abort to complete. Return 0 if all commands -* successfully aborted, 1 otherwise -*/ -static int fnic_clean_pending_aborts (struct fnic *fnic, -struct scsi_cmnd *lr_sc, -bool new_sc) +struct fnic_clean_pending_aborts_data { +struct fnic *fnic; +struct scsi_cmnd *lr_sc; +bool new_sc; +int ret; +}; +static bool __fnic_clean_pending_aborts (struct scsi_cmnd *sc,void *data, +bool rsvd) { -int tag, abt_tag; +int tag = sc->request->tag; +int abt_tag; +struct fnic_clean_pending_aborts_data *aborts_data = data; +struct fnic *fnic = aborts_data->fnic; +struct scsi_cmnd *lr_sc = aborts_data->lr_sc; +bool new_sc = aborts_data->new_sc; +struct scsi_device *lun_dev = lr_sc->device;struct fnic_io_req *io_req;spinlock_t *io_lock;unsigned long flags; -int ret =0 ; -struct scsi_cmnd *sc;struct scsi_lun fc_lun; -struct scsi_device *lun_dev = lr_sc->device;DECLARE_COMPLETION_ONSTACK (tm_done);enum fnic_ioreq_state old_ioreq_state; -for (tag =0 ; tag < fnic->fnic_max_tag_id; tag++) { - io_lock =fnic_io_lock_tag (fnic, tag); -spin_lock_irqsave (io_lock, flags); - sc =scsi_host_find_tag (fnic->lport->host, tag); -/* -* ignore this lun reset cmd if issued using new SC -* or cmds that do not belong to this lun -*/ -if (!sc || ((sc == lr_sc) && new_sc) || sc->device != lun_dev) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } - - io_req = (struct fnic_io_req *)CMD_SP (sc); + io_lock =fnic_io_lock_tag (fnic, tag); +spin_lock_irqsave (io_lock, flags); + sc =scsi_host_find_tag (fnic->lport->host, tag); +/* +* ignore this lun reset cmd if issued using new SC +* or cmds that do not belong to this lun +*/ +if (!sc || ((sc == lr_sc) && new_sc) || sc->device != lun_dev) + goto unlock; -if (!io_req || sc->device != lun_dev) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } + io_req = (struct fnic_io_req *)CMD_SP (sc); -/* -* Found IO that is still pending with firmware and -* belongs to the LUN that we are resetting -*/ -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"Found IO in %s on lun\n" , -fnic_ioreq_state_to_str (CMD_STATE (sc))); +if (!io_req || sc->device != lun_dev) + goto unlock; -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } -if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && - (!(CMD_FLAGS (sc) &FNIC_DEV_RST_ISSUED ))) { -FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, -"%s dev rst not pending sc 0x%p\n" , __func__, - sc); -spin_unlock_irqrestore (io_lock, flags); -continue ; - } +/* +* Found IO that is still pending with firmware and +* belongs to the LUN that we are resetting +*/ +FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, +"Found IO in %s on lun\n" , +fnic_ioreq_state_to_str (CMD_STATE (sc))); -if (io_req->abts_done) -shost_printk (KERN_ERR , fnic->lport->host, -"%s: io_req->abts_done is set state is %s\n" , - __func__,fnic_ioreq_state_to_str (CMD_STATE (sc))); - old_ioreq_state =CMD_STATE (sc); -/* -* Any pending IO issued prior to reset is expected to be -* in abts pending state, if not we need to set -* FNIC_IOREQ_ABTS_PENDING to indicate the IO is abort pending. -* When IO is completed, the IO will be handed over and -* handled in this function. -*/ -CMD_STATE (sc) =FNIC_IOREQ_ABTS_PENDING ; +if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) + goto unlock; -BUG_ON (io_req->abts_done); +if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && + (!(CMD_FLAGS (sc) &FNIC_DEV_RST_ISSUED ))) { +FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, +"%s dev rst not pending sc 0x%p\n" , __func__, + sc); + goto unlock; + } - abt_tag = tag; -if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { - abt_tag |=FNIC_TAG_DEV_RST ; -FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, -"%s: dev rst sc 0x%p\n" , __func__, sc); - } +if (io_req->abts_done) +shost_printk (KERN_ERR , fnic->lport->host, +"%s: io_req->abts_done is set state is %s\n" , + __func__,fnic_ioreq_state_to_str (CMD_STATE (sc))); + old_ioreq_state =CMD_STATE (sc); +/* +* Any pending IO issued prior to reset is expected to be +* in abts pending state, if not we need to set +* FNIC_IOREQ_ABTS_PENDING to indicate the IO is abort pending. +* When IO is completed, the IO will be handed over and +* handled in this function. +*/ +CMD_STATE (sc) =FNIC_IOREQ_ABTS_PENDING ; -CMD_ABTS_STATUS (sc) =FCPIO_INVALID_CODE ; - io_req->abts_done = &tm_done; -spin_unlock_irqrestore (io_lock, flags); +BUG_ON (io_req->abts_done); -/* Now queue the abort command to firmware */ -int_to_scsilun (sc->device->lun, &fc_lun); + abt_tag = tag; +if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { + abt_tag |=FNIC_TAG_DEV_RST ; +FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, +"%s: dev rst sc 0x%p\n" , __func__, sc); + } -if (fnic_queue_abort_io_req (fnic, abt_tag, -FCPIO_ITMF_ABT_TASK_TERM , - fc_lun.scsi_lun, io_req)) { -spin_lock_irqsave (io_lock, flags); - io_req = (struct fnic_io_req *)CMD_SP (sc); -if (io_req) - io_req->abts_done =NULL ; -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) -CMD_STATE (sc) = old_ioreq_state; -spin_unlock_irqrestore (io_lock, flags); - ret =1 ; - goto clean_pending_aborts_end; - }else { -spin_lock_irqsave (io_lock, flags); -if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) -CMD_FLAGS (sc) |=FNIC_DEV_RST_TERM_ISSUED ; -spin_unlock_irqrestore (io_lock, flags); - } -CMD_FLAGS (sc) |=FNIC_IO_INTERNAL_TERM_ISSUED ; +CMD_ABTS_STATUS (sc) =FCPIO_INVALID_CODE ; + io_req->abts_done = &tm_done; +spin_unlock_irqrestore (io_lock, flags); -wait_for_completion_timeout (&tm_done, -msecs_to_jiffies - (fnic->config.ed_tov)); +/* Now queue the abort command to firmware */ +int_to_scsilun (sc->device->lun, &fc_lun); -/* Recheck cmd state to check if it is now aborted */ +if (fnic_queue_abort_io_req (fnic, abt_tag, +FCPIO_ITMF_ABT_TASK_TERM , + fc_lun.scsi_lun, io_req)) {spin_lock_irqsave (io_lock, flags); io_req = (struct fnic_io_req *)CMD_SP (sc); -if (!io_req) { -spin_unlock_irqrestore (io_lock, flags); -CMD_FLAGS (sc) |=FNIC_IO_ABT_TERM_REQ_NULL ; -continue ; - } +if (io_req) + io_req->abts_done =NULL ; +if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) +CMD_STATE (sc) = old_ioreq_state; +spin_unlock_irqrestore (io_lock, flags); + goto fail; + }else { +spin_lock_irqsave (io_lock, flags); +if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) +CMD_FLAGS (sc) |=FNIC_DEV_RST_TERM_ISSUED ; +spin_unlock_irqrestore (io_lock, flags); + } +CMD_FLAGS (sc) |=FNIC_IO_INTERNAL_TERM_ISSUED ; - io_req->abts_done =NULL ; +wait_for_completion_timeout (&tm_done, +msecs_to_jiffies + (fnic->config.ed_tov)); -/* if abort is still pending with fw, fail */ -if (CMD_ABTS_STATUS (sc) ==FCPIO_INVALID_CODE ) { -spin_unlock_irqrestore (io_lock, flags); -CMD_FLAGS (sc) |=FNIC_IO_ABT_TERM_DONE ; - ret =1 ; - goto clean_pending_aborts_end; - } -CMD_STATE (sc) =FNIC_IOREQ_ABTS_COMPLETE ; +/* Recheck cmd state to check if it is now aborted */ +spin_lock_irqsave (io_lock, flags); + io_req = (struct fnic_io_req *)CMD_SP (sc); +if (!io_req) { +CMD_FLAGS (sc) |=FNIC_IO_ABT_TERM_REQ_NULL ; + goto unlock; + } -/* original sc used for lr is handled by dev reset code */ -if (sc != lr_sc) -CMD_SP (sc) =NULL ; + io_req->abts_done =NULL ; + +/* if abort is still pending with fw, fail */ +if (CMD_ABTS_STATUS (sc) ==FCPIO_INVALID_CODE ) {spin_unlock_irqrestore (io_lock, flags); +CMD_FLAGS (sc) |=FNIC_IO_ABT_TERM_DONE ; + goto fail; + } +CMD_STATE (sc) =FNIC_IOREQ_ABTS_COMPLETE ; -/* original sc used for lr is handled by dev reset code */ -if (sc != lr_sc) { -fnic_release_ioreq_buf (fnic, io_req, sc); -mempool_free (io_req, fnic->io_req_pool); - } +/* original sc used for lr is handled by dev reset code */ +if (sc != lr_sc) +CMD_SP (sc) =NULL ; +spin_unlock_irqrestore (io_lock, flags); -/* -* Any IO is returned during reset, it needs to call scsi_done -* to return the scsi_cmnd to upper layer. -*/ -if (sc->scsi_done) { -/* Set result to let upper SCSI layer retry */ - sc->result =DID_RESET <<16 ; - sc->scsi_done (sc); - } +/* original sc used for lr is handled by dev reset code */ +if (sc != lr_sc) { +fnic_release_ioreq_buf (fnic, io_req, sc); +mempool_free (io_req, fnic->io_req_pool); + } + +/* +* Any IO is returned during reset, it needs to call scsi_done +* to return the scsi_cmnd to upper layer. +*/ +if (sc->scsi_done) { +/* Set result to let upper SCSI layer retry */ + sc->result =DID_RESET <<16 ; + sc->scsi_done (sc); } +return true; + unlock: +spin_unlock_irqrestore (io_lock, flags); +return true; + fail: + aborts_data->ret =1 ; +return false; +} + +/* +* Clean up any pending aborts on the lun +* For each outstanding IO on this lun, whose abort is not completed by fw, +* issue a local abort. Wait for abort to complete. Return 0 if all commands +* successfully aborted, 1 otherwise +*/ +static int fnic_clean_pending_aborts (struct fnic *fnic, +struct scsi_cmnd *lr_sc, +bool new_sc) + +{ +int ret =0 ; +struct fnic_clean_pending_aborts_data data = { + .fnic = fnic, + .lr_sc = lr_sc, + .new_sc = new_sc, + .ret =0 , + }; + +scsi_host_busy_iter (fnic->lport->host, __fnic_clean_pending_aborts, + &data); +if (data.ret) +return data.ret;schedule_timeout (msecs_to_jiffies (2 * fnic->config.ed_tov));
@@ -2285,7 +2308,6 @@ static int fnic_clean_pending_aborts(struct fnic *fnic,if (fnic_is_abts_pending (fnic, lr_sc)) ret =FAILED ; -clean_pending_aborts_end:return ret; }
Signature · 1 line
2.29.2
PATCH v2 3/5 scsi: fnic: use scsi_host_busy_iter in fnic_cleanup_io
In reply to Ming LeiSo far, scsi_host_find_tag() is supposed to use in fast path and the passed tag has to be active.
Convert the scsi command walking into scsi_host_busy_iter(), which has been one common pattern for handling failure.
--- drivers/scsi/fnic/fnic_scsi.c | 137 +++++++++++++++++----------------- 1 file changed, 68 insertions(+), 69 deletions(-)
drivers/scsi/fnic/fnic_scsi.c +68 -69
@@ -1361,93 +1361,92 @@ int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int copy_work_to_do)return wq_work_done; } -static void fnic_cleanup_io (struct fnic *fnic,int exclude_id) +static bool fnic_cleanup_cmd (struct scsi_cmnd *sc,void *data,bool rsvd) { -int i;struct fnic_io_req *io_req;unsigned long flags =0 ; -struct scsi_cmnd *sc;spinlock_t *io_lock;unsigned long start_time =0 ; +struct fc_lport *lp =shost_priv (sc->device->host); +struct fnic *fnic =lport_priv (lp);struct fnic_stats *fnic_stats = &fnic->fnic_stats; +int *exclude_id = data; -for (i =0 ; i < fnic->fnic_max_tag_id; i++) { -if (i == exclude_id) -continue ; +if (*exclude_id == sc->request->tag) +return true; - io_lock =fnic_io_lock_tag (fnic, i); -spin_lock_irqsave (io_lock, flags); - sc =scsi_host_find_tag (fnic->lport->host, i); -if (!sc) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } + io_lock =fnic_io_lock_tag (fnic, sc->request->tag); +spin_lock_irqsave (io_lock, flags); - io_req = (struct fnic_io_req *)CMD_SP (sc); -if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && - !(CMD_FLAGS (sc) &FNIC_DEV_RST_DONE )) { -/* -* We will be here only when FW completes reset -* without sending completions for outstanding ios. -*/ -CMD_FLAGS (sc) |=FNIC_DEV_RST_DONE ; -if (io_req && io_req->dr_done) -complete (io_req->dr_done); -else if (io_req && io_req->abts_done) -complete (io_req->abts_done); -spin_unlock_irqrestore (io_lock, flags); -continue ; - }else if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } -if (!io_req) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } + io_req = (struct fnic_io_req *)CMD_SP (sc); +if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && + !(CMD_FLAGS (sc) &FNIC_DEV_RST_DONE )) { +/* +* We will be here only when FW completes reset +* without sending completions for outstanding ios. +*/ +CMD_FLAGS (sc) |=FNIC_DEV_RST_DONE ; +if (io_req && io_req->dr_done) +complete (io_req->dr_done); +else if (io_req && io_req->abts_done) +complete (io_req->abts_done); + goto unlock; + }else if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { + goto unlock; + } +if (!io_req) + goto unlock; -CMD_SP (sc) =NULL ; +CMD_SP (sc) =NULL ; -spin_unlock_irqrestore (io_lock, flags); +spin_unlock_irqrestore (io_lock, flags); -/* -* If there is a scsi_cmnd associated with this io_req, then -* free the corresponding state -*/ - start_time = io_req->start_time; -fnic_release_ioreq_buf (fnic, io_req, sc); -mempool_free (io_req, fnic->io_req_pool); +/* +* If there is a scsi_cmnd associated with this io_req, then +* free the corresponding state +*/ + start_time = io_req->start_time; +fnic_release_ioreq_buf (fnic, io_req, sc); +mempool_free (io_req, fnic->io_req_pool); - sc->result =DID_TRANSPORT_DISRUPTED <<16 ; -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"%s: tag:0x%x : sc:0x%p duration = %lu DID_TRANSPORT_DISRUPTED\n" , - __func__, sc->request->tag, sc, - (jiffies - start_time)); + sc->result =DID_TRANSPORT_DISRUPTED <<16 ; +FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, +"%s: tag:0x%x : sc:0x%p duration = %lu DID_TRANSPORT_DISRUPTED\n" , + __func__, sc->request->tag, sc, + (jiffies - start_time)); -if (atomic64_read (&fnic->io_cmpl_skip)) -atomic64_dec (&fnic->io_cmpl_skip); -else -atomic64_inc (&fnic_stats->io_stats.io_completions); +if (atomic64_read (&fnic->io_cmpl_skip)) +atomic64_dec (&fnic->io_cmpl_skip); +else +atomic64_inc (&fnic_stats->io_stats.io_completions); -/* Complete the command to SCSI */ -if (sc->scsi_done) { -if (!(CMD_FLAGS (sc) &FNIC_IO_ISSUED )) -shost_printk (KERN_ERR , fnic->lport->host, -"Calling done for IO not issued to fw: tag:0x%x sc:0x%p\n" , - sc->request->tag, sc); +/* Complete the command to SCSI */ +if (sc->scsi_done) { +if (!(CMD_FLAGS (sc) &FNIC_IO_ISSUED )) +shost_printk (KERN_ERR , fnic->lport->host, +"Calling done for IO not issued to fw: tag:0x%x sc:0x%p\n" , + sc->request->tag, sc); -FNIC_TRACE (fnic_cleanup_io, - sc->device->host->host_no, i, sc, -jiffies_to_msecs (jiffies - start_time), -0 , ((u64 )sc->cmnd[0 ] <<32 | - (u64 )sc->cmnd[2 ] <<24 | - (u64 )sc->cmnd[3 ] <<16 | - (u64 )sc->cmnd[4 ] <<8 | sc->cmnd[5 ]), - (((u64 )CMD_FLAGS (sc) <<32 ) |CMD_STATE (sc))); +FNIC_TRACE (fnic_cleanup_io, + sc->device->host->host_no, sc->request->tag, sc, +jiffies_to_msecs (jiffies - start_time), +0 , ((u64 )sc->cmnd[0 ] <<32 | + (u64 )sc->cmnd[2 ] <<24 | + (u64 )sc->cmnd[3 ] <<16 | + (u64 )sc->cmnd[4 ] <<8 | sc->cmnd[5 ]), + (((u64 )CMD_FLAGS (sc) <<32 ) |CMD_STATE (sc))); - sc->scsi_done (sc); - } + sc->scsi_done (sc); } +return true; + unlock: +spin_unlock_irqrestore (io_lock, flags); +return true; +} + +static void fnic_cleanup_io (struct fnic *fnic,int exclude_id) +{ +scsi_host_busy_iter (fnic->lport->host, fnic_cleanup_cmd, &exclude_id); } void fnic_wq_copy_cleanup_handler(struct vnic_wq_copy *wq,
Signature · 1 line
2.29.2
PATCH v2 4/5 scsi: fnic: use scsi_host_busy_iter in fnic_rport_exch_reset
In reply to Ming LeiSo far, scsi_host_find_tag() is supposed to use in fast path and the passed tag has to be active.
Convert the scsi command walking into scsi_host_busy_iter(), which has been one common pattern for handling failure.
--- drivers/scsi/fnic/fnic_scsi.c | 200 ++++++++++++++++++---------------- 1 file changed, 105 insertions(+), 95 deletions(-)
drivers/scsi/fnic/fnic_scsi.c +105 -95
@@ -1557,124 +1557,134 @@ static inline int fnic_queue_abort_io_req(struct fnic *fnic, int tag,return 0 ; } -static void fnic_rport_exch_reset (struct fnic *fnic,u32 port_id) +struct fnic_reset_data { +u32 port_id; +int term_cnt; +}; + +static bool fnic_reset_cmd (struct scsi_cmnd *sc,void *data,bool rsvd) { +struct fnic_reset_data *reset_data = data;int tag;int abt_tag; -int term_cnt =0 ;struct fnic_io_req *io_req;spinlock_t *io_lock;unsigned long flags; -struct scsi_cmnd *sc; -struct reset_stats *reset_stats = &fnic->fnic_stats.reset_stats; -struct terminate_stats *term_stats = &fnic->fnic_stats.term_stats;struct scsi_lun fc_lun;enum fnic_ioreq_state old_ioreq_state; +struct fc_lport *lp =shost_priv (sc->device->host); +struct fnic *fnic =lport_priv (lp); +struct reset_stats *reset_stats = &fnic->fnic_stats.reset_stats; +struct terminate_stats *term_stats = &fnic->fnic_stats.term_stats; -FNIC_SCSI_DBG (KERN_DEBUG , - fnic->lport->host, -"fnic_rport_exch_reset called portid 0x%06x\n" , - port_id); + tag = sc->request->tag; + abt_tag = tag; + io_lock =fnic_io_lock_tag (fnic, tag); +spin_lock_irqsave (io_lock, flags); -if (fnic->in_remove) -return ; + io_req = (struct fnic_io_req *)CMD_SP (sc); -for (tag =0 ; tag < fnic->fnic_max_tag_id; tag++) { - abt_tag = tag; - io_lock =fnic_io_lock_tag (fnic, tag); -spin_lock_irqsave (io_lock, flags); - sc =scsi_host_find_tag (fnic->lport->host, tag); -if (!sc) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } +if (!io_req || io_req->port_id != reset_data->port_id) + goto unlock; - io_req = (struct fnic_io_req *)CMD_SP (sc); +if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && + (!(CMD_FLAGS (sc) &FNIC_DEV_RST_ISSUED ))) { +FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, +"fnic_rport_exch_reset dev rst not pending sc 0x%p\n" , + sc); + goto unlock; + } -if (!io_req || io_req->port_id != port_id) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } +/* +* Found IO that is still pending with firmware and +* belongs to rport that went away +*/ +if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) + goto unlock; -if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && - (!(CMD_FLAGS (sc) &FNIC_DEV_RST_ISSUED ))) { -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"fnic_rport_exch_reset dev rst not pending sc 0x%p\n" , - sc); -spin_unlock_irqrestore (io_lock, flags); -continue ; - } +if (io_req->abts_done) { +shost_printk (KERN_ERR , fnic->lport->host, +"fnic_rport_exch_reset: io_req->abts_done is set " +"state is %s\n" , +fnic_ioreq_state_to_str (CMD_STATE (sc))); + } -/* -* Found IO that is still pending with firmware and -* belongs to rport that went away -*/ -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } -if (io_req->abts_done) { -shost_printk (KERN_ERR , fnic->lport->host, -"fnic_rport_exch_reset: io_req->abts_done is set " -"state is %s\n" , -fnic_ioreq_state_to_str (CMD_STATE (sc))); - } +if (!(CMD_FLAGS (sc) &FNIC_IO_ISSUED )) { +shost_printk (KERN_ERR , fnic->lport->host, +"rport_exch_reset " +"IO not yet issued %p tag 0x%x flags " +"%x state %d\n" , + sc, tag,CMD_FLAGS (sc),CMD_STATE (sc)); + } + old_ioreq_state =CMD_STATE (sc); +CMD_STATE (sc) =FNIC_IOREQ_ABTS_PENDING ; +CMD_ABTS_STATUS (sc) =FCPIO_INVALID_CODE ; +if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { +atomic64_inc (&reset_stats->device_reset_terminates); + abt_tag = (tag |FNIC_TAG_DEV_RST ); +FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, +"fnic_rport_exch_reset dev rst sc 0x%p\n" , + sc); + } -if (!(CMD_FLAGS (sc) &FNIC_IO_ISSUED )) { -shost_printk (KERN_ERR , fnic->lport->host, -"rport_exch_reset " -"IO not yet issued %p tag 0x%x flags " -"%x state %d\n" , - sc, tag,CMD_FLAGS (sc),CMD_STATE (sc)); - } - old_ioreq_state =CMD_STATE (sc); -CMD_STATE (sc) =FNIC_IOREQ_ABTS_PENDING ; -CMD_ABTS_STATUS (sc) =FCPIO_INVALID_CODE ; -if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { -atomic64_inc (&reset_stats->device_reset_terminates); - abt_tag = (tag |FNIC_TAG_DEV_RST ); -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"fnic_rport_exch_reset dev rst sc 0x%p\n" , - sc); - } +BUG_ON (io_req->abts_done); -BUG_ON (io_req->abts_done); +FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, +"fnic_rport_reset_exch: Issuing abts\n" ); -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"fnic_rport_reset_exch: Issuing abts\n" ); +spin_unlock_irqrestore (io_lock, flags); +/* Now queue the abort command to firmware */ +int_to_scsilun (sc->device->lun, &fc_lun); + +if (fnic_queue_abort_io_req (fnic, abt_tag, +FCPIO_ITMF_ABT_TASK_TERM , + fc_lun.scsi_lun, io_req)) { +/* +* Revert the cmd state back to old state, if +* it hasn't changed in between. This cmd will get +* aborted later by scsi_eh, or cleaned up during +* lun reset +*/ +spin_lock_irqsave (io_lock, flags); +if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) +CMD_STATE (sc) = old_ioreq_state; +spin_unlock_irqrestore (io_lock, flags); + }else { +spin_lock_irqsave (io_lock, flags); +if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) +CMD_FLAGS (sc) |=FNIC_DEV_RST_TERM_ISSUED ; +else +CMD_FLAGS (sc) |=FNIC_IO_INTERNAL_TERM_ISSUED ;spin_unlock_irqrestore (io_lock, flags); +atomic64_inc (&term_stats->terminates); + reset_data->term_cnt++; + } +return true; +unlock: +spin_unlock_irqrestore (io_lock, flags); +return true; +} -/* Now queue the abort command to firmware */ -int_to_scsilun (sc->device->lun, &fc_lun); +static void fnic_rport_exch_reset (struct fnic *fnic,u32 port_id) +{ +struct fnic_reset_data data = { + .port_id = port_id, + .term_cnt =0 , + }; -if (fnic_queue_abort_io_req (fnic, abt_tag, -FCPIO_ITMF_ABT_TASK_TERM , - fc_lun.scsi_lun, io_req)) { -/* -* Revert the cmd state back to old state, if -* it hasn't changed in between. This cmd will get -* aborted later by scsi_eh, or cleaned up during -* lun reset -*/ -spin_lock_irqsave (io_lock, flags); -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) -CMD_STATE (sc) = old_ioreq_state; -spin_unlock_irqrestore (io_lock, flags); - }else { -spin_lock_irqsave (io_lock, flags); -if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) -CMD_FLAGS (sc) |=FNIC_DEV_RST_TERM_ISSUED ; -else -CMD_FLAGS (sc) |=FNIC_IO_INTERNAL_TERM_ISSUED ; -spin_unlock_irqrestore (io_lock, flags); -atomic64_inc (&term_stats->terminates); - term_cnt++; - } - } -if (term_cnt >atomic64_read (&term_stats->max_terminates)) -atomic64_set (&term_stats->max_terminates, term_cnt); +FNIC_SCSI_DBG (KERN_DEBUG , + fnic->lport->host, +"fnic_rport_exch_reset called portid 0x%06x\n" , + port_id); + +if (fnic->in_remove) +return ; + +scsi_host_busy_iter (fnic->lport->host, fnic_reset_cmd, &data); +if (data.term_cnt >atomic64_read (&fnic->fnic_stats.term_stats.max_terminates)) +atomic64_set (&fnic->fnic_stats.term_stats.max_terminates, data.term_cnt); }static bool fnic_terminate_cmd (struct scsi_cmnd *sc,void *data,bool rsvd)
Signature · 1 line
2.29.2
PATCH v2 5/5 scsi: fnic: use scsi_host_busy_iter in fnic_is_abts_pending
In reply to Ming LeiSo far, scsi_host_find_tag() is supposed to use in fast path and the passed tag should be active.
Convert the scsi command walking into scsi_host_busy_iter(), which has been one common pattern for handling failure.
--- drivers/scsi/fnic/fnic_scsi.c | 93 ++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 41 deletions(-)
drivers/scsi/fnic/fnic_scsi.c +52 -41
@@ -2808,58 +2808,69 @@ void fnic_exch_mgr_reset(struct fc_lport *lp, u32 sid, u32 did) } -/* -* fnic_is_abts_pending() is a helper function that -* walks through tag map to check if there is any IOs pending,if there is one, -* then it returns 1 (true), otherwise 0 (false) -* if @lr_sc is non NULL, then it checks IOs specific to particular LUN, -* otherwise, it checks for all IOs. -*/ -int fnic_is_abts_pending (struct fnic *fnic,struct scsi_cmnd *lr_sc) +struct fnic_is_abts_pending_data { +struct scsi_cmnd *lr_sc; +int ret; +}; + +static bool __fnic_is_abts_pending (struct scsi_cmnd *sc,void *data,bool rsvd) { -int tag; +struct fnic_is_abts_pending_data *pdata = data;struct fnic_io_req *io_req;spinlock_t *io_lock;unsigned long flags; -int ret =0 ; -struct scsi_cmnd *sc;struct scsi_device *lun_dev =NULL ; +struct fc_lport *lp =shost_priv (sc->device->host); +struct fnic *fnic =lport_priv (lp); -if (lr_sc) - lun_dev = lr_sc->device; +if (pdata->lr_sc) + lun_dev = pdata->lr_sc->device; -/* walk again to check, if IOs are still pending in fw */ -for (tag =0 ; tag < fnic->fnic_max_tag_id; tag++) { - sc =scsi_host_find_tag (fnic->lport->host, tag); -/* -* ignore this lun reset cmd or cmds that do not belong to -* this lun -*/ -if (!sc || (lr_sc && (sc->device != lun_dev || sc == lr_sc))) -continue ; +/* +* ignore this lun reset cmd or cmds that do not belong to +* this lun +*/ +if (!sc || (pdata->lr_sc && (sc->device != lun_dev || + sc == pdata->lr_sc))) +return true; - io_lock =fnic_io_lock_hash (fnic, sc); -spin_lock_irqsave (io_lock, flags); + io_lock =fnic_io_lock_hash (fnic, sc); +spin_lock_irqsave (io_lock, flags); - io_req = (struct fnic_io_req *)CMD_SP (sc); + io_req = (struct fnic_io_req *)CMD_SP (sc); -if (!io_req || sc->device != lun_dev) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } +if (!io_req || sc->device != lun_dev) + goto unlock; -/* -* Found IO that is still pending with firmware and -* belongs to the LUN that we are resetting -*/ -FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, -"Found IO in %s on lun\n" , -fnic_ioreq_state_to_str (CMD_STATE (sc))); +/* +* Found IO that is still pending with firmware and +* belongs to the LUN that we are resetting +*/ +FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, +"Found IO in %s on lun\n" , +fnic_ioreq_state_to_str (CMD_STATE (sc))); -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) - ret =1 ; -spin_unlock_irqrestore (io_lock, flags); - } +if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) + pdata->ret =1 ; + unlock: +spin_unlock_irqrestore (io_lock, flags); +return true; +} -return ret; +/* +* fnic_is_abts_pending() is a helper function that +* walks through tag map to check if there is any IOs pending,if there is one, +* then it returns 1 (true), otherwise 0 (false) +* if @lr_sc is non NULL, then it checks IOs specific to particular LUN, +* otherwise, it checks for all IOs. +*/ +int fnic_is_abts_pending (struct fnic *fnic,struct scsi_cmnd *lr_sc) +{ +struct fnic_is_abts_pending_data data = { + .lr_sc = lr_sc, + .ret =0 , + }; + +scsi_host_busy_iter (fnic->lport->host, __fnic_is_abts_pending, &data); +return data.ret; }
Signature · 1 line
2.29.2