lpfc: Update lpfc to revision 14.2.0.9
Subsystems (2)
cover lpfc: Update lpfc to revision 14.2.0.9
Update lpfc to revision 14.2.0.9
This patch set contains bug fixes and a change to a default setting.
The patches were cut against Martin's 6.2/scsi-queue tree.
Justin Tee (6):
lpfc: Fix WQ|CQ|EQ resource check
lpfc: Correct bandwidth logging during receipt of congestion sync WCQE
lpfc: Fix MI capability display in cmf_info sysfs attribute
lpfc: Fix crash involving race between FLOGI timeout and devloss
handler
lpfc: Change default lpfc_suppress_rsp mode to off
lpfc: Update lpfc version to 14.2.0.9
drivers/scsi/lpfc/lpfc_attr.c | 12 +++++------ drivers/scsi/lpfc/lpfc_els.c | 36 +++++++++++++++++++++++++++----- drivers/scsi/lpfc/lpfc_hbadisc.c | 36 +++++++++++++++++++++++--------- drivers/scsi/lpfc/lpfc_init.c | 15 ++++++------- drivers/scsi/lpfc/lpfc_sli.c | 6 ++++++ drivers/scsi/lpfc/lpfc_sli4.h | 1 + drivers/scsi/lpfc/lpfc_version.h | 2 +- 7 files changed, 79 insertions(+), 29 deletions(-)
Signature · 1 line
2.38.0
PATCH 1/6 lpfc: Fix WQ|CQ|EQ resource check
Adapter configurations with limited EQ resources may fail to initialize.
Firmware resources are queried in lpfc_sli4_read_config(). The driver parameters cfg_irq_chann and cfg_hdw_queue are adjusted from defaults if constrained by firmware resources.
The minimum resource check includes a special allocation for queues such as ELS, MBOX, NVME LS. However the additional reservation was also incorrectly applied to EQ resources.
Reordered WQ|CQ|EQ resource checks to apply the special allocation adjustment to WQ and CQ resources only.
--- drivers/scsi/lpfc/lpfc_init.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +5 -7
@@ -10092,17 +10092,15 @@ lpfc_sli4_read_config(struct lpfc_hba *phba) qmin = phba->sli4_hba.max_cfg_param.max_wq;if (phba->sli4_hba.max_cfg_param.max_cq < qmin) qmin = phba->sli4_hba.max_cfg_param.max_cq; -if (phba->sli4_hba.max_cfg_param.max_eq < qmin) - qmin = phba->sli4_hba.max_cfg_param.max_eq;/* -* Whats left after this can go toward NVME / FCP. -* The minus 4 accounts for ELS, NVME LS, MBOX -* plus one extra. When configured for -* NVMET, FCP io channel WQs are not created. +* Reserve 4 (ELS, NVME LS, MBOX, plus one extra) and +* the remainder can be used for NVME / FCP. */ qmin -=4 ; +if (phba->sli4_hba.max_cfg_param.max_eq < qmin) + qmin = phba->sli4_hba.max_cfg_param.max_eq; -/* Check to see if there is enough for NVME */ +/* Check to see if there is enough for default cfg */ if ((phba->cfg_irq_chann > qmin) || (phba->cfg_hdw_queue > qmin)) { lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
Signature · 1 line
2.38.0
PATCH 2/6 lpfc: Correct bandwidth logging during receipt of congestion sync WCQE
In reply to Justin TeeThe lpfc_cmf_timer adjusts phba->cmf_link_byte_count periodically and can artifically inflate bandwidth percent.
During bandwidth calculation, correct for this by setting a cap of logging a maximum of 100%.
Bandwidth calculation is only used for display under LOG_CGN_MGMT so there is no expectation of impacts on performance.
--- drivers/scsi/lpfc/lpfc_sli.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/scsi/lpfc/lpfc_sli.c +6 -0
@@ -1848,6 +1848,12 @@ lpfc_cmf_sync_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, phba->cmf_link_byte_count); bwpcent =div64_u64 (bw *100 + slop, phba->cmf_link_byte_count); +/* Because of bytes adjustment due to shorter timer in +* lpfc_cmf_timer() the cmf_link_byte_count can be shorter and +* may seem like BW is above 100%. +*/ +if (bwpcent >100 ) + bwpcent =100 ;if (phba->cmf_max_bytes_per_interval < bw && bwpcent >95 )
Signature · 1 line
2.38.0
PATCH 3/6 lpfc: Fix MI capability display in cmf_info sysfs attribute
In reply to Justin TeeThe dynamic mi_ver value holds the currently configured MI setting. mi_ver was being displayed as part of the cmf_info sysfs attribute, when the output string meant to display MI capabilities instead.
Add a mi_cap member in the lpfc_pc_sli4_params structure that will store MI capabilities during initialization so that cmf_info prints out capabilities instead of current configuration.
--- drivers/scsi/lpfc/lpfc_attr.c | 2 +- drivers/scsi/lpfc/lpfc_init.c | 3 +++ drivers/scsi/lpfc/lpfc_sli4.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_attr.c +1 -1
@@ -134,7 +134,7 @@ lpfc_cmf_info_show(struct device *dev, struct device_attribute *attr,scnprintf (tmp,sizeof (tmp),"Congestion Mgmt Info: E2Eattr %d Ver %d " "CMF %d cnt %d\n" , - phba->sli4_hba.pc_sli4_params.mi_ver, + phba->sli4_hba.pc_sli4_params.mi_cap, cp ? cp->cgn_info_version :0 , phba->sli4_hba.pc_sli4_params.cmf, phba->cmf_timer_cnt);
drivers/scsi/lpfc/lpfc_init.c +3 -0
@@ -699,6 +699,8 @@ lpfc_sli4_refresh_params(struct lpfc_hba *phba)return rc; } mbx_sli4_parameters = &mqe->un.get_sli4_parameters.sli4_parameters; + phba->sli4_hba.pc_sli4_params.mi_cap = +bf_get (cfg_mi_ver, mbx_sli4_parameters);/* Are we forcing MI off via module parameter? */ if (phba->cfg_enable_mi)
@@ -13839,6 +13841,7 @@ lpfc_get_sli4_parameters(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) mbx_sli4_parameters); phba->sli4_hba.extents_in_use =bf_get (cfg_ext, mbx_sli4_parameters); phba->sli4_hba.rpi_hdrs_in_use =bf_get (cfg_hdrr, mbx_sli4_parameters); + sli4_params->mi_cap =bf_get (cfg_mi_ver, mbx_sli4_parameters);/* Check for Extended Pre-Registered SGL support */ phba->cfg_xpsgl =bf_get (cfg_xpsgl, mbx_sli4_parameters);
drivers/scsi/lpfc/lpfc_sli4.h +1 -0
@@ -556,6 +556,7 @@ struct lpfc_pc_sli4_params {#define LPFC_MIB3_SUPPORT 3uint16_t mi_value;#define LPFC_DFLT_MIB_VAL 2 +uint8_t mi_cap;uint8_t mib_bde_cnt;uint8_t cmf;uint8_t cqv;
Signature · 1 line
2.38.0
PATCH 4/6 lpfc: Fix crash involving race between FLOGI timeout and devloss handler
In reply to Justin TeeWhen a FLOGI completes with a sequence timeout error, a freed kref ptr dereference crash can occur due to a timing race involving ndlp referencing in lpfc_dev_loss_tmo_callbk.
Fix by ensuring the driver accounts for an outstanding FLOGI when dev_loss is active. Also, don't remove the HBA_FLOGI_OUTSTANDING flag when the FLOGI is retried to allow the driver to handle the reference counts correctly in lpfc_dev_loss_tmo_handler.
--- drivers/scsi/lpfc/lpfc_els.c | 36 +++++++++++++++++++++++++++----- drivers/scsi/lpfc/lpfc_hbadisc.c | 36 +++++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 15 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +31 -5
@@ -952,6 +952,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,uint16_t fcf_index;int rc;u32 ulp_status, ulp_word4, tmo; +bool flogi_in_retry = false;/* Check to see if link went down during discovery */ if (lpfc_els_chk_latt (vport)) {
@@ -1022,8 +1023,23 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, phba->hba_flag, phba->fcf.fcf_flag);/* Check for retry */ -if (lpfc_els_retry (phba, cmdiocb, rspiocb)) +if (lpfc_els_retry (phba, cmdiocb, rspiocb)) { +/* Address a timing race with dev_loss. If dev_loss +* is active on this FPort node, put the initial ref +* count back to stop premature node release actions. +*/ +lpfc_check_nlp_post_devloss (vport, ndlp); + flogi_in_retry = true; goto out; + } + +/* The FLOGI will not be retried. If the FPort node is not +* registered with the SCSI transport, remove the initial +* reference to trigger node release. +*/ +if (!(ndlp->nlp_flag &NLP_IN_DEV_LOSS ) && + !(ndlp->fc4_xpt_flags &SCSI_XPT_REGD )) +lpfc_nlp_put (ndlp);lpfc_printf_vlog (vport,KERN_WARNING ,LOG_TRACE_EVENT , "0150 FLOGI failure Status:x%x/x%x "
@@ -1086,7 +1102,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,spin_unlock_irq (shost->host_lock);/* -* The FLogI succeeded. Sync the data for the CPU before +* The FLOGI succeeded. Sync the data for the CPU before * accessing it. */ prsp = list_get_first(&pcmd->list, struct lpfc_dmabuf, list);
@@ -1108,6 +1124,12 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, vport->phba->pport->vmid_flag |= (LPFC_VMID_ISSUE_QFPA |LPFC_VMID_TYPE_PRIO ); +/* +* Address a timing race with dev_loss. If dev_loss is active on +* this FPort node, put the initial ref count back to stop premature +* node release actions. +*/ +lpfc_check_nlp_post_devloss (vport, ndlp);if (vport->port_state ==LPFC_FLOGI ) {/* * If Common Service Parameters indicate Nport
@@ -1198,7 +1220,9 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,lpfc_issue_clear_la (phba, vport); } out: - phba->hba_flag &= ~HBA_FLOGI_OUTSTANDING ; +if (!flogi_in_retry) + phba->hba_flag &= ~HBA_FLOGI_OUTSTANDING ; +lpfc_els_free_iocb (phba, cmdiocb);lpfc_nlp_put (ndlp); }
@@ -1365,15 +1389,17 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,return 1 ; } +/* Avoid race with FLOGI completion and hba_flags. */ + phba->hba_flag |= (HBA_FLOGI_ISSUED |HBA_FLOGI_OUTSTANDING ); + rc =lpfc_issue_fabric_iocb (phba, elsiocb);if (rc ==IOCB_ERROR ) { + phba->hba_flag &= ~(HBA_FLOGI_ISSUED |HBA_FLOGI_OUTSTANDING );lpfc_els_free_iocb (phba, elsiocb);lpfc_nlp_put (ndlp);return 1 ; } - phba->hba_flag |= (HBA_FLOGI_ISSUED |HBA_FLOGI_OUTSTANDING ); -/* Clear external loopback plug detected flag */ phba->link_flag &= ~LS_EXTERNAL_LOOPBACK ;
drivers/scsi/lpfc/lpfc_hbadisc.c +26 -10
@@ -426,10 +426,6 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp) name = (uint8_t *)&ndlp->nlp_portname; phba = vport->phba; -spin_lock_irqsave (&ndlp->lock, iflags); - ndlp->nlp_flag &= ~NLP_IN_DEV_LOSS ; -spin_unlock_irqrestore (&ndlp->lock, iflags); -if (phba->sli_rev ==LPFC_SLI_REV4 ) fcf_inuse =lpfc_fcf_inuse (phba);
@@ -451,22 +447,36 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp) *name, *(name+1 ), *(name+2 ), *(name+3 ), *(name+4 ), *(name+5 ), *(name+6 ), *(name+7 ), ndlp->nlp_DID); + +spin_lock_irqsave (&ndlp->lock, iflags); + ndlp->nlp_flag &= ~NLP_IN_DEV_LOSS ; +spin_unlock_irqrestore (&ndlp->lock, iflags);return fcf_inuse; }/* Fabric nodes are done. */ if (ndlp->nlp_type &NLP_FABRIC ) {spin_lock_irqsave (&ndlp->lock, iflags); -/* In massive vport configuration settings, it's possible -* dev_loss_tmo fired during node recovery. So, check if -* fabric nodes are in discovery states outstanding. + +/* In massive vport configuration settings or when the FLOGI +* completes with a sequence timeout, it's possible +* dev_loss_tmo fired during node recovery. The driver has to +* account for this race to allow for recovery and keep +* the reference counting correct. */ switch (ndlp->nlp_DID) {case Fabric_DID: fc_vport = vport->fc_vport; -if (fc_vport && - fc_vport->vport_state ==FC_VPORT_INITIALIZING ) - recovering = true; +if (fc_vport) { +/* NPIV path. */ +if (fc_vport->vport_state == +FC_VPORT_INITIALIZING ) + recovering = true; + }else { +/* Physical port path. */ +if (phba->hba_flag &HBA_FLOGI_OUTSTANDING ) + recovering = true; + }break ;case Fabric_Cntl_DID:if (ndlp->nlp_flag &NLP_REG_LOGIN_SEND )
@@ -514,6 +524,9 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp)return fcf_inuse; } +spin_lock_irqsave (&ndlp->lock, iflags); + ndlp->nlp_flag &= ~NLP_IN_DEV_LOSS ; +spin_unlock_irqrestore (&ndlp->lock, iflags);lpfc_nlp_put (ndlp);return fcf_inuse; }
@@ -552,6 +565,9 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp)return fcf_inuse; } +spin_lock_irqsave (&ndlp->lock, iflags); + ndlp->nlp_flag &= ~NLP_IN_DEV_LOSS ; +spin_unlock_irqrestore (&ndlp->lock, iflags);if (!(ndlp->fc4_xpt_flags &NVME_XPT_REGD ))lpfc_disc_state_machine (vport, ndlp,NULL ,NLP_EVT_DEVICE_RM );
Signature · 1 line
2.38.0
PATCH 5/6 lpfc: Change default lpfc_suppress_rsp mode to off
In reply to Justin TeeThe suppress response feature is non-standard and causes difficulties when troubleshooting with analyzer wiretraces.
At this time, diagnostic capabilities triumphs slight performance enhancements provided by this feature. Thus, turn it off by default.
--- drivers/scsi/lpfc/lpfc_attr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/lpfc/lpfc_attr.c +5 -5
@@ -3828,13 +3828,13 @@ lpfc_vport_param_store(devloss_tmo)static DEVICE_ATTR_RW (lpfc_devloss_tmo);/* -* lpfc_suppress_rsp: Enable suppress rsp feature is firmware supports it -* lpfc_suppress_rsp = 0 Disable -* lpfc_suppress_rsp = 1 Enable (default) +* lpfc_suppress_rsp: Enable suppress rsp feature if firmware supports it +* lpfc_suppress_rsp = 0 Disable (default) +* lpfc_suppress_rsp = 1 Enable * */ -LPFC_ATTR_R (suppress_rsp,1 ,0 ,1 , -"Enable suppress rsp feature is firmware supports it" ); +LPFC_ATTR_R (suppress_rsp,0 ,0 ,1 , +"Enable suppress rsp feature if firmware supports it" );/* * lpfc_nvmet_mrq: Specify number of RQ pairs for processing NVMET cmds
Signature · 1 line
2.38.0
PATCH 6/6 lpfc: Update lpfc version to 14.2.0.9
In reply to Justin TeeUpdate lpfc version to 14.2.0.9
--- drivers/scsi/lpfc/lpfc_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_version.h +1 -1
@@ -20,7 +20,7 @@* included with this package. * *******************************************************************/ -#define LPFC_DRIVER_VERSION "14.2.0.8" +#define LPFC_DRIVER_VERSION "14.2.0.9"#define LPFC_DRIVER_NAME "lpfc"/* Used for SLI 2/3 */
Signature · 1 line
2.38.0
Martin K. Petersen
AppliedJustin,
Quoted 1 line
Update lpfc to revision 14.2.0.9
Applied to 6.2/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 15 lines · Justin Tee
Update lpfc to revision 14.2.0.9
This patch set contains bug fixes and a change to a default setting.
The patches were cut against Martin's 6.2/scsi-queue tree.
Justin Tee (6):
lpfc: Fix WQ|CQ|EQ resource check
lpfc: Correct bandwidth logging during receipt of congestion sync WCQE
lpfc: Fix MI capability display incmf_infosysfs attribute
lpfc: Fix crash involving race between FLOGI timeout and devloss
handler
lpfc: Change defaultlpfc_suppress_rspmode to off
lpfc: Update lpfc version to 14.2.0.9
Quoted 1 line
[...]
Applied to 6.2/scsi-queue, thanks!
[1/6] lpfc: Fix WQ|CQ|EQ resource check
https://git.kernel.org/mkp/scsi/c/2c1a0a7584f5 [2/6] lpfc: Correct bandwidth logging during receipt of congestion sync WCQE https://git.kernel.org/mkp/scsi/c/ae696255d655 [3/6] lpfc: Fix MI capability display in cmf_info sysfs attribute https://git.kernel.org/mkp/scsi/c/d99af587d59c [4/6] lpfc: Fix crash involving race between FLOGI timeout and devloss handler https://git.kernel.org/mkp/scsi/c/97f256913c5d [6/6] lpfc: Update lpfc version to 14.2.0.9 https://git.kernel.org/mkp/scsi/c/d57d98fef46f
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering