| Message ID | 20211021073208.27582-10-njavali@marvell.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | qla2xxx - misc driver and EDIF bug fixes | expand |
> On Oct 21, 2021, at 2:32 AM, Nilesh Javali <njavali@marvell.com> wrote: > > From: Quinn Tran <qutran@marvell.com> > > On ipsec start by remote port, Target port may use RSCN to > trigger initiator to relogin. If driver is already in the process > of a relogin, then ignore the RSCN and allow the current relogin > to continue. This reduces thrashing of the connection. > > Signed-off-by: Quinn Tran <qutran@marvell.com> > Signed-off-by: Nilesh Javali <njavali@marvell.com> > --- > drivers/scsi/qla2xxx/qla_attr.c | 7 ++++++- > drivers/scsi/qla2xxx/qla_edif.h | 4 ++++ > drivers/scsi/qla2xxx/qla_init.c | 24 ++++++++++++++++++++++-- > 3 files changed, 32 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c > index cb5f2ecb652d..41a9fb04b663 100644 > --- a/drivers/scsi/qla2xxx/qla_attr.c > +++ b/drivers/scsi/qla2xxx/qla_attr.c > @@ -2757,7 +2757,12 @@ qla2x00_terminate_rport_io(struct fc_rport *rport) > if (fcport->loop_id != FC_NO_LOOP_ID) > fcport->logout_on_delete = 1; > > - qlt_schedule_sess_for_deletion(fcport); > + if (!EDIF_NEGOTIATION_PENDING(fcport)) { > + ql_dbg(ql_dbg_disc, fcport->vha, 0x911e, > + "%s %d sched delete\n", __func__, ^^^^^^ Same comment as previous patch. Please use more meaningful debug print. > + __LINE__); > + qlt_schedule_sess_for_deletion(fcport); > + } > } else { > qla2x00_port_logout(fcport->vha, fcport); > } > diff --git a/drivers/scsi/qla2xxx/qla_edif.h b/drivers/scsi/qla2xxx/qla_edif.h > index cd54c1dfe3cb..920b1eace40f 100644 > --- a/drivers/scsi/qla2xxx/qla_edif.h > +++ b/drivers/scsi/qla2xxx/qla_edif.h > @@ -132,4 +132,8 @@ struct enode { > _s->disc_state == DSC_DELETED || \ > !_s->edif.app_sess_online)) > > +#define EDIF_NEGOTIATION_PENDING(_fcport) \ > + ((_fcport->vha.e_dbell.db_flags & EDB_ACTIVE) && \ > + (_fcport->disc_state == DSC_LOGIN_AUTH_PEND)) > + > #endif /* __QLA_EDIF_H */ > diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c > index dbffc59e1677..999e0423891c 100644 > --- a/drivers/scsi/qla2xxx/qla_init.c > +++ b/drivers/scsi/qla2xxx/qla_init.c > @@ -1793,8 +1793,28 @@ void qla2x00_handle_rscn(scsi_qla_host_t *vha, struct event_arg *ea) > fcport->d_id.b24, fcport->port_name); > return; > } > - fcport->scan_needed = 1; > - fcport->rscn_gen++; > + > + if (vha->hw->flags.edif_enabled && vha->e_dbell.db_flags & EDB_ACTIVE) { > + /* > + * On ipsec start by remote port, Target port > + * may use RSCN to trigger initiator to > + * relogin. If driver is already in the > + * process of a relogin, then ignore the RSCN > + * and allow the current relogin to continue. > + * This reduces thrashing of the connection. > + */ > + if (atomic_read(&fcport->state) == FCS_ONLINE) { > + /* > + * If state = online, then set scan_needed=1 to do relogin. > + * Otherwise we're already in the middle of a relogin > + */ > + fcport->scan_needed = 1; > + fcport->rscn_gen++; > + } > + } else { > + fcport->scan_needed = 1; > + fcport->rscn_gen++; > + } > } > break; > case RSCN_AREA_ADDR: > -- > 2.19.0.rc0 > Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com> -- Himanshu Madhani Oracle Linux Engineering
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index cb5f2ecb652d..41a9fb04b663 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -2757,7 +2757,12 @@ qla2x00_terminate_rport_io(struct fc_rport *rport) if (fcport->loop_id != FC_NO_LOOP_ID) fcport->logout_on_delete = 1; - qlt_schedule_sess_for_deletion(fcport); + if (!EDIF_NEGOTIATION_PENDING(fcport)) { + ql_dbg(ql_dbg_disc, fcport->vha, 0x911e, + "%s %d sched delete\n", __func__, + __LINE__); + qlt_schedule_sess_for_deletion(fcport); + } } else { qla2x00_port_logout(fcport->vha, fcport); } diff --git a/drivers/scsi/qla2xxx/qla_edif.h b/drivers/scsi/qla2xxx/qla_edif.h index cd54c1dfe3cb..920b1eace40f 100644 --- a/drivers/scsi/qla2xxx/qla_edif.h +++ b/drivers/scsi/qla2xxx/qla_edif.h @@ -132,4 +132,8 @@ struct enode { _s->disc_state == DSC_DELETED || \ !_s->edif.app_sess_online)) +#define EDIF_NEGOTIATION_PENDING(_fcport) \ + ((_fcport->vha.e_dbell.db_flags & EDB_ACTIVE) && \ + (_fcport->disc_state == DSC_LOGIN_AUTH_PEND)) + #endif /* __QLA_EDIF_H */ diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index dbffc59e1677..999e0423891c 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1793,8 +1793,28 @@ void qla2x00_handle_rscn(scsi_qla_host_t *vha, struct event_arg *ea) fcport->d_id.b24, fcport->port_name); return; } - fcport->scan_needed = 1; - fcport->rscn_gen++; + + if (vha->hw->flags.edif_enabled && vha->e_dbell.db_flags & EDB_ACTIVE) { + /* + * On ipsec start by remote port, Target port + * may use RSCN to trigger initiator to + * relogin. If driver is already in the + * process of a relogin, then ignore the RSCN + * and allow the current relogin to continue. + * This reduces thrashing of the connection. + */ + if (atomic_read(&fcport->state) == FCS_ONLINE) { + /* + * If state = online, then set scan_needed=1 to do relogin. + * Otherwise we're already in the middle of a relogin + */ + fcport->scan_needed = 1; + fcport->rscn_gen++; + } + } else { + fcport->scan_needed = 1; + fcport->rscn_gen++; + } } break; case RSCN_AREA_ADDR: