Fix bugs in qla2xxx driver
Subsystems (4)
v3 cover Fix bugs in qla2xxx driver
This series of patches contains 3 separate changes that fix some bugs in the qla2xxx driver.
---
v3:
- Fix build issue in patch 1
v2:
- Change a spinlock wrap to a WRITE_ONCE() in patch 1
- Add Reviewed-by tags on patches 2 and 3
---
Anastasia Kovaleva (3):
scsi: qla2xxx: Drop starvation counter on success
scsi: qla2xxx: Make target send correct LOGO
scsi: qla2xxx: Remove incorrect trap
drivers/scsi/qla2xxx/qla_iocb.c | 11 +++++++++++ drivers/scsi/qla2xxx/qla_isr.c | 4 ++++ drivers/scsi/qla2xxx/qla_target.c | 16 +++++++--------- 3 files changed, 22 insertions(+), 9 deletions(-)
Signature · 1 line
2.40.1
PATCH v3 1/3 scsi: qla2xxx: Drop starvation counter on success
Long-lived sessions under high load can accumulate a starvation counter, and the current implementation does not allow this counter to be reset during an active session.
If HBA sends correct ATIO IOCB, then it has enough resources to process commands and we should not call ISP recovery.
--- drivers/scsi/qla2xxx/qla_isr.c | 4 ++++ drivers/scsi/qla2xxx/qla_target.c | 6 ++++++ 2 files changed, 10 insertions(+)
drivers/scsi/qla2xxx/qla_isr.c +4 -0
@@ -1959,6 +1959,10 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)ql_dbg (ql_dbg_async, vha,0x5091 ,"Transceiver Removal\n" );break ; +case MBA_REJECTED_FCP_CMD : +ql_dbg (ql_dbg_async, vha,0x5092 ,"LS_RJT was sent. No resources to process the ELS request.\n" ); +break ; +default : ql_dbg(ql_dbg_async, vha, 0x5057, "Unknown AEN:%04x %04x %04x %04x\n",
drivers/scsi/qla2xxx/qla_target.c +6 -0
@@ -6826,6 +6826,12 @@ qlt_24xx_process_atio_queue(struct scsi_qla_host *vha, uint8_t ha_locked)qlt_send_term_exchange (ha->base_qpair,NULL , pkt, ha_locked,0 ); }else { +/* +* If we get correct ATIO, then HBA had enough memory +* to proceed without reset. +*/ +WRITE_ONCE (vha->hw->exch_starvation,0 ); +qlt_24xx_atio_pkt_all_vps (vha, (struct atio_from_isp *)pkt, ha_locked); }
Signature · 1 line
2.40.1
PATCH v3 2/3 scsi: qla2xxx: Make target send correct LOGO
In reply to Anastasia KovalevaUpon removing the ACL from the target, it sends a LOGO command to the initiator to break the connection. But HBA fills port_name and port_id of the LOGO command with all zeroes, which is not valid. The initiator sends a reject for this command, but it is not being processed on the target, since it assumes LOGO can never fail. This leaves a system in a state where the initiator thinks it is still logged in to the target and can send commands to it, but the target ignores all incoming commands from this initiator.
If, in such a situation, the initiator sends some command (e.g. during a scan), after not receiving a response for a timeout duration, it sends ABORT for the command. After a timeout on receiving an ABORT response, the initiator sends LOGO to the target. Only after that, the initiator can successfully relogin to the target and restore the connection. In the end, this whole situation hangs the system for approximately a minute.
By default, the driver sends a LOGO command to HBA filling only port_id, expecting HBA to match port_id with the correct port_name from it's internal table. HBA doesn't do that, instead filling these fields with all zeroes.
This patch makes the driver send a LOGO command to HBA with port_name and port_id in the I/O PARMETER fields. HBA then copies these values to corresponding fields in the LOGO command frame.
--- drivers/scsi/qla2xxx/qla_iocb.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/scsi/qla2xxx/qla_iocb.c +11 -0
@@ -2486,6 +2486,17 @@ qla24xx_logout_iocb(srb_t *sp, struct logio_entry_24xx *logio) logio->port_id[1 ] = sp->fcport->d_id.b.area; logio->port_id[2 ] = sp->fcport->d_id.b.domain; logio->vp_index = sp->vha->vp_idx; + logio->io_parameter[0 ] =cpu_to_le32 (sp->vha->d_id.b.al_pa | + sp->vha->d_id.b.area <<8 | + sp->vha->d_id.b.domain <<16 ); + logio->io_parameter[1 ] =cpu_to_le32 (sp->vha->port_name[3 ] | + sp->vha->port_name[2 ] <<8 | + sp->vha->port_name[1 ] <<16 | + sp->vha->port_name[0 ] <<24 ); + logio->io_parameter[2 ] =cpu_to_le32 (sp->vha->port_name[7 ] | + sp->vha->port_name[6 ] <<8 | + sp->vha->port_name[5 ] <<16 | + sp->vha->port_name[4 ] <<24 ); } static void
Signature · 1 line
2.40.1
kernel test robot
build botRe: [PATCH v3 2/3] scsi: qla2xxx: Make target send correct LOGO
FYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-1
Rule: add the tag "Cc: [email protected]" in the sign-off area to have the patch automatically included in the stable tree.
Subject: [PATCH v3 2/3] scsi: qla2xxx: Make target send correct LOGO
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH v3 3/3 scsi: qla2xxx: Remove incorrect trap
In reply to Anastasia KovalevaThis BUG_ON() is triggered when there is no fc_port with a certain loop ID in the scsi host vp_fcports list, but there is one in lport_loopid_map. As these two data structures do not change simultaneously and atomically, such a trap is invalid.
--- drivers/scsi/qla2xxx/qla_target.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/scsi/qla2xxx/qla_target.c +1 -9
@@ -5190,15 +5190,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,ql_dbg (ql_dbg_disc, vha,0x20fc ,"%s: logo %llx res %d sess %p " , __func__, wwn, res, sess); -if (res ==0 ) { -/* -* cmd went upper layer, look for qlt_xmit_tm_rsp() -* for LOGO_ACK & sess delete -*/ -BUG_ON (!sess); - res =0 ; - }else { -/* cmd did not go to upper layer. */ +if (res) {if (sess) {qlt_schedule_sess_for_deletion (sess); res =0 ;
Signature · 1 line
2.40.1
Quoted 14 lines · Anastasia Kovaleva
This series of patches contains 3 separate changes that fix some bugs in the qla2xxx driver.
---
v3:
- Fix build issue in patch 1
v2:
- Change a spinlock wrap to aWRITE_ONCE()in patch 1
- Add Reviewed-by tags on patches 2 and 3
---
Anastasia Kovaleva (3):
scsi: qla2xxx: Drop starvation counter on success
scsi: qla2xxx: Make target send correct LOGO
scsi: qla2xxx: Remove incorrect trap
Quoted 5 lines
drivers/scsi/qla2xxx/qla_iocb.c | 11 +++++++++++ drivers/scsi/qla2xxx/qla_isr.c | 4 ++++ drivers/scsi/qla2xxx/qla_target.c | 16 +++++++--------- 3 files changed, 22 insertions(+), 9 deletions(-)
Gentle ping
Quoted 14 lines · Anastasia Kovaleva
This series of patches contains 3 separate changes that fix some bugs in the qla2xxx driver.
---
v3:
- Fix build issue in patch 1
v2:
- Change a spinlock wrap to aWRITE_ONCE()in patch 1
- Add Reviewed-by tags on patches 2 and 3
---
Anastasia Kovaleva (3):
scsi: qla2xxx: Drop starvation counter on success
scsi: qla2xxx: Make target send correct LOGO
scsi: qla2xxx: Remove incorrect trap
Quoted 5 lines
drivers/scsi/qla2xxx/qla_iocb.c| 11 +++++++++++drivers/scsi/qla2xxx/qla_isr.c| 4 ++++drivers/scsi/qla2xxx/qla_target.c| 16 +++++++---------3 files changed, 22 insertions(+), 9 deletions(-)
Gentle ping