| Message ID | 1568210202-12794-1-git-send-email-loberman@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | bnx2fc: Handle scope bits when array returns BUSY or TASK_SET_FULL | expand |
Laurence, > The qla2xxx driver had this issue as well when the newer array > firmware returned the retry_delay_timer in the fcp_rsp. > The bnx2fc is not handling the masking of the scope bits either > so the retry_delay_timestamp value lands up being a large value > added to the timer timestamp delaying I/O for up to 27 Minutes. > This patch adds similar code to handle this to the > bnx2fc driver to avoid the huge delay. > --- > V2. Fix Indent for comments (Chad) > V3. Kbuild robot reported uninitialized variable scope > Initialize scope to 0 > > Signed-off-by: Laurence Oberman <loberman@redhat.com> > Reported-by: David Jeffery <djeffery@redhat.com> > Reported-by: kbuild test robot <lkp@intel.com> > --- > drivers/scsi/bnx2fc/bnx2fc_io.c | 29 ++++++++++++++++++++++++----- > 1 file changed, 24 insertions(+), 5 deletions(-) Applied to 5.4/scsi-fixes. Please read Documentation/process/submitting-patches.rst. Your patch got all mangled since you put tags after the --- separator. Also, please use the -vN option when submitting updated patches. Thanks!
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c index 9e50e5b..579b88d 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_io.c +++ b/drivers/scsi/bnx2fc/bnx2fc_io.c @@ -1928,6 +1928,7 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req, struct bnx2fc_rport *tgt = io_req->tgt; struct scsi_cmnd *sc_cmd; struct Scsi_Host *host; + u16 scope = 0, qualifier = 0; /* scsi_cmd_cmpl is called with tgt lock held */ @@ -1997,12 +1998,30 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req, if (io_req->cdb_status == SAM_STAT_TASK_SET_FULL || io_req->cdb_status == SAM_STAT_BUSY) { - /* Set the jiffies + retry_delay_timer * 100ms - for the rport/tgt */ - tgt->retry_delay_timestamp = jiffies + - fcp_rsp->retry_delay_timer * HZ / 10; + /* Newer array firmware with BUSY or + * TASK_SET_FULL may return a status that needs + * the scope bits masked. + * Or a huge delay timestamp up to 27 minutes + * can result. + */ + if (fcp_rsp->retry_delay_timer) { + /* Upper 2 bits */ + scope = fcp_rsp->retry_delay_timer + & 0xC000; + /* Lower 14 bits */ + qualifier = fcp_rsp->retry_delay_timer + & 0x3FFF; + } + if (scope > 0 && qualifier > 0 && + qualifier <= 0x3FEF) { + /* Set the jiffies + + * retry_delay_timer * 100ms + * for the rport/tgt + */ + tgt->retry_delay_timestamp = jiffies + + (qualifier * HZ / 10); + } } - } if (io_req->fcp_resid) scsi_set_resid(sc_cmd, io_req->fcp_resid);
The qla2xxx driver had this issue as well when the newer array firmware returned the retry_delay_timer in the fcp_rsp. The bnx2fc is not handling the masking of the scope bits either so the retry_delay_timestamp value lands up being a large value added to the timer timestamp delaying I/O for up to 27 Minutes. This patch adds similar code to handle this to the bnx2fc driver to avoid the huge delay. --- V2. Fix Indent for comments (Chad) V3. Kbuild robot reported uninitialized variable scope Initialize scope to 0 Signed-off-by: Laurence Oberman <loberman@redhat.com> Reported-by: David Jeffery <djeffery@redhat.com> Reported-by: kbuild test robot <lkp@intel.com> --- drivers/scsi/bnx2fc/bnx2fc_io.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)