lpfc: Update lpfc to revision 14.0.0.1
cover lpfc: Update lpfc to revision 14.0.0.1
Update lpfc to revision 14.0.0.1
This patch set adds support the Congestion Management Framework (CMF) which a component of Emulex San Manager (ESM). ESM is an inband monitoring and management solution. CMF performs congestion monitoring and adaptive managment with roles split between the adapter and the driver.
The CMF framework consists of tables and buffers exchanged between the adapter and the driver. The tables indicate whether congestion is to be managed, values for management, and congestion statistics. When fully managed, periodic synchronization occurs between the driver and the adapter.
The patches were cut against Martin's 5.15/scsi-queue tree
James Smart (16):
fc: Add EDC ELS definition
lpfc: Add SET_HOST_DATA mbox cmd to pass date/time info to firmware
lpfc: Add MIB feature enablement support
lpfc: Expand FPIN and RDF receive logging
lpfc: Add EDC ELS support
lpfc: Add cm statistics buffer support
lpfc: Add support for cm enablement buffer
lpfc: add cmfsync WQE support
lpfc: Add support for the CM framework
lpfc: Add rx monitoring statistics
lpfc: Add support for maintaining the cm statistics buffer
lpfc: Add debugfs support for cm framework buffers
lpfc: Add cmf_info sysfs entry
lpfc: Add bsg support for retrieving adapter cmf data
lpfc: Update lpfc version to 14.0.0.1
lpfc: Copyright updates for 14.0.0.1 patches
drivers/scsi/lpfc/lpfc.h | 252 ++++++ drivers/scsi/lpfc/lpfc_attr.c | 226 ++++- drivers/scsi/lpfc/lpfc_bsg.c | 89 ++ drivers/scsi/lpfc/lpfc_bsg.h | 10 +- drivers/scsi/lpfc/lpfc_crtn.h | 28 + drivers/scsi/lpfc/lpfc_ct.c | 17 +- drivers/scsi/lpfc/lpfc_debugfs.c | 223 +++++ drivers/scsi/lpfc/lpfc_debugfs.h | 11 +- drivers/scsi/lpfc/lpfc_els.c | 1065 ++++++++++++++++++++++- drivers/scsi/lpfc/lpfc_hbadisc.c | 23 +- drivers/scsi/lpfc/lpfc_hw.h | 2 + drivers/scsi/lpfc/lpfc_hw4.h | 249 +++++- drivers/scsi/lpfc/lpfc_init.c | 1402 +++++++++++++++++++++++++++++- drivers/scsi/lpfc/lpfc_logmsg.h | 5 +- drivers/scsi/lpfc/lpfc_mem.c | 15 +- drivers/scsi/lpfc/lpfc_nvme.c | 44 +- drivers/scsi/lpfc/lpfc_nvme.h | 3 - drivers/scsi/lpfc/lpfc_scsi.c | 187 +++- drivers/scsi/lpfc/lpfc_sli.c | 770 +++++++++++++++- drivers/scsi/lpfc/lpfc_sli.h | 2 + drivers/scsi/lpfc/lpfc_sli4.h | 1 + drivers/scsi/lpfc/lpfc_version.h | 2 +- include/uapi/scsi/fc/fc_els.h | 106 +++ 23 files changed, 4618 insertions(+), 114 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/16 fc: Add EDC ELS definition
Add Exchange Diagnostic Capabilities (EDC) ELS definition and the following capability descriptors:
Link Fault Capability Descriptor
Congestion Signaling Capability Descriptor
Definition taken from FC-LS-5 r5.01
--- include/uapi/scsi/fc/fc_els.h | 106 ++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+)
include/uapi/scsi/fc/fc_els.h +106 -0
@@ -41,6 +41,7 @@ enum fc_els_cmd {ELS_REC =0x13 ,/* read exchange concise */ ELS_SRR =0x14 ,/* sequence retransmission request */ ELS_FPIN =0x16 ,/* Fabric Performance Impact Notification */ +ELS_EDC =0x17 ,/* Exchange Diagnostic Capabilities */ ELS_RDP =0x18 ,/* Read Diagnostic Parameters */ ELS_RDF =0x19 ,/* Register Diagnostic Functions */ ELS_PRLI = 0x20, /* process login */
@@ -111,6 +112,7 @@ enum fc_els_cmd { [ELS_REC] = "REC", \ [ELS_SRR] = "SRR", \ [ELS_FPIN] = "FPIN", \ + [ELS_EDC] = "EDC", \ [ELS_RDP] = "RDP", \ [ELS_RDF] = "RDF", \ [ELS_PRLI] = "PRLI", \
@@ -218,6 +220,10 @@ enum fc_els_rjt_explan {enum fc_ls_tlv_dtag {ELS_DTAG_LS_REQ_INFO =0x00000001 ,/* Link Service Request Information Descriptor */ +ELS_DTAG_LNK_FAULT_CAP =0x0001000D , +/* Link Fault Capability Descriptor */ +ELS_DTAG_CG_SIGNAL_CAP =0x0001000F , +/* Congestion Signaling Capability Descriptor */ ELS_DTAG_LNK_INTEGRITY =0x00020001 ,/* Link Integrity Notification Descriptor */ ELS_DTAG_DELIVERY =0x00020002 ,
@@ -236,6 +242,8 @@ enum fc_ls_tlv_dtag {*/ #define FC_LS_TLV_DTAG_INIT { \ { ELS_DTAG_LS_REQ_INFO, "Link Service Request Information" }, \ + { ELS_DTAG_LNK_FAULT_CAP, "Link Fault Capability" }, \ + { ELS_DTAG_CG_SIGNAL_CAP, "Congestion Signaling Capability" }, \ { ELS_DTAG_LNK_INTEGRITY, "Link Integrity Notification" }, \ { ELS_DTAG_DELIVERY, "Delivery Notification Present" }, \ { ELS_DTAG_PEER_CONGEST, "Peer Congestion Notification" }, \
@@ -1144,4 +1152,102 @@ struct fc_els_rdf_resp { }; +/* +* Diagnostic Capability Descriptors for EDC ELS +*/ + +/* +* Diagnostic: Link Fault Capability Descriptor +*/ +struct fc_diag_lnkflt_desc { +__be32 desc_tag;/* Descriptor Tag (0x0001000D) */ +__be32 desc_len;/* Length of Descriptor (in bytes). +* Size of descriptor excluding +* desc_tag and desc_len fields. +* 12 bytes +*/ +__be32 degrade_activate_threshold; +__be32 degrade_deactivate_threshold; +__be32 fec_degrade_interval; +}; + +enum fc_edc_cg_signal_cap_types { +/* Note: Capability: bits 31:4 Rsvd; bits 3:0 are capabilities */ +EDC_CG_SIG_NOTSUPPORTED =0x00 ,/* neither supported */ +EDC_CG_SIG_WARN_ONLY =0x01 , +EDC_CG_SIG_WARN_ALARM =0x02 ,/* both supported */ +}; + +/* +* Initializer useful for decoding table. +* Please keep this in sync with the above definitions. +*/ +#define FC_EDC_CG_SIGNAL_CAP_TYPES_INIT { \ + { EDC_CG_SIG_NOTSUPPORTED, "Signaling Not Supported" }, \ + { EDC_CG_SIG_WARN_ONLY, "Warning Signal" }, \ + { EDC_CG_SIG_WARN_ALARM, "Warning and Alarm Signals" }, \ +} + +enum fc_diag_cg_sig_freq_types { +EDC_CG_SIGFREQ_CNT_MIN =1 ,/* Min Frequency Count */ +EDC_CG_SIGFREQ_CNT_MAX =999 ,/* Max Frequency Count */ + +EDC_CG_SIGFREQ_SEC =0x1 ,/* Units: seconds */ +EDC_CG_SIGFREQ_MSEC =0x2 ,/* Units: milliseconds */ +}; + +struct fc_diag_cg_sig_freq { +__be16 count;/* Time between signals +* note: upper 6 bits rsvd +*/ +__be16 units;/* Time unit for count +* note: upper 12 bits rsvd +*/ +}; + +/* +* Diagnostic: Congestion Signaling Capability Descriptor +*/ +struct fc_diag_cg_sig_desc { +__be32 desc_tag;/* Descriptor Tag (0x0001000F) */ +__be32 desc_len;/* Length of Descriptor (in bytes). +* Size of descriptor excluding +* desc_tag and desc_len fields. +* 16 bytes +*/ +__be32 xmt_signal_capability; +struct fc_diag_cg_sig_freq xmt_signal_frequency; +__be32 rcv_signal_capability; +struct fc_diag_cg_sig_freq rcv_signal_frequency; +}; + +/* +* ELS_EDC - Exchange Diagnostic Capabilities +*/ +struct fc_els_edc { +__u8 edc_cmd;/* command (0x17) */ +__u8 edc_zero[3 ];/* specified as zero - part of cmd */ +__be32 desc_len;/* Length of Descriptor List (in bytes). +* Size of ELS excluding edc_cmd, +* edc_zero and desc_len fields. +*/ +struct fc_tlv_desc desc[0 ]; +/* Diagnostic Descriptor list */ +}; + +/* +* ELS EDC LS_ACC Response. +*/ +struct fc_els_edc_resp { +struct fc_els_ls_acc acc_hdr; +__be32 desc_list_len;/* Length of response (in +* bytes). Excludes acc_hdr +* and desc_list_len fields. +*/ +struct fc_els_lsri_desc lsri; +struct fc_tlv_desc desc[0 ]; +/* Supported Diagnostic Descriptor list */ +}; + +#endif /* _FC_ELS_H_ */
Signature · 1 line
2.26.2
PATCH 2/16 lpfc: Add SET_HOST_DATA mbox cmd to pass date/time info to firmware
In reply to James SmartImplement the SET_HOST_DATA mbox command to set date / time during initialization. It is used by the firmware for various purposes including congestion management and firmware dumps.
--- drivers/scsi/lpfc/lpfc_hw4.h | 30 ++++++++++++++++++++- drivers/scsi/lpfc/lpfc_sli.c | 51 +++++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_hw4.h +29 -1
@@ -3427,12 +3427,40 @@ struct lpfc_mbx_set_feature {#define LPFC_SET_HOST_OS_DRIVER_VERSION 0x2 +#define LPFC_SET_HOST_DATE_TIME 0x4 + +struct lpfc_mbx_set_host_date_time { +uint32_t word6; +#define lpfc_mbx_set_host_month_WORD word6 +#define lpfc_mbx_set_host_month_SHIFT 16 +#define lpfc_mbx_set_host_month_MASK 0xFF +#define lpfc_mbx_set_host_day_WORD word6 +#define lpfc_mbx_set_host_day_SHIFT 8 +#define lpfc_mbx_set_host_day_MASK 0xFF +#define lpfc_mbx_set_host_year_WORD word6 +#define lpfc_mbx_set_host_year_SHIFT 0 +#define lpfc_mbx_set_host_year_MASK 0xFF +uint32_t word7; +#define lpfc_mbx_set_host_hour_WORD word7 +#define lpfc_mbx_set_host_hour_SHIFT 16 +#define lpfc_mbx_set_host_hour_MASK 0xFF +#define lpfc_mbx_set_host_min_WORD word7 +#define lpfc_mbx_set_host_min_SHIFT 8 +#define lpfc_mbx_set_host_min_MASK 0xFF +#define lpfc_mbx_set_host_sec_WORD word7 +#define lpfc_mbx_set_host_sec_SHIFT 0 +#define lpfc_mbx_set_host_sec_MASK 0xFF +}; +struct lpfc_mbx_set_host_data {#define LPFC_HOST_OS_DRIVER_VERSION_SIZE 48struct mbox_header header;uint32_t param_id;uint32_t param_len; -uint8_t data[LPFC_HOST_OS_DRIVER_VERSION_SIZE ]; +union { +uint8_t data[LPFC_HOST_OS_DRIVER_VERSION_SIZE ]; +struct lpfc_mbx_set_host_date_time tm; + } un; };struct lpfc_mbx_set_trunk_mode {
drivers/scsi/lpfc/lpfc_sli.c +50 -1
69 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 3/16 lpfc: Add MIB feature enablement support
In reply to James SmartMIB support is currently limited to detecting support in the adapter and ensuring FDMI support is enabled if present. For the new framework MIB support also requires active enablement of support via the SET_FEATURES command with the firmware.
Rework the MIB detection and enablement for the following:
- Move detection away from the get_sli4_parameters routine, and into the hba_setup path. get_sli4_parameters is only called once at attachment while hba_setup is called as part of any sli port reset path. This ensures detection after fw download.
- Update SET_FEATURES mbx command for the MIB enablement feature and add support for the feature.
- Create the cmf_setup routine to encapsulate the detection of MIB support and perform the enablement of the MIB support feature.
--- drivers/scsi/lpfc/lpfc_ct.c | 15 +++-- drivers/scsi/lpfc/lpfc_hw4.h | 7 +++ drivers/scsi/lpfc/lpfc_init.c | 15 ----- drivers/scsi/lpfc/lpfc_logmsg.h | 3 + drivers/scsi/lpfc/lpfc_sli.c | 103 ++++++++++++++++++++++++++++++++ 5 files changed, 123 insertions(+), 20 deletions(-)
drivers/scsi/lpfc/lpfc_ct.c +10 -5
@@ -2332,24 +2332,29 @@ lpfc_cmpl_ct_disc_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,break ;case SLI_MGMT_RPA :if (vport->port_type ==LPFC_PHYSICAL_PORT && - phba->cfg_enable_mi && - phba->sli4_hba.pc_sli4_params.mi_ver >LPFC_MIB1_SUPPORT ) { + phba->sli4_hba.pc_sli4_params.mi_ver) {/* mi is only for the phyical port, no vports */ if (phba->link_flag &LS_CT_VEN_RPA ) {lpfc_printf_vlog (vport,KERN_INFO , -LOG_DISCOVERY |LOG_ELS , +LOG_DISCOVERY |LOG_ELS | +LOG_CGN_MGMT ,"6449 VEN RPA FDMI Success\n" ); phba->link_flag &= ~LS_CT_VEN_RPA ;break ; } +lpfc_printf_log (phba,KERN_INFO ,LOG_CGN_MGMT , +"6210 Issue Vendor MI FDMI %x\n" , + phba->sli4_hba.pc_sli4_params.mi_ver); + +/* CGN is only for the physical port, no vports */ if (lpfc_fdmi_cmd (vport, ndlp, cmd, LPFC_FDMI_VENDOR_ATTR_mi) ==0 ) phba->link_flag |=LS_CT_VEN_RPA ;lpfc_printf_log (phba,KERN_INFO ,LOG_DISCOVERY |LOG_ELS ,"6458 Send MI FDMI:%x Flag x%x\n" , - phba->sli4_hba.pc_sli4_params.mi_value, + phba->sli4_hba.pc_sli4_params.mi_ver, phba->link_flag); }else { lpfc_printf_log(phba, KERN_INFO,
@@ -3348,7 +3353,7 @@ lpfc_fdmi_vendor_attr_mi(struct lpfc_vport *vport, ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;memset (ae,0 ,256 );sprintf (mibrevision,"ELXE2EM:%04d" , - phba->sli4_hba.pc_sli4_params.mi_value); + phba->sli4_hba.pc_sli4_params.mi_ver);strncpy (ae->un.AttrString, &mibrevision[0 ],sizeof (ae->un.AttrString)); len =strnlen (ae->un.AttrString,sizeof (ae->un.AttrString)); len += (len &3 ) ? (4 - (len &3 )) :4 ;
drivers/scsi/lpfc/lpfc_hw4.h +7 -0
@@ -3393,6 +3393,7 @@ struct lpfc_sli4_parameters {#define LPFC_SET_UE_RECOVERY 0x10#define LPFC_SET_MDS_DIAGS 0x12#define LPFC_SET_DUAL_DUMP 0x1e +#define LPFC_SET_ENABLE_MI 0x21struct lpfc_mbx_set_feature {struct mbox_header header;uint32_t feature;
@@ -3416,6 +3417,12 @@ struct lpfc_mbx_set_feature {#define LPFC_DISABLE_DUAL_DUMP 0#define LPFC_ENABLE_DUAL_DUMP 1#define LPFC_QUERY_OP_DUAL_DUMP 2 +#define lpfc_mbx_set_feature_mi_SHIFT 0 +#define lpfc_mbx_set_feature_mi_MASK 0x0000ffff +#define lpfc_mbx_set_feature_mi_WORD word6 +#define lpfc_mbx_set_feature_milunq_SHIFT 16 +#define lpfc_mbx_set_feature_milunq_MASK 0x0000ffff +#define lpfc_mbx_set_feature_milunq_WORD word6uint32_t word7;#define lpfc_mbx_set_feature_UERP_SHIFT 0#define lpfc_mbx_set_feature_UERP_MASK 0x0000ffff
drivers/scsi/lpfc/lpfc_init.c +0 -15
@@ -12350,21 +12350,6 @@ lpfc_get_sli4_parameters(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)else phba->nsler =0 ; -/* Save PB info for use during HBA setup */ - sli4_params->mi_ver =bf_get (cfg_mi_ver, mbx_sli4_parameters); - sli4_params->mib_bde_cnt =bf_get (cfg_mib_bde_cnt, mbx_sli4_parameters); - sli4_params->mib_size = mbx_sli4_parameters->mib_size; - sli4_params->mi_value =LPFC_DFLT_MIB_VAL ; - -/* Next we check for Vendor MIB support */ -if (sli4_params->mi_ver && phba->cfg_enable_mi) - phba->cfg_fdmi_on =LPFC_FDMI_SUPPORT ; - -lpfc_printf_log (phba,KERN_INFO ,LOG_INIT , -"6461 MIB attr %d enable %d FDMI %d buf %d:%d\n" , - sli4_params->mi_ver, phba->cfg_enable_mi, - sli4_params->mi_value, sli4_params->mib_bde_cnt, - sli4_params->mib_size);return 0 ; }
drivers/scsi/lpfc/lpfc_logmsg.h +3 -0
@@ -44,6 +44,9 @@#define LOG_NVME_DISC 0x00200000/* NVME Discovery/Connect events. */ #define LOG_NVME_ABTS 0x00400000/* NVME ABTS events. */ #define LOG_NVME_IOERR 0x00800000/* NVME IO Error events. */ +#define LOG_RSVD1 0x01000000/* Reserved */ +#define LOG_RSVD2 0x02000000/* Reserved */ +#define LOG_CGN_MGMT 0x04000000/* Congestion Mgmt events */ #define LOG_TRACE_EVENT 0x80000000/* Dmp the DBG log on this err */ #define LOG_ALL_MSG 0x7fffffff/* LOG all messages */
drivers/scsi/lpfc/lpfc_sli.c +103 -0
121 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 4/16 lpfc: Expand FPIN and RDF receive logging
In reply to James SmartExpand FPIN logging:
- Display Attached Port Names for Link Integrity and Peer Congestion events
- Log Delivery, Peer Congestion, and Congestion events
- Sanity check FPIN descriptor lengths when processing FPIN descriptors.
Log RDF events when congestion logging is enabled
--- drivers/scsi/lpfc/lpfc_els.c | 349 +++++++++++++++++++++++++++++++---- drivers/scsi/lpfc/lpfc_hw4.h | 14 ++ 2 files changed, 322 insertions(+), 41 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +308 -41
@@ -3260,7 +3260,7 @@ lpfc_cmpl_els_disc_cmd(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, irsp->ulpStatus, irsp->un.ulpWord[4 ], irsp->un.elsreq64.remoteID);/* ELS cmd tag <ulpIoTag> completes */ - lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS, + lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS | LOG_CGN_MGMT, "0217 ELS cmd tag x%x completes Data: x%x x%x x%x " "x%x\n", irsp->ulpIoTag, irsp->ulpStatus,
@@ -3319,11 +3319,12 @@ lpfc_cmpl_els_disc_cmd(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,for (i =0 ; i <ELS_RDF_REG_TAG_CNT && i <be32_to_cpu (prdf->reg_d1.reg_desc.count); i++) -lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS , -"4677 Fabric RDF Notification Grant Data: " -"0x%08x\n" , -be32_to_cpu ( - prdf->reg_d1.desc_tags[i])); +lpfc_printf_vlog (vport,KERN_INFO , +LOG_ELS |LOG_CGN_MGMT , +"4677 Fabric RDF Notification Grant " +"Data: 0x%08x\n" , +be32_to_cpu ( + prdf->reg_d1.desc_tags[i])); } out:
@@ -3689,7 +3690,7 @@ lpfc_issue_els_rdf(struct lpfc_vport *vport, uint8_t retry) prdf->reg_d1.desc_tags[2 ] =cpu_to_be32 (ELS_DTAG_PEER_CONGEST ); prdf->reg_d1.desc_tags[3 ] =cpu_to_be32 (ELS_DTAG_CONGESTION ); -lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS , +lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS |LOG_CGN_MGMT ,"6444 Xmit RDF to remote NPORT x%x\n" , ndlp->nlp_DID);
@@ -3733,7 +3734,7 @@ lpfc_els_rcv_rdf(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, {/* Send LS_ACC */ if (lpfc_els_rsp_acc (vport,ELS_CMD_RDF , cmdiocb, ndlp,NULL )) { -lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS , +lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS |LOG_CGN_MGMT ,"1623 Failed to RDF_ACC from x%x for x%x\n" , ndlp->nlp_DID, vport->fc_myDID);return -EIO ;
@@ -3741,7 +3742,7 @@ lpfc_els_rcv_rdf(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,/* Issue new RDF for reregistering */ if (lpfc_issue_els_rdf (vport,0 )) { -lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS , +lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS |LOG_CGN_MGMT ,"2623 Failed to re register RDF for x%x\n" , vport->fc_myDID);return -EIO ;
@@ -8693,44 +8694,254 @@ DECLARE_ENUM2STR_LOOKUP(lpfc_get_tlv_dtag_nm, fc_ls_tlv_dtag,DECLARE_ENUM2STR_LOOKUP (lpfc_get_fpin_li_event_nm, fc_fpin_li_event_types,FC_FPIN_LI_EVT_TYPES_INIT ); +DECLARE_ENUM2STR_LOOKUP (lpfc_get_fpin_deli_event_nm, fc_fpin_deli_event_types, +FC_FPIN_DELI_EVT_TYPES_INIT ); + +DECLARE_ENUM2STR_LOOKUP (lpfc_get_fpin_congn_event_nm, fc_fpin_congn_event_types, +FC_FPIN_CONGN_EVT_TYPES_INIT ); + +DECLARE_ENUM2STR_LOOKUP (lpfc_get_fpin_congn_severity_nm, + fc_fpin_congn_severity_types, +FC_FPIN_CONGN_SEVERITY_INIT ); + + +/** +* lpfc_display_fpin_wwpn - Display WWPNs accessible by the attached port +* @phba: Pointer to phba object. +* @wwnlist: Pointer to list of WWPNs in FPIN payload +* @cnt: count of WWPNs in FPIN payload +* +* This routine is called by LI and PC descriptors. +* Limit the number of WWPNs displayed to 6 log messages, 6 per log message +*/ +static void +lpfc_display_fpin_wwpn (struct lpfc_hba *phba,__be64 *wwnlist,u32 cnt) +{ +char buf[LPFC_FPIN_WWPN_LINE_SZ ]; +__be64 wwn; +u64 wwpn; +int i, len; +int line =0 ; +int wcnt =0 ; +bool endit = false; + + len =scnprintf (buf,LPFC_FPIN_WWPN_LINE_SZ ,"Accessible WWPNs:" ); +for (i =0 ; i < cnt; i++) { +/* Are we on the last WWPN */ +if (i == (cnt -1 )) + endit = true; + +/* Extract the next WWPN from the payload */ + wwn = *wwnlist++; + wwpn =be64_to_cpu (wwn); + len +=scnprintf (buf + len,LPFC_FPIN_WWPN_LINE_SZ , +" %016llx" , wwpn); + +/* Log a message if we are on the last WWPN +* or if we hit the max allowed per message. +*/ + wcnt++; +if (wcnt ==LPFC_FPIN_WWPN_LINE_CNT || endit) { + buf[len] =0 ; +lpfc_printf_log (phba,KERN_INFO ,LOG_ELS , +"4686 %s\n" , buf); + +/* Check if we reached the last WWPN */ +if (endit) +return ; + +/* Limit the number of log message displayed per FPIN */ + line++; +if (line ==LPFC_FPIN_WWPN_NUM_LINE ) { +lpfc_printf_log (phba,KERN_INFO ,LOG_ELS , +"4687 %d WWPNs Truncated\n" , + cnt - i -1 ); +return ; + } + +/* Start over with next log message */ + wcnt =0 ; + len =scnprintf (buf,LPFC_FPIN_WWPN_LINE_SZ , +"Additional WWPNs:" ); + } + } +} +/** * lpfc_els_rcv_fpin_li - Process an FPIN Link Integrity Event. -* @vport: Pointer to vport object. +* @phba: Pointer to phba object. * @tlv: Pointer to the Link Integrity Notification Descriptor. * -* This function processes a link integrity FPIN event by -* logging a message +* This function processes a Link Integrity FPIN event by logging a message. **/ static void -lpfc_els_rcv_fpin_li (struct lpfc_vport *vport,struct fc_tlv_desc *tlv) +lpfc_els_rcv_fpin_li (struct lpfc_hba *phba,struct fc_tlv_desc *tlv) {struct fc_fn_li_desc *li = (struct fc_fn_li_desc *)tlv;const char *li_evt_str; -u32 li_evt; +u32 li_evt, cnt; li_evt =be16_to_cpu (li->event_type); li_evt_str =lpfc_get_fpin_li_event_nm (li_evt); + cnt =be32_to_cpu (li->pname_count); -lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS , -"4680 FPIN Link Integrity %s (x%x) " -"Detecting PN x%016llx Attached PN x%016llx " -"Duration %d mSecs Count %d Port Cnt %d\n" , - li_evt_str, li_evt, -be64_to_cpu (li->detecting_wwpn), -be64_to_cpu (li->attached_wwpn), -be32_to_cpu (li->event_threshold), -be32_to_cpu (li->event_count), -be32_to_cpu (li->pname_count)); +lpfc_printf_log (phba,KERN_INFO ,LOG_ELS , +"4680 FPIN Link Integrity %s (x%x) " +"Detecting PN x%016llx Attached PN x%016llx " +"Duration %d mSecs Count %d Port Cnt %d\n" , + li_evt_str, li_evt, +be64_to_cpu (li->detecting_wwpn), +be64_to_cpu (li->attached_wwpn), +be32_to_cpu (li->event_threshold), +be32_to_cpu (li->event_count), cnt); + +lpfc_display_fpin_wwpn (phba, (__be64 *)&li->pname_list, cnt); +} + +/** +* lpfc_els_rcv_fpin_del - Process an FPIN Delivery Event. +* @phba: Pointer to hba object. +* @tlv: Pointer to the Delivery Notification Descriptor TLV +* +* This function processes a Delivery FPIN event by logging a message. +**/ +static void +lpfc_els_rcv_fpin_del (struct lpfc_hba *phba,struct fc_tlv_desc *tlv) +{ +struct fc_fn_deli_desc *del = (struct fc_fn_deli_desc *)tlv; +const char *del_rsn_str; +u32 del_rsn; +__be32 *frame; + + del_rsn =be16_to_cpu (del->deli_reason_code); + del_rsn_str =lpfc_get_fpin_deli_event_nm (del_rsn); + +/* Skip over desc_tag/desc_len header to payload */ + frame = (__be32 *)(del +1 ); + +lpfc_printf_log (phba,KERN_INFO ,LOG_ELS , +"4681 FPIN Delivery %s (x%x) " +"Detecting PN x%016llx Attached PN x%016llx " +"DiscHdr0 x%08x " +"DiscHdr1 x%08x DiscHdr2 x%08x DiscHdr3 x%08x " +"DiscHdr4 x%08x DiscHdr5 x%08x\n" , + del_rsn_str, del_rsn, +be64_to_cpu (del->detecting_wwpn), +be64_to_cpu (del->attached_wwpn), +be32_to_cpu (frame[0 ]), +be32_to_cpu (frame[1 ]), +be32_to_cpu (frame[2 ]), +be32_to_cpu (frame[3 ]), +be32_to_cpu (frame[4 ]), +be32_to_cpu (frame[5 ])); } +/** +* lpfc_els_rcv_fpin_peer_cgn - Process a FPIN Peer Congestion Event. +* @phba: Pointer to hba object. +* @tlv: Pointer to the Peer Congestion Notification Descriptor TLV +* +* This function processes a Peer Congestion FPIN event by logging a message. +**/ static void -lpfc_els_rcv_fpin (struct lpfc_vport *vport,struct fc_els_fpin *fpin, -u32 fpin_length) +lpfc_els_rcv_fpin_peer_cgn (struct lpfc_hba *phba,struct fc_tlv_desc *tlv) { -struct fc_tlv_desc *tlv; +struct fc_fn_peer_congn_desc *pc = (struct fc_fn_peer_congn_desc *)tlv; +const char *pc_evt_str; +u32 pc_evt, cnt; + + pc_evt =be16_to_cpu (pc->event_type); + pc_evt_str =lpfc_get_fpin_congn_event_nm (pc_evt); + cnt =be32_to_cpu (pc->pname_count); + +lpfc_printf_log (phba,KERN_INFO ,LOG_CGN_MGMT |LOG_ELS , +"4684 FPIN Peer Congestion %s (x%x) " +"Duration %d mSecs " +"Detecting PN x%016llx Attached PN x%016llx " +"Impacted Port Cnt %d\n" , + pc_evt_str, pc_evt, +be32_to_cpu (pc->event_period), +be64_to_cpu (pc->detecting_wwpn), +be64_to_cpu (pc->attached_wwpn), + cnt); + +lpfc_display_fpin_wwpn (phba, (__be64 *)&pc->pname_list, cnt); +} + +/** +* lpfc_els_rcv_fpin_cgn - Process an FPIN Congestion notification +* @phba: Pointer to hba object. +* @tlv: Pointer to the Congestion Notification Descriptor TLV +* +* This function processes an FPIN Congestion Notifiction. The notification +* could be an Alarm or Warning. This routine feeds that data into driver's +* running congestion algorithm. It also processes the FPIN by +* logging a message. It returns 1 to indicate deliver this message +* to the upper layer or 0 to indicate don't deliver it. +**/ +static int +lpfc_els_rcv_fpin_cgn (struct lpfc_hba *phba,struct fc_tlv_desc *tlv) +{ +struct fc_fn_congn_desc *cgn = (struct fc_fn_congn_desc *)tlv; +const char *cgn_evt_str; +u32 cgn_evt; +const char *cgn_sev_str; +u32 cgn_sev; +bool nm_log = false; +int rc =1 ; + + cgn_evt =be16_to_cpu (cgn->event_type); + cgn_evt_str =lpfc_get_fpin_congn_event_nm (cgn_evt); + cgn_sev = cgn->severity; + cgn_sev_str =lpfc_get_fpin_congn_severity_nm (cgn_sev); + +/* The driver only takes action on a Credit Stall or Oversubscription +* event type to engage the IO algorithm. The driver prints an +* unmaskable message only for Lost Credit and Credit Stall. +* TODO: Still need to have definition of host action on clear, +* lost credit and device specific event types. +*/ +switch (cgn_evt) { +case FPIN_CONGN_LOST_CREDIT : + nm_log = true; +break ; +case FPIN_CONGN_CREDIT_STALL : + nm_log = true; + fallthrough; +case FPIN_CONGN_OVERSUBSCRIPTION : +if (cgn_evt ==FPIN_CONGN_OVERSUBSCRIPTION ) + nm_log = false; +switch (cgn_sev) { +case FPIN_CONGN_SEVERITY_ERROR : +/* Take action here for an Alarm event */ +break ; +case FPIN_CONGN_SEVERITY_WARNING : +/* Take action here for a Warning event */ +break ; + } +break ; + } + +/* Change the log level to unmaskable for the following event types. */ +lpfc_printf_log (phba, (nm_log ?KERN_WARNING :KERN_INFO ), +LOG_CGN_MGMT |LOG_ELS , +"4683 FPIN CONGESTION %s type %s (x%x) Event " +"Duration %d mSecs\n" , + cgn_sev_str, cgn_evt_str, cgn_evt, +be32_to_cpu (cgn->event_period)); +return rc; +} + +static void +lpfc_els_rcv_fpin (struct lpfc_vport *vport,void *p,u32 fpin_length) +{ +struct lpfc_hba *phba = vport->phba; +struct fc_els_fpin *fpin = (struct fc_els_fpin *)p; +struct fc_tlv_desc *tlv, *first_tlv, *current_tlv;const char *dtag_nm; -uint32_t desc_cnt =0 , bytes_remain; -u32 dtag; +int desc_cnt =0 , bytes_remain, cnt; +u32 dtag, deliver =0 ; +int len;/* FPINs handled only if we are in the right discovery state */ if (vport->port_state <LPFC_DISC_AUTH )
@@ -8740,35 +8951,91 @@ lpfc_els_rcv_fpin(struct lpfc_vport *vport, struct fc_els_fpin *fpin,if (fpin_length <sizeof (struct fc_els_fpin ))return ; +/* Sanity check descriptor length. The desc_len value does not +* include space for the ELS command and the desc_len fields. +*/ + len =be32_to_cpu (fpin->desc_len); +if (fpin_length < len +sizeof (struct fc_els_fpin )) { +lpfc_printf_log (phba,KERN_WARNING ,LOG_CGN_MGMT , +"4671 Bad ELS FPIN length %d: %d\n" , + len, fpin_length); +return ; + } + tlv = (struct fc_tlv_desc *)&fpin->fpin_desc[0 ]; + first_tlv = tlv; bytes_remain = fpin_length - offsetof(struct fc_els_fpin , fpin_desc); bytes_remain =min_t (u32, bytes_remain,be32_to_cpu (fpin->desc_len)); -/* process each descriptor */ +/* process each descriptor separately */ while (bytes_remain >=FC_TLV_DESC_HDR_SZ && bytes_remain >=FC_TLV_DESC_SZ_FROM_LENGTH (tlv)) { - dtag =be32_to_cpu (tlv->desc_tag);switch (dtag) {case ELS_DTAG_LNK_INTEGRITY : -lpfc_els_rcv_fpin_li (vport, tlv); +lpfc_els_rcv_fpin_li (phba, tlv); + deliver =1 ; +break ; +case ELS_DTAG_DELIVERY : +lpfc_els_rcv_fpin_del (phba, tlv); + deliver =1 ; +break ; +case ELS_DTAG_PEER_CONGEST : +lpfc_els_rcv_fpin_peer_cgn (phba, tlv); + deliver =1 ; +break ; +case ELS_DTAG_CONGESTION : + deliver =lpfc_els_rcv_fpin_cgn (phba, tlv);break ;default : dtag_nm =lpfc_get_tlv_dtag_nm (dtag); -lpfc_printf_vlog (vport,KERN_ERR ,LOG_TRACE_EVENT , -"4678 skipped FPIN descriptor[%d]: " -"tag x%x (%s)\n" , - desc_cnt, dtag, dtag_nm); -break ; +lpfc_printf_log (phba,KERN_WARNING ,LOG_CGN_MGMT , +"4678 unknown FPIN descriptor[%d]: " +"tag x%x (%s)\n" , + desc_cnt, dtag, dtag_nm); + +/* If descriptor is bad, drop the rest of the data */ +return ; } + cnt =be32_to_cpu (tlv->desc_len); - desc_cnt++; +/* Sanity check descriptor length. The desc_len value does not +* include space for the desc_tag and the desc_len fields. +*/ + len -= (cnt +sizeof (struct fc_tlv_desc )); +if (len <0 ) { + dtag_nm =lpfc_get_tlv_dtag_nm (dtag); +lpfc_printf_log (phba,KERN_WARNING ,LOG_CGN_MGMT , +"4672 Bad FPIN descriptor TLV length " +"%d: %d %d %s\n" , + cnt, len, fpin_length, dtag_nm); +return ; + } + + current_tlv = tlv; bytes_remain -=FC_TLV_DESC_SZ_FROM_LENGTH (tlv); tlv =fc_tlv_next_desc (tlv); - } -fc_host_fpin_rcv (lpfc_shost_from_vport (vport), fpin_length, - (char *)fpin); +/* Format payload such that the FPIN delivered to the +* upper layer is a single descriptor FPIN. +*/ +if (desc_cnt) +memcpy (first_tlv, current_tlv, + (cnt +sizeof (struct fc_els_fpin ))); + +/* Adjust the length so that it only reflects a +* single descriptor FPIN. +*/ + fpin_length = cnt +sizeof (struct fc_els_fpin ); + fpin->desc_len =cpu_to_be32 (fpin_length); + fpin_length +=sizeof (struct fc_els_fpin );/* the entire FPIN */ + +/* Send every descriptor individually to the upper layer */ +if (deliver) +fc_host_fpin_rcv (lpfc_shost_from_vport (vport), + fpin_length, (char *)fpin); + desc_cnt++; + } }/**
drivers/scsi/lpfc/lpfc_hw4.h +14 -0
@@ -20,6 +20,7 @@* included with this package. * *******************************************************************/ +#include <uapi/scsi/fc/fc_fs.h> #include <uapi/scsi/fc/fc_els.h> /* Macros to deal with bit fields. Each bit field must have 3 #defines
@@ -4813,3 +4814,16 @@ struct lpfc_grp_hdr {#define LPFC_FW_DUMP 1#define LPFC_FW_RESET 2#define LPFC_DV_RESET 3 + +/* +* Initializer useful for decoding FPIN string table. +*/ +#define FC_FPIN_CONGN_SEVERITY_INIT { \ + { FPIN_CONGN_SEVERITY_WARNING, "Warning" }, \ + { FPIN_CONGN_SEVERITY_ERROR, "Alarm" }, \ +} + +/* Used for logging FPIN messages */ +#define LPFC_FPIN_WWPN_LINE_SZ 128 +#define LPFC_FPIN_WWPN_LINE_CNT 6 +#define LPFC_FPIN_WWPN_NUM_LINE 6
Signature · 1 line
2.26.2
PATCH 5/16 lpfc: Add EDC ELS support
In reply to James SmartWhen congestion management is enabled, issue EDC ELS to register congestion signaling capabilities with the fabric. The response handling will process the fabric parameters and set the reporting parameters.
Similarly, add support for receiving an EDC request from the fabric generating a corresponding response.
Implement handlers for congestion signals from the fabric and maintain statistics for them.
--- drivers/scsi/lpfc/lpfc.h | 35 ++ drivers/scsi/lpfc/lpfc_attr.c | 27 ++ drivers/scsi/lpfc/lpfc_crtn.h | 6 + drivers/scsi/lpfc/lpfc_ct.c | 2 + drivers/scsi/lpfc/lpfc_els.c | 637 ++++++++++++++++++++++++++++++- drivers/scsi/lpfc/lpfc_hbadisc.c | 19 +- drivers/scsi/lpfc/lpfc_hw.h | 2 + drivers/scsi/lpfc/lpfc_hw4.h | 58 +++ drivers/scsi/lpfc/lpfc_init.c | 86 ++++- drivers/scsi/lpfc/lpfc_sli.c | 127 +++++- 10 files changed, 988 insertions(+), 11 deletions(-)
drivers/scsi/lpfc/lpfc.h +35 -0
@@ -403,6 +403,11 @@ struct lpfc_trunk_link { link3; }; +struct lpfc_cgn_acqe_stat { +atomic64_t alarm; +atomic64_t warn; +}; +struct lpfc_vport {struct lpfc_hba *phba;struct list_head listentry;
@@ -1343,6 +1348,36 @@ struct lpfc_hba {uint64_t ktime_seg10_min;uint64_t ktime_seg10_max;#endif +/* CMF objects */ +u32 cmf_active_mode; +#define LPFC_CFG_OFF 0 + +/* Signal / FPIN handling for Congestion Mgmt */ +u8 cgn_reg_fpin;/* Negotiated value from RDF */ +u8 cgn_init_reg_fpin;/* Initial value from READ_CONFIG */ +#define LPFC_CGN_FPIN_NONE 0x0 +#define LPFC_CGN_FPIN_WARN 0x1 +#define LPFC_CGN_FPIN_ALARM 0x2 +#define LPFC_CGN_FPIN_BOTH (LPFC_CGN_FPIN_WARN | LPFC_CGN_FPIN_ALARM) + +u8 cgn_reg_signal;/* Negotiated value from EDC */ +u8 cgn_init_reg_signal;/* Initial value from READ_CONFIG */ +/* cgn_reg_signal and cgn_init_reg_signal use +* enum fc_edc_cg_signal_cap_types +*/ +u16 cgn_fpin_frequency; +#define LPFC_FPIN_INIT_FREQ 0xffff +u32 cgn_sig_freq; +u32 cgn_acqe_cnt; + +/* Statistics counter for ACQE cgn alarms and warnings */ +struct lpfc_cgn_acqe_stat cgn_acqe_stat; + +/* Congestion buffer information */ +atomic_t cgn_fabric_warn_cnt;/* Total warning cgn events for info */ +atomic_t cgn_fabric_alarm_cnt;/* Total alarm cgn events for info */ +atomic_t cgn_sync_warn_cnt;/* Total warning events for SYNC wqe */ +atomic_t cgn_sync_alarm_cnt;/* Total alarm events for SYNC wqe */ struct hlist_node cpuhp;/* used for cpuhp per hba callback */ struct timer_list cpuhp_poll_timer;
drivers/scsi/lpfc/lpfc_attr.c +27 -0
@@ -6150,6 +6150,19 @@ LPFC_ATTR_RW(ras_fwlog_func, 0, 0, 7, "Firmware Logging Enabled on Function");*/ LPFC_BBCR_ATTR_RW (enable_bbcr,1 ,0 ,1 ,"Enable BBC Recovery" ); +/* Signaling module parameters */ +int lpfc_fabric_cgn_frequency =100 ;/* 100 ms default */ +module_param (lpfc_fabric_cgn_frequency, int,0444 ); +MODULE_PARM_DESC (lpfc_fabric_cgn_frequency,"Congestion signaling fabric freq" ); + +int lpfc_acqe_cgn_frequency =10 ;/* 10 sec default */ +module_param (lpfc_acqe_cgn_frequency, int,0444 ); +MODULE_PARM_DESC (lpfc_acqe_cgn_frequency,"Congestion signaling ACQE freq" ); + +int lpfc_use_cgn_signal =1 ;/* 0 - only use FPINs, 1 - Use signals if avail */ +module_param (lpfc_use_cgn_signal, int,0444 ); +MODULE_PARM_DESC (lpfc_use_cgn_signal,"Use Congestion signaling if available" ); +/* * lpfc_enable_dpp: Enable DPP on G7 * 0 = DPP on G7 disabled
@@ -6915,6 +6928,9 @@ lpfc_get_stats(struct Scsi_Host *shost) hs->invalid_crc_count = pmb->un.varRdLnk.crcCnt; hs->error_frames = pmb->un.varRdLnk.crcCnt; + hs->cn_sig_warn =atomic64_read (&phba->cgn_acqe_stat.warn); + hs->cn_sig_alarm =atomic64_read (&phba->cgn_acqe_stat.alarm); + hs->link_failure_count -= lso->link_failure_count; hs->loss_of_sync_count -= lso->loss_of_sync_count; hs->loss_of_signal_count -= lso->loss_of_signal_count;
@@ -7026,6 +7042,12 @@ lpfc_reset_stats(struct Scsi_Host *shost)else lso->link_events = (phba->fc_eventTag >>1 ); +atomic64_set (&phba->cgn_acqe_stat.warn,0 ); +atomic64_set (&phba->cgn_acqe_stat.alarm,0 ); + +memset (&shost_to_fc_host (shost)->fpin_stats,0 , +sizeof (shost_to_fc_host (shost)->fpin_stats)); + psli->stats_start =ktime_get_seconds ();mempool_free (pmboxq, phba->mbox_mem_pool);
@@ -7459,6 +7481,11 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)lpfc_enable_dpp_init (phba, lpfc_enable_dpp);lpfc_enable_mi_init (phba, lpfc_enable_mi); + phba->cmf_active_mode =LPFC_CFG_OFF ; +if (lpfc_fabric_cgn_frequency >EDC_CG_SIGFREQ_CNT_MAX || + lpfc_fabric_cgn_frequency <EDC_CG_SIGFREQ_CNT_MIN ) + lpfc_fabric_cgn_frequency =100 ;/* 100 ms default */ +if (phba->sli_rev !=LPFC_SLI_REV4 ) {/* NVME only supported on SLI4 */ phba->nvmet_support =0 ;
drivers/scsi/lpfc/lpfc_crtn.h +6 -0
@@ -74,6 +74,7 @@ int lpfc_init_iocb_list(struct lpfc_hba *phba, int cnt);void lpfc_free_iocb_list (struct lpfc_hba *phba);int lpfc_post_rq_buffer (struct lpfc_hba *phba,struct lpfc_queue *hrq,struct lpfc_queue *drq,int count,int idx); +int lpfc_config_cgn_signal (struct lpfc_hba *phba);void lpfc_mbx_cmpl_local_config_link (struct lpfc_hba *,LPFC_MBOXQ_t *);void lpfc_mbx_cmpl_reg_login (struct lpfc_hba *,LPFC_MBOXQ_t *);
@@ -143,6 +144,7 @@ int lpfc_issue_els_scr(struct lpfc_vport *vport, uint8_t retry);int lpfc_issue_els_rscn (struct lpfc_vport *vport,uint8_t retry);int lpfc_issue_fabric_reglogin (struct lpfc_vport *);int lpfc_issue_els_rdf (struct lpfc_vport *vport,uint8_t retry); +int lpfc_issue_els_edc (struct lpfc_vport *vport,uint8_t retry);int lpfc_els_free_iocb (struct lpfc_hba *,struct lpfc_iocbq *);int lpfc_ct_free_iocb (struct lpfc_hba *,struct lpfc_iocbq *); int lpfc_els_rsp_acc(struct lpfc_vport *, uint32_t, struct lpfc_iocbq *,
@@ -607,6 +609,10 @@ extern int lpfc_enable_nvmet_cnt;extern unsigned long long lpfc_enable_nvmet[];extern int lpfc_no_hba_reset_cnt;extern unsigned long lpfc_no_hba_reset[]; +extern int lpfc_acqe_cgn_frequency; +extern int lpfc_fabric_cgn_frequency; +extern int lpfc_use_cgn_signal; +extern union lpfc_wqe128 lpfc_iread_cmd_template;extern union lpfc_wqe128 lpfc_iwrite_cmd_template;extern union lpfc_wqe128 lpfc_icmnd_cmd_template;
drivers/scsi/lpfc/lpfc_ct.c +2 -0
@@ -2288,6 +2288,8 @@ lpfc_cmpl_ct_disc_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,/* No retry on Vendor, RPA only done on physical port */ if (phba->link_flag &LS_CT_VEN_RPA ) { phba->link_flag &= ~LS_CT_VEN_RPA ; +if (phba->cmf_active_mode ==LPFC_CFG_OFF ) +return ;lpfc_printf_log (phba,KERN_ERR ,LOG_DISCOVERY |LOG_ELS ,"6460 VEN FDMI RPA failure\n" );
drivers/scsi/lpfc/lpfc_els.c +633 -4
691 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_hbadisc.c +17 -2
@@ -4209,6 +4209,7 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *)(pmb->ctx_buf);struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *)pmb->ctx_ndlp;struct lpfc_vport *vport = pmb->vport; +int rc; pmb->ctx_buf =NULL ; pmb->ctx_ndlp =NULL ;
@@ -4284,9 +4285,23 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)/* Issue SCR just before NameServer GID_FT Query */ lpfc_issue_els_scr (vport,0 ); -if (!phba->cfg_enable_mi || - phba->sli4_hba.pc_sli4_params.mi_ver <LPFC_MIB3_SUPPORT ) +/* Link was bounced or a Fabric LOGO occurred. Start EDC +* with initial FW values provided the congestion mode is +* not off. Note that signals may or may not be supported +* by the adapter but FPIN is provided by default for 1 +* or both missing signals support. +*/ +if (phba->cmf_active_mode !=LPFC_CFG_OFF ) { + phba->cgn_reg_fpin = phba->cgn_init_reg_fpin; + phba->cgn_reg_signal = phba->cgn_init_reg_signal; + rc =lpfc_issue_els_edc (vport,0 ); +lpfc_printf_log (phba,KERN_INFO , +LOG_INIT |LOG_ELS |LOG_DISCOVERY , +"4220 EDC issue error x%x, Data: x%x\n" , + rc, phba->cgn_init_reg_signal); + }else {lpfc_issue_els_rdf (vport,0 ); + } } vport->fc_ns_retry =0 ;
drivers/scsi/lpfc/lpfc_hw.h +2 -0
@@ -608,6 +608,7 @@ struct fc_vft_header {#define ELS_CMD_LIRR 0x7A000000#define ELS_CMD_LCB 0x81000000#define ELS_CMD_FPIN 0x16000000 +#define ELS_CMD_EDC 0x17000000#define ELS_CMD_QFPA 0xB0000000#define ELS_CMD_UVEM 0xB1000000#else /* __LITTLE_ENDIAN_BITFIELD */
@@ -652,6 +653,7 @@ struct fc_vft_header {#define ELS_CMD_LIRR 0x7A#define ELS_CMD_LCB 0x81#define ELS_CMD_FPIN ELS_FPIN +#define ELS_CMD_EDC ELS_EDC#define ELS_CMD_QFPA 0xB0#define ELS_CMD_UVEM 0xB1#endif
drivers/scsi/lpfc/lpfc_hw4.h +58 -0
106 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_init.c +84 -2
112 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.c +124 -3
163 lines not on this page · raw message
Signature · 1 line
2.26.2
kernel test robot
build botRe: [PATCH 05/16] lpfc: Add EDC ELS support
I love your patch! Perhaps something to improve:
Hi James,
I love your patch! Perhaps something to improve:
[auto build test WARNING on scsi/for-next]
[also build test WARNING on mkp-scsi/for-next linus/master v5.14-rc5 next-20210812] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/James-Smart/lpfc-Update-lpfc-to-revision-14-0-0-1/20210813-101108 base: https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git for-next config: mips-allyesconfig (attached as .config) compiler: mips-linux-gcc (GCC) 10.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/500c94414bdcb236c244cbbde9219852777a38bf
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review James-Smart/lpfc-Update-lpfc-to-revision-14-0-0-1/20210813-101108 git checkout 500c94414bdcb236c244cbbde9219852777a38bf
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-10.3.0 make.cross ARCH=mips
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
In file included from drivers/scsi/lpfc/lpfc_els.c:45:
drivers/scsi/lpfc/lpfc_els.c: In function 'lpfc_cmpl_els_edc':
>> drivers/scsi/lpfc/lpfc_logmsg.h:94:45: warning: format '%ld' expects argument of type 'long int', but argument 7 has type 'unsigned int' [-Wformat=]
94 | dev_printk(level, &((phba)->pcidev)->dev, "%d:" \
| ^~~~~
drivers/scsi/lpfc/lpfc_els.c:3947:5: note: in expansion of macro 'lpfc_printf_log'
3947 | lpfc_printf_log(
| ^~~~~~~~~~~~~~~
drivers/scsi/lpfc/lpfc_logmsg.h:94:45: warning: format '%ld' expects argument of type 'long int', but argument 8 has type 'unsigned int' [-Wformat=]
94 | dev_printk(level, &((phba)->pcidev)->dev, "%d:" \
| ^~~~~
drivers/scsi/lpfc/lpfc_els.c:3947:5: note: in expansion of macro 'lpfc_printf_log'
3947 | lpfc_printf_log(
| ^~~~~~~~~~~~~~~
>> drivers/scsi/lpfc/lpfc_logmsg.h:94:45: warning: format '%ld' expects argument of type 'long int', but argument 7 has type 'unsigned int' [-Wformat=]
94 | dev_printk(level, &((phba)->pcidev)->dev, "%d:" \
| ^~~~~
drivers/scsi/lpfc/lpfc_els.c:3973:5: note: in expansion of macro 'lpfc_printf_log'
3973 | lpfc_printf_log(
| ^~~~~~~~~~~~~~~
drivers/scsi/lpfc/lpfc_logmsg.h:94:45: warning: format '%ld' expects argument of type 'long int', but argument 8 has type 'unsigned int' [-Wformat=]
94 | dev_printk(level, &((phba)->pcidev)->dev, "%d:" \
| ^~~~~
drivers/scsi/lpfc/lpfc_els.c:3973:5: note: in expansion of macro 'lpfc_printf_log'
3973 | lpfc_printf_log(
| ^~~~~~~~~~~~~~~
drivers/scsi/lpfc/lpfc_els.c: In function 'lpfc_els_rcv_edc':
>> drivers/scsi/lpfc/lpfc_logmsg.h:94:45: warning: format '%ld' expects argument of type 'long int', but argument 7 has type 'unsigned int' [-Wformat=]
94 | dev_printk(level, &((phba)->pcidev)->dev, "%d:" \
| ^~~~~
drivers/scsi/lpfc/lpfc_els.c:8806:5: note: in expansion of macro 'lpfc_printf_log'
8806 | lpfc_printf_log(
| ^~~~~~~~~~~~~~~
drivers/scsi/lpfc/lpfc_logmsg.h:94:45: warning: format '%ld' expects argument of type 'long int', but argument 8 has type 'unsigned int' [-Wformat=]
94 | dev_printk(level, &((phba)->pcidev)->dev, "%d:" \
| ^~~~~
drivers/scsi/lpfc/lpfc_els.c:8806:5: note: in expansion of macro 'lpfc_printf_log'
8806 | lpfc_printf_log(
| ^~~~~~~~~~~~~~~
>> drivers/scsi/lpfc/lpfc_logmsg.h:94:45: warning: format '%ld' expects argument of type 'long int', but argument 7 has type 'unsigned int' [-Wformat=]
94 | dev_printk(level, &((phba)->pcidev)->dev, "%d:" \
| ^~~~~
drivers/scsi/lpfc/lpfc_els.c:8821:5: note: in expansion of macro 'lpfc_printf_log'
8821 | lpfc_printf_log(
| ^~~~~~~~~~~~~~~
drivers/scsi/lpfc/lpfc_logmsg.h:94:45: warning: format '%ld' expects argument of type 'long int', but argument 8 has type 'unsigned int' [-Wformat=]
94 | dev_printk(level, &((phba)->pcidev)->dev, "%d:" \
| ^~~~~
drivers/scsi/lpfc/lpfc_els.c:8821:5: note: in expansion of macro 'lpfc_printf_log'
8821 | lpfc_printf_log(
| ^~~~~~~~~~~~~~~vim +94 drivers/scsi/lpfc/lpfc_logmsg.h
e8b62011d88d6f James Smart 2007-08-02 85
dea3101e0a5c89 James Bottomley 2005-04-17 86 #define lpfc_printf_log(phba, level, mask, fmt, arg...) \
7f5f3d0d02aa2f James Smart 2008-02-08 87 do { \
f4b4c68f74dcd5 James Smart 2009-05-22 88 { uint32_t log_verbose = (phba)->pport ? \
f4b4c68f74dcd5 James Smart 2009-05-22 89 (phba)->pport->cfg_log_verbose : \
f4b4c68f74dcd5 James Smart 2009-05-22 90 (phba)->cfg_log_verbose; \
372c187b8a705c Dick Kennedy 2020-06-30 91 if (((mask) & log_verbose) || (level[1] <= '3')) { \
372c187b8a705c Dick Kennedy 2020-06-30 92 if ((mask) & LOG_TRACE_EVENT) \
372c187b8a705c Dick Kennedy 2020-06-30 93 lpfc_dmp_dbg(phba); \e8b62011d88d6f James Smart 2007-08-02 @94 dev_printk(level, &((phba)->pcidev)->dev, "%d:" \
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH 6/16 lpfc: Add cm statistics buffer support
In reply to James SmartThe cmf framework requires the driver to maintain a cm statistics table, accessible inband, of congestion related statistics that are reported per minute, rolled up to per hour, and rolled up again per day. Several days worth may be maintained. The table is registered with the adapter when the MIB feature is enabled.
Add definition of the table and add support to register the table with the adapter. Includes definition and initialization of event counters that are later added to the statistics table.
--- drivers/scsi/lpfc/lpfc.h | 133 ++++++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_crtn.h | 3 + drivers/scsi/lpfc/lpfc_hw4.h | 17 +++++ drivers/scsi/lpfc/lpfc_init.c | 109 ++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_sli.c | 10 +++ 5 files changed, 272 insertions(+)
drivers/scsi/lpfc/lpfc.h +133 -0
@@ -403,6 +403,127 @@ struct lpfc_trunk_link { link3; }; +/* Max number of days of congestion data */ +#define LPFC_MAX_CGN_DAYS 10 + +/* Format of congestion buffer info +* This structure defines memory thats allocated and registered with +* the HBA firmware. When adding or removing fields from this structure +* the alignment must match the HBA firmware. +*/ + +struct lpfc_cgn_info { +/* Header */ +__le16 cgn_info_size;/* is sizeof(struct lpfc_cgn_info) */ +uint8_t cgn_info_version;/* represents format of structure */ +#define LPFC_CGN_INFO_V1 1 +#define LPFC_CGN_INFO_V2 2 +#define LPFC_CGN_INFO_V3 3 +uint8_t cgn_info_mode;/* 0=off 1=managed 2=monitor only */ +uint8_t cgn_info_detect; +uint8_t cgn_info_action; +uint8_t cgn_info_level0; +uint8_t cgn_info_level1; +uint8_t cgn_info_level2; + +/* Start Time */ +uint8_t cgn_info_month; +uint8_t cgn_info_day; +uint8_t cgn_info_year; +uint8_t cgn_info_hour; +uint8_t cgn_info_minute; +uint8_t cgn_info_second; + +/* minute / hours / daily indices */ +uint8_t cgn_index_minute; +uint8_t cgn_index_hour; +uint8_t cgn_index_day; + +__le16 cgn_warn_freq; +__le16 cgn_alarm_freq; +__le16 cgn_lunq; +uint8_t cgn_pad1[8 ]; + +/* Driver Information */ +__le16 cgn_drvr_min[60 ]; +__le32 cgn_drvr_hr[24 ]; +__le32 cgn_drvr_day[LPFC_MAX_CGN_DAYS ]; + +/* Congestion Warnings */ +__le16 cgn_warn_min[60 ]; +__le32 cgn_warn_hr[24 ]; +__le32 cgn_warn_day[LPFC_MAX_CGN_DAYS ]; + +/* Latency Information */ +__le32 cgn_latency_min[60 ]; +__le32 cgn_latency_hr[24 ]; +__le32 cgn_latency_day[LPFC_MAX_CGN_DAYS ]; + +/* Bandwidth Information */ +__le16 cgn_bw_min[60 ]; +__le16 cgn_bw_hr[24 ]; +__le16 cgn_bw_day[LPFC_MAX_CGN_DAYS ]; + +/* Congestion Alarms */ +__le16 cgn_alarm_min[60 ]; +__le32 cgn_alarm_hr[24 ]; +__le32 cgn_alarm_day[LPFC_MAX_CGN_DAYS ]; + +/* Start of congestion statistics */ +uint8_t cgn_stat_npm;/* Notifications per minute */ + +/* Start Time */ +uint8_t cgn_stat_month; +uint8_t cgn_stat_day; +uint8_t cgn_stat_year; +uint8_t cgn_stat_hour; +uint8_t cgn_stat_minute; +uint8_t cgn_pad2[2 ]; + +__le32 cgn_notification; +__le32 cgn_peer_notification; +__le32 link_integ_notification; +__le32 delivery_notification; + +uint8_t cgn_stat_cgn_month;/* Last congestion notification FPIN */ +uint8_t cgn_stat_cgn_day; +uint8_t cgn_stat_cgn_year; +uint8_t cgn_stat_cgn_hour; +uint8_t cgn_stat_cgn_min; +uint8_t cgn_stat_cgn_sec; + +uint8_t cgn_stat_peer_month;/* Last peer congestion FPIN */ +uint8_t cgn_stat_peer_day; +uint8_t cgn_stat_peer_year; +uint8_t cgn_stat_peer_hour; +uint8_t cgn_stat_peer_min; +uint8_t cgn_stat_peer_sec; + +uint8_t cgn_stat_lnk_month;/* Last link integrity FPIN */ +uint8_t cgn_stat_lnk_day; +uint8_t cgn_stat_lnk_year; +uint8_t cgn_stat_lnk_hour; +uint8_t cgn_stat_lnk_min; +uint8_t cgn_stat_lnk_sec; + +uint8_t cgn_stat_del_month;/* Last delivery notification FPIN */ +uint8_t cgn_stat_del_day; +uint8_t cgn_stat_del_year; +uint8_t cgn_stat_del_hour; +uint8_t cgn_stat_del_min; +uint8_t cgn_stat_del_sec; +#define LPFC_CGN_STAT_SIZE 48 +#define LPFC_CGN_DATA_SIZE (sizeof(struct lpfc_cgn_info) - \ + LPFC_CGN_STAT_SIZE - sizeof(uint32_t)) + +__le32 cgn_info_crc; +#define LPFC_CGN_CRC32_MAGIC_NUMBER 0x1EDC6F41 +#define LPFC_CGN_CRC32_SEED 0xFFFFFFFF +}; + +#define LPFC_CGN_INFO_SZ (sizeof(struct lpfc_cgn_info) - \ + sizeof(uint32_t)) +struct lpfc_cgn_acqe_stat {atomic64_t alarm;atomic64_t warn;
@@ -1374,10 +1495,22 @@ struct lpfc_hba {struct lpfc_cgn_acqe_stat cgn_acqe_stat;/* Congestion buffer information */ +struct lpfc_dmabuf *cgn_i;/* Congestion Info buffer */ atomic_t cgn_fabric_warn_cnt;/* Total warning cgn events for info */ atomic_t cgn_fabric_alarm_cnt;/* Total alarm cgn events for info */ atomic_t cgn_sync_warn_cnt;/* Total warning events for SYNC wqe */ atomic_t cgn_sync_alarm_cnt;/* Total alarm events for SYNC wqe */ +atomic_t cgn_driver_evt_cnt;/* Total driver cgn events for fmw */ +atomic_t cgn_latency_evt_cnt; +struct timespec64 cgn_daily_ts; +atomic64_t cgn_latency_evt;/* Avg latency per minute */ +unsigned long cgn_evt_timestamp; +#define LPFC_CGN_TIMER_TO_MIN 60000/* ms in a minute */ +uint32_t cgn_evt_minute; +#define LPFC_SEC_MIN 60 +#define LPFC_MIN_HOUR 60 +#define LPFC_HOUR_DAY 24 +#define LPFC_MIN_DAY (LPFC_MIN_HOUR * LPFC_HOUR_DAY)struct hlist_node cpuhp;/* used for cpuhp per hba callback */ struct timer_list cpuhp_poll_timer;
drivers/scsi/lpfc/lpfc_crtn.h +3 -0
@@ -58,6 +58,7 @@ void lpfc_request_features(struct lpfc_hba *, struct lpfcMboxq *);int lpfc_sli4_mbox_rsrc_extent (struct lpfc_hba *,struct lpfcMboxq *,uint16_t ,uint16_t ,bool );int lpfc_get_sli4_parameters (struct lpfc_hba *,LPFC_MBOXQ_t *); +int lpfc_reg_congestion_buf (struct lpfc_hba *phba);struct lpfc_vport *lpfc_find_vport_by_did (struct lpfc_hba *,uint32_t );void lpfc_cleanup_rcv_buffers (struct lpfc_vport *);void lpfc_rcv_seq_check_edtov (struct lpfc_vport *);
@@ -74,6 +75,8 @@ int lpfc_init_iocb_list(struct lpfc_hba *phba, int cnt);void lpfc_free_iocb_list (struct lpfc_hba *phba);int lpfc_post_rq_buffer (struct lpfc_hba *phba,struct lpfc_queue *hrq,struct lpfc_queue *drq,int count,int idx); +void lpfc_init_congestion_stat (struct lpfc_hba *phba); +void lpfc_init_congestion_buf (struct lpfc_hba *phba);int lpfc_config_cgn_signal (struct lpfc_hba *phba);void lpfc_mbx_cmpl_local_config_link (struct lpfc_hba *,LPFC_MBOXQ_t *);
drivers/scsi/lpfc/lpfc_hw4.h +17 -0
@@ -1025,6 +1025,7 @@ struct mbox_header {#define LPFC_MBOX_OPCODE_SET_HOST_DATA 0x5D#define LPFC_MBOX_OPCODE_SEND_ACTIVATION 0x73#define LPFC_MBOX_OPCODE_RESET_LICENSES 0x74 +#define LPFC_MBOX_OPCODE_REG_CONGESTION_BUF 0x8E#define LPFC_MBOX_OPCODE_GET_RSRC_EXTENT_INFO 0x9A#define LPFC_MBOX_OPCODE_GET_ALLOC_RSRC_EXTENT 0x9B#define LPFC_MBOX_OPCODE_ALLOC_RSRC_EXTENT 0x9C
@@ -3503,6 +3504,21 @@ struct lpfc_mbx_get_sli4_parameters {struct lpfc_sli4_parameters sli4_parameters; }; +struct lpfc_mbx_reg_congestion_buf { +struct mbox_header header; +uint32_t word0; +#define lpfc_mbx_reg_cgn_buf_type_WORD word0 +#define lpfc_mbx_reg_cgn_buf_type_SHIFT 0 +#define lpfc_mbx_reg_cgn_buf_type_MASK 0xFF +#define lpfc_mbx_reg_cgn_buf_cnt_WORD word0 +#define lpfc_mbx_reg_cgn_buf_cnt_SHIFT 16 +#define lpfc_mbx_reg_cgn_buf_cnt_MASK 0xFF +uint32_t word1; +uint32_t length; +uint32_t addr_lo; +uint32_t addr_hi; +}; +struct lpfc_rscr_desc_generic {#define LPFC_RSRC_DESC_WSIZE 22uint32_t desc[LPFC_RSRC_DESC_WSIZE ];
@@ -3902,6 +3918,7 @@ struct lpfc_mqe {struct lpfc_mbx_query_fw_config query_fw_cfg;struct lpfc_mbx_set_beacon_config beacon_config;struct lpfc_mbx_get_sli4_parameters get_sli4_parameters; +struct lpfc_mbx_reg_congestion_buf reg_congestion_buf;struct lpfc_mbx_set_link_diag_state link_diag_state;struct lpfc_mbx_set_link_diag_loopback link_diag_loopback;struct lpfc_mbx_run_link_diag_test link_diag_test;
drivers/scsi/lpfc/lpfc_init.c +109 -0
115 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.c +10 -0
@@ -7713,6 +7713,16 @@ lpfc_cmf_setup(struct lpfc_hba *phba) sli4_params->mi_ver);mempool_free (mboxq, phba->mbox_mem_pool); + +/* Initialize atomic counters */ +atomic_set (&phba->cgn_fabric_warn_cnt,0 ); +atomic_set (&phba->cgn_fabric_alarm_cnt,0 ); +atomic_set (&phba->cgn_sync_alarm_cnt,0 ); +atomic_set (&phba->cgn_sync_warn_cnt,0 ); +atomic_set (&phba->cgn_driver_evt_cnt,0 ); +atomic_set (&phba->cgn_latency_evt_cnt,0 ); +atomic64_set (&phba->cgn_latency_evt,0 ); +return 0 ; }
Signature · 1 line
2.26.2
PATCH 7/16 lpfc: Add support for cm enablement buffer
In reply to James SmartAs part of the cmf framework, the firmware maintains a table with congestion related state information, specifically whether enabled and if enabled, whether monitoring or actively managing congestion.
Add definition of the table and add support to read the table from the adapter and determine if it is enabled. In support of this, the READ_OBJECT mailbox command definition is added to the driver.
--- drivers/scsi/lpfc/lpfc.h | 29 ++++++ drivers/scsi/lpfc/lpfc_attr.c | 5 - drivers/scsi/lpfc/lpfc_crtn.h | 4 + drivers/scsi/lpfc/lpfc_hw4.h | 32 ++++++ drivers/scsi/lpfc/lpfc_init.c | 188 ++++++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_sli.c | 110 ++++++++++++++++++++ 6 files changed, 363 insertions(+), 5 deletions(-)
drivers/scsi/lpfc/lpfc.h +29 -0
@@ -114,6 +114,12 @@ struct lpfc_sli2_slim;#define LPFC_MBX_NO_WAIT 0#define LPFC_MBX_WAIT 1 +#define LPFC_CFG_PARAM_MAGIC_NUM 0xFEAA0005 +#define LPFC_PORT_CFG_NAME "/cfg/port.cfg" + +#define lpfc_rangecheck (val, min, max) \ + ((uint)(val) >= (uint)(min) && (val) <= (max)) +enum lpfc_polling_flags {ENABLE_FCP_RING_POLLING =0x1 ,DISABLE_FCP_RING_INT =0x2
@@ -403,6 +409,26 @@ struct lpfc_trunk_link { link3; }; +/* Format of congestion module parameters */ +struct lpfc_cgn_param { +uint32_t cgn_param_magic; +uint8_t cgn_param_version;/* version 1 */ +uint8_t cgn_param_mode;/* 0=off 1=managed 2=monitor only */ +#define LPFC_CFG_OFF 0 +#define LPFC_CFG_MANAGED 1 +#define LPFC_CFG_MONITOR 2 +uint8_t cgn_rsvd1; +uint8_t cgn_rsvd2; +uint8_t cgn_param_level0; +uint8_t cgn_param_level1; +uint8_t cgn_param_level2; +uint8_t byte11; +uint8_t byte12; +uint8_t byte13; +uint8_t byte14; +uint8_t byte15; +}; +/* Max number of days of congestion data */ #define LPFC_MAX_CGN_DAYS 10
@@ -1491,6 +1517,9 @@ struct lpfc_hba {u32 cgn_sig_freq;u32 cgn_acqe_cnt; +/* Congestion parameters from flash */ +struct lpfc_cgn_param cgn_p; +/* Statistics counter for ACQE cgn alarms and warnings */ struct lpfc_cgn_acqe_stat cgn_acqe_stat;
drivers/scsi/lpfc/lpfc_attr.c +0 -5
@@ -2248,11 +2248,6 @@ lpfc_sriov_hw_max_virtfn_show(struct device *dev,return scnprintf (buf,PAGE_SIZE ,"%d\n" , max_nr_virtfn); } -static inline bool lpfc_rangecheck (uint val,uint min,uint max) -{ -return val >= min && val <= max; -} -/** * lpfc_enable_bbcr_set: Sets an attribute value. * @phba: pointer the the adapter structure.
drivers/scsi/lpfc/lpfc_crtn.h +4 -0
@@ -77,6 +77,7 @@ int lpfc_post_rq_buffer(struct lpfc_hba *phba, struct lpfc_queue *hrq, struct lpfc_queue *drq, int count, int idx);void lpfc_init_congestion_stat (struct lpfc_hba *phba);void lpfc_init_congestion_buf (struct lpfc_hba *phba); +int lpfc_sli4_cgn_params_read (struct lpfc_hba *phba);int lpfc_config_cgn_signal (struct lpfc_hba *phba);void lpfc_mbx_cmpl_local_config_link (struct lpfc_hba *,LPFC_MBOXQ_t *);
@@ -220,6 +221,9 @@ irqreturn_t lpfc_sli_fp_intr_handler(int, void *);irqreturn_t lpfc_sli4_intr_handler (int ,void *);irqreturn_t lpfc_sli4_hba_intr_handler (int ,void *); +int lpfc_read_object (struct lpfc_hba *phba,char *s,uint32_t *datap, +uint32_t len); +void lpfc_sli4_cleanup_poll_list (struct lpfc_hba *phba);int lpfc_sli4_poll_eq (struct lpfc_queue *q,uint8_t path);void lpfc_sli4_poll_hbtimer (struct timer_list *t);
drivers/scsi/lpfc/lpfc_hw4.h +32 -0
@@ -1134,6 +1134,12 @@ struct lpfc_mbx_sge {uint32_t length; }; +struct lpfc_mbx_host_buf { +uint32_t length; +uint32_t pa_lo; +uint32_t pa_hi; +}; +struct lpfc_mbx_nembed_cmd {struct lpfc_sli4_cfg_mhdr cfg_mhdr;#define LPFC_SLI4_MBX_SGE_MAX_PAGES 19
@@ -1144,6 +1150,30 @@ struct lpfc_mbx_nembed_sge_virt {void *addr[LPFC_SLI4_MBX_SGE_MAX_PAGES ]; }; +struct lpfc_mbx_read_object {/* Version 0 */ +struct mbox_header header; +union { +struct { +uint32_t word0; +#define lpfc_mbx_rd_object_rlen_SHIFT 0 +#define lpfc_mbx_rd_object_rlen_MASK 0x00FFFFFF +#define lpfc_mbx_rd_object_rlen_WORD word0 +uint32_t rd_object_offset; +uint32_t rd_object_name[26 ]; +#define LPFC_OBJ_NAME_SZ 104/* 26 x sizeof(uint32_t) is 104. */ +uint32_t rd_object_cnt; +struct lpfc_mbx_host_buf rd_object_hbuf[4 ]; + } request; +struct { +uint32_t rd_object_actual_rlen; +uint32_t word1; +#define lpfc_mbx_rd_object_eof_SHIFT 31 +#define lpfc_mbx_rd_object_eof_MASK 0x1 +#define lpfc_mbx_rd_object_eof_WORD word1 + } response; + } u; +}; +struct lpfc_mbx_eq_create {struct mbox_header header;union {
@@ -2339,6 +2369,7 @@ struct lpfc_mbx_redisc_fcf_tbl {#define ADD_STATUS_OPERATION_ALREADY_ACTIVE 0x67#define ADD_STATUS_FW_NOT_SUPPORTED 0xEB#define ADD_STATUS_INVALID_REQUEST 0x4B +#define ADD_STATUS_INVALID_OBJECT_NAME 0xA0#define ADD_STATUS_FW_DOWNLOAD_HW_DISABLED 0x58struct lpfc_mbx_sli4_config {
@@ -3893,6 +3924,7 @@ struct lpfc_mqe {struct lpfc_mbx_unreg_fcfi unreg_fcfi;struct lpfc_mbx_mq_create mq_create;struct lpfc_mbx_mq_create_ext mq_create_ext; +struct lpfc_mbx_read_object read_object;struct lpfc_mbx_eq_create eq_create;struct lpfc_mbx_modify_eq_delay eq_delay;struct lpfc_mbx_cq_create cq_create;
drivers/scsi/lpfc/lpfc_init.c +188 -0
194 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.c +110 -0
116 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 8/16 lpfc: add cmfsync WQE support
In reply to James SmartWhen congestion mgmt is enabled, cmf has the driver regularly issue a command to synchronize reporting of congestion mgmt events such as fpin and signal delivery.
This patch adds the definition of the CMF_SYNC WQE and its CQE fields as well as support for issuing the command. The patch also adds the few remaining cmf-related SLI additions, such as feature definition for enablement of CMF and notifications to the driver if the cm enablement mode changes.
--- drivers/scsi/lpfc/lpfc.h | 4 + drivers/scsi/lpfc/lpfc_crtn.h | 1 + drivers/scsi/lpfc/lpfc_hw4.h | 87 ++++++++++++++++- drivers/scsi/lpfc/lpfc_sli.c | 178 ++++++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_sli.h | 1 + 5 files changed, 268 insertions(+), 3 deletions(-)
drivers/scsi/lpfc/lpfc.h +4 -0
@@ -1499,6 +1499,10 @@ struct lpfc_hba {u32 cmf_active_mode;#define LPFC_CFG_OFF 0 +#define LPFC_CMF_INTERVAL 90 +#define LPFC_CMF_BLK_SIZE 512 +#define LPFC_MAX_CMF_INFO 32 +/* Signal / FPIN handling for Congestion Mgmt */ u8 cgn_reg_fpin;/* Negotiated value from RDF */ u8 cgn_init_reg_fpin;/* Initial value from READ_CONFIG */
drivers/scsi/lpfc/lpfc_crtn.h +1 -0
@@ -79,6 +79,7 @@ void lpfc_init_congestion_stat(struct lpfc_hba *phba);void lpfc_init_congestion_buf (struct lpfc_hba *phba);int lpfc_sli4_cgn_params_read (struct lpfc_hba *phba);int lpfc_config_cgn_signal (struct lpfc_hba *phba); +int lpfc_issue_cmf_sync_wqe (struct lpfc_hba *phba,u32 ms,u64 total);void lpfc_mbx_cmpl_local_config_link (struct lpfc_hba *,LPFC_MBOXQ_t *);void lpfc_mbx_cmpl_reg_login (struct lpfc_hba *,LPFC_MBOXQ_t *);
drivers/scsi/lpfc/lpfc_hw4.h +84 -3
162 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.c +178 -0
184 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.h +1 -0
@@ -107,6 +107,7 @@ struct lpfc_iocbq {#define LPFC_IO_NVME_LS 0x400000/* NVME LS command */ #define LPFC_IO_NVMET 0x800000/* NVMET command */ #define LPFC_IO_VMID 0x1000000/* VMID tagged IO */ +#define LPFC_IO_CMF 0x4000000/* CMF command */ uint32_t drvrTimeout;/* driver timeout in seconds */ struct lpfc_vport *vport;/* virtual port pointer */
Signature · 1 line
2.26.2
PATCH 9/16 lpfc: Add support for the CM framework
In reply to James SmartThis patch completes the enablement of the cm framework feature in the adapter.
The patch performs the following:
- Detects the presence of the congestion management framework feature
When the cm framework is present:
- Issues the SET_FEATURE command to enable the feature
- Registers the cm statistics buffer with the adapter
- Reads the cm enablement buffer to determine the cm framework state for cm management.
When cm management is enabled:
- Monitors all FPIN and congestion signalling events, incrementing counters.
- Regularly syncs with the adapter to communicate congestion events and to receive an rx request limit.
- Monitors requests for rx data and ensures that no more than the adapter prescribed limit is issued on the link. If the limit is exceeded, scsi and/or nvme traffic is temporarily suspended.
- Maintains the minute, hourly, daily statistics buffer.
- Monitors for congestion enablement change events, causing a reread of the enablement buffer and acting on any change in enablement.
And
- Adds teardown logic, including buffer deregistration, on adapter detachment or reset.
--- drivers/scsi/lpfc/lpfc.h | 33 ++- drivers/scsi/lpfc/lpfc_attr.c | 1 + drivers/scsi/lpfc/lpfc_crtn.h | 10 + drivers/scsi/lpfc/lpfc_els.c | 73 +++++- drivers/scsi/lpfc/lpfc_hbadisc.c | 4 + drivers/scsi/lpfc/lpfc_init.c | 391 ++++++++++++++++++++++++++++++- drivers/scsi/lpfc/lpfc_mem.c | 9 + drivers/scsi/lpfc/lpfc_nvme.c | 44 +++- drivers/scsi/lpfc/lpfc_scsi.c | 185 ++++++++++++++- drivers/scsi/lpfc/lpfc_sli.c | 192 ++++++++++++++- drivers/scsi/lpfc/lpfc_sli.h | 1 + drivers/scsi/lpfc/lpfc_sli4.h | 1 + 12 files changed, 910 insertions(+), 34 deletions(-)
drivers/scsi/lpfc/lpfc.h +30 -3
@@ -550,6 +550,14 @@ struct lpfc_cgn_info {#define LPFC_CGN_INFO_SZ (sizeof(struct lpfc_cgn_info) - \ sizeof(uint32_t)) +struct lpfc_cgn_stat { +atomic64_t total_bytes; +atomic64_t rcv_bytes; +atomic64_t rx_latency; +#define LPFC_CGN_NOT_SENT 0xFFFFFFFFFFFFFFFFLL +atomic_t rx_io_cnt; +}; +struct lpfc_cgn_acqe_stat {atomic64_t alarm;atomic64_t warn;
@@ -1021,7 +1029,10 @@ struct lpfc_hba {* capability */ #define HBA_FLOGI_ISSUED 0x100000/* FLOGI was issued */ +#define HBA_CGN_RSVD1 0x200000/* Reserved CGN flag */ +#define HBA_CGN_DAY_WRAP 0x400000/* HBA Congestion info day wraps */ #define HBA_DEFER_FLOGI 0x800000/* Defer FLOGI till read_sparm cmpl */ +#define HBA_SETUP 0x1000000/* Signifies HBA setup is completed */ #define HBA_NEEDS_CFG_PORT 0x2000000/* SLI3 - needs a CONFIG_PORT mbox */ #define HBA_HBEAT_INP 0x4000000/* mbox HBEAT is in progress */ #define HBA_HBEAT_TMO 0x8000000/* HBEAT initiated after timeout */
@@ -1272,6 +1283,7 @@ struct lpfc_hba {uint32_t total_iocbq_bufs;struct list_head active_rrq_list;spinlock_t hbalock; +struct work_struct unblock_request_work;/* SCSI layer unblock IOs */ /* dma_mem_pools */ struct dma_pool *lpfc_sg_dma_buf_pool;
@@ -1496,12 +1508,25 @@ struct lpfc_hba {uint64_t ktime_seg10_max;#endif /* CMF objects */ -u32 cmf_active_mode; -#define LPFC_CFG_OFF 0 - +struct lpfc_cgn_stat __percpu *cmf_stat; +uint32_t cmf_interval_rate;/* timer interval limit in ms */ +uint32_t cmf_timer_cnt;#define LPFC_CMF_INTERVAL 90 +uint64_t cmf_link_byte_count; +uint64_t cmf_max_line_rate; +uint64_t cmf_max_bytes_per_interval; +uint64_t cmf_last_sync_bw;#define LPFC_CMF_BLK_SIZE 512 +struct hrtimer cmf_timer; +atomic_t cmf_bw_wait; +atomic_t cmf_busy; +atomic_t cmf_stop_io;/* To block request and stop IO's */ +uint32_t cmf_active_mode; +uint32_t cmf_info_per_interval;#define LPFC_MAX_CMF_INFO 32 +struct timespec64 cmf_latency;/* Interval congestion timestamp */ +uint32_t cmf_last_ts;/* Interval congestion time (ms) */ +uint32_t cmf_active_info;/* Signal / FPIN handling for Congestion Mgmt */ u8 cgn_reg_fpin;/* Negotiated value from RDF */
@@ -1521,6 +1546,8 @@ struct lpfc_hba {u32 cgn_sig_freq;u32 cgn_acqe_cnt; +uint64_t rx_block_cnt; +/* Congestion parameters from flash */ struct lpfc_cgn_param cgn_p;
drivers/scsi/lpfc/lpfc_attr.c +1 -0
@@ -7476,6 +7476,7 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)lpfc_enable_dpp_init (phba, lpfc_enable_dpp);lpfc_enable_mi_init (phba, lpfc_enable_mi); + phba->cgn_p.cgn_param_mode =LPFC_CFG_OFF ; phba->cmf_active_mode =LPFC_CFG_OFF ;if (lpfc_fabric_cgn_frequency >EDC_CG_SIGFREQ_CNT_MAX || lpfc_fabric_cgn_frequency <EDC_CG_SIGFREQ_CNT_MIN )
drivers/scsi/lpfc/lpfc_crtn.h +10 -0
@@ -59,6 +59,7 @@ int lpfc_sli4_mbox_rsrc_extent(struct lpfc_hba *, struct lpfcMboxq *, uint16_t, uint16_t, bool);int lpfc_get_sli4_parameters (struct lpfc_hba *,LPFC_MBOXQ_t *);int lpfc_reg_congestion_buf (struct lpfc_hba *phba); +int lpfc_unreg_congestion_buf (struct lpfc_hba *phba);struct lpfc_vport *lpfc_find_vport_by_did (struct lpfc_hba *,uint32_t );void lpfc_cleanup_rcv_buffers (struct lpfc_vport *);void lpfc_rcv_seq_check_edtov (struct lpfc_vport *);
@@ -75,11 +76,17 @@ int lpfc_init_iocb_list(struct lpfc_hba *phba, int cnt);void lpfc_free_iocb_list (struct lpfc_hba *phba);int lpfc_post_rq_buffer (struct lpfc_hba *phba,struct lpfc_queue *hrq,struct lpfc_queue *drq,int count,int idx); +uint32_t lpfc_calc_cmf_latency (struct lpfc_hba *phba); +void lpfc_cmf_signal_init (struct lpfc_hba *phba); +void lpfc_cmf_start (struct lpfc_hba *phba); +void lpfc_cmf_stop (struct lpfc_hba *phba);void lpfc_init_congestion_stat (struct lpfc_hba *phba);void lpfc_init_congestion_buf (struct lpfc_hba *phba);int lpfc_sli4_cgn_params_read (struct lpfc_hba *phba);int lpfc_config_cgn_signal (struct lpfc_hba *phba);int lpfc_issue_cmf_sync_wqe (struct lpfc_hba *phba,u32 ms,u64 total); +void lpfc_unblock_requests (struct lpfc_hba *phba); +void lpfc_block_requests (struct lpfc_hba *phba);void lpfc_mbx_cmpl_local_config_link (struct lpfc_hba *,LPFC_MBOXQ_t *);void lpfc_mbx_cmpl_reg_login (struct lpfc_hba *,LPFC_MBOXQ_t *);
@@ -471,6 +478,9 @@ void lpfc_free_fast_evt(struct lpfc_hba *, struct lpfc_fast_path_event *);void lpfc_create_static_vport (struct lpfc_hba *);void lpfc_stop_hba_timers (struct lpfc_hba *);void lpfc_stop_port (struct lpfc_hba *); +int lpfc_update_cmf_cmd (struct lpfc_hba *phba,uint32_t sz); +int lpfc_update_cmf_cmpl (struct lpfc_hba *phba,uint64_t val,uint32_t sz, +struct Scsi_Host *shost);void __lpfc_sli4_stop_fcf_redisc_wait_timer (struct lpfc_hba *);void lpfc_sli4_stop_fcf_redisc_wait_timer (struct lpfc_hba *);void lpfc_parse_fcoe_conf (struct lpfc_hba *,uint8_t *,uint32_t );
drivers/scsi/lpfc/lpfc_els.c +69 -4
119 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_hbadisc.c +4 -0
@@ -3647,6 +3647,10 @@ lpfc_mbx_cmpl_read_topology(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) phba->wait_4_mlo_maint_flg); }lpfc_mbx_process_link_up (phba, la); + +if (phba->cmf_active_mode !=LPFC_CFG_OFF ) +lpfc_cmf_signal_init (phba); + }else if (attn_type ==LPFC_ATT_LINK_DOWN || attn_type ==LPFC_ATT_UNEXP_WWPN ) { phba->fc_stat.LinkDown++;
drivers/scsi/lpfc/lpfc_init.c +388 -3
531 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_mem.c +9 -0
@@ -335,6 +335,15 @@ lpfc_mem_free_all(struct lpfc_hba *phba)dma_pool_destroy (phba->lpfc_cmd_rsp_buf_pool); phba->lpfc_cmd_rsp_buf_pool =NULL ; +/* Free Congestion Data buffer */ +if (phba->cgn_i) { +dma_free_coherent (&phba->pcidev->dev, +sizeof (struct lpfc_cgn_info ), + phba->cgn_i->virt, phba->cgn_i->phys); +kfree (phba->cgn_i); + phba->cgn_i =NULL ; + } +/* Free the iocb lookup array */ kfree (psli->iocbq_lookup); psli->iocbq_lookup =NULL ;
drivers/scsi/lpfc/lpfc_nvme.c +39 -5
93 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_scsi.c +178 -7
254 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.c +180 -12
293 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.h +1 -0
@@ -463,4 +463,5 @@ struct lpfc_io_buf {uint64_t ts_isr_cmpl;uint64_t ts_data_io;#endif +uint64_t rx_cmd_start; };
drivers/scsi/lpfc/lpfc_sli4.h +1 -0
@@ -557,6 +557,7 @@ struct lpfc_pc_sli4_params {uint16_t mi_value;#define LPFC_DFLT_MIB_VAL 2uint8_t mib_bde_cnt; +uint8_t cmf;uint8_t cqv;uint8_t mqv;uint8_t wqv;
Signature · 1 line
2.26.2
PATCH 10/16 lpfc: Add rx monitoring statistics
In reply to James SmartThe driver provides overwatch of the cm behavior by maintaining a set of rx io statistics. This information is also used in later updating of the cm statistics buffer.
--- drivers/scsi/lpfc/lpfc.h | 21 +++++++++++++++ drivers/scsi/lpfc/lpfc_init.c | 50 +++++++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_mem.c | 4 +++ drivers/scsi/lpfc/lpfc_scsi.c | 2 ++ drivers/scsi/lpfc/lpfc_sli.c | 15 +++++++++++ 5 files changed, 92 insertions(+)
drivers/scsi/lpfc/lpfc.h +21 -0
@@ -1546,6 +1546,12 @@ struct lpfc_hba {u32 cgn_sig_freq;u32 cgn_acqe_cnt; +/* RX monitor handling for CMF */ +struct rxtable_entry *rxtable;/* RX_monitor information */ +atomic_t rxtable_idx_head; +#define LPFC_RXMONITOR_TABLE_IN_USE (LPFC_MAX_RXMONITOR_ENTRY + 73) +atomic_t rxtable_idx_tail; +atomic_t rx_max_read_cnt;/* Maximum read bytes */ uint64_t rx_block_cnt;/* Congestion parameters from flash */
@@ -1591,6 +1597,21 @@ struct lpfc_hba {struct dbg_log_ent dbg_log[DBG_LOG_SZ ]; }; +#define LPFC_MAX_RXMONITOR_ENTRY 800 +struct rxtable_entry { +uint64_t total_bytes;/* Total no of read bytes requested */ +uint64_t rcv_bytes;/* Total no of read bytes completed */ +uint64_t avg_io_size; +uint64_t avg_io_latency;/* Average io latency in microseconds */ +uint64_t max_read_cnt;/* Maximum read bytes */ +uint64_t max_bytes_per_interval; +uint32_t cmf_busy; +uint32_t cmf_info;/* CMF_SYNC_WQE info */ +uint32_t io_cnt; +uint32_t timer_utilization; +uint32_t timer_interval; +}; +static inline struct Scsi_Host *lpfc_shost_from_vport (struct lpfc_vport *vport) {
drivers/scsi/lpfc/lpfc_init.c +50 -0
77 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_mem.c +4 -0
@@ -344,6 +344,10 @@ lpfc_mem_free_all(struct lpfc_hba *phba) phba->cgn_i =NULL ; } +/* Free RX table */ +kfree (phba->rxtable); + phba->rxtable =NULL ; +/* Free the iocb lookup array */ kfree (psli->iocbq_lookup); psli->iocbq_lookup =NULL ;
drivers/scsi/lpfc/lpfc_scsi.c +2 -0
@@ -3981,6 +3981,8 @@ lpfc_update_cmf_cmd(struct lpfc_hba *phba, uint32_t size)atomic_inc (&phba->cmf_busy);return -EBUSY ; } +if (size >atomic_read (&phba->rx_max_read_cnt)) +atomic_set (&phba->rx_max_read_cnt, size); } cgs =this_cpu_ptr (phba->cmf_stat);
drivers/scsi/lpfc/lpfc_sli.c +15 -0
@@ -8066,6 +8066,21 @@ lpfc_cmf_setup(struct lpfc_hba *phba)atomic64_set (&phba->cgn_latency_evt,0 ); phba->cmf_interval_rate =LPFC_CMF_INTERVAL ; + +/* Allocate RX Monitor Buffer */ +if (!phba->rxtable) { + phba->rxtable =kmalloc_array (LPFC_MAX_RXMONITOR_ENTRY , +sizeof (struct rxtable_entry ), +GFP_KERNEL ); +if (!phba->rxtable) { +lpfc_printf_log (phba,KERN_ERR ,LOG_INIT , +"2644 Failed to alloc memory " +"for RX Monitor Buffer\n" ); +return -ENOMEM ; + } + } +atomic_set (&phba->rxtable_idx_head,0 ); +atomic_set (&phba->rxtable_idx_tail,0 );return 0 ; }
Signature · 1 line
2.26.2
PATCH 11/16 lpfc: Add support for maintaining the cm statistics buffer
In reply to James SmartThis patch adds the logic to move the congestion management and event information into the cmd statistics buffer maintained for the adapter. The update includes rolling up values for the last minute, hour, and day information.
--- drivers/scsi/lpfc/lpfc_crtn.h | 2 + drivers/scsi/lpfc/lpfc_els.c | 10 + drivers/scsi/lpfc/lpfc_init.c | 531 +++++++++++++++++++++++++++++++++- 3 files changed, 542 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_crtn.h +2 -0
@@ -83,8 +83,10 @@ void lpfc_cmf_stop(struct lpfc_hba *phba);void lpfc_init_congestion_stat (struct lpfc_hba *phba);void lpfc_init_congestion_buf (struct lpfc_hba *phba);int lpfc_sli4_cgn_params_read (struct lpfc_hba *phba); +uint32_t lpfc_cgn_calc_crc32 (void *bufp,uint32_t sz,uint32_t seed);int lpfc_config_cgn_signal (struct lpfc_hba *phba);int lpfc_issue_cmf_sync_wqe (struct lpfc_hba *phba,u32 ms,u64 total); +void lpfc_cgn_update_stat (struct lpfc_hba *phba,uint32_t dtag);void lpfc_unblock_requests (struct lpfc_hba *phba);void lpfc_block_requests (struct lpfc_hba *phba);
drivers/scsi/lpfc/lpfc_els.c +10 -0
@@ -3783,6 +3783,7 @@ lpfc_least_capable_settings(struct lpfc_hba *phba,u32 rsp_sig_cap =0 , drv_sig_cap =0 ;u32 rsp_sig_freq_cyc =0 , rsp_sig_freq_scale =0 ;struct lpfc_cgn_info *cp; +u32 crc;u16 sig_freq;/* Get rsp signal and frequency capabilities. */
@@ -3856,6 +3857,8 @@ lpfc_least_capable_settings(struct lpfc_hba *phba, cp->cgn_alarm_freq =cpu_to_le16 (sig_freq); cp->cgn_warn_freq =cpu_to_le16 (sig_freq); } + crc =lpfc_cgn_calc_crc32 (cp,LPFC_CGN_INFO_SZ ,LPFC_CGN_CRC32_SEED ); + cp->cgn_info_crc =cpu_to_le32 (crc);return ; out_no_support:
@@ -9539,6 +9542,7 @@ lpfc_els_rcv_fpin_cgn(struct lpfc_hba *phba, struct fc_tlv_desc *tlv)const char *cgn_sev_str;u32 cgn_sev;uint16_t value; +u32 crc;bool nm_log = false;int rc =1 ;
@@ -9601,6 +9605,11 @@ lpfc_els_rcv_fpin_cgn(struct lpfc_hba *phba, struct fc_tlv_desc *tlv) LPFC_CGN_FPIN_WARN) cp->cgn_warn_freq =cpu_to_le16 (value); + crc =lpfc_cgn_calc_crc32 + (cp, +LPFC_CGN_INFO_SZ , +LPFC_CGN_CRC32_SEED ); + cp->cgn_info_crc =cpu_to_le32 (crc); }/* Don't deliver to upper layer since
@@ -9688,6 +9697,7 @@ lpfc_els_rcv_fpin(struct lpfc_vport *vport, void *p, u32 fpin_length)/* If descriptor is bad, drop the rest of the data */ return ; } +lpfc_cgn_update_stat (phba, dtag); cnt =be32_to_cpu (tlv->desc_len);/* Sanity check descriptor length. The desc_len value does not
drivers/scsi/lpfc/lpfc_init.c +530 -1
586 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 12/16 lpfc: Add debugfs support for cm framework buffers
In reply to James SmartThis patch adds support via debugfs to report the cm statistics, cm enablement, and rx monitor information.
--- drivers/scsi/lpfc/lpfc.h | 2 + drivers/scsi/lpfc/lpfc_debugfs.c | 223 +++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_debugfs.h | 9 ++ 3 files changed, 234 insertions(+)
drivers/scsi/lpfc/lpfc.h +2 -0
@@ -1357,6 +1357,8 @@ struct lpfc_hba {#ifdef LPFC_HDWQ_LOCK_STAT struct dentry *debug_lockstat;#endif +struct dentry *debug_cgn_buffer; +struct dentry *debug_rx_monitor;struct dentry *debug_ras_log;atomic_t nvmeio_trc_cnt;uint32_t nvmeio_trc_size;
drivers/scsi/lpfc/lpfc_debugfs.c +223 -0
247 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_debugfs.h +9 -0
@@ -52,6 +52,9 @@/* scsistat output buffer size */ #define LPFC_SCSISTAT_SIZE 8192 +/* Congestion Info Buffer size */ +#define LPFC_CGN_BUF_SIZE 8192 +#define LPFC_DEBUG_OUT_LINE_SZ 80/*
@@ -279,6 +282,12 @@ struct lpfc_idiag {void *ptr_private; }; +#define MAX_DEBUGFS_RX_TABLE_SIZE (100 * LPFC_MAX_RXMONITOR_ENTRY) +struct lpfc_rx_monitor_debug { +char *i_private; +char *buffer; +}; +#else #define lpfc_nvmeio_data(phba, fmt, arg...) \
Signature · 1 line
2.26.2
PATCH 13/16 lpfc: Add cmf_info sysfs entry
In reply to James SmartThis patch allows abbreviated cm framework status information to be obtained via sysfs.
--- drivers/scsi/lpfc/lpfc.h | 1 + drivers/scsi/lpfc/lpfc_attr.c | 193 +++++++++++++++++++++++++++++++++- drivers/scsi/lpfc/lpfc_crtn.h | 2 + drivers/scsi/lpfc/lpfc_els.c | 2 +- drivers/scsi/lpfc/lpfc_hw4.h | 6 +- drivers/scsi/lpfc/lpfc_init.c | 38 +++++++ drivers/scsi/lpfc/lpfc_nvme.h | 3 - 7 files changed, 235 insertions(+), 10 deletions(-)
drivers/scsi/lpfc/lpfc.h +1 -0
@@ -1600,6 +1600,7 @@ struct lpfc_hba { };#define LPFC_MAX_RXMONITOR_ENTRY 800 +#define LPFC_MAX_RXMONITOR_DUMP 32struct rxtable_entry {uint64_t total_bytes;/* Total no of read bytes requested */ uint64_t rcv_bytes;/* Total no of read bytes completed */
drivers/scsi/lpfc/lpfc_attr.c +189 -4
235 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_crtn.h +2 -0
@@ -86,6 +86,7 @@ int lpfc_sli4_cgn_params_read(struct lpfc_hba *phba);uint32_t lpfc_cgn_calc_crc32 (void *bufp,uint32_t sz,uint32_t seed);int lpfc_config_cgn_signal (struct lpfc_hba *phba);int lpfc_issue_cmf_sync_wqe (struct lpfc_hba *phba,u32 ms,u64 total); +void lpfc_cgn_dump_rxmonitor (struct lpfc_hba *phba);void lpfc_cgn_update_stat (struct lpfc_hba *phba,uint32_t dtag);void lpfc_unblock_requests (struct lpfc_hba *phba);void lpfc_block_requests (struct lpfc_hba *phba);
@@ -159,6 +160,7 @@ int lpfc_issue_els_rscn(struct lpfc_vport *vport, uint8_t retry);int lpfc_issue_fabric_reglogin (struct lpfc_vport *);int lpfc_issue_els_rdf (struct lpfc_vport *vport,uint8_t retry);int lpfc_issue_els_edc (struct lpfc_vport *vport,uint8_t retry); +void lpfc_els_rcv_fpin (struct lpfc_vport *vport,void *p,u32 fpin_length);int lpfc_els_free_iocb (struct lpfc_hba *,struct lpfc_iocbq *);int lpfc_ct_free_iocb (struct lpfc_hba *,struct lpfc_iocbq *); int lpfc_els_rsp_acc(struct lpfc_vport *, uint32_t, struct lpfc_iocbq *,
drivers/scsi/lpfc/lpfc_els.c +1 -1
@@ -9632,7 +9632,7 @@ lpfc_els_rcv_fpin_cgn(struct lpfc_hba *phba, struct fc_tlv_desc *tlv)return rc; } -static void +void lpfc_els_rcv_fpin (struct lpfc_vport *vport,void *p,u32 fpin_length) {struct lpfc_hba *phba = vport->phba;
drivers/scsi/lpfc/lpfc_hw4.h +4 -2
@@ -1157,6 +1157,7 @@ struct lpfc_mbx_nembed_sge_virt {void *addr[LPFC_SLI4_MBX_SGE_MAX_PAGES ]; }; +#define LPFC_MBX_OBJECT_NAME_LEN_DW 26struct lpfc_mbx_read_object {/* Version 0 */ struct mbox_header header;union {
@@ -1166,7 +1167,7 @@ struct lpfc_mbx_read_object { /* Version 0 */#define lpfc_mbx_rd_object_rlen_MASK 0x00FFFFFF#define lpfc_mbx_rd_object_rlen_WORD word0uint32_t rd_object_offset; -uint32_t rd_object_name[26 ]; +uint32_t rd_object_name[LPFC_MBX_OBJECT_NAME_LEN_DW ];#define LPFC_OBJ_NAME_SZ 104/* 26 x sizeof(uint32_t) is 104. */ uint32_t rd_object_cnt;struct lpfc_mbx_host_buf rd_object_hbuf[4 ];
@@ -3871,6 +3872,7 @@ struct lpfc_mbx_get_port_name {#define MB_CEQ_STATUS_QUEUE_FLUSHING 0x4#define MB_CQE_STATUS_DMA_FAILED 0x5 +#define LPFC_MBX_WR_CONFIG_MAX_BDE 1struct lpfc_mbx_wr_object {struct mbox_header header;
@@ -3887,7 +3889,7 @@ struct lpfc_mbx_wr_object {#define lpfc_wr_object_write_length_MASK 0x00FFFFFF#define lpfc_wr_object_write_length_WORD word4uint32_t write_offset; -uint32_t object_name[26 ]; +uint32_t object_name[LPFC_MBX_OBJECT_NAME_LEN_DW ];uint32_t bde_count;struct ulp_bde64 bde[LPFC_MBX_WR_CONFIG_MAX_BDE ]; } request;
drivers/scsi/lpfc/lpfc_init.c +38 -0
@@ -5404,6 +5404,44 @@ lpfc_async_link_speed_to_read_top(struct lpfc_hba *phba, uint8_t speed_code)return port_speed; } +void +lpfc_cgn_dump_rxmonitor (struct lpfc_hba *phba) +{ +struct rxtable_entry *entry; +int cnt =0 , head, tail, last, start; + + head =atomic_read (&phba->rxtable_idx_head); + tail =atomic_read (&phba->rxtable_idx_tail); +if (!phba->rxtable || head == tail) { +lpfc_printf_log (phba,KERN_ERR ,LOG_CGN_MGMT , +"4411 Rxtable is empty\n" ); +return ; + } + last = tail; + start = head; + +/* Display the last LPFC_MAX_RXMONITOR_DUMP entries from the rxtable */ +while (start != last) { +if (start) + start--; +else + start =LPFC_MAX_RXMONITOR_ENTRY -1 ; + entry = &phba->rxtable[start]; +lpfc_printf_log (phba,KERN_INFO ,LOG_CGN_MGMT , +"4410 %02d: MBPI %lld Xmit %lld Cmpl %lld " +"Lat %lld ASz %lld Info %02d BWUtil %d " +"Int %d slot %d\n" , + cnt, entry->max_bytes_per_interval, + entry->total_bytes, entry->rcv_bytes, + entry->avg_io_latency, entry->avg_io_size, + entry->cmf_info, entry->timer_utilization, + entry->timer_interval, start); + cnt++; +if (cnt >=LPFC_MAX_RXMONITOR_DUMP ) +return ; + } +} +/** * lpfc_cgn_update_stat - Save data into congestion stats buffer * @phba: pointer to lpfc hba data structure.
drivers/scsi/lpfc/lpfc_nvme.h +0 -3
@@ -34,9 +34,6 @@#define LPFC_NVME_FB_SHIFT 9#define LPFC_NVME_MAX_FB (1 << 20)/* 1M */ -#define LPFC_MAX_NVME_INFO_TMP_LEN 100 -#define LPFC_NVME_INFO_MORE_STR "\nCould be more info...\n" -#define lpfc_ndlp_get_nrport (ndlp) \ ((!ndlp->nrport || (ndlp->fc4_xpt_flags & NVME_XPT_UNREG_WAIT))\ ? NULL : ndlp->nrport)
Signature · 1 line
2.26.2
PATCH 14/16 lpfc: Add bsg support for retrieving adapter cmf data
In reply to James SmartThis patch adds a bsg ioctl to allow user applications to retrieve the adapter congestion management framework buffer.
--- drivers/scsi/lpfc/lpfc_bsg.c | 89 ++++++++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_bsg.h | 8 ++++ 2 files changed, 97 insertions(+)
drivers/scsi/lpfc/lpfc_bsg.c +89 -0
@@ -5751,6 +5751,92 @@ lpfc_get_trunk_info(struct bsg_job *job) } +static int +lpfc_get_cgnbuf_info (struct bsg_job *job) +{ +struct lpfc_vport *vport =shost_priv (fc_bsg_to_shost (job)); +struct lpfc_hba *phba = vport->phba; +struct fc_bsg_request *bsg_request = job->request; +struct fc_bsg_reply *bsg_reply = job->reply; +struct get_cgnbuf_info_req *cgnbuf_req; +struct lpfc_cgn_info *cp; +uint8_t *cgn_buff; +int size, cinfosz; +int rc =0 ; + +if (job->request_len <sizeof (struct fc_bsg_request ) + +sizeof (struct get_cgnbuf_info_req )) { + rc = -ENOMEM ; + goto job_exit; + } + +if (!phba->sli4_hba.pc_sli4_params.cmf) { + rc = -ENOENT ; + goto job_exit; + } + +if (!phba->cgn_i || !phba->cgn_i->virt) { + rc = -ENOENT ; + goto job_exit; + } + + cp = phba->cgn_i->virt; +if (cp->cgn_info_version <LPFC_CGN_INFO_V3 ) { + rc = -EPERM ; + goto job_exit; + } + + cgnbuf_req = (struct get_cgnbuf_info_req *) + bsg_request->rqst_data.h_vendor.vendor_cmd; + +/* For reset or size == 0 */ + bsg_reply->reply_payload_rcv_len =0 ; + +if (cgnbuf_req->reset ==LPFC_BSG_CGN_RESET_STAT ) { +lpfc_init_congestion_stat (phba); + goto job_exit; + } + +/* We don't want to include the CRC at the end */ + cinfosz =sizeof (struct lpfc_cgn_info ) -sizeof (uint32_t ); + + size = cgnbuf_req->read_size; +if (!size) + goto job_exit; + +if (size < cinfosz) { +/* Just copy back what we can */ + cinfosz = size; + rc = -E2BIG ; + } + +/* Allocate memory to read congestion info */ + cgn_buff =vmalloc (cinfosz); +if (!cgn_buff) { + rc = -ENOMEM ; + goto job_exit; + } + +memcpy (cgn_buff, cp, cinfosz); + + bsg_reply->reply_payload_rcv_len = +sg_copy_from_buffer (job->reply_payload.sg_list, + job->reply_payload.sg_cnt, + cgn_buff, cinfosz); + +vfree (cgn_buff); + +job_exit: + bsg_reply->result = rc; +if (!rc) +bsg_job_done (job, bsg_reply->result, + bsg_reply->reply_payload_rcv_len); +else +lpfc_printf_log (phba,KERN_ERR ,LOG_LIBDFC , +"2724 GET CGNBUF error: %d\n" , rc); +return rc; +} +/** * lpfc_bsg_hst_vendor - process a vendor-specific fc_bsg_job * @job: fc_bsg_job to handle
@@ -5813,6 +5899,9 @@ lpfc_bsg_hst_vendor(struct bsg_job *job)case LPFC_BSG_VENDOR_GET_TRUNK_INFO : rc =lpfc_get_trunk_info (job);break ; +case LPFC_BSG_VENDOR_GET_CGNBUF_INFO : + rc =lpfc_get_cgnbuf_info (job); +break ;default : rc = -EINVAL ; bsg_reply->reply_payload_rcv_len =0 ;
drivers/scsi/lpfc/lpfc_bsg.h +8 -0
@@ -43,6 +43,7 @@#define LPFC_BSG_VENDOR_RAS_GET_CONFIG 18#define LPFC_BSG_VENDOR_RAS_SET_CONFIG 19#define LPFC_BSG_VENDOR_GET_TRUNK_INFO 20 +#define LPFC_BSG_VENDOR_GET_CGNBUF_INFO 21struct set_ct_event {uint32_t command;
@@ -386,6 +387,13 @@ struct get_trunk_info_req {uint32_t command; }; +struct get_cgnbuf_info_req { +uint32_t command; +uint32_t read_size; +uint32_t reset; +#define LPFC_BSG_CGN_RESET_STAT 1 +}; +/* driver only */ #define SLI_CONFIG_NOT_HANDLED 0#define SLI_CONFIG_HANDLED 1
Signature · 1 line
2.26.2
PATCH 15/16 lpfc: Update lpfc version to 14.0.0.1
In reply to James SmartUpdate lpfc version to 14.0.0.1
--- 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.0.0.0" +#define LPFC_DRIVER_VERSION "14.0.0.1"#define LPFC_DRIVER_NAME "lpfc"/* Used for SLI 2/3 */
Signature · 1 line
2.26.2
PATCH 16/16 lpfc: Copyright updates for 14.0.0.1 patches
In reply to James SmartUpdate copyrights to 2021 for files modified in the 14.0.0.1 patch set.
--- drivers/scsi/lpfc/lpfc_bsg.h | 2 +- drivers/scsi/lpfc/lpfc_debugfs.h | 2 +- drivers/scsi/lpfc/lpfc_logmsg.h | 2 +- drivers/scsi/lpfc/lpfc_mem.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/lpfc/lpfc_bsg.h +1 -1
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2019 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2021 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2010-2015 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_debugfs.h +1 -1
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2019 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2021 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2007-2011 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_logmsg.h +1 -1
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2018 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2021 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2004-2009 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_mem.c +1 -1
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2018 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2021 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2004-2014 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
Signature · 1 line
2.26.2