lpfc: Update lpfc to revision 12.6.0.0
Subsystems (3)
cover lpfc: Update lpfc to revision 12.6.0.0
Update lpfc to revision 12.6.0.0
This patch contains a set fixes, optimizations, and a handful of new additions.
The patches were cut against Martin's 5.5/scsi-queue tree
James Smart (16):
lpfc: fix lpfc_nvmet_mrq to be bound by hdw queue count
lpfc: Fix reporting of read-only fw error errors
lpfc: Fix lockdep errors in sli_ringtx_put
lpfc: Fix SLI3 hba in loop mode not discovering devices
lpfc: Fix bad ndlp ptr in xri aborted handling
lpfc: Fix hardlockup in lpfc_abort_handler
lpfc: fix coverity error of dereference after null check
lpfc: Slight fast-path Performance optimizations
lpfc: Remove lock contention target write path
lpfc: Revise interrupt coalescing for missing scenarios
lpfc: Make FW logging dynamically configurable
lpfc: Add log macros to allow print by serverity or verbocity setting
lpfc: Add FA-WWN Async Event reporting
lpfc: Add FC-AL support to lpe32000 models
lpfc: Add additional discovery log messages
lpfc: Update lpfc version to 12.6.0.0
drivers/scsi/lpfc/lpfc.h | 11 +- drivers/scsi/lpfc/lpfc_attr.c | 92 +++++++++++++- drivers/scsi/lpfc/lpfc_bsg.c | 18 ++- drivers/scsi/lpfc/lpfc_ct.c | 22 +++- drivers/scsi/lpfc/lpfc_debugfs.c | 117 +++++++++++++++++- drivers/scsi/lpfc/lpfc_els.c | 14 ++- drivers/scsi/lpfc/lpfc_hbadisc.c | 39 +++++- drivers/scsi/lpfc/lpfc_hw4.h | 15 ++- drivers/scsi/lpfc/lpfc_init.c | 242 +++++++++++++++++++++++++++---------- drivers/scsi/lpfc/lpfc_logmsg.h | 17 +++ drivers/scsi/lpfc/lpfc_mbox.c | 1 + drivers/scsi/lpfc/lpfc_mem.c | 3 - drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +- drivers/scsi/lpfc/lpfc_nvme.c | 2 +- drivers/scsi/lpfc/lpfc_nvmet.c | 46 ++----- drivers/scsi/lpfc/lpfc_nvmet.h | 2 - drivers/scsi/lpfc/lpfc_scsi.c | 33 ++--- drivers/scsi/lpfc/lpfc_sli.c | 40 ++++-- drivers/scsi/lpfc/lpfc_sli.h | 3 +- drivers/scsi/lpfc/lpfc_sli4.h | 2 + drivers/scsi/lpfc/lpfc_version.h | 2 +- 21 files changed, 567 insertions(+), 158 deletions(-)
Signature · 1 line
2.13.7
PATCH 1/16 lpfc: fix lpfc_nvmet_mrq to be bound by hdw queue count
Currently, lpfc_nvmet_mrq is always scaled back to the min(lpfc_nvmet_mrq, lpfc_irq_chann). There's no reason to reduce it to the number of interrupt vectors. Rather, it should be scaled down based on the number of hardware queues for the system (if lower than max of 16).
Change scaling to use hardware queue count rather than interrupt vector count.
--- drivers/scsi/lpfc/lpfc_attr.c | 6 +++--- drivers/scsi/lpfc/lpfc_init.c | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-)
drivers/scsi/lpfc/lpfc_attr.c +3 -3
@@ -7264,11 +7264,11 @@ lpfc_nvme_mod_param_dep(struct lpfc_hba *phba) }if (!phba->cfg_nvmet_mrq) - phba->cfg_nvmet_mrq = phba->cfg_irq_chann; + phba->cfg_nvmet_mrq = phba->cfg_hdw_queue;/* Adjust lpfc_nvmet_mrq to avoid running out of WQE slots */ -if (phba->cfg_nvmet_mrq > phba->cfg_irq_chann) { - phba->cfg_nvmet_mrq = phba->cfg_irq_chann; +if (phba->cfg_nvmet_mrq > phba->cfg_hdw_queue) { + phba->cfg_nvmet_mrq = phba->cfg_hdw_queue;lpfc_printf_log (phba,KERN_ERR ,LOG_NVME_DISC ,"6018 Adjust lpfc_nvmet_mrq to %d\n" , phba->cfg_nvmet_mrq);
drivers/scsi/lpfc/lpfc_init.c +2 -4
@@ -8630,8 +8630,8 @@ lpfc_sli4_queue_verify(struct lpfc_hba *phba)*/ if (phba->nvmet_support) { -if (phba->cfg_irq_chann < phba->cfg_nvmet_mrq) - phba->cfg_nvmet_mrq = phba->cfg_irq_chann; +if (phba->cfg_hdw_queue < phba->cfg_nvmet_mrq) + phba->cfg_nvmet_mrq = phba->cfg_hdw_queue;if (phba->cfg_nvmet_mrq >LPFC_NVMET_MRQ_MAX ) phba->cfg_nvmet_mrq =LPFC_NVMET_MRQ_MAX ; }
@@ -11033,8 +11033,6 @@ lpfc_sli4_enable_msix(struct lpfc_hba *phba) phba->cfg_irq_chann, vectors);if (phba->cfg_irq_chann > vectors) phba->cfg_irq_chann = vectors; -if (phba->nvmet_support && (phba->cfg_nvmet_mrq > vectors)) - phba->cfg_nvmet_mrq = vectors; }return rc;
Signature · 1 line
2.13.7
PATCH 2/16 lpfc: Fix reporting of read-only fw error errors
In reply to James SmartWhen the adapter FW is administratively set to RO mode, a FW update triggered by the driver's sysfs attribute will fail. Currently, the driver's logging mechanism does not properly parse the adapter return codes and print a meaningful message. This oversite prevents quick diagnosis in the field.
Parse the adapter return codes for Write_Object and write an appropriate message to the system console.
--- drivers/scsi/lpfc/lpfc_hw4.h | 1 + drivers/scsi/lpfc/lpfc_init.c | 69 ++++++++++++++++++++++++++++++------------- 2 files changed, 50 insertions(+), 20 deletions(-)
drivers/scsi/lpfc/lpfc_hw4.h +1 -0
@@ -2320,6 +2320,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_FW_DOWNLOAD_HW_DISABLED 0x58struct lpfc_mbx_sli4_config {struct mbox_header header;
drivers/scsi/lpfc/lpfc_init.c +49 -20
101 lines not on this page · raw message
Signature · 1 line
2.13.7
Re: [PATCH 02/16] lpfc: Fix reporting of read-only fw error errors
James,
drivers/scsi/lpfc/lpfc_init.c lpfc_sli4_get_iocb_cnt(struct lpfc_hba *phba) · line 12340
Quoted 5 lines
drivers/scsi/lpfc/lpfc_init.c +1
-1(phba->pcidev->device ==PCI_DEVICE_ID_LANCER_G6_FC && magic_number !=MAGIC_NUMER_G6 ) || (phba->pcidev->device ==PCI_DEVICE_ID_LANCER_G7_FC && - magic_number != MAGIC_NUMER_G7)) + magic_number != MAGIC_NUMER_G7)) {
These magic numers[sic] caught my eye.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Re: [PATCH 02/16] lpfc: Fix reporting of read-only fw error errors
Quoted 11 lines · Martin K. Petersen
James,
drivers/scsi/lpfc/lpfc_init.c lpfc_sli4_get_iocb_cnt(struct lpfc_hba *phba) · line 12340
Quoted 5 lines
(
phba->pcidev->device==PCI_DEVICE_ID_LANCER_G6_FC&&
magic_number!=MAGIC_NUMER_G6) ||
(phba->pcidev->device==PCI_DEVICE_ID_LANCER_G7_FC&&drivers/scsi/lpfc/lpfc_init.c +1
-1- magic_number != MAGIC_NUMER_G7)) + magic_number != MAGIC_NUMER_G7)) {These magic numers[sic] caught my eye.
I'll send a patch to fix the spelling errors
-- james
PATCH 3/16 lpfc: Fix lockdep errors in sli_ringtx_put
In reply to James SmartFix lockdep error in __lpfc_sli_ringtx_put():
The hbalock is valid for sli3, but not for sli4. Change lockdep to look at ring lock if sli4.
Also update comment in __lpfc_sli_issue_iocb_s4() to reflect proper lock. note: lockdep check is already correct.
--- drivers/scsi/lpfc/lpfc_sli.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +7 -3
@@ -9004,7 +9004,8 @@ lpfc_mbox_api_table_setup(struct lpfc_hba *phba, uint8_t dev_grp)* @pring: Pointer to driver SLI ring object. * @piocb: Pointer to address of newly added command iocb. * -* This function is called with hbalock held to add a command +* This function is called with hbalock held for SLI3 ports or +* the ring lock held for SLI4 ports to add a command * iocb to the txq when SLI layer cannot submit the command iocb * to the ring. **/
@@ -9012,7 +9013,10 @@ void __lpfc_sli_ringtx_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, struct lpfc_iocbq *piocb) { - lockdep_assert_held(&phba->hbalock); + if (phba->sli_rev == LPFC_SLI_REV4) + lockdep_assert_held(&pring->ring_lock); + else + lockdep_assert_held(&phba->hbalock);/* Insert the caller's iocb in the txq tail for later processing. */ list_add_tail (&piocb->list, &pring->txq); }
@@ -9903,7 +9907,7 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,* __lpfc_sli_issue_iocb_s4 is used by other functions in the driver to issue * an iocb command to an HBA with SLI-4 interface spec. * -* This function is called with hbalock held. The function will return success +* This function is called with ringlock held. The function will return success * after it successfully submit the iocb to firmware or after adding to the * txq. **/
Signature · 1 line
2.13.7
PATCH 4/16 lpfc: Fix SLI3 hba in loop mode not discovering devices
In reply to James SmartWhen operating in private loop mode, PLOGI exchanges are racing and the driver tries to abort it's PLOGI. But the PLOGI abort ends up terminating the login with the other end causing the other end to abort its PLOGI as well. Discovery never fully completes.
Fix by disabling the PLOGI abort when private loop and letting the state machine play out.
--- drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_nportdisc.c +3 -1
@@ -542,8 +542,10 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,* single discovery thread, this will cause a huge delay in * discovery. Also this will cause multiple state machines * running in parallel for this node. +* This only applies to a fabric environment. */ -if (ndlp->nlp_state ==NLP_STE_PLOGI_ISSUE ) { +if ((ndlp->nlp_state ==NLP_STE_PLOGI_ISSUE ) && + (vport->fc_flag &FC_FABRIC )) {/* software abort outstanding PLOGI */ lpfc_els_abort (phba, ndlp); }
Signature · 1 line
2.13.7
PATCH 5/16 lpfc: Fix bad ndlp ptr in xri aborted handling
In reply to James SmartIn cases where I/O may be aborted, such as driver unload or link bounces, the system will crash based on a bad ndlp pointer. Example:
RIP: 0010:lpfc_sli4_abts_err_handler+0x15/0x140 [lpfc] ... lpfc_sli4_io_xri_aborted+0x20d/0x270 [lpfc] lpfc_sli4_sp_handle_abort_xri_wcqe.isra.54+0x84/0x170 [lpfc] lpfc_sli4_fp_handle_cqe+0xc2/0x480 [lpfc] __lpfc_sli4_process_cq+0xc6/0x230 [lpfc] __lpfc_sli4_hba_process_cq+0x29/0xc0 [lpfc] process_one_work+0x14c/0x390
Crash was caused by a bad ndlp address passed to I/O indicated by the XRI aborted CQE. The address was not NULL so the routine deferenced the ndlp ptr. The bad ndlp also caused the lpfc_sli4_io_xri_aborted to call an erroneous io handler. Root cause for the bad ndlp was an lpfc_ncmd that was aborted, put on the abort_io list, completed, taken off the abort_io list, sent to lpfc_release_nvme_buf where it was put back on the abort_io list because the lpfc_ncmd->flags setting LPFC_SBUF_XBUSY was not cleared on the final completion.
Rework the exchange busy handling to ensure the flags are properly set for both scsi and nvme.
--- drivers/scsi/lpfc/lpfc_scsi.c | 11 +++++++---- drivers/scsi/lpfc/lpfc_sli.c | 5 ++++- drivers/scsi/lpfc/lpfc_sli.h | 3 +-- 3 files changed, 12 insertions(+), 7 deletions(-)
drivers/scsi/lpfc/lpfc_scsi.c +7 -4
@@ -526,7 +526,7 @@ lpfc_sli4_io_xri_aborted(struct lpfc_hba *phba, &qp->lpfc_abts_io_buf_list, list) {if (psb->cur_iocbq.sli4_xritag == xri) {list_del_init (&psb->list); - psb->exch_busy =0 ; + psb->flags &= ~LPFC_SBUF_XBUSY ; psb->status =IOSTAT_SUCCESS ;#ifdef BUILD_NVME if (psb->cur_iocbq.iocb_flag ==LPFC_IO_NVME ) {
@@ -568,7 +568,7 @@ lpfc_sli4_io_xri_aborted(struct lpfc_hba *phba,if (iocbq->sli4_xritag != xri)continue ; psb = container_of(iocbq, struct lpfc_io_buf, cur_iocbq); - psb->exch_busy =0 ; + psb->flags &= ~LPFC_SBUF_XBUSY ;spin_unlock_irqrestore (&phba->hbalock, iflag);if (!list_empty (&pring->txq))lpfc_worker_wake_up (phba);
@@ -788,7 +788,7 @@ lpfc_release_scsi_buf_s4(struct lpfc_hba *phba, struct lpfc_io_buf *psb) psb->prot_seg_cnt =0 ; qp = psb->hdwq; -if (psb->exch_busy) { +if (psb->flags &LPFC_SBUF_XBUSY ) {spin_lock_irqsave (&qp->abts_io_buf_list_lock, iflag); psb->pCmd =NULL ;list_add_tail (&psb->list, &qp->lpfc_abts_io_buf_list);
@@ -3837,7 +3837,10 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, lpfc_cmd->result = (pIocbOut->iocb.un.ulpWord[4 ] &IOERR_PARAM_MASK ); lpfc_cmd->status = pIocbOut->iocb.ulpStatus;/* pick up SLI4 exhange busy status from HBA */ - lpfc_cmd->exch_busy = pIocbOut->iocb_flag &LPFC_EXCHANGE_BUSY ; +if (pIocbOut->iocb_flag &LPFC_EXCHANGE_BUSY ) + lpfc_cmd->flags |=LPFC_SBUF_XBUSY ; +else + lpfc_cmd->flags &= ~LPFC_SBUF_XBUSY ;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS if (lpfc_cmd->prot_data_type) {
drivers/scsi/lpfc/lpfc_sli.c +4 -1
@@ -11777,7 +11777,10 @@ lpfc_sli_wake_iocb_wait(struct lpfc_hba *phba, !(cmdiocbq->iocb_flag & LPFC_IO_LIBDFC)) { lpfc_cmd = container_of(cmdiocbq, struct lpfc_io_buf, cur_iocbq); - lpfc_cmd->exch_busy = rspiocbq->iocb_flag &LPFC_EXCHANGE_BUSY ; +if (rspiocbq && (rspiocbq->iocb_flag &LPFC_EXCHANGE_BUSY )) + lpfc_cmd->flags |=LPFC_SBUF_XBUSY ; +else + lpfc_cmd->flags &= ~LPFC_SBUF_XBUSY ; } pdone_q = cmdiocbq->context_un.wait_queue;
drivers/scsi/lpfc/lpfc_sli.h +1 -2
@@ -384,14 +384,13 @@ struct lpfc_io_buf {struct lpfc_nodelist *ndlp;uint32_t timeout; -uint16_t flags;/* TBD convert exch_busy to flags */ +uint16_t flags;#define LPFC_SBUF_XBUSY 0x1/* SLI4 hba reported XB on WCQE cmpl */ #define LPFC_SBUF_BUMP_QDEPTH 0x2/* bumped queue depth counter */ /* External DIF device IO conversions */ #define LPFC_SBUF_NORMAL_DIF 0x4/* normal mode to insert/strip */ #define LPFC_SBUF_PASS_DIF 0x8/* insert/strip mode to passthru */ #define LPFC_SBUF_NOT_POSTED 0x10/* SGL failed post to FW. */ -uint16_t exch_busy;/* SLI4 hba reported XB on complete WCQE */ uint16_t status;/* From IOCB Word 7- ulpStatus */ uint32_t result;/* From IOCB Word 4. */
Signature · 1 line
2.13.7
PATCH 6/16 lpfc: Fix hardlockup in lpfc_abort_handler
In reply to James SmartIn lpfc_abort_handler, the lock acquire order is hbalock (irqsave), buf_lock (irq) and ring_lock (irq). The issue is that in two places the locks are released out of order - the buf_lock and the hbalock - resulting in the cpu preemption/lock flags getting restored out of order and deadlocking the cpu.
Fix the unlock order by fully releasing the hbalocks as well.
---
Original patch sent by Zhangguanghui <[email protected]> Modified slightly as merged and tested at Emulex.
--- drivers/scsi/lpfc/lpfc_scsi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_scsi.c +3 -2
@@ -4848,20 +4848,21 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd) ret_val =__lpfc_sli_issue_iocb (phba,LPFC_FCP_RING , abtsiocb,0 ); } -/* no longer need the lock after this point */ -spin_unlock_irqrestore (&phba->hbalock, flags);if (ret_val ==IOCB_ERROR ) {/* Indicate the IO is not being aborted by the driver. */ iocb->iocb_flag &= ~LPFC_DRIVER_ABORTED ; lpfc_cmd->waitq =NULL ;spin_unlock (&lpfc_cmd->buf_lock); +spin_unlock_irqrestore (&phba->hbalock, flags);lpfc_sli_release_iocbq (phba, abtsiocb); ret =FAILED ; goto out; } +/* no longer need the lock after this point */ spin_unlock (&lpfc_cmd->buf_lock); +spin_unlock_irqrestore (&phba->hbalock, flags);if (phba->cfg_poll &DISABLE_FCP_RING_INT ) lpfc_sli_handle_fast_ring_event(phba,
Signature · 1 line
2.13.7
PATCH 7/16 lpfc: fix coverity error of dereference after null check
In reply to James SmartLog message conditional upon vport being NULL dereferences vport to determine log verbose setting.
Changed to use lpfc_print_log which uses phba to determine the active log verbose setting.
--- drivers/scsi/lpfc/lpfc_els.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +2 -2
@@ -4292,8 +4292,8 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, irsp = &rspiocb->iocb;if (!vport) { -lpfc_printf_vlog (vport,KERN_ERR ,LOG_ELS , -"3177 ELS response failed\n" ); +lpfc_printf_log (phba,KERN_ERR ,LOG_ELS , +"3177 ELS response failed\n" ); goto out; }if (cmdiocb->context_un.mbox)
Signature · 1 line
2.13.7
PATCH 8/16 lpfc: Slight fast-path Performance optimizations
In reply to James SmartSlightly rework some error check code paths for better streamlining.
Added compiler unlikely hints to allow slightly better optimization of the fast-path.
Removed a few pointer checks that were obviously already valid.
--- drivers/scsi/lpfc/lpfc_nvme.c | 2 +- drivers/scsi/lpfc/lpfc_scsi.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-)
drivers/scsi/lpfc/lpfc_nvme.c +1 -1
@@ -2093,7 +2093,7 @@ lpfc_release_nvme_buf(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_ncmd) lpfc_ncmd->flags &= ~LPFC_SBUF_BUMP_QDEPTH ; qp = lpfc_ncmd->hdwq; -if (lpfc_ncmd->flags &LPFC_SBUF_XBUSY ) { +if (unlikely (lpfc_ncmd->flags &LPFC_SBUF_XBUSY )) { lpfc_printf_log(phba, KERN_INFO, LOG_NVME_ABTS, "6310 XB release deferred for " "ox_id x%x on reqtag x%x\n",
drivers/scsi/lpfc/lpfc_scsi.c +9 -8
@@ -611,7 +611,7 @@ lpfc_get_scsi_buf_s3(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp, }spin_unlock_irqrestore (&phba->scsi_buf_list_get_lock, iflag); -if (lpfc_ndlp_check_qdepth (phba, ndlp) && lpfc_cmd) { +if (lpfc_ndlp_check_qdepth (phba, ndlp)) {atomic_inc (&ndlp->cmd_pending); lpfc_cmd->flags |=LPFC_SBUF_BUMP_QDEPTH ; }
@@ -3826,7 +3826,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, phba->sli4_hba.hdwq[idx].scsi_cstat.io_cmpls++;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS -if (phba->cpucheck_on &LPFC_CHECK_SCSI_IO ) { +if (unlikely (phba->cpucheck_on &LPFC_CHECK_SCSI_IO )) { cpu =raw_smp_processor_id ();if (cpu <LPFC_CHECK_CPU_CNT && phba->sli4_hba.hdwq) phba->sli4_hba.hdwq[idx].cpucheck_cmpl_io[cpu]++;
@@ -3874,7 +3874,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, }#endif -if (lpfc_cmd->status) { +if (unlikely (lpfc_cmd->status)) {if (lpfc_cmd->status ==IOSTAT_LOCAL_REJECT && (lpfc_cmd->result &IOERR_DRVR_MASK )) lpfc_cmd->status =IOSTAT_DRIVER_REJECT ;
@@ -4615,17 +4615,18 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) err =lpfc_scsi_prep_dma_buf (phba, lpfc_cmd); } -if (err ==2 ) { - cmnd->result =DID_ERROR <<16 ; - goto out_fail_command_release_buf; - }else if (err) { +if (unlikely (err)) { +if (err ==2 ) { + cmnd->result =DID_ERROR <<16 ; + goto out_fail_command_release_buf; + } goto out_host_busy_free_buf; }lpfc_scsi_prep_cmnd (vport, lpfc_cmd, ndlp);#ifdef CONFIG_SCSI_LPFC_DEBUG_FS -if (phba->cpucheck_on &LPFC_CHECK_SCSI_IO ) { +if (unlikely (phba->cpucheck_on &LPFC_CHECK_SCSI_IO )) { cpu =raw_smp_processor_id ();if (cpu <LPFC_CHECK_CPU_CNT ) { struct lpfc_sli4_hdw_queue *hdwq =
Signature · 1 line
2.13.7
PATCH 9/16 lpfc: Remove lock contention target write path
In reply to James SmartLower IOps performance with write operations. Perf tool shows lock contention in dma_pool_alloc and dma_pool_free related to the txrdy_payload_pool.
The allocations are for dma buffers for XFER_RDY's, which actually are not needed for the FCP_TRECEIVE command as the command contents are used by the adapter to generate the IU.
Remove the allocations and the associated buffer pool. Rather than leaving NULLs in buffer pointer locations, set command and sgl to indicate skipped SGLE indexes.
--- drivers/scsi/lpfc/lpfc.h | 1 - drivers/scsi/lpfc/lpfc_init.c | 16 ++++----------- drivers/scsi/lpfc/lpfc_mem.c | 3 --- drivers/scsi/lpfc/lpfc_nvmet.c | 46 +++++++++--------------------------------- drivers/scsi/lpfc/lpfc_nvmet.h | 2 -- 5 files changed, 14 insertions(+), 54 deletions(-)
drivers/scsi/lpfc/lpfc.h +0 -1
@@ -989,7 +989,6 @@ struct lpfc_hba {struct dma_pool *lpfc_drb_pool;/* data receive buffer pool */ struct dma_pool *lpfc_nvmet_drb_pool;/* data receive buffer pool */ struct dma_pool *lpfc_hbq_pool;/* SLI3 hbq buffer pool */ -struct dma_pool *txrdy_payload_pool;struct dma_pool *lpfc_cmd_rsp_buf_pool;struct lpfc_dma_pool lpfc_mbuf_safety_pool;
drivers/scsi/lpfc/lpfc_init.c +4 -12
@@ -7556,18 +7556,10 @@ lpfc_create_shost(struct lpfc_hba *phba)if (phba->nvmet_support) {/* Only 1 vport (pport) will support NVME target */ -if (phba->txrdy_payload_pool ==NULL ) { - phba->txrdy_payload_pool =dma_pool_create ( -"txrdy_pool" , &phba->pcidev->dev, -TXRDY_PAYLOAD_LEN ,16 ,0 ); -if (phba->txrdy_payload_pool) { - phba->targetport =NULL ; - phba->cfg_enable_fc4_type =LPFC_ENABLE_NVME ; -lpfc_printf_log (phba,KERN_INFO , -LOG_INIT |LOG_NVME_DISC , -"6076 NVME Target Found\n" ); - } - } + phba->targetport =NULL ; + phba->cfg_enable_fc4_type =LPFC_ENABLE_NVME ; +lpfc_printf_log (phba,KERN_INFO ,LOG_INIT |LOG_NVME_DISC , +"6076 NVME Target Found\n" ); }lpfc_debugfs_initialize (vport);
drivers/scsi/lpfc/lpfc_mem.c +0 -3
@@ -230,9 +230,6 @@ lpfc_mem_free(struct lpfc_hba *phba)dma_pool_destroy (phba->lpfc_hrb_pool); phba->lpfc_hrb_pool =NULL ; -dma_pool_destroy (phba->txrdy_payload_pool); - phba->txrdy_payload_pool =NULL ; -dma_pool_destroy (phba->lpfc_hbq_pool); phba->lpfc_hbq_pool =NULL ;
drivers/scsi/lpfc/lpfc_nvmet.c +10 -36
84 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_nvmet.h +0 -2
@@ -112,9 +112,7 @@ struct lpfc_nvmet_rcv_ctx {struct lpfc_hba *phba;struct lpfc_iocbq *wqeq;struct lpfc_iocbq *abort_wqeq; -dma_addr_t txrdy_phys;spinlock_t ctxlock;/* protect flag access */ -uint32_t *txrdy;uint32_t sid;uint32_t offset;uint16_t oxid;
Signature · 1 line
2.13.7
PATCH 10/16 lpfc: Revise interrupt coalescing for missing scenarios
In reply to James SmartThe existing "auto eq delay" mechanism was sometimes skipping over an eq, not ramping the coalescing down under light load fast enough, and in other cases never kicked in as cpu sharing by multiple vectors didn't quite add up right.
Tweak the interrupt mechanism such that:
- Add a flag to the eq to force checking for colaescing values when being serviced in the interrupt handler. The flag will be set by any CQ bound to the EQ whenever the number of CQ elements process in a single scan meets or exceeds the hardware queue notify level. E.g. there's a significant number of completions happening.
- In the heartbeat work item that checks coalescing:
- Replace the structure that was counting the number of EQs that interrupted on a single cpu with a new structure that looks at the EQ to see whether EQ currently has a coalescing value (thus it should be re-evaluate) or was marked by the new flag indicating heavy completions.
- When a cpu, which may be servicing multiple vectors, had at least 1 EQ that should be checked, a new coalescing delay is calculated based on the number of interrupts that occurred on the cpu.
- The new coalescing value is then applied to the EQs that had interrupted on the cpu.
--- drivers/scsi/lpfc/lpfc_hw4.h | 1 - drivers/scsi/lpfc/lpfc_init.c | 51 ++++++++++++++++++------------------------- drivers/scsi/lpfc/lpfc_sli.c | 3 ++- drivers/scsi/lpfc/lpfc_sli4.h | 1 + 4 files changed, 24 insertions(+), 32 deletions(-)
drivers/scsi/lpfc/lpfc_hw4.h +0 -1
@@ -210,7 +210,6 @@ struct lpfc_sli_intf {#define LPFC_MAX_IMAX 5000000#define LPFC_DEF_IMAX 0 -#define LPFC_IMAX_THRESHOLD 1000#define LPFC_MAX_AUTO_EQ_DELAY 120#define LPFC_EQ_DELAY_STEP 15#define LPFC_EQD_ISR_TRIGGER 20000
drivers/scsi/lpfc/lpfc_init.c +21 -30
82 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.c +2 -1
@@ -13640,6 +13640,7 @@ __lpfc_sli4_process_cq(struct lpfc_hba *phba, struct lpfc_queue *cq, phba->sli4_hba.sli4_write_cq_db (phba, cq, consumed,LPFC_QUEUE_NOARM ); consumed =0 ; + cq->assoc_qp->q_flag |=HBA_EQ_DELAY_CHK ; }if (count ==LPFC_NVMET_CQ_NOTIFY )
@@ -14278,7 +14279,7 @@ lpfc_sli4_hba_intr_handler(int irq, void *dev_id) fpeq->last_cpu =raw_smp_processor_id ();if (icnt >LPFC_EQD_ISR_TRIGGER && - phba->cfg_irq_chann ==1 && + fpeq->q_flag &HBA_EQ_DELAY_CHK && phba->cfg_auto_imax && fpeq->q_mode !=LPFC_MAX_AUTO_EQ_DELAY && phba->sli.sli_flag &LPFC_SLI_USE_EQDR )
drivers/scsi/lpfc/lpfc_sli4.h +1 -0
@@ -199,6 +199,7 @@ struct lpfc_queue {uint8_t q_flag;#define HBA_NVMET_WQFULL 0x1/* We hit WQ Full condition for NVMET */ #define HBA_NVMET_CQ_NOTIFY 0x1/* LPFC_NVMET_CQ_NOTIFY CQEs this EQE */ +#define HBA_EQ_DELAY_CHK 0x2/* EQ is a candidate for coalescing */ #define LPFC_NVMET_CQ_NOTIFY 4void __iomem *db_regaddr;uint16_t dpp_enable;
Signature · 1 line
2.13.7
PATCH 11/16 lpfc: Make FW logging dynamically configurable
In reply to James SmartCurrently, the FW logging facility is a load/boot time parameter which requires the driver to be unloaded/reloaded or the system rebooted in order to change it's configuration.
Convert the logging facility to allow dynamic enablement and configuration. Specifically:
- Convert the feature so that it can be enabled dynamically via an attribute. Additionally, the size of the buffer can be configured dynamically.
- Add locks around states that now may be changing.
- Tie the feature into debugfs so that the logs can be read at any time.
--- drivers/scsi/lpfc/lpfc.h | 9 ++- drivers/scsi/lpfc/lpfc_attr.c | 48 +++++++++++++++- drivers/scsi/lpfc/lpfc_bsg.c | 18 ++++-- drivers/scsi/lpfc/lpfc_debugfs.c | 117 ++++++++++++++++++++++++++++++++++++++- drivers/scsi/lpfc/lpfc_sli.c | 22 +++++++- 5 files changed, 204 insertions(+), 10 deletions(-)
drivers/scsi/lpfc/lpfc.h +8 -1
@@ -605,6 +605,12 @@ struct lpfc_epd_pool {spinlock_t lock;/* lock for expedite pool */ }; +enum ras_state { +INACTIVE , +REG_INPROGRESS , +ACTIVE +}; +struct lpfc_ras_fwlog {uint8_t *fwlog_buff;uint32_t fw_buffcount;/* Buffer size posted to FW */
@@ -621,7 +627,7 @@ struct lpfc_ras_fwlog {bool ras_enabled;/* Ras Enabled for the function */ #define LPFC_RAS_DISABLE_LOGGING 0x00#define LPFC_RAS_ENABLE_LOGGING 0x01 -bool ras_active;/* RAS logging running state */ +enum ras_state state;/* RAS logging running state */ };struct lpfc_hba {
@@ -1053,6 +1059,7 @@ struct lpfc_hba {#ifdef LPFC_HDWQ_LOCK_STAT struct dentry *debug_lockstat;#endif +struct dentry *debug_ras_log;atomic_t nvmeio_trc_cnt;uint32_t nvmeio_trc_size;uint32_t nvmeio_trc_output_idx;
drivers/scsi/lpfc/lpfc_attr.c +47 -1
54 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_bsg.c +14 -4
@@ -5435,10 +5435,12 @@ lpfc_bsg_get_ras_config(struct bsg_job *job) bsg_reply->reply_data.vendor_reply.vendor_rsp;/* Current logging state */ -if (ras_fwlog->ras_active == true) +spin_lock_irq (&phba->hbalock); +if (ras_fwlog->state ==ACTIVE ) ras_reply->state =LPFC_RASLOG_STATE_RUNNING ;else ras_reply->state =LPFC_RASLOG_STATE_STOPPED ; +spin_unlock_irq (&phba->hbalock); ras_reply->log_level = phba->ras_fwlog.fw_loglevel; ras_reply->log_buff_sz = phba->cfg_ras_fwlog_buffsize;
@@ -5495,10 +5497,13 @@ lpfc_bsg_set_ras_config(struct bsg_job *job)if (action ==LPFC_RASACTION_STOP_LOGGING ) {/* Check if already disabled */ -if (ras_fwlog->ras_active == false) { +spin_lock_irq (&phba->hbalock); +if (ras_fwlog->state !=ACTIVE ) { +spin_unlock_irq (&phba->hbalock); rc = -ESRCH ; goto ras_job_error; } +spin_unlock_irq (&phba->hbalock);/* Disable logging */ lpfc_ras_stop_fwlog (phba);
@@ -5509,8 +5514,10 @@ lpfc_bsg_set_ras_config(struct bsg_job *job)* FW-logging with new log-level. Return status * "Logging already Running" to caller. **/ -if (ras_fwlog->ras_active) +spin_lock_irq (&phba->hbalock); +if (ras_fwlog->state !=INACTIVE ) action_status = -EINPROGRESS ; +spin_unlock_irq (&phba->hbalock);/* Enable logging */ rc = lpfc_sli4_ras_fwlog_init(phba, log_level,
@@ -5626,10 +5633,13 @@ lpfc_bsg_get_ras_fwlog(struct bsg_job *job) goto ras_job_error;/* Logging to be stopped before reading */ -if (ras_fwlog->ras_active == true) { +spin_lock_irq (&phba->hbalock); +if (ras_fwlog->state ==ACTIVE ) { +spin_unlock_irq (&phba->hbalock); rc = -EINPROGRESS ; goto ras_job_error; } +spin_unlock_irq (&phba->hbalock);if (job->request_len < sizeof(struct fc_bsg_request) +
drivers/scsi/lpfc/lpfc_debugfs.c +116 -1
147 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.c +19 -3
@@ -6219,11 +6219,16 @@ lpfc_ras_stop_fwlog(struct lpfc_hba *phba) {struct lpfc_ras_fwlog *ras_fwlog = &phba->ras_fwlog; - ras_fwlog->ras_active = false; +spin_lock_irq (&phba->hbalock); + ras_fwlog->state =INACTIVE ; +spin_unlock_irq (&phba->hbalock);/* Disable FW logging to host memory */ writel (LPFC_CTL_PDEV_CTL_DDL_RAS , phba->sli4_hba.conf_regs_memmap_p +LPFC_CTL_PDEV_CTL_OFFSET ); + +/* Wait 10ms for firmware to stop using DMA buffer */ +usleep_range (10 *1000 ,20 *1000 ); }/**
@@ -6259,7 +6264,9 @@ lpfc_sli4_ras_dma_free(struct lpfc_hba *phba) ras_fwlog->lwpd.virt =NULL ; } - ras_fwlog->ras_active = false; +spin_lock_irq (&phba->hbalock); + ras_fwlog->state =INACTIVE ; +spin_unlock_irq (&phba->hbalock); }/**
@@ -6361,7 +6368,9 @@ lpfc_sli4_ras_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) goto disable_ras; } - ras_fwlog->ras_active = true; +spin_lock_irq (&phba->hbalock); + ras_fwlog->state =ACTIVE ; +spin_unlock_irq (&phba->hbalock);mempool_free (pmb, phba->mbox_mem_pool);return ;
@@ -6393,6 +6402,10 @@ lpfc_sli4_ras_fwlog_init(struct lpfc_hba *phba,uint32_t len =0 , fwlog_buffsize, fwlog_entry_count;int rc =0 ; +spin_lock_irq (&phba->hbalock); + ras_fwlog->state =INACTIVE ; +spin_unlock_irq (&phba->hbalock); + fwlog_buffsize = (LPFC_RAS_MIN_BUFF_POST_SIZE * phba->cfg_ras_fwlog_buffsize); fwlog_entry_count = (fwlog_buffsize/LPFC_RAS_MAX_ENTRY_SIZE );
@@ -6452,6 +6465,9 @@ lpfc_sli4_ras_fwlog_init(struct lpfc_hba *phba, mbx_fwlog->u.request.lwpd.addr_lo =putPaddrLow (ras_fwlog->lwpd.phys); mbx_fwlog->u.request.lwpd.addr_hi =putPaddrHigh (ras_fwlog->lwpd.phys); +spin_lock_irq (&phba->hbalock); + ras_fwlog->state =REG_INPROGRESS ; +spin_unlock_irq (&phba->hbalock); mbox->vport = phba->pport; mbox->mbox_cmpl = lpfc_sli4_ras_mbox_cmpl;
Signature · 1 line
2.13.7
PATCH 12/16 lpfc: Add log macros to allow print by serverity or verbocity setting
In reply to James SmartAdd two new macros to aid in message logging:
Both macros print a message if the corresponding lpfc verbosity setting is set or the kernel log level is WARNING or more critical.
One macro is for use with a phba structure, the other with a vport structure.
--- drivers/scsi/lpfc/lpfc_logmsg.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/scsi/lpfc/lpfc_logmsg.h +17 -0
@@ -46,6 +46,23 @@#define LOG_NVME_IOERR 0x00800000/* NVME IO Error events. */ #define LOG_ALL_MSG 0xffffffff/* LOG all messages */ +/* generate message by verbose log setting or severity */ +#define lpfc_vlog_msg(vport, level, mask, fmt, arg...) \ +{ if (((mask) & (vport)->cfg_log_verbose) || (level[1] <= '4')) \ + dev_printk(level, &((vport)->phba->pcidev)->dev, "%d:(%d):" \ + fmt, (vport)->phba->brd_no, vport->vpi, ##arg); } + +#define lpfc_log_msg(phba, level, mask, fmt, arg...) \ +do { \ + { uint32_t log_verbose = (phba)->pport ? \ + (phba)->pport->cfg_log_verbose : \ + (phba)->cfg_log_verbose; \ + if (((mask) & log_verbose) || (level[1] <= '4')) \ + dev_printk(level, &((phba)->pcidev)->dev, "%d:" \ + fmt, phba->brd_no, ##arg); \ + } \ +} while (0) + #define lpfc_printf_vlog(vport, level, mask, fmt, arg...) \ do { \ { if (((mask) & (vport)->cfg_log_verbose) || (level[1] <= '3')) \
Signature · 1 line
2.13.7
PATCH 13/16 lpfc: Add FA-WWN Async Event reporting
In reply to James SmartAdd decode support for adapter Async Events which report FA-WWN configuration errors.
---
Note:
Requires the prior patch:
lpfc: Add log macros to allow print by serverity or verbocity setting
--- drivers/scsi/lpfc/lpfc_hw4.h | 1 + drivers/scsi/lpfc/lpfc_init.c | 10 ++++++++++ 2 files changed, 11 insertions(+)
drivers/scsi/lpfc/lpfc_hw4.h +1 -0
@@ -4261,6 +4261,7 @@ struct lpfc_acqe_sli {#define LPFC_SLI_EVENT_TYPE_DIAG_DUMP 0x5#define LPFC_SLI_EVENT_TYPE_MISCONFIGURED 0x9#define LPFC_SLI_EVENT_TYPE_REMOTE_DPORT 0xA +#define LPFC_SLI_EVENT_TYPE_MISCONF_FAWWN 0xF#define LPFC_SLI_EVENT_TYPE_EEPROM_FAILURE 0x10 };
drivers/scsi/lpfc/lpfc_init.c +10 -0
@@ -5430,6 +5430,16 @@ lpfc_sli4_async_sli_evt(struct lpfc_hba *phba, struct lpfc_acqe_sli *acqe_sli)"Event Data1:x%08x Event Data2: x%08x\n" , acqe_sli->event_data1, acqe_sli->event_data2);break ; +case LPFC_SLI_EVENT_TYPE_MISCONF_FAWWN : +/* Misconfigured WWN. Reports that the SLI Port is configured +* to use FA-WWN, but the attached device doesn’t support it. +* No driver action is required. +* Event Data1 - N.A, Event Data2 - N.A +*/ +lpfc_log_msg (phba,KERN_WARNING ,LOG_SLI , +"2699 Misconfigured FA-WWN - Attached device does " +"not support FA-WWN\n" ); +break ;case LPFC_SLI_EVENT_TYPE_EEPROM_FAILURE :/* EEPROM failure. No driver action is required */ lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
Signature · 1 line
2.13.7
PATCH 14/16 lpfc: Add FC-AL support to lpe32000 models
In reply to James SmartIn the past, the lpe32000 models, based their main support being for 32G, and as FC-AL is not supported in the FC standards past 8G, did not support FC-AL operation.
This patch adds private-loop FC-AL support for the LPE32000 adapters when a link is 8G or below. To avoid conditions where link rate may change, which would cause non-connectivity to the AL device, FC-AL mode must become a persistent setting and the link kept at a speed supporting FC-AL.
the patch:
- adds a pls attribute indicating whether the adapter properly supports FC-AL.
- adds support for the adapter to indicate that topology should be fixed and the topology types to be configured.
- adds a pt attribute to report the persistent topology if present.
--- drivers/scsi/lpfc/lpfc.h | 1 + drivers/scsi/lpfc/lpfc_attr.c | 38 +++++++++++++++++- drivers/scsi/lpfc/lpfc_hw4.h | 12 ++++++ drivers/scsi/lpfc/lpfc_init.c | 90 +++++++++++++++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_mbox.c | 1 + drivers/scsi/lpfc/lpfc_sli4.h | 1 + 6 files changed, 142 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc.h +1 -0
@@ -731,6 +731,7 @@ struct lpfc_hba {#define HBA_FCOE_MODE 0x4/* HBA function in FCoE Mode */ #define HBA_SP_QUEUE_EVT 0x8/* Slow-path qevt posted to worker thread*/ #define HBA_POST_RECEIVE_BUFFER 0x10/* Rcv buffers need to be posted */ +#define HBA_PERSISTENT_TOPO 0x20/* Persistent topology support in hba */ #define ELS_XRI_ABORT_EVENT 0x40#define ASYNC_EVENT 0x80#define LINK_DISABLED 0x100/* Link disabled by user */
drivers/scsi/lpfc/lpfc_attr.c +37 -1
@@ -3535,6 +3535,31 @@ LPFC_ATTR_R(enable_rrq, 2, 0, 2,LPFC_ATTR_R (suppress_link_up,LPFC_INITIALIZE_LINK ,LPFC_INITIALIZE_LINK ,LPFC_DELAY_INIT_LINK_INDEFINITELY ,"Suppress Link Up at initialization" ); + +static ssize_t +lpfc_pls_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct Scsi_Host *shost =class_to_shost (dev); +struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; + +return scnprintf (buf,PAGE_SIZE ,"%d\n" , + phba->sli4_hba.pc_sli4_params.pls); +} +static DEVICE_ATTR(pls, 0444, + lpfc_pls_show, NULL); + +static ssize_t +lpfc_pt_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct Scsi_Host *shost =class_to_shost (dev); +struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba; + +return scnprintf (buf,PAGE_SIZE ,"%d\n" , + (phba->hba_flag &HBA_PERSISTENT_TOPO ) ?1 :0 ); +} +static DEVICE_ATTR(pt, 0444, + lpfc_pt_show, NULL); +/* # lpfc_cnt: Number of IOCBs allocated for ELS, CT, and ABTS # 1 - (1024)
@@ -4095,7 +4120,16 @@ lpfc_topology_store(struct device *dev, struct device_attribute *attr, val);return -EINVAL ; } -if ((phba->pcidev->device ==PCI_DEVICE_ID_LANCER_G6_FC || +/* +* The 'topology' is not a configurable parameter if : +* - persistent topology enabled +* - G7 adapters +* - G6 with no private loop support +*/ + +if (((phba->hba_flag &HBA_PERSISTENT_TOPO ) || + (!phba->sli4_hba.pc_sli4_params.pls && + phba->pcidev->device ==PCI_DEVICE_ID_LANCER_G6_FC ) || phba->pcidev->device ==PCI_DEVICE_ID_LANCER_G7_FC ) && val ==4 ) { lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
@@ -6117,6 +6151,8 @@ struct device_attribute *lpfc_hba_attrs[] = { &dev_attr_lpfc_req_fw_upgrade, &dev_attr_lpfc_suppress_link_up, &dev_attr_iocb_hw, + &dev_attr_pls, + &dev_attr_pt, &dev_attr_txq_hw, &dev_attr_txcmplq_hw, &dev_attr_lpfc_fips_level,
drivers/scsi/lpfc/lpfc_hw4.h +12 -0
@@ -2809,6 +2809,15 @@ struct lpfc_mbx_read_config {#define lpfc_mbx_rd_conf_trunk_SHIFT 12#define lpfc_mbx_rd_conf_trunk_MASK 0x0000000F#define lpfc_mbx_rd_conf_trunk_WORD word2 +#define lpfc_mbx_rd_conf_pt_SHIFT 20 +#define lpfc_mbx_rd_conf_pt_MASK 0x00000003 +#define lpfc_mbx_rd_conf_pt_WORD word2 +#define lpfc_mbx_rd_conf_tf_SHIFT 22 +#define lpfc_mbx_rd_conf_tf_MASK 0x00000001 +#define lpfc_mbx_rd_conf_tf_WORD word2 +#define lpfc_mbx_rd_conf_ptv_SHIFT 23 +#define lpfc_mbx_rd_conf_ptv_MASK 0x00000001 +#define lpfc_mbx_rd_conf_ptv_WORD word2#define lpfc_mbx_rd_conf_topology_SHIFT 24#define lpfc_mbx_rd_conf_topology_MASK 0x000000FF#define lpfc_mbx_rd_conf_topology_WORD word2
@@ -3479,6 +3488,9 @@ struct lpfc_sli4_parameters {#define cfg_bv1s_SHIFT 10#define cfg_bv1s_MASK 0x00000001#define cfg_bv1s_WORD word19 +#define cfg_pvl_SHIFT 13 +#define cfg_pvl_MASK 0x00000001 +#define cfg_pvl_WORD word19#define cfg_nsler_SHIFT 12#define cfg_nsler_MASK 0x00000001
drivers/scsi/lpfc/lpfc_init.c +90 -0
108 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_mbox.c +1 -0
@@ -515,6 +515,7 @@ lpfc_init_link(struct lpfc_hba * phba,if ((phba->pcidev->device ==PCI_DEVICE_ID_LANCER_G6_FC || phba->pcidev->device ==PCI_DEVICE_ID_LANCER_G7_FC ) && + !(phba->sli4_hba.pc_sli4_params.pls) && mb->un.varInitLnk.link_flags &FLAGS_TOPOLOGY_MODE_LOOP ) { mb->un.varInitLnk.link_flags =FLAGS_TOPOLOGY_MODE_PT_PT ; phba->cfg_topology =FLAGS_TOPOLOGY_MODE_PT_PT ;
drivers/scsi/lpfc/lpfc_sli4.h +1 -0
@@ -514,6 +514,7 @@ struct lpfc_pc_sli4_params {uint8_t cqav;uint8_t wqsize;uint8_t bv1s; +uint8_t pls;#define LPFC_WQ_SZ64_SUPPORT 1#define LPFC_WQ_SZ128_SUPPORT 2uint8_t wqpcnt;
Signature · 1 line
2.13.7
PATCH 15/16 lpfc: Add additional discovery log messages
In reply to James SmartWhen debugging a recent discovery customer problem it was very hard to tell what was happening with the existing discovery log messages. To fully debug the issue additional log messages were necessary.
Add or extend log messages so that sufficient information is present for debugging.
--- drivers/scsi/lpfc/lpfc_ct.c | 22 +++++++++++++++++++--- drivers/scsi/lpfc/lpfc_els.c | 10 ++++++++-- drivers/scsi/lpfc/lpfc_hbadisc.c | 39 +++++++++++++++++++++++++++++++++++---- 3 files changed, 62 insertions(+), 9 deletions(-)
drivers/scsi/lpfc/lpfc_ct.c +19 -3
@@ -763,9 +763,11 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, cpu_to_be16(SLI_CT_RESPONSE_FS_ACC)) {lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY ,"0208 NameServer Rsp Data: x%x x%x " -"sz x%x\n" , +"x%x x%x sz x%x\n" , vport->fc_flag, CTreq->un.gid.Fc4Type, + vport->num_disc_nodes, + vport->gidft_inp, irsp->un.genreq64.bdl.bdeSize); lpfc_ns_rsp(vport,
@@ -961,9 +963,13 @@ lpfc_cmpl_ct_cmd_gid_pt(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,if (CTrsp->CommandResponse.bits.CmdRsp ==cpu_to_be16 (SLI_CT_RESPONSE_FS_ACC )) {lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , -"4105 NameServer Rsp Data: x%x x%x\n" , +"4105 NameServer Rsp Data: x%x x%x " +"x%x x%x sz x%x\n" , vport->fc_flag, - CTreq->un.gid.Fc4Type); + CTreq->un.gid.Fc4Type, + vport->num_disc_nodes, + vport->gidft_inp, + irsp->un.genreq64.bdl.bdeSize); lpfc_ns_rsp(vport, outp,
@@ -1025,6 +1031,11 @@ lpfc_cmpl_ct_cmd_gid_pt(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, } vport->gidft_inp--; } + +lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , +"6450 GID_PT cmpl inp %d disc %d\n" , + vport->gidft_inp, vport->num_disc_nodes); +/* Link up / RSCN discovery */ if ((vport->num_disc_nodes ==0 ) && (vport->gidft_inp ==0 )) {
@@ -1159,6 +1170,11 @@ lpfc_cmpl_ct_cmd_gff_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,/* Link up / RSCN discovery */ if (vport->num_disc_nodes) vport->num_disc_nodes--; + +lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , +"6451 GFF_ID cmpl inp %d disc %d\n" , + vport->gidft_inp, vport->num_disc_nodes); +if (vport->num_disc_nodes ==0 ) {/* * The driver has cycled through all Nports in the RSCN payload.
drivers/scsi/lpfc/lpfc_els.c +8 -2
@@ -5265,6 +5265,11 @@ lpfc_els_disc_plogi(struct lpfc_vport *vport) } } } + +lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , +"6452 Discover PLOGI %d flag x%x\n" , + sentplogi, vport->fc_flag); +if (sentplogi) {lpfc_set_disctmo (vport); }
@@ -6668,9 +6673,10 @@ lpfc_els_handle_rscn(struct lpfc_vport *vport)/* RSCN processed */ lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , -"0215 RSCN processed Data: x%x x%x x%x x%x\n" , +"0215 RSCN processed Data: x%x x%x x%x x%x x%x x%x\n" , vport->fc_flag,0 , vport->fc_rscn_id_cnt, - vport->port_state); + vport->port_state, vport->num_disc_nodes, + vport->gidft_inp);/* To process RSCN, first compare RSCN data with NameServer */ vport->fc_ns_retry =0 ;
drivers/scsi/lpfc/lpfc_hbadisc.c +35 -4
@@ -5404,6 +5404,13 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)if (!ndlp)return NULL ;lpfc_nlp_set_state (vport, ndlp,NLP_STE_NPR_NODE ); + +lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , +"6453 Setup New Node 2B_DISC x%x " +"Data:x%x x%x x%x\n" , + ndlp->nlp_DID, ndlp->nlp_flag, + ndlp->nlp_state, vport->fc_flag); +spin_lock_irq (shost->host_lock); ndlp->nlp_flag |=NLP_NPR_2B_DISC ;spin_unlock_irq (shost->host_lock);
@@ -5417,6 +5424,12 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did) "0014 Could not enable ndlp\n");return NULL ; } +lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , +"6454 Setup Enabled Node 2B_DISC x%x " +"Data:x%x x%x x%x\n" , + ndlp->nlp_DID, ndlp->nlp_flag, + ndlp->nlp_state, vport->fc_flag); +spin_lock_irq (shost->host_lock); ndlp->nlp_flag |=NLP_NPR_2B_DISC ;spin_unlock_irq (shost->host_lock);
@@ -5436,6 +5449,12 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)*/ lpfc_cancel_retry_delay_tmo (vport, ndlp); +lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , +"6455 Setup RSCN Node 2B_DISC x%x " +"Data:x%x x%x x%x\n" , + ndlp->nlp_DID, ndlp->nlp_flag, + ndlp->nlp_state, vport->fc_flag); +/* NVME Target mode waits until rport is known to be * impacted by the RSCN before it transitions. No * active management - just go to NPR provided the
@@ -5458,9 +5477,21 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)spin_lock_irq (shost->host_lock); ndlp->nlp_flag |=NLP_NPR_2B_DISC ;spin_unlock_irq (shost->host_lock); - }else + }else { +lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , +"6456 Skip Setup RSCN Node x%x " +"Data:x%x x%x x%x\n" , + ndlp->nlp_DID, ndlp->nlp_flag, + ndlp->nlp_state, vport->fc_flag); ndlp =NULL ; + } }else { +lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , +"6457 Setup Active Node 2B_DISC x%x " +"Data:x%x x%x x%x\n" , + ndlp->nlp_DID, ndlp->nlp_flag, + ndlp->nlp_state, vport->fc_flag); +/* If the initiator received a PLOGI from this NPort or if the * initiator is already in the process of discovery on it, * there's no need to try to discover it again.
@@ -5612,10 +5643,10 @@ lpfc_disc_start(struct lpfc_vport *vport)/* Start Discovery state <hba_state> */ lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , -"0202 Start Discovery hba state x%x " -"Data: x%x x%x x%x\n" , +"0202 Start Discovery port state x%x " +"flg x%x Data: x%x x%x x%x\n" , vport->port_state, vport->fc_flag, vport->fc_plogi_cnt, - vport->fc_adisc_cnt); + vport->fc_adisc_cnt, vport->fc_npr_cnt);/* First do ADISCs - if any */ num_sent =lpfc_els_disc_adisc (vport);
Signature · 1 line
2.13.7
PATCH 16/16 lpfc: Update lpfc version to 12.6.0.0
In reply to James SmartUpdate lpfc version to 12.6.0.0
--- 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 "12.4.0.1" +#define LPFC_DRIVER_VERSION "12.6.0.0"#define LPFC_DRIVER_NAME "lpfc"/* Used for SLI 2/3 */
Signature · 1 line
2.13.7
Martin K. Petersen
AppliedJames,
Quoted 4 lines
Update lpfc to revision 12.6.0.0
This patch contains a set fixes, optimizations, and a handful of new additions.
Applied to 5.5/scsi-queue, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering