lpfc: Update lpfc to revision 12.8.0.8
Subsystems (2)
cover lpfc: Update lpfc to revision 12.8.0.8
Update lpfc to revision 12.8.0.8
This patch set contains fixes and a cleanup patches.
The patches were cut against Martin's 5.11/scsi-queue tree
James Smart (22):
lpfc: Fix incorrect dbde assignment when building target abts wqe
lpfc: Fix vport indices in lpfc_find_vport_by_vpid()
lpfc: Fix reftag generation sizing errors
lpfc: Fix stale node accesses on stale RRQ request
lpfc: Fix FLOGI failure due to accessing a freed node
lpfc: Fix lpfc_els_retry() possible null pointer dereference
lpfc: Fix pt2pt connection does not recover after LOGO
lpfc: Fix unnecessary null check in lpfc_release_scsi_buf
lpfc: Fix null pointer dereference in lpfc_prep_els_iocb()
lpfc: Fix use after free in lpfc_els_free_iocb
lpfc: Fix status returned in lpfc_els_retry() error exit path
lpfc: Fix dropped FLOGI during pt2pt discovery recovery
lpfc: Fix PLOGI ACC to be transmit after REG_LOGIN
lpfc: Fix ADISC handling that never frees nodes
lpfc: Fix nodeinfo debugfs output
lpfc: Fix pt2pt state transition causing rmmod hang
lpfc: Fix crash caused by switch reboot
lpfc: Change wording of invalid pci reset log message
lpfc: Reduce LOG_TRACE_EVENT logging for vports
lpfc: Correct function header comments related to ndlp reference
counting
lpfc: Update lpfc version to 12.8.0.8
lpfc: update copyrights for 12.8.0.7 and 12.8.0.8 changes
drivers/scsi/lpfc/lpfc.h | 3 +- drivers/scsi/lpfc/lpfc_attr.c | 2 +- drivers/scsi/lpfc/lpfc_crtn.h | 4 +- drivers/scsi/lpfc/lpfc_debugfs.c | 13 +- drivers/scsi/lpfc/lpfc_disc.h | 3 +- drivers/scsi/lpfc/lpfc_els.c | 639 ++++++++++++++--------------- drivers/scsi/lpfc/lpfc_hbadisc.c | 6 +- drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 272 +++++------- drivers/scsi/lpfc/lpfc_nvme.c | 2 +- drivers/scsi/lpfc/lpfc_nvmet.c | 5 +- drivers/scsi/lpfc/lpfc_scsi.c | 117 ++++-- drivers/scsi/lpfc/lpfc_sli.c | 29 +- drivers/scsi/lpfc/lpfc_version.h | 6 +- drivers/scsi/lpfc/lpfc_vport.c | 10 +- 15 files changed, 516 insertions(+), 597 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/22 lpfc: Fix incorrect dbde assignment when building target abts wqe
The wqe_dbde field indicates whether a Data BDE is present in Words 0:2 and should therefore should be clear in the abts request wqe. By setting the bit we can be misleading fw into error cases.
Clear the wqe_dbde field
--- drivers/scsi/lpfc/lpfc_nvmet.c | 1 - 1 file changed, 1 deletion(-)
drivers/scsi/lpfc/lpfc_nvmet.c +0 -1
@@ -3304,7 +3304,6 @@ lpfc_nvmet_unsol_issue_abort(struct lpfc_hba *phba,bf_set (wqe_rcvoxid, &wqe_abts->xmit_sequence.wqe_com, xri);/* Word 10 */ -bf_set (wqe_dbde, &wqe_abts->xmit_sequence.wqe_com,1 );bf_set (wqe_iod, &wqe_abts->xmit_sequence.wqe_com,LPFC_WQE_IOD_WRITE );bf_set (wqe_lenloc, &wqe_abts->xmit_sequence.wqe_com,LPFC_WQE_LENLOC_WORD12 );
Signature · 1 line
2.26.2
PATCH 2/22 lpfc: Fix vport indices in lpfc_find_vport_by_vpid()
In reply to James SmartCalls to lpfc_find_vport_by_vpid() for the highest indexed vport fails with error, "2936 Could not find Vport mapped to vpi XXX". Our vport indices in the loop and if-clauses were off by one.
Correct the vpid range used for vpi lookup to include the highest possible vpid.
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_hbadisc.c +2 -2
@@ -6081,12 +6081,12 @@ lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi)* Translate the physical vpi to the logical vpi. The * vport stores the logical vpi. */ -for (i =0 ; i < phba->max_vpi; i++) { +for (i =0 ; i <= phba->max_vpi; i++) {if (vpi == phba->vpi_ids[i])break ; } -if (i >= phba->max_vpi) { +if (i > phba->max_vpi) {lpfc_printf_log (phba,KERN_ERR ,LOG_TRACE_EVENT ,"2936 Could not find Vport mapped " "to vpi %d\n" , vpi);
Signature · 1 line
2.26.2
PATCH 3/22 lpfc: Fix reftag generation sizing errors
In reply to James SmartAn LBA is 8 bytes. The driver generates a reftag from the LBA but the reftag is 4 bytes. Thus scsi_get_lba() could return a value that exceeds our reftag size.
Fix by creating a common routine used for creating reftags that ensures a 4byte value. Also correct a few code lines that access lba directly and ensure 64bit data types are used.
--- drivers/scsi/lpfc/lpfc_scsi.c | 109 ++++++++++++++++++++++------------ 1 file changed, 71 insertions(+), 38 deletions(-)
drivers/scsi/lpfc/lpfc_scsi.c +71 -38
@@ -132,6 +132,27 @@ lpfc_sli4_set_rsp_sgl_last(struct lpfc_hba *phba, } } +#define LPFC_INVALID_REFTAG ((u32)-1) + +/* +* lpfc_scsi_get_reftag - Get truncated LBA for a SCSI command +* @sc: The SCSI Layer structure for the IO in question. +* +* The LBA of a SCSI command can be up to 8 bytes in length, for DIF +* reftag applications and some log messages, we need to use a +* truncated LBA (4 bytes) +*/ +static u32 +lpfc_scsi_get_reftag (struct scsi_cmnd *sc) +{ +sector_t lba; + + lba =scsi_get_lba (sc); + +/* Now truncate the LBA to 4 bytes, reftag size */ +return (u32)(lba &0xffffffff ); +} +/** * lpfc_update_stats - Update statistical data for the command completion * @vport: The virtual port on which this call is executing.
@@ -1000,7 +1021,7 @@ lpfc_bg_err_inject(struct lpfc_hba *phba, struct scsi_cmnd *sc,uint32_t op =scsi_get_prot_op (sc);uint32_t blksize;uint32_t numblks; -sector_t lba; +u32 lba;int rc =0 ;int blockoff =0 ;
@@ -1008,7 +1029,9 @@ lpfc_bg_err_inject(struct lpfc_hba *phba, struct scsi_cmnd *sc,return 0 ; sgpe =scsi_prot_sglist (sc); - lba =scsi_get_lba (sc); + lba =lpfc_scsi_get_reftag (sc); +if (lba ==LPFC_INVALID_REFTAG ) +return 0 ;/* First check if we need to match the LBA */ if (phba->lpfc_injerr_lba !=LPFC_INJERR_LBA_OFF ) {
@@ -1016,11 +1039,11 @@ lpfc_bg_err_inject(struct lpfc_hba *phba, struct scsi_cmnd *sc, numblks = (scsi_bufflen (sc) + blksize -1 ) / blksize;/* Make sure we have the right LBA if one is specified */ -if ((phba->lpfc_injerr_lba < lba) || - (phba->lpfc_injerr_lba >= (lba + numblks))) +if (phba->lpfc_injerr_lba < (u64 )lba || + (phba->lpfc_injerr_lba >= (u64)(lba + numblks)))return 0 ;if (sgpe) { - blockoff = phba->lpfc_injerr_lba - lba; + blockoff = phba->lpfc_injerr_lba - (u64 )lba; numblks =sg_dma_len (sgpe) /sizeof (struct scsi_dif_tuple );if (numblks < blockoff)
@@ -1589,7 +1612,9 @@ lpfc_bg_setup_bpl(struct lpfc_hba *phba, struct scsi_cmnd *sc, goto out;/* extract some info from the scsi command for pde*/ - reftag = (uint32_t )scsi_get_lba (sc);/* Truncate LBA */ + reftag =lpfc_scsi_get_reftag (sc); +if (reftag ==LPFC_INVALID_REFTAG ) + goto out;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS rc =lpfc_bg_err_inject (phba, sc, &reftag,NULL ,1 );
@@ -1750,7 +1775,9 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,/* extract some info from the scsi command */ blksize =lpfc_cmd_blksize (sc); - reftag = (uint32_t )scsi_get_lba (sc);/* Truncate LBA */ + reftag =lpfc_scsi_get_reftag (sc); +if (reftag ==LPFC_INVALID_REFTAG ) + goto out;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS rc =lpfc_bg_err_inject (phba, sc, &reftag,NULL ,1 );
@@ -1979,7 +2006,9 @@ lpfc_bg_setup_sgl(struct lpfc_hba *phba, struct scsi_cmnd *sc, goto out;/* extract some info from the scsi command for pde*/ - reftag = (uint32_t )scsi_get_lba (sc);/* Truncate LBA */ + reftag =lpfc_scsi_get_reftag (sc); +if (reftag ==LPFC_INVALID_REFTAG ) + goto out;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS rc =lpfc_bg_err_inject (phba, sc, &reftag,NULL ,1 );
@@ -2178,7 +2207,9 @@ lpfc_bg_setup_sgl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,/* extract some info from the scsi command */ blksize =lpfc_cmd_blksize (sc); - reftag = (uint32_t )scsi_get_lba (sc);/* Truncate LBA */ + reftag =lpfc_scsi_get_reftag (sc); +if (reftag ==LPFC_INVALID_REFTAG ) + goto out;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS rc =lpfc_bg_err_inject (phba, sc, &reftag,NULL ,1 );
@@ -2770,7 +2801,9 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd) chk_guard =1 ; src = (struct scsi_dif_tuple *)sg_virt (sgpe); - start_ref_tag = (uint32_t )scsi_get_lba (cmd);/* Truncate LBA */ + start_ref_tag =lpfc_scsi_get_reftag (cmd); +if (start_ref_tag ==LPFC_INVALID_REFTAG ) + goto out; start_app_tag = src->app_tag; len = sgpe->length;while (src && protsegcnt) {
@@ -2861,8 +2894,8 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd)SAM_STAT_CHECK_CONDITION ; phba->bg_guard_err_cnt++;lpfc_printf_log (phba,KERN_WARNING ,LOG_FCP |LOG_BG , -"9069 BLKGRD: LBA %lx grd_tag error %x != %x\n" , - (unsigned long )scsi_get_lba (cmd), +"9069 BLKGRD: reftag %x grd_tag err %x != %x\n" , +lpfc_scsi_get_reftag (cmd), sum, guard_tag); }else if (err_type ==BGS_REFTAG_ERR_MASK ) {
@@ -2873,8 +2906,8 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd) phba->bg_reftag_err_cnt++;lpfc_printf_log (phba,KERN_WARNING ,LOG_FCP |LOG_BG , -"9066 BLKGRD: LBA %lx ref_tag error %x != %x\n" , - (unsigned long )scsi_get_lba (cmd), +"9066 BLKGRD: reftag %x ref_tag err %x != %x\n" , +lpfc_scsi_get_reftag (cmd), ref_tag, start_ref_tag); }else if (err_type ==BGS_APPTAG_ERR_MASK ) {
@@ -2885,8 +2918,8 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd) phba->bg_apptag_err_cnt++;lpfc_printf_log (phba,KERN_WARNING ,LOG_FCP |LOG_BG , -"9041 BLKGRD: LBA %lx app_tag error %x != %x\n" , - (unsigned long )scsi_get_lba (cmd), +"9041 BLKGRD: reftag %x app_tag err %x != %x\n" , +lpfc_scsi_get_reftag (cmd), app_tag, start_app_tag); } }
@@ -3062,10 +3095,10 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd,if (lpfc_bgs_get_invalid_prof (bgstat)) { cmd->result =DID_ERROR <<16 ;lpfc_printf_log (phba,KERN_WARNING ,LOG_FCP |LOG_BG , -"9072 BLKGRD: Invalid BG Profile in cmd" -" 0x%x lba 0x%llx blk cnt 0x%x " +"9072 BLKGRD: Invalid BG Profile in cmd " +"0x%x reftag 0x%x blk cnt 0x%x " "bgstat=x%x bghm=x%x\n" , cmd->cmnd[0 ], - (unsigned long long )scsi_get_lba (cmd), +lpfc_scsi_get_reftag (cmd),blk_rq_sectors (cmd->request), bgstat, bghm); ret = (-1 ); goto out;
@@ -3074,10 +3107,10 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd,if (lpfc_bgs_get_uninit_dif_block (bgstat)) { cmd->result =DID_ERROR <<16 ;lpfc_printf_log (phba,KERN_WARNING ,LOG_FCP |LOG_BG , -"9073 BLKGRD: Invalid BG PDIF Block in cmd" -" 0x%x lba 0x%llx blk cnt 0x%x " +"9073 BLKGRD: Invalid BG PDIF Block in cmd " +"0x%x reftag 0x%x blk cnt 0x%x " "bgstat=x%x bghm=x%x\n" , cmd->cmnd[0 ], - (unsigned long long )scsi_get_lba (cmd), +lpfc_scsi_get_reftag (cmd),blk_rq_sectors (cmd->request), bgstat, bghm); ret = (-1 ); goto out;
@@ -3092,10 +3125,10 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd,SAM_STAT_CHECK_CONDITION ; phba->bg_guard_err_cnt++;lpfc_printf_log (phba,KERN_WARNING ,LOG_FCP |LOG_BG , -"9055 BLKGRD: Guard Tag error in cmd" -" 0x%x lba 0x%llx blk cnt 0x%x " +"9055 BLKGRD: Guard Tag error in cmd " +"0x%x reftag 0x%x blk cnt 0x%x " "bgstat=x%x bghm=x%x\n" , cmd->cmnd[0 ], - (unsigned long long )scsi_get_lba (cmd), +lpfc_scsi_get_reftag (cmd),blk_rq_sectors (cmd->request), bgstat, bghm); }
@@ -3109,10 +3142,10 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd, phba->bg_reftag_err_cnt++;lpfc_printf_log (phba,KERN_WARNING ,LOG_FCP |LOG_BG , -"9056 BLKGRD: Ref Tag error in cmd" -" 0x%x lba 0x%llx blk cnt 0x%x " +"9056 BLKGRD: Ref Tag error in cmd " +"0x%x reftag 0x%x blk cnt 0x%x " "bgstat=x%x bghm=x%x\n" , cmd->cmnd[0 ], - (unsigned long long )scsi_get_lba (cmd), +lpfc_scsi_get_reftag (cmd),blk_rq_sectors (cmd->request), bgstat, bghm); }
@@ -3126,10 +3159,10 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd, phba->bg_apptag_err_cnt++;lpfc_printf_log (phba,KERN_WARNING ,LOG_FCP |LOG_BG , -"9061 BLKGRD: App Tag error in cmd" -" 0x%x lba 0x%llx blk cnt 0x%x " +"9061 BLKGRD: App Tag error in cmd " +"0x%x reftag 0x%x blk cnt 0x%x " "bgstat=x%x bghm=x%x\n" , cmd->cmnd[0 ], - (unsigned long long )scsi_get_lba (cmd), +lpfc_scsi_get_reftag (cmd),blk_rq_sectors (cmd->request), bgstat, bghm); }
@@ -3170,10 +3203,10 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd,if (!ret) {/* No error was reported - problem in FW? */ lpfc_printf_log (phba,KERN_WARNING ,LOG_FCP |LOG_BG , -"9057 BLKGRD: Unknown error in cmd" -" 0x%x lba 0x%llx blk cnt 0x%x " +"9057 BLKGRD: Unknown error in cmd " +"0x%x reftag 0x%x blk cnt 0x%x " "bgstat=x%x bghm=x%x\n" , cmd->cmnd[0 ], - (unsigned long long )scsi_get_lba (cmd), +lpfc_scsi_get_reftag (cmd),blk_rq_sectors (cmd->request), bgstat, bghm);/* Calcuate what type of error it was */
@@ -5252,10 +5285,10 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd)lpfc_printf_vlog (vport,KERN_INFO ,LOG_SCSI_CMD ,"9033 BLKGRD: rcvd %s cmd:x%x " -"sector x%llx cnt %u pt %x\n" , +"reftag x%x cnt %u pt %x\n" , dif_op_str[scsi_get_prot_op (cmnd)], cmnd->cmnd[0 ], - (unsigned long long )scsi_get_lba (cmnd), +lpfc_scsi_get_reftag (cmnd),blk_rq_sectors (cmnd->request), (cmnd->cmnd[1 ]>>5 )); }
@@ -5265,9 +5298,9 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd)lpfc_printf_vlog (vport,KERN_INFO ,LOG_SCSI_CMD ,"9038 BLKGRD: rcvd PROT_NORMAL cmd: " -"x%x sector x%llx cnt %u pt %x\n" , +"x%x reftag x%x cnt %u pt %x\n" , cmnd->cmnd[0 ], - (unsigned long long )scsi_get_lba (cmnd), +lpfc_scsi_get_reftag (cmnd),blk_rq_sectors (cmnd->request), (cmnd->cmnd[1 ]>>5 )); }
Signature · 1 line
2.26.2
Re: [PATCH 03/22] lpfc: Fix reftag generation sizing errors
James,
drivers/scsi/lpfc/lpfc_scsi.c lpfc_sli4_set_rsp_sgl_last(struct lpfc_hba *phba, · line 155
Quoted 11 lines
drivers/scsi/lpfc/lpfc_scsi.c +11
-0+static u32 +lpfc_scsi_get_reftag (struct scsi_cmnd *sc) +{ +sector_t lba; + + lba =scsi_get_lba (sc); + +/* Now truncate the LBA to 4 bytes, reftag size */ +return (u32)(lba &0xffffffff ); +} +
ref_tag = t10_pi_ref_tag(sc->request);
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
PATCH 4/22 lpfc: Fix stale node accesses on stale RRQ request
In reply to James SmartWhenever an RRQ needs to be triggered, the DID from the node structure and node pointer are stored in the RRQ data structure and the RRQ is scheduled for later transmission. However, at the point in time that the timer triggers, there's no validation on the node pointer. Reference counters may have freed the structure. Additionally the DID in the node may no longer be valid.
Fix by not tracking the node pointer in the RRQ, only the DID. At the time of the timer expiration, look up the node with the did and if present, send the RRQ. If no node exists, no need to send the RRQ.
--- drivers/scsi/lpfc/lpfc_disc.h | 1 - drivers/scsi/lpfc/lpfc_els.c | 32 ++++++++------------------------ drivers/scsi/lpfc/lpfc_sli.c | 18 ++++++++---------- 3 files changed, 16 insertions(+), 35 deletions(-)
drivers/scsi/lpfc/lpfc_disc.h +0 -1
@@ -159,7 +159,6 @@ struct lpfc_node_rrq {uint16_t rxid;uint32_t nlp_DID;/* FC D_ID of entry */ struct lpfc_vport *vport; -struct lpfc_nodelist *ndlp;unsigned long rrq_stop_time; };
drivers/scsi/lpfc/lpfc_els.c +8 -24
@@ -1849,7 +1849,7 @@ lpfc_cmpl_els_rrq(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, {struct lpfc_vport *vport = cmdiocb->vport;IOCB_t *irsp; -struct lpfc_nodelist *ndlp; +struct lpfc_nodelist *ndlp = cmdiocb->context1;struct lpfc_node_rrq *rrq;/* we pass cmdiocb to state machine which needs rspiocb as well */
@@ -1862,22 +1862,12 @@ lpfc_cmpl_els_rrq(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, irsp->ulpStatus, irsp->un.ulpWord[4 ], irsp->un.elsreq64.remoteID); - ndlp =lpfc_findnode_did (vport, irsp->un.elsreq64.remoteID); -if (!ndlp || ndlp != rrq->ndlp) { -lpfc_printf_vlog (vport,KERN_ERR ,LOG_TRACE_EVENT , -"2882 RRQ completes to NPort x%x " -"with no ndlp. Data: x%x x%x x%x\n" , - irsp->un.elsreq64.remoteID, - irsp->ulpStatus, irsp->un.ulpWord[4 ], - irsp->ulpIoTag); - goto out; - } -/* rrq completes to NPort <nlp_DID> */ lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS , -"2880 RRQ completes to NPort x%x " +"2880 RRQ completes to DID x%x " "Data: x%x x%x x%x x%x x%x\n" , - ndlp->nlp_DID, irsp->ulpStatus, irsp->un.ulpWord[4 ], + irsp->un.elsreq64.remoteID, + irsp->ulpStatus, irsp->un.ulpWord[4 ], irsp->ulpTimeout, rrq->xritag, rrq->rxid);if (irsp->ulpStatus) {
@@ -1893,10 +1883,8 @@ lpfc_cmpl_els_rrq(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, ndlp->nlp_DID, irsp->ulpStatus, irsp->un.ulpWord[4]); } -out: -if (rrq) -lpfc_clr_rrq_active (phba, rrq->xritag, rrq); +lpfc_clr_rrq_active (phba, rrq->xritag, rrq);lpfc_els_free_iocb (phba, cmdiocb);lpfc_nlp_put (ndlp);return ;
@@ -7619,9 +7607,6 @@ lpfc_issue_els_rrq(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,uint16_t cmdsize;int ret; - -if (ndlp != rrq->ndlp) - ndlp = rrq->ndlp;if (!ndlp)return 1 ;
@@ -7651,9 +7636,9 @@ lpfc_issue_els_rrq(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, did, rrq->xritag, rrq->rxid); elsiocb->context_un.rrq = rrq; elsiocb->iocb_cmpl = lpfc_cmpl_els_rrq; - elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; + +lpfc_nlp_get (ndlp); + elsiocb->context1 = ndlp; ret =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 );if (ret ==IOCB_ERROR )
@@ -7662,7 +7647,6 @@ lpfc_issue_els_rrq(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, io_err:lpfc_nlp_put (ndlp); - node_err:lpfc_els_free_iocb (phba, elsiocb);return 1 ; }
drivers/scsi/lpfc/lpfc_sli.c +8 -10
@@ -987,16 +987,10 @@ lpfc_clr_rrq_active(struct lpfc_hba *phba, {struct lpfc_nodelist *ndlp =NULL ; +/* Lookup did to verify if did is still active on this vport */ if (rrq->vport) ndlp =lpfc_findnode_did (rrq->vport, rrq->nlp_DID); -/* The target DID could have been swapped (cable swap) -* we should use the ndlp from the findnode if it is -* available. -*/ -if ((!ndlp) && rrq->ndlp) - ndlp = rrq->ndlp; -if (!ndlp) goto out;
@@ -1118,9 +1112,14 @@ lpfc_cleanup_vports_rrqs(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)lpfc_sli4_vport_delete_fcp_xri_aborted (vport); }spin_lock_irqsave (&phba->hbalock, iflags); -list_for_each_entry_safe (rrq, nextrrq, &phba->active_rrq_list, list) -if ((rrq->vport == vport) && (!ndlp || rrq->ndlp == ndlp)) +list_for_each_entry_safe (rrq, nextrrq, &phba->active_rrq_list, list) { +if (rrq->vport != vport) +continue ; + +if (!ndlp || ndlp ==lpfc_findnode_did (vport, rrq->nlp_DID))list_move (&rrq->list, &rrq_list); + + }spin_unlock_irqrestore (&phba->hbalock, iflags);list_for_each_entry_safe (rrq, nextrrq, &rrq_list, list) {
@@ -1213,7 +1212,6 @@ lpfc_set_rrq_active(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp, rrq->xritag = xritag; rrq->rrq_stop_time = jiffies +msecs_to_jiffies (1000 * (phba->fc_ratov +1 )); - rrq->ndlp = ndlp; rrq->nlp_DID = ndlp->nlp_DID; rrq->vport = ndlp->vport; rrq->rxid = rxid;
Signature · 1 line
2.26.2
PATCH 5/22 lpfc: Fix FLOGI failure due to accessing a freed node
In reply to James SmartAfter an initial successful FLOGI into the switch, if a subsequent FLOGI fails the driver crashed accessing a node struct. On FLOGI error, the flogi completion logic triggers the final dereference on the node structure without checking if it is registered with a backend. The devloss logic is triggered after node is freed leading to the access of freed node.
Fix by adjusting the error path to not take the final dereferece if there is an outstanding transport registration. Let the transport devloss call remove the final reference.
--- drivers/scsi/lpfc/lpfc_els.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_els.c +2 -1
@@ -1182,7 +1182,8 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, phba->fcf.fcf_flag &= ~FCF_DISCOVERY ;spin_unlock_irq (&phba->hbalock); -lpfc_nlp_put (ndlp); +if (!(ndlp->fc4_xpt_flags & (SCSI_XPT_REGD |NVME_XPT_REGD ))) +lpfc_nlp_put (ndlp);if (!lpfc_error_lost_link (irsp)) {/* FLOGI failed, so just use loop map to make discovery list */ lpfc_disc_list_loopmap (vport);
Signature · 1 line
2.26.2
PATCH 6/22 lpfc: Fix lpfc_els_retry() possible null pointer dereference
In reply to James SmartDriver crashed in lpfc_debugfs_disc_trc() due to null ndlp pointer. In some calling cases, the ndlp is null and the did is looked up.
Fix by using the local did variable that is set appropriately based on ndlp value.
--- drivers/scsi/lpfc/lpfc_els.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_els.c +1 -1
@@ -3823,7 +3823,7 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,lpfc_debugfs_disc_trc (vport,LPFC_DISC_TRC_ELS_CMD ,"Retry ELS: wd7:x%x wd4:x%x did:x%x" , - *(((uint32_t *) irsp) +7 ), irsp->un.ulpWord[4 ], ndlp->nlp_DID); + *(((uint32_t *)irsp) +7 ), irsp->un.ulpWord[4 ], did);switch (irsp->ulpStatus) {case IOSTAT_FCP_RSP_ERROR :
Signature · 1 line
2.26.2
PATCH 7/22 lpfc: Fix pt2pt connection does not recover after LOGO
In reply to James SmartOn a pt2pt setup, between 2 initiators, if one side issues a a LOGO, there is no relogin attempt. The FC specs are grey in this area on which port (higher wwn or not) is to re-login.
As there is no spec guidance, unconditionally re-PLOGI after the logout to ensure a login is re-established.
--- drivers/scsi/lpfc/lpfc_nportdisc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_nportdisc.c +7 -2
@@ -913,9 +913,14 @@ lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, } }else if ((!(ndlp->nlp_type &NLP_FABRIC ) && ((ndlp->nlp_type &NLP_FCP_TARGET ) || - !(ndlp->nlp_type &NLP_FCP_INITIATOR ))) || + (ndlp->nlp_type &NLP_NVME_TARGET ) || + (vport->fc_flag &FC_PT2PT ))) || (ndlp->nlp_state ==NLP_STE_ADISC_ISSUE )) { -/* Only try to re-login if this is NOT a Fabric Node */ +/* Only try to re-login if this is NOT a Fabric Node +* AND the remote NPORT is a FCP/NVME Target or we +* are in pt2pt mode. NLP_STE_ADISC_ISSUE is a special +* case for LOGO as a response to ADISC behavior. +*/ mod_timer (&ndlp->nlp_delayfunc, jiffies +msecs_to_jiffies (1000 *1 ));spin_lock_irq (&ndlp->lock);
Signature · 1 line
2.26.2
PATCH 8/22 lpfc: Fix unnecessary null check in lpfc_release_scsi_buf
In reply to James Smartlpfc_fcp_io_cmd_wqe_cmpl() is intended to mirror lpfc_nvme_io_cmd_wqe_cmpl() for sli4 fcp completions. When the routine was added, lpfc_fcp_io_cmd_wqe_cmpl() included a null pointer check for phba. However, phba is definitely valid, being dereferenced by the calling routine and used later in the routine itself.
Remove the unnecessary null check.
--- drivers/scsi/lpfc/lpfc_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_scsi.c +1 -1
@@ -4093,7 +4093,7 @@ lpfc_fcp_io_cmd_wqe_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn,/* Sanity check on return of outstanding command */ cmd = lpfc_cmd->pCmd; -if (!cmd || !phba) { +if (!cmd) {lpfc_printf_vlog (vport,KERN_ERR ,LOG_TRACE_EVENT ,"9042 I/O completion: Not an active IO\n" );spin_unlock (&lpfc_cmd->buf_lock);
Signature · 1 line
2.26.2
PATCH 9/22 lpfc: Fix null pointer dereference in lpfc_prep_els_iocb()
In reply to James SmartIt is possible to call lpfc_issue_els_plogi() passing a did for which no matching ndlp is found. A call is then made to lpfc_prep_els_iocb() with a null pointer to a lpfc_nodelist structure resulting in a null pointer dereference.
Fix by returning an error status if no valid ndlp is found. Fix up comments regarding ndlp reference counting.
--- drivers/scsi/lpfc/lpfc_els.c | 50 +++++++++++++++++------------------- 1 file changed, 24 insertions(+), 26 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +24 -26
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2020 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-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
@@ -2052,13 +2052,12 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,* This routine issues a Port Login (PLOGI) command to a remote N_Port * (with the @did) for a @vport. Before issuing a PLOGI to a remote N_Port, * the ndlp with the remote N_Port DID must exist on the @vport's ndlp list. -* This routine constructs the proper feilds of the PLOGI IOCB and invokes +* This routine constructs the proper fields of the PLOGI IOCB and invokes * the lpfc_sli_issue_iocb() routine to send out PLOGI ELS command. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the PLOGI ELS command. +* Note that the ndlp reference count will be incremented by 1 for holding +* the ndlp and the reference to ndlp will be stored into the context1 field +* of the IOCB for the completion callback function to the PLOGI ELS command. * * Return code * 0 - Successfully issued a plogi for @vport
@@ -2076,29 +2075,28 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry)int ret; ndlp =lpfc_findnode_did (vport, did); +if (!ndlp) +return 1 ; -if (ndlp) { -/* Defer the processing of the issue PLOGI until after the -* outstanding UNREG_RPI mbox command completes, unless we -* are going offline. This logic does not apply for Fabric DIDs -*/ -if ((ndlp->nlp_flag &NLP_UNREG_INP ) && - ((ndlp->nlp_DID & Fabric_DID_MASK) != Fabric_DID_MASK) && - !(vport->fc_flag &FC_OFFLINE_MODE )) { -lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , -"4110 Issue PLOGI x%x deferred " -"on NPort x%x rpi x%x Data: x%px\n" , - ndlp->nlp_defer_did, ndlp->nlp_DID, - ndlp->nlp_rpi, ndlp); - -/* We can only defer 1st PLOGI */ -if (ndlp->nlp_defer_did ==NLP_EVT_NOTHING_PENDING ) - ndlp->nlp_defer_did = did; -return 0 ; - } +/* Defer the processing of the issue PLOGI until after the +* outstanding UNREG_RPI mbox command completes, unless we +* are going offline. This logic does not apply for Fabric DIDs +*/ +if ((ndlp->nlp_flag &NLP_UNREG_INP ) && + ((ndlp->nlp_DID & Fabric_DID_MASK) != Fabric_DID_MASK) && + !(vport->fc_flag &FC_OFFLINE_MODE )) { +lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY , +"4110 Issue PLOGI x%x deferred " +"on NPort x%x rpi x%x Data: x%px\n" , + ndlp->nlp_defer_did, ndlp->nlp_DID, + ndlp->nlp_rpi, ndlp); + +/* We can only defer 1st PLOGI */ +if (ndlp->nlp_defer_did ==NLP_EVT_NOTHING_PENDING ) + ndlp->nlp_defer_did = did; +return 0 ; } -/* If ndlp is not NULL, we will bump the reference count on it */ cmdsize = (sizeof (uint32_t ) +sizeof (struct serv_parm )); elsiocb =lpfc_prep_els_iocb (vport,1 , cmdsize, retry, ndlp, did,ELS_CMD_PLOGI );
Signature · 1 line
2.26.2
PATCH 10/22 lpfc: Fix use after free in lpfc_els_free_iocb
In reply to James SmartThere are several code paths where the following sequence occurs:
- An ndlp pointer is assigned to an iocb via a nlp_get()
- An attempt is made to issue the iocb, but it fails
- The failure case does a put on the ndlp then calls lpfc_els_free_iocb()
The put may free the ndlp structure, but the els_free_iocb may reference the now-stale ndlp pointer and cause a crash.
Fix by ensuring that the lpfc_els_free_iocb() occurs before the lpfc_nlp_put().
While fixing, refactored the code to better ensure this calling sequence.
--- drivers/scsi/lpfc/lpfc_els.c | 348 ++++++++++++++++++----------------- 1 file changed, 177 insertions(+), 171 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +177 -171
@@ -1342,12 +1342,17 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, phba->sli3_options, 0, 0); elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto out; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return 1 ; + } rc =lpfc_issue_fabric_iocb (phba, elsiocb); -if (rc ==IOCB_ERROR ) +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb);lpfc_nlp_put (ndlp); +return 1 ; + } phba->hba_flag |=HBA_FLOGI_ISSUED ;
@@ -1377,11 +1382,7 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, vport->fc_myDID = did; } -if (!rc) -return 0 ; - out: -lpfc_els_free_iocb (phba, elsiocb); -return 1 ; +return 0 ; }/**
@@ -2152,19 +2153,19 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry)"Issue PLOGI: did:x%x refcnt %d" , did, kref_read(&ndlp->kref), 0); elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto io_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return 1 ; + } ret =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 );if (ret) { +lpfc_els_free_iocb (phba, elsiocb);lpfc_nlp_put (ndlp); - goto io_err; +return 1 ; } -return 0 ; - io_err: -lpfc_els_free_iocb (phba, elsiocb); -return 1 ; +return 0 ; }/**
@@ -2458,12 +2459,17 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,"Issue PRLI: did:x%x refcnt %d" , ndlp->nlp_DID, kref_read(&ndlp->kref), 0); elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto io_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); + goto err; + } rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto node_err; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); + goto err; + }/* The driver supports 2 FC4 types. Make sure
@@ -2475,13 +2481,10 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,else return 0 ; - node_err: -lpfc_nlp_put (ndlp); - io_err: +err:spin_lock_irq (&ndlp->lock); ndlp->nlp_flag &= ~NLP_PRLI_SND ;spin_unlock_irq (&ndlp->lock); -lpfc_els_free_iocb (phba, elsiocb);return 1 ; }
@@ -2765,24 +2768,27 @@ lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, ndlp->nlp_flag |=NLP_ADISC_SND ;spin_unlock_irq (&ndlp->lock); elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); + goto err; + }lpfc_debugfs_disc_trc (vport,LPFC_DISC_TRC_ELS_CMD ,"Issue ADISC: did:x%x refcnt %d" , ndlp->nlp_DID,kref_read (&ndlp->kref),0 ); rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); + goto err; + } +return 0 ; - io_err: -lpfc_nlp_put (ndlp); - node_err: +err:spin_lock_irq (&ndlp->lock); ndlp->nlp_flag &= ~NLP_ADISC_SND ;spin_unlock_irq (&ndlp->lock); -lpfc_els_free_iocb (phba, elsiocb);return 1 ; }
@@ -2983,15 +2989,20 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, ndlp->nlp_flag &= ~NLP_ISSUE_LOGO ;spin_unlock_irq (&ndlp->lock); elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); + goto err; + }lpfc_debugfs_disc_trc (vport,LPFC_DISC_TRC_ELS_CMD ,"Issue LOGO: did:x%x refcnt %d" , ndlp->nlp_DID,kref_read (&ndlp->kref),0 ); rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); + goto err; + }spin_lock_irq (&ndlp->lock); ndlp->nlp_prev_state = ndlp->nlp_state;
@@ -2999,13 +3010,10 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,lpfc_nlp_set_state (vport, ndlp,NLP_STE_LOGO_ISSUE );return 0 ; - io_err: -lpfc_nlp_put (ndlp); - node_err: +err:spin_lock_irq (&ndlp->lock); ndlp->nlp_flag &= ~NLP_LOGO_SND ;spin_unlock_irq (&ndlp->lock); -lpfc_els_free_iocb (phba, elsiocb);return 1 ; }
@@ -3221,25 +3229,24 @@ lpfc_issue_els_scr(struct lpfc_vport *vport, uint8_t retry) phba->fc_stat.elsXmitSCR++; elsiocb->iocb_cmpl = lpfc_cmpl_els_disc_cmd; elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return 1 ; + }lpfc_debugfs_disc_trc (vport,LPFC_DISC_TRC_ELS_CMD ,"Issue SCR: did:x%x refcnt %d" , ndlp->nlp_DID,kref_read (&ndlp->kref),0 ); rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return 1 ; + }/* Keep the ndlp just in case RDF is being sent */ return 0 ; - - io_err: -lpfc_nlp_put (ndlp); - node_err: -lpfc_els_free_iocb (phba, elsiocb); -return 1 ; }/**
@@ -3321,16 +3328,21 @@ lpfc_issue_els_rscn(struct lpfc_vport *vport, uint8_t retry) phba->fc_stat.elsXmitRSCN++; elsiocb->iocb_cmpl = lpfc_cmpl_els_cmd; elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return 1 ; + }lpfc_debugfs_disc_trc (vport,LPFC_DISC_TRC_ELS_CMD ,"Issue RSCN: did:x%x" , ndlp->nlp_DID,0 ,0 ); rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return 1 ; + }/* This will cause the callback-function lpfc_cmpl_els_cmd to * trigger the release of node.
@@ -3338,11 +3350,6 @@ lpfc_issue_els_rscn(struct lpfc_vport *vport, uint8_t retry)if (!(vport->fc_flag &FC_PT2PT ))lpfc_nlp_put (ndlp);return 0 ; -io_err: -lpfc_nlp_put (ndlp); -node_err: -lpfc_els_free_iocb (phba, elsiocb); -return 1 ; }/**
@@ -3437,8 +3444,8 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)* lpfc_els_free_iocb routine to trigger the release of * the node. */ -lpfc_nlp_put (ndlp);lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp);return 1 ; }/* This will cause the callback-function lpfc_cmpl_els_cmd to
@@ -3518,23 +3525,22 @@ lpfc_issue_els_rdf(struct lpfc_vport *vport, uint8_t retry) elsiocb->iocb_cmpl = lpfc_cmpl_els_disc_cmd; elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return -EIO ; + }lpfc_debugfs_disc_trc (vport,LPFC_DISC_TRC_ELS_CMD ,"Issue RDF: did:x%x refcnt %d" , ndlp->nlp_DID,kref_read (&ndlp->kref),0 ); rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return -EIO ; + }return 0 ; - - io_err: -lpfc_nlp_put (ndlp); - node_err: -lpfc_els_free_iocb (phba, elsiocb); -return -EIO ; }/**
@@ -4821,12 +4827,17 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag, phba->fc_stat.elsXmitACC++; elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return 1 ; + } rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return 1 ; + }/* Xmit ELS ACC response tag <ulpIoTag> */ lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
@@ -4837,12 +4848,6 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag, ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi, vport->fc_flag);return 0 ; - -io_err: -lpfc_nlp_put (ndlp); -node_err: -lpfc_els_free_iocb (phba, elsiocb); -return 1 ; }/**
@@ -4914,20 +4919,19 @@ lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError, phba->fc_stat.elsXmitLSRJT++; elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return 1 ; + } rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return 1 ; + }return 0 ; - - io_err: -lpfc_nlp_put (ndlp); - node_err: -lpfc_els_free_iocb (phba, elsiocb); -return 1 ; }/**
@@ -4997,12 +5001,17 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, phba->fc_stat.elsXmitACC++; elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return 1 ; + } rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return 1 ; + }/* Xmit ELS ACC response tag <ulpIoTag> */ lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
@@ -5013,12 +5022,6 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi, vport->fc_flag);return 0 ; - -io_err: -lpfc_nlp_put (ndlp); -node_err: -lpfc_els_free_iocb (phba, elsiocb); -return 1 ; }/**
@@ -5172,19 +5175,19 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, phba->fc_stat.elsXmitACC++; elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return 1 ; + } rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; -return 0 ; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return 1 ; + } - io_err: -lpfc_nlp_put (ndlp); - node_err: -lpfc_els_free_iocb (phba, elsiocb); -return 1 ; +return 0 ; }/**
@@ -5279,20 +5282,19 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format, phba->fc_stat.elsXmitACC++; elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return 1 ; + } rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return 1 ; + }return 0 ; - - io_err: -lpfc_nlp_put (ndlp); - node_err: -lpfc_els_free_iocb (phba, elsiocb); -return 1 ; }/**
@@ -5394,19 +5396,19 @@ lpfc_els_rsp_echo_acc(struct lpfc_vport *vport, uint8_t *data, phba->fc_stat.elsXmitACC++; elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return 1 ; + } rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; -return 0 ; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return 1 ; + } - io_err: -lpfc_nlp_put (ndlp); - node_err: -lpfc_els_free_iocb (phba, elsiocb); -return 1 ; +return 0 ; }/**
@@ -6050,8 +6052,8 @@ lpfc_els_rdp_cmpl(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context, rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 );if (rc ==IOCB_ERROR ) { -lpfc_nlp_put (ndlp);lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); } goto free_rdp_context;
@@ -6082,8 +6084,8 @@ lpfc_els_rdp_cmpl(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context, rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 );if (rc ==IOCB_ERROR ) { -lpfc_nlp_put (ndlp);lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); } free_rdp_context:
@@ -6295,16 +6297,16 @@ lpfc_els_lcb_rsp(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) phba->fc_stat.elsXmitACC++; elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; - - rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (!rc) +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); goto out; + } -lpfc_nlp_put (ndlp); - node_err: -lpfc_els_free_iocb (phba, elsiocb); + rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); + } out:kfree (lcb_context);return ;
@@ -6340,8 +6342,8 @@ lpfc_els_lcb_rsp(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 );if (rc ==IOCB_ERROR ) { -lpfc_nlp_put (ndlp);lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); } free_lcb_context:kfree (lcb_context);
@@ -7407,18 +7409,17 @@ lpfc_els_rsp_rls_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; phba->fc_stat.elsXmitACC++; elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return ; + } rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); + }return ; - - io_err: -lpfc_nlp_put (ndlp); - node_err: -lpfc_els_free_iocb (phba, elsiocb); }/**
@@ -7567,8 +7568,8 @@ lpfc_els_rcv_rtv(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 );if (rc ==IOCB_ERROR ) { -lpfc_nlp_put (ndlp);lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); }return 0 ;
@@ -7645,8 +7646,8 @@ lpfc_issue_els_rrq(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,return 0 ; io_err: -lpfc_nlp_put (ndlp);lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp);return 1 ; }
@@ -7743,19 +7744,19 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize, elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; phba->fc_stat.elsXmitACC++; elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); +return 1 ; + } rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; -return 0 ; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); +return 1 ; + } - io_err: -lpfc_nlp_put (ndlp); - node_err: -lpfc_els_free_iocb (phba, elsiocb); -return 1 ; +return 0 ; }/**
@@ -9661,11 +9662,14 @@ lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, did, 0, 0); elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); goto err_out; + } rc =lpfc_issue_fabric_iocb (phba, elsiocb);if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb);lpfc_nlp_put (ndlp); goto err_out; }
@@ -9674,7 +9678,6 @@ lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,return 0 ; err_out: -lpfc_els_free_iocb (phba, elsiocb);lpfc_vport_set_state (vport,FC_VPORT_FAILED );lpfc_printf_vlog (vport,KERN_ERR ,LOG_TRACE_EVENT ,"0256 Issue FDISC: Cannot send IOCB\n" );
@@ -9782,20 +9785,23 @@ lpfc_issue_els_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) ndlp->nlp_flag |=NLP_LOGO_SND ;spin_unlock_irq (&ndlp->lock); elsiocb->context1 =lpfc_nlp_get (ndlp); -if (!elsiocb->context1) - goto node_err; +if (!elsiocb->context1) { +lpfc_els_free_iocb (phba, elsiocb); + goto err; + } + rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) - goto io_err; +if (rc ==IOCB_ERROR ) { +lpfc_els_free_iocb (phba, elsiocb); +lpfc_nlp_put (ndlp); + goto err; + }return 0 ; - io_err: -lpfc_nlp_put (ndlp); - node_err: +err:spin_lock_irq (&ndlp->lock); ndlp->nlp_flag &= ~NLP_LOGO_SND ;spin_unlock_irq (&ndlp->lock); -lpfc_els_free_iocb (phba, elsiocb);return 1 ; }
Signature · 1 line
2.26.2
PATCH 11/22 lpfc: Fix status returned in lpfc_els_retry() error exit path
In reply to James SmartAn unlikely error exit path from lpfc_els_retry() returns incorrect status to a caller, erroneously indicating that a retry has been successfully issued or scheduled.
Change error exit path to indicate no retry.
--- drivers/scsi/lpfc/lpfc_els.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_els.c +1 -1
@@ -3822,7 +3822,7 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, did = irsp->un.elsreq64.remoteID; ndlp =lpfc_findnode_did (vport, did);if (!ndlp && (cmd !=ELS_CMD_PLOGI )) -return 1 ; +return 0 ; } lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,
Signature · 1 line
2.26.2
PATCH 12/22 lpfc: Fix dropped FLOGI during pt2pt discovery recovery
In reply to James SmartWhen connected in pt2pt mode, there is a scenario where the remote port significantly delays sending a response to our FLOGI, but acts on the FLOGI it sent us and proceeds to PLOGI/PRLI. The FLOGI ends up timing out and kicks off recovery logic. End result is a lot of unnecessary state changes and lots of discovery messages being logged.
Fix by terminating the FLOGI and noop'ing it's completion if we have already accepted the remote ports FLOGI and are now processing PLOGI.
--- drivers/scsi/lpfc/lpfc.h | 1 + drivers/scsi/lpfc/lpfc_crtn.h | 2 ++ drivers/scsi/lpfc/lpfc_els.c | 10 ++++++++-- drivers/scsi/lpfc/lpfc_nportdisc.c | 10 ++++++++++ drivers/scsi/lpfc/lpfc_sli.c | 2 +- 5 files changed, 22 insertions(+), 3 deletions(-)
drivers/scsi/lpfc/lpfc.h +1 -0
@@ -782,6 +782,7 @@ struct lpfc_hba {#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 */ +#define HBA_FLOGI_OUTSTANDING 0x10000000/* FLOGI is outstanding */ uint32_t fcp_ring_in_use;/* When polling test if intr-hndlr active*/ struct lpfc_dmabuf slim2p;
drivers/scsi/lpfc/lpfc_crtn.h +2 -0
@@ -103,6 +103,8 @@ int lpfc_check_sli_ndlp(struct lpfc_hba *, struct lpfc_sli_ring *,struct lpfc_nodelist *lpfc_nlp_init (struct lpfc_vport *vport,uint32_t did);struct lpfc_nodelist *lpfc_nlp_get (struct lpfc_nodelist *);int lpfc_nlp_put (struct lpfc_nodelist *); +void lpfc_ignore_els_cmpl (struct lpfc_hba *phba,struct lpfc_iocbq *cmdiocb, +struct lpfc_iocbq *rspiocb);int lpfc_nlp_not_used (struct lpfc_nodelist *ndlp);struct lpfc_nodelist *lpfc_setup_disc_node (struct lpfc_vport *,uint32_t );void lpfc_disc_list_loopmap (struct lpfc_vport *);
drivers/scsi/lpfc/lpfc_els.c +8 -2
@@ -1200,6 +1200,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,lpfc_issue_clear_la (phba, vport); } out: + phba->hba_flag &= ~HBA_FLOGI_OUTSTANDING ;lpfc_els_free_iocb (phba, cmdiocb);lpfc_nlp_put (ndlp); }
@@ -1354,7 +1355,7 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,return 1 ; } - phba->hba_flag |=HBA_FLOGI_ISSUED ; + phba->hba_flag |= (HBA_FLOGI_ISSUED |HBA_FLOGI_OUTSTANDING );/* Check for a deferred FLOGI ACC condition */ if (phba->defer_flogi_acc_flag) {
@@ -1425,9 +1426,14 @@ lpfc_els_abort_flogi(struct lpfc_hba *phba) icmd = &iocb->iocb;if (icmd->ulpCommand ==CMD_ELS_REQUEST64_CR ) { ndlp = (struct lpfc_nodelist *)(iocb->context1); -if (ndlp && (ndlp->nlp_DID == Fabric_DID)) +if (ndlp && ndlp->nlp_DID == Fabric_DID) { +if ((phba->pport->fc_flag &FC_PT2PT ) && + !(phba->pport->fc_flag &FC_PT2PT_PLOGI )) + iocb->fabric_iocb_cmpl = + lpfc_ignore_els_cmpl;lpfc_sli_issue_abort_iotag (phba, pring, iocb,NULL ); + } } }/* Make sure HBA is alive */
drivers/scsi/lpfc/lpfc_nportdisc.c +10 -0
@@ -523,6 +523,16 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,/* rcv'ed PLOGI decides what our NPortId will be */ vport->fc_myDID = icmd->un.rcvels.parmRo; +/* If there is an outstanding FLOGI, abort it now. +* The remote NPort is not going to ACC our FLOGI +* if its already issuing a PLOGI for pt2pt mode. +* This indicates our FLOGI was dropped; however, we +* must have ACCed the remote NPorts FLOGI to us +* to make it here. +*/ +if (phba->hba_flag &HBA_FLOGI_OUTSTANDING ) +lpfc_els_abort_flogi (phba); + ed_tov =be32_to_cpu (sp->cmn.e_d_tov);if (sp->cmn.edtovResolution) {/* E_D_TOV ticks are in nanoseconds */
drivers/scsi/lpfc/lpfc_sli.c +1 -1
@@ -11591,7 +11591,7 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,* which are aborted. The function frees memory resources used for * the aborted ELS commands. **/ -static void +void lpfc_ignore_els_cmpl (struct lpfc_hba *phba,struct lpfc_iocbq *cmdiocb,struct lpfc_iocbq *rspiocb) {
Signature · 1 line
2.26.2
PATCH 13/22 lpfc: Fix PLOGI ACC to be transmit after REG_LOGIN
In reply to James SmartThe driver is seeing a scenario where PLOGI response was issued and traffic is arriving while the adapter is still setting up the login context. This is resulting in errors handling the traffic.
Change the driver so that PLOGI response is sent after the login context has been setup to avoid the situation.
--- drivers/scsi/lpfc/lpfc_nportdisc.c | 239 +++++++++-------------------- 1 file changed, 70 insertions(+), 169 deletions(-)
drivers/scsi/lpfc/lpfc_nportdisc.c +70 -169
@@ -279,106 +279,43 @@ lpfc_els_abort(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)lpfc_cancel_retry_delay_tmo (phba->pport, ndlp); } -/* lpfc_defer_pt2pt_acc - Complete SLI3 pt2pt processing on link up +/* lpfc_defer_plogi_acc - Issue PLOGI ACC after reg_login completes * @phba: pointer to lpfc hba data structure. -* @link_mbox: pointer to CONFIG_LINK mailbox object +* @login_mbox: pointer to REG_RPI mailbox object * -* This routine is only called if we are SLI3, direct connect pt2pt -* mode and the remote NPort issues the PLOGI after link up. +* The ACC for a rcv'ed PLOGI is deferred until AFTER the REG_RPI completes */ static void -lpfc_defer_pt2pt_acc (struct lpfc_hba *phba,LPFC_MBOXQ_t *link_mbox) +lpfc_defer_plogi_acc (struct lpfc_hba *phba,LPFC_MBOXQ_t *login_mbox) { -LPFC_MBOXQ_t *login_mbox; -MAILBOX_t *mb = &link_mbox->u.mb;struct lpfc_iocbq *save_iocb;struct lpfc_nodelist *ndlp; +MAILBOX_t *mb = &login_mbox->u.mb; +int rc; - ndlp = link_mbox->ctx_ndlp; - login_mbox = link_mbox->context3; + ndlp = login_mbox->ctx_ndlp; save_iocb = login_mbox->context3; - link_mbox->context3 =NULL ; - login_mbox->context3 =NULL ; - -/* Check for CONFIG_LINK error */ -if (mb->mbxStatus) { -lpfc_printf_log (phba,KERN_ERR ,LOG_TRACE_EVENT , -"4575 CONFIG_LINK fails pt2pt discovery: %x\n" , - mb->mbxStatus); -mempool_free (login_mbox, phba->mbox_mem_pool); -mempool_free (link_mbox, phba->mbox_mem_pool); -kfree (save_iocb); -return ; - } -/* Now that CONFIG_LINK completed, and our SID is configured, -* we can now proceed with sending the PLOGI ACC. -*/ - rc =lpfc_els_rsp_acc (link_mbox->vport,ELS_CMD_PLOGI , - save_iocb, ndlp, login_mbox); -if (rc) { -lpfc_printf_log (phba,KERN_ERR ,LOG_TRACE_EVENT , -"4576 PLOGI ACC fails pt2pt discovery: %x\n" , - rc); -mempool_free (login_mbox, phba->mbox_mem_pool); +if (mb->mbxStatus ==MBX_SUCCESS ) { +/* Now that REG_RPI completed successfully, +* we can now proceed with sending the PLOGI ACC. +*/ + rc =lpfc_els_rsp_acc (login_mbox->vport,ELS_CMD_PLOGI , + save_iocb, ndlp,NULL ); +if (rc) { +lpfc_printf_log (phba,KERN_ERR ,LOG_TRACE_EVENT , +"4576 PLOGI ACC fails pt2pt discovery: " +"DID %x Data: %x\n" , ndlp->nlp_DID, rc); + } } -mempool_free (link_mbox, phba->mbox_mem_pool); +/* Now process the REG_RPI cmpl */ +lpfc_mbx_cmpl_reg_login (phba, login_mbox); + ndlp->nlp_flag &= ~NLP_ACC_REGLOGIN ;kfree (save_iocb); } -/** -* lpfc_defer_tgt_acc - Progress SLI4 target rcv PLOGI handler -* @phba: Pointer to HBA context object. -* @pmb: Pointer to mailbox object. -* -* This function provides the unreg rpi mailbox completion handler for a tgt. -* The routine frees the memory resources associated with the completed -* mailbox command and transmits the ELS ACC. -* -* This routine is only called if we are SLI4, acting in target -* mode and the remote NPort issues the PLOGI after link up. -**/ -static void -lpfc_defer_acc_rsp (struct lpfc_hba *phba,LPFC_MBOXQ_t *pmb) -{ -struct lpfc_vport *vport = pmb->vport; -struct lpfc_nodelist *ndlp = pmb->ctx_ndlp; -LPFC_MBOXQ_t *mbox = pmb->context3; -struct lpfc_iocbq *piocb =NULL ; -int rc; - -if (mbox) { - pmb->context3 =NULL ; - piocb = mbox->context3; - mbox->context3 =NULL ; - } - -/* -* Complete the unreg rpi mbx request, and update flags. -* This will also restart any deferred events. -*/ -lpfc_sli4_unreg_rpi_cmpl_clr (phba, pmb); - -if (!piocb) { -lpfc_printf_vlog (vport,KERN_ERR ,LOG_TRACE_EVENT , -"4578 PLOGI ACC fail\n" ); -if (mbox) -mempool_free (mbox, phba->mbox_mem_pool); -return ; - } - - rc =lpfc_els_rsp_acc (vport,ELS_CMD_PLOGI , piocb, ndlp, mbox); -if (rc) { -lpfc_printf_vlog (vport,KERN_ERR ,LOG_TRACE_EVENT , -"4579 PLOGI ACC fail %x\n" , rc); -if (mbox) -mempool_free (mbox, phba->mbox_mem_pool); - } -kfree (piocb); -} -static int lpfc_rcv_plogi (struct lpfc_vport *vport,struct lpfc_nodelist *ndlp,struct lpfc_iocbq *cmdiocb)
@@ -395,8 +332,7 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,struct lpfc_iocbq *save_iocb;struct ls_rjt stat;uint32_t vid, flag; -u16 rpi; -int rc, defer_acc; +int rc;memset (&stat,0 ,sizeof (struct ls_rjt )); pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
@@ -445,7 +381,6 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,else ndlp->nlp_fcp_info |=CLASS3 ; - defer_acc =0 ; ndlp->nlp_class_sup =0 ;if (sp->cls1.classValid) ndlp->nlp_class_sup |=FC_COS_CLASS1 ;
@@ -549,27 +484,26 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,memcpy (&phba->fc_fabparam, sp,sizeof (struct serv_parm )); -/* Issue config_link / reg_vfi to account for updated TOV's */ - +/* Issue CONFIG_LINK for SLI3 or REG_VFI for SLI4, +* to account for updated TOV's / parameters +*/ if (phba->sli_rev ==LPFC_SLI_REV4 )lpfc_issue_reg_vfi (vport);else { - defer_acc =1 ; link_mbox =mempool_alloc (phba->mbox_mem_pool,GFP_KERNEL );if (!link_mbox) goto out;lpfc_config_link (phba, link_mbox); - link_mbox->mbox_cmpl = lpfc_defer_pt2pt_acc; + link_mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl; link_mbox->vport = vport; link_mbox->ctx_ndlp = ndlp; - save_iocb =kzalloc (sizeof (*save_iocb),GFP_KERNEL ); -if (!save_iocb) + rc =lpfc_sli_issue_mbox (phba, link_mbox,MBX_NOWAIT ); +if (rc ==MBX_NOT_FINISHED ) { +mempool_free (link_mbox, phba->mbox_mem_pool); goto out; -/* Save info from cmd IOCB used in rsp */ -memcpy ((uint8_t *)save_iocb, (uint8_t *)cmdiocb, -sizeof (struct lpfc_iocbq )); + } }lpfc_can_disctmo (vport);
@@ -588,59 +522,28 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,if (!login_mbox) goto out; -/* Registering an existing RPI behaves differently for SLI3 vs SLI4 */ -if (phba->nvmet_support && !defer_acc) { - link_mbox =mempool_alloc (phba->mbox_mem_pool,GFP_KERNEL ); -if (!link_mbox) - goto out; - -/* As unique identifiers such as iotag would be overwritten -* with those from the cmdiocb, allocate separate temporary -* storage for the copy. -*/ - save_iocb =kzalloc (sizeof (*save_iocb),GFP_KERNEL ); -if (!save_iocb) - goto out; - -/* Unreg RPI is required for SLI4. */ - rpi = phba->sli4_hba.rpi_ids[ndlp->nlp_rpi]; -lpfc_unreg_login (phba, vport->vpi, rpi, link_mbox); - link_mbox->vport = vport; - link_mbox->ctx_ndlp =lpfc_nlp_get (ndlp); -if (!link_mbox->ctx_ndlp) - goto out; - - link_mbox->mbox_cmpl = lpfc_defer_acc_rsp; - -if (((ndlp->nlp_DID & Fabric_DID_MASK) != Fabric_DID_MASK) && - (!(vport->fc_flag &FC_OFFLINE_MODE ))) - ndlp->nlp_flag |=NLP_UNREG_INP ; + save_iocb =kzalloc (sizeof (*save_iocb),GFP_KERNEL ); +if (!save_iocb) + goto out; -/* Save info from cmd IOCB used in rsp */ -memcpy (save_iocb, cmdiocb,sizeof (*save_iocb)); +/* Save info from cmd IOCB to be used in rsp after all mbox completes */ +memcpy ((uint8_t *)save_iocb, (uint8_t *)cmdiocb, +sizeof (struct lpfc_iocbq )); -/* Delay sending ACC till unreg RPI completes. */ - defer_acc =1 ; - }else if (phba->sli_rev ==LPFC_SLI_REV4 ) +/* Registering an existing RPI behaves differently for SLI3 vs SLI4 */ +if (phba->sli_rev ==LPFC_SLI_REV4 )lpfc_unreg_rpi (vport, ndlp); +/* Issue REG_LOGIN first, before ACCing the PLOGI, thus we will +* always be deferring the ACC. +*/ rc =lpfc_reg_rpi (phba, vport->vpi, icmd->un.rcvels.remoteID, (uint8_t *)sp, login_mbox, ndlp->nlp_rpi);if (rc) goto out; -/* ACC PLOGI rsp command needs to execute first, -* queue this login_mbox command to be processed later. -*/ login_mbox->mbox_cmpl = lpfc_mbx_cmpl_reg_login; -/* -* login_mbox->ctx_ndlp = lpfc_nlp_get(ndlp) deferred until mailbox -* command issued in lpfc_cmpl_els_acc(). -*/ login_mbox->vport = vport; -spin_lock_irq (&ndlp->lock); - ndlp->nlp_flag |= (NLP_ACC_REGLOGIN |NLP_RCV_PLOGI ); -spin_unlock_irq (&ndlp->lock);/* * If there is an outstanding PLOGI issued, abort it before
@@ -670,7 +573,8 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,* to register, then unregister the RPI. */ spin_lock_irq (&ndlp->lock); - ndlp->nlp_flag |=NLP_RM_DFLT_RPI ; + ndlp->nlp_flag |= (NLP_RM_DFLT_RPI |NLP_ACC_REGLOGIN | +NLP_RCV_PLOGI );spin_unlock_irq (&ndlp->lock); stat.un.b.lsRjtRsnCode =LSRJT_INVALID_CMD ; stat.un.b.lsRjtRsnCodeExp =LSEXP_NOTHING_MORE ;
@@ -680,42 +584,39 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,mempool_free (login_mbox, phba->mbox_mem_pool);return 1 ; } -if (defer_acc) { -/* So the order here should be: -* SLI3 pt2pt -* Issue CONFIG_LINK mbox -* CONFIG_LINK cmpl -* SLI4 tgt -* Issue UNREG RPI mbx -* UNREG RPI cmpl -* Issue PLOGI ACC -* PLOGI ACC cmpl -* Issue REG_LOGIN mbox -*/ -/* Save the REG_LOGIN mbox for and rcv IOCB copy later */ - link_mbox->context3 = login_mbox; - login_mbox->context3 = save_iocb; +/* So the order here should be: +* SLI3 pt2pt +* Issue CONFIG_LINK mbox +* CONFIG_LINK cmpl +* SLI4 pt2pt +* Issue REG_VFI mbox +* REG_VFI cmpl +* SLI4 +* Issue UNREG RPI mbx +* UNREG RPI cmpl +* Issue REG_RPI mbox +* REG RPI cmpl +* Issue PLOGI ACC +* PLOGI ACC cmpl +*/ + login_mbox->mbox_cmpl = lpfc_defer_plogi_acc; + login_mbox->ctx_ndlp =lpfc_nlp_get (ndlp); + login_mbox->context3 = save_iocb;/* For PLOGI ACC */ -/* Start the ball rolling by issuing CONFIG_LINK here */ - rc =lpfc_sli_issue_mbox (phba, link_mbox,MBX_NOWAIT ); -if (rc ==MBX_NOT_FINISHED ) - goto out; -return 1 ; - } +spin_lock_irq (&ndlp->lock); + ndlp->nlp_flag |= (NLP_ACC_REGLOGIN |NLP_RCV_PLOGI ); +spin_unlock_irq (&ndlp->lock); + +/* Start the ball rolling by issuing REG_LOGIN here */ + rc =lpfc_sli_issue_mbox (phba, login_mbox,MBX_NOWAIT ); +if (rc ==MBX_NOT_FINISHED ) + goto out; +lpfc_nlp_set_state (vport, ndlp,NLP_STE_REG_LOGIN_ISSUE ); - rc =lpfc_els_rsp_acc (vport,ELS_CMD_PLOGI , cmdiocb, ndlp, login_mbox); -if (rc) -mempool_free (login_mbox, phba->mbox_mem_pool);return 1 ; out: -if (defer_acc) -lpfc_printf_log (phba,KERN_ERR ,LOG_TRACE_EVENT , -"4577 discovery failure: %p %p %p\n" , - save_iocb, link_mbox, login_mbox);kfree (save_iocb); -if (link_mbox) -mempool_free (link_mbox, phba->mbox_mem_pool);if (login_mbox)mempool_free (login_mbox, phba->mbox_mem_pool);
Signature · 1 line
2.26.2
PATCH 14/22 lpfc: Fix ADISC handling that never frees nodes
In reply to James SmartWhile testing target port swap test with ADISC enabled, several nodes remain in UNUSED state. These nodes are never freed and rmmod hangs for long time before finising with "0233 Nodelist not empty" error.
During PLOGI completion lpfc_plogi_confirm_nport() looks for existing nodes with same WWPN. If found, the existing node is used to continue discovery. The node on which plogi was performed is freed. When ADISC is enabled, an ADISC els request is triggered in response to an RSCN. It's possible that the ADISC may be rejected by the remote port causing the ADISC completion handler to clear the port and node name in the node. If this occurs, if a PLOGI is received it causes a node lookup based on wwpn to now fail, causing the port swap logic to kick in which allocates a new node and swaps to it. This effectively orphans the original node structure.
Fix the situation by detecting when the lookup fails and forgo the node swap and node allocation by using the node on which the PLOGI was issued.
--- drivers/scsi/lpfc/lpfc_els.c | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +7 -26
@@ -1608,7 +1608,7 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,struct lpfc_nodelist *new_ndlp;struct serv_parm *sp;uint8_t name[sizeof (struct lpfc_name )]; -uint32_t rc, keepDID =0 , keep_nlp_flag =0 ; +uint32_t keepDID =0 , keep_nlp_flag =0 ;uint32_t keep_new_nlp_flag =0 ;uint16_t keep_nlp_state;u32 keep_nlp_fc4_type =0 ;
@@ -1630,7 +1630,7 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp, new_ndlp =lpfc_findnode_wwpn (vport, &sp->portName);/* return immediately if the WWPN matches ndlp */ -if (new_ndlp == ndlp) +if (!new_ndlp || (new_ndlp == ndlp))return ndlp;if (phba->sli_rev ==LPFC_SLI_REV4 ) {
@@ -1649,30 +1649,11 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp, (new_ndlp ? new_ndlp->nlp_flag :0 ), (new_ndlp ? new_ndlp->nlp_fc4_type : 0)); -if (!new_ndlp) { - rc =memcmp (&ndlp->nlp_portname, name, -sizeof (struct lpfc_name )); -if (!rc) { -if (active_rrqs_xri_bitmap) -mempool_free (active_rrqs_xri_bitmap, - phba->active_rrq_pool); -return ndlp; - } - new_ndlp =lpfc_nlp_init (vport, ndlp->nlp_DID); -if (!new_ndlp) { -if (active_rrqs_xri_bitmap) -mempool_free (active_rrqs_xri_bitmap, - phba->active_rrq_pool); -return ndlp; - } - }else { - keepDID = new_ndlp->nlp_DID; -if (phba->sli_rev ==LPFC_SLI_REV4 && - active_rrqs_xri_bitmap) -memcpy (active_rrqs_xri_bitmap, - new_ndlp->active_rrqs_xri_bitmap, - phba->cfg_rrq_xri_bitmap_sz); - } + keepDID = new_ndlp->nlp_DID; + +if (phba->sli_rev ==LPFC_SLI_REV4 && active_rrqs_xri_bitmap) +memcpy (active_rrqs_xri_bitmap, new_ndlp->active_rrqs_xri_bitmap, + phba->cfg_rrq_xri_bitmap_sz);/* At this point in this routine, we know new_ndlp will be * returned. however, any previous GID_FTs that were done
Signature · 1 line
2.26.2
PATCH 15/22 lpfc: Fix nodeinfo debugfs output
In reply to James SmartThe debugfs nodeinfo output gets jumbled when no rpri or a defer entry is displayed. The misalignment makes it difficult to read.
Change the format to consistently print out a 4 character rpi, and turn defer into a suffix.
--- drivers/scsi/lpfc/lpfc_debugfs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/scsi/lpfc/lpfc_debugfs.c +7 -4
@@ -869,7 +869,7 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)"WWNN x%llx " , wwn_to_u64(ndlp->nlp_nodename.u.wwn));if (ndlp->nlp_flag &NLP_RPI_REGISTERED ) - len +=scnprintf (buf+len, size-len,"RPI:%03d " , + len +=scnprintf (buf+len, size-len,"RPI:%04d " , ndlp->nlp_rpi);else len +=scnprintf (buf+len, size-len,"RPI:none " );
@@ -895,7 +895,7 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)if (ndlp->nlp_type &NLP_NVME_INITIATOR ) len +=scnprintf (buf + len, size - len,"NVME_INITIATOR " ); - len +=scnprintf (buf+len, size-len,"refcnt:%x" , + len +=scnprintf (buf+len, size-len,"refcnt:%d" ,kref_read (&ndlp->kref));if (iocnt) { i =atomic_read (&ndlp->cmd_pending);
@@ -904,8 +904,11 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size) i, ndlp->cmd_qdepth); outio += i; } - len +=scnprintf (buf + len, size - len,"defer:%x " , - ndlp->nlp_defer_did); + len +=scnprintf (buf+len, size-len," xpt:x%x" , + ndlp->fc4_xpt_flags); +if (ndlp->nlp_defer_did !=NLP_EVT_NOTHING_PENDING ) + len +=scnprintf (buf+len, size-len," defer:%x" , + ndlp->nlp_defer_did); len +=scnprintf (buf+len, size-len,"\n" ); }spin_unlock_irq (shost->host_lock);
Signature · 1 line
2.26.2
PATCH 16/22 lpfc: Fix pt2pt state transition causing rmmod hang
In reply to James SmartOn a setup with a dual port HBA and both ports direct connected, an rmmod hangs momentarily when we log an Illegal State Transition. Once it resumes, a nodelist not empty logic is hit, which forces rmmod to cleanup and exit. We're missing a state transition case in the discovery engine.
Fix by adding a case for a DEVICE_RM event while in the unmapped state to avoid illegal state transition log message.
--- drivers/scsi/lpfc/lpfc_nportdisc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_nportdisc.c +11 -1
@@ -2485,6 +2485,16 @@ lpfc_rcv_prlo_unmap_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,return ndlp->nlp_state; } +static uint32_t +lpfc_device_rm_unmap_node (struct lpfc_vport *vport, +struct lpfc_nodelist *ndlp, +void *arg, +uint32_t evt) +{ +lpfc_drop_node (vport, ndlp); +return NLP_STE_FREED_NODE ; +} + static uint32_t lpfc_device_recov_unmap_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
@@ -2978,7 +2988,7 @@ static uint32_t (*lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT]) lpfc_disc_illegal,/* CMPL_LOGO */ lpfc_disc_illegal,/* CMPL_ADISC */ lpfc_disc_illegal,/* CMPL_REG_LOGIN */ - lpfc_disc_illegal,/* DEVICE_RM */ + lpfc_device_rm_unmap_node,/* DEVICE_RM */ lpfc_device_recov_unmap_node,/* DEVICE_RECOVERY */ lpfc_rcv_plogi_mapped_node, /* RCV_PLOGI MAPPED_NODE */
Signature · 1 line
2.26.2
PATCH 17/22 lpfc: Fix crash caused by switch reboot
In reply to James SmartDriver is causing a crash in __lpfc_sli_release_iocbq_s4() when it dereferences the els_wq which is NULL.
Validate the pring for the els_wq before dereferencing. Reorg the code to move the pring assignment closer to where it is actually used.
--- drivers/scsi/lpfc/lpfc_sli.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +2 -3
@@ -1403,7 +1403,6 @@ __lpfc_sli_release_iocbq_s4(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq) goto out; } - pring = phba->sli4_hba.els_wq->pring;if ((iocbq->iocb_flag &LPFC_EXCHANGE_BUSY ) && (sglq->state !=SGL_XRI_ABORTED )) { spin_lock_irqsave(&phba->sli4_hba.sgl_list_lock,
@@ -1426,9 +1425,9 @@ __lpfc_sli_release_iocbq_s4(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq) &phba->sli4_hba.lpfc_els_sgl_list);spin_unlock_irqrestore ( &phba->sli4_hba.sgl_list_lock, iflag); - + pring =lpfc_phba_elsring (phba);/* Check if TXQ queue needs to be serviced */ -if (!list_empty (&pring->txq)) +if (pring && (!list_empty (&pring->txq)))lpfc_worker_wake_up (phba); } }
Signature · 1 line
2.26.2
PATCH 18/22 lpfc: Change wording of invalid pci reset log message
In reply to James SmartMessage 8347 Invalid device found log message is logged when an LPe12000 adapter is installed. The log message is supposed to indicate an unsupported pci reset adapter rather than an invalid device.
Change the wording to: Incapable PCI reset device.
--- drivers/scsi/lpfc/lpfc_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_scsi.c +1 -1
@@ -5031,7 +5031,7 @@ lpfc_check_pci_resettable(struct lpfc_hba *phba)break ;default :lpfc_printf_log (phba,KERN_INFO ,LOG_INIT , -"8347 Invalid device found: " +"8347 Incapable PCI reset device: " "0x%04x\n" , ptr->device);return -EBADSLT ; }
Signature · 1 line
2.26.2
PATCH 19/22 lpfc: Reduce LOG_TRACE_EVENT logging for vports
In reply to James SmartLots of discovery messages are flooding the console log when testing NPIV.
Informational message for vports should have LOG_VPORT associated with it as opposed to LOG_TRACE_EVENT.
--- drivers/scsi/lpfc/lpfc_vport.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/lpfc/lpfc_vport.c +4 -4
@@ -190,7 +190,7 @@ lpfc_valid_wwn_format(struct lpfc_hba *phba, struct lpfc_name *wwn, ((wwn->u.wwn[0] & 0xf) != 0 || (wwn->u.wwn[1] & 0xf) != 0)))return 1 ; - lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT, + lpfc_printf_log(phba, KERN_ERR, LOG_VPORT, "1822 Invalid %s: %02x:%02x:%02x:%02x:" "%02x:%02x:%02x:%02x\n", name_type,
@@ -531,7 +531,7 @@ disable_vport(struct fc_vport *fc_vport) }lpfc_vport_set_state (vport,FC_VPORT_DISABLED ); -lpfc_printf_vlog (vport,KERN_ERR ,LOG_TRACE_EVENT , +lpfc_printf_vlog (vport,KERN_ERR ,LOG_VPORT ,"1826 Vport Disabled.\n" );return VPORT_OK ; }
@@ -579,7 +579,7 @@ enable_vport(struct fc_vport *fc_vport) } out: -lpfc_printf_vlog (vport,KERN_ERR ,LOG_TRACE_EVENT , +lpfc_printf_vlog (vport,KERN_ERR ,LOG_VPORT ,"1827 Vport Enabled.\n" );return VPORT_OK ; }
@@ -725,7 +725,7 @@ lpfc_vport_delete(struct fc_vport *fc_vport)spin_lock_irq (&phba->port_list_lock);list_del_init (&vport->listentry);spin_unlock_irq (&phba->port_list_lock); -lpfc_printf_vlog (vport,KERN_ERR ,LOG_TRACE_EVENT , +lpfc_printf_vlog (vport,KERN_ERR ,LOG_VPORT ,"1828 Vport Deleted.\n" );scsi_host_put (shost);return VPORT_OK ;
Signature · 1 line
2.26.2
PATCH 20/22 lpfc: Correct function header comments related to ndlp reference counting
In reply to James SmartCode inspection revealed stale comments in function headers for functions that call lpfc_prep_els_iocb(). Changes in ndlp reference counting were not reflected in function headers.
Update the stale comments in function headers to more accurately indicate ndlp reference counting.
--- drivers/scsi/lpfc/lpfc_els.c | 159 ++++++++++++++++------------------- 1 file changed, 71 insertions(+), 88 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +71 -88
@@ -1251,10 +1251,9 @@ lpfc_cmpl_els_link_down(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,* function field. The lpfc_issue_fabric_iocb routine is invoked to send * out FLOGI ELS command with one outstanding fabric IOCB at a time. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the FLOGI ELS command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the FLOGI ELS command. * * Return code * 0 - successfully issued flogi iocb for @vport
@@ -2281,10 +2280,9 @@ lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,* is put to the IOCB completion callback func field before invoking the * routine lpfc_sli_issue_iocb() to send out PRLI command. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the PRLI ELS command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the PRLI ELS command. * * Return code * 0 - successfully issued prli iocb command for @vport
@@ -2710,10 +2708,9 @@ lpfc_cmpl_els_adisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,* and states of the ndlp, and invokes the lpfc_sli_issue_iocb() routine * to issue the ADISC ELS command. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the ADISC ELS command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the ADISC ELS command. * * Return code * 0 - successfully issued adisc
@@ -2788,8 +2785,7 @@ lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,* This routine is the completion function for issuing the ELS Logout (LOGO) * command. If no error status was reported from the LOGO response, the * state machine of the associated ndlp shall be invoked for transition with -* respect to NLP_EVT_CMPL_LOGO event. Otherwise, if error status was reported, -* the lpfc_els_retry() routine will be invoked to retry the LOGO command. +* respect to NLP_EVT_CMPL_LOGO event. **/ static void lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
@@ -2926,10 +2922,9 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,* payload of the IOCB, properly sets up the @ndlp state, and invokes the * lpfc_sli_issue_iocb() routine to send out the LOGO ELS command. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the LOGO ELS command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the LOGO ELS command. * * Callers of this routine are expected to unregister the RPI first *
@@ -3165,10 +3160,9 @@ lpfc_cmpl_els_disc_cmd(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,* IOCB is allocated, payload prepared, and the lpfc_sli_issue_iocb() * routine is invoked to send the SCR IOCB. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the SCR ELS command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the SCR ELS command. * * Return code * 0 - Successfully issued scr command
@@ -3247,10 +3241,9 @@ lpfc_issue_els_scr(struct lpfc_vport *vport, uint8_t retry)* in point-to-point mode. When sent to the Fabric Controller, it will * replay the RSCN to registered recipients. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the RSCN ELS command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the RSCN ELS command. * * Return code * 0 - Successfully issued RSCN command
@@ -3352,10 +3345,9 @@ lpfc_issue_els_rscn(struct lpfc_vport *vport, uint8_t retry)* for this (FARPR) purpose. An IOCB is allocated, payload prepared, and the * lpfc_sli_issue_iocb() routine is invoked to send the FARPR ELS command. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the PARPR ELS command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the FARPR ELS command. * * Return code * 0 - Successfully issued farpr command
@@ -3450,10 +3442,9 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)* This routine issues an ELS RDF to the Fabric Controller to register * for diagnostic functions. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the RDF ELS command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the RDF ELS command. * * Return code * 0 - Successfully issued rdf command
@@ -3764,7 +3755,7 @@ lpfc_link_reset(struct lpfc_vport *vport)* This routine makes a retry decision on an ELS command IOCB, which has * failed. The following ELS IOCBs use this function for retrying the command * when previously issued command responsed with error status: FLOGI, PLOGI, -* PRLI, ADISC, LOGO, and FDISC. Based on the ELS command type and the +* PRLI, ADISC and FDISC. Based on the ELS command type and the * returned error status, it makes the decision whether a retry shall be * issued for the command, and whether a retry shall be made immediately or * delayed. In the former case, the corresponding ELS command issuing-function
@@ -4664,10 +4655,10 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,* field of the IOCB for the completion callback function to issue the * mailbox command to the HBA later when callback is invoked. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the corresponding response ELS IOCB command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the corresponding +* response ELS IOCB command. * * Return code * 0 - Successfully issued acc response
@@ -4850,10 +4841,10 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,* context_un.mbox field of the IOCB for the completion callback function * to issue to the HBA later. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the reject response ELS IOCB command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the reject response +* ELS IOCB command. * * Return code * 0 - Successfully issued reject response
@@ -4931,10 +4922,10 @@ lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError,* Discover (ADISC) ELS command. It simply prepares the payload of the IOCB * and invokes the lpfc_sli_issue_iocb() routine to send out the command. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the ADISC Accept response ELS IOCB command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the ADISC Accept response +* ELS IOCB command. * * Return code * 0 - Successfully issued acc adisc response
@@ -5021,10 +5012,10 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,* Login (PRLI) ELS command. It simply prepares the payload of the IOCB * and invokes the lpfc_sli_issue_iocb() routine to send out the command. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the PRLI Accept response ELS IOCB command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the PRLI Accept response +* ELS IOCB command. * * Return code * 0 - Successfully issued acc prli response
@@ -5187,17 +5178,11 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,* This routine issues a Request Node Identification Data (RNID) Accept * (ACC) response. It constructs the RNID ACC response command according to * the proper @format and then calls the lpfc_sli_issue_iocb() routine to -* issue the response. Note that this command does not need to hold the ndlp -* reference count for the callback. So, the ndlp reference count taken by -* the lpfc_prep_els_iocb() routine is put back and the context1 field of -* IOCB is set to NULL to indicate to the lpfc_els_free_iocb() routine that -* there is no ndlp reference available. -* -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function. However, for the RNID Accept Response ELS command, -* this is undone later by this routine after the IOCB is allocated. +* issue the response. +* +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function. * * Return code * 0 - Successfully issued acc rnid response
@@ -7318,16 +7303,16 @@ lpfc_els_rcv_rrq(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,* * This routine is the completion callback function for the MBX_READ_LNK_STAT * mailbox command. This callback function is to actually send the Accept -* (ACC) response to a Read Port Status (RPS) unsolicited IOCB event. It +* (ACC) response to a Read Link Status (RLS) unsolicited IOCB event. It * collects the link statistics from the completion of the MBX_READ_LNK_STAT -* mailbox command, constructs the RPS response with the link statistics +* mailbox command, constructs the RLS response with the link statistics * collected, and then invokes the lpfc_sli_issue_iocb() routine to send ACC -* response to the RPS. +* response to the RLS. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the RPS Accept Response ELS IOCB command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the RLS Accept Response +* ELS IOCB command. * **/ static void
@@ -7485,10 +7470,10 @@ lpfc_els_rcv_rls(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,* response. Otherwise, it sends the Accept(ACC) response to a Read Timeout * Value (RTV) unsolicited IOCB event. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the RTV Accept Response ELS IOCB command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the RTV Accept Response +* ELS IOCB command. * * Return codes * 0 - Successfully processed rtv iocb (currently always return 0)
@@ -7675,10 +7660,10 @@ lpfc_send_rrq(struct lpfc_hba *phba, struct lpfc_node_rrq *rrq)* This routine issuees an Accept (ACC) Read Port List (RPL) ELS command. * It is to be called by the lpfc_els_rcv_rpl() routine to accept the RPL. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the RPL Accept Response ELS command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the RPL Accept Response +* ELS command. * * Return code * 0 - Successfully issued ACC RPL ELS command
@@ -9569,10 +9554,9 @@ lpfc_cmpl_els_fdisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,* routine to issue the IOCB, which makes sure only one outstanding fabric * IOCB will be sent off HBA at any given time. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the FDISC ELS command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the FDISC ELS command. * * Return code * 0 - Successfully issued fdisc iocb command
@@ -9730,10 +9714,9 @@ lpfc_cmpl_els_npiv_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,* * This routine issues a LOGO ELS command to an @ndlp off a @vport. * -* Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp -* will be incremented by 1 for holding the ndlp and the reference to ndlp -* will be stored into the context1 field of the IOCB for the completion -* callback function to the LOGO ELS command. +* Note that the ndlp reference count will be incremented by 1 for holding the +* ndlp and the reference to ndlp will be stored into the context1 field of +* the IOCB for the completion callback function to the LOGO ELS command. * * Return codes * 0 - Successfully issued logo off the @vport
@@ -10050,7 +10033,7 @@ lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb)* driver internal fabric IOCB list. The list contains fabric IOCBs to be * issued to the ELS IOCB ring. This abort function walks the fabric IOCB * list, removes each IOCB associated with the @vport off the list, set the -* status feild to IOSTAT_LOCAL_REJECT, and invokes the callback function +* status field to IOSTAT_LOCAL_REJECT, and invokes the callback function * associated with the IOCB. **/ static void lpfc_fabric_abort_vport (struct lpfc_vport *vport)
@@ -10083,7 +10066,7 @@ static void lpfc_fabric_abort_vport(struct lpfc_vport *vport)* driver internal fabric IOCB list. The list contains fabric IOCBs to be * issued to the ELS IOCB ring. This abort function walks the fabric IOCB * list, removes each IOCB associated with the @ndlp off the list, set the -* status feild to IOSTAT_LOCAL_REJECT, and invokes the callback function +* status field to IOSTAT_LOCAL_REJECT, and invokes the callback function * associated with the IOCB. **/ void lpfc_fabric_abort_nport (struct lpfc_nodelist *ndlp)
@@ -10120,7 +10103,7 @@ void lpfc_fabric_abort_nport(struct lpfc_nodelist *ndlp)* This routine aborts all the IOCBs currently on the driver internal * fabric IOCB list. The list contains fabric IOCBs to be issued to the ELS * IOCB ring. This function takes the entire IOCB list off the fabric IOCB -* list, removes IOCBs off the list, set the status feild to +* list, removes IOCBs off the list, set the status field to * IOSTAT_LOCAL_REJECT, and invokes the callback function associated with * the IOCB. **/
Signature · 1 line
2.26.2
PATCH 21/22 lpfc: Update lpfc version to 12.8.0.8
In reply to James SmartUpdate lpfc version to 12.8.0.8
--- drivers/scsi/lpfc/lpfc_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_version.h +2 -2
@@ -20,7 +20,7 @@* included with this package. * *******************************************************************/ -#define LPFC_DRIVER_VERSION "12.8.0.7" +#define LPFC_DRIVER_VERSION "12.8.0.8"#define LPFC_DRIVER_NAME "lpfc"/* Used for SLI 2/3 */
@@ -32,6 +32,6 @@#define LPFC_MODULE_DESC "Emulex LightPulse Fibre Channel SCSI driver " \ LPFC_DRIVER_VERSION -#define LPFC_COPYRIGHT "Copyright (C) 2017-2020 Broadcom. All Rights " \ +#define LPFC_COPYRIGHT "Copyright (C) 2017-2021 Broadcom. All Rights " \ "Reserved. The term \"Broadcom\" refers to Broadcom Inc. " \ "and/or its subsidiaries."
Signature · 1 line
2.26.2
PATCH 22/22 lpfc: update copyrights for 12.8.0.7 and 12.8.0.8 changes
In reply to James SmartFor the files modified in 2021 via the 12.8.0.7 and 12.8.0.8 patch sets, update the copyright for 2021.
--- drivers/scsi/lpfc/lpfc.h | 2 +- drivers/scsi/lpfc/lpfc_attr.c | 2 +- drivers/scsi/lpfc/lpfc_crtn.h | 2 +- drivers/scsi/lpfc/lpfc_debugfs.c | 2 +- drivers/scsi/lpfc/lpfc_disc.h | 2 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 2 +- drivers/scsi/lpfc/lpfc_nvme.c | 2 +- drivers/scsi/lpfc/lpfc_nvmet.c | 4 ++-- drivers/scsi/lpfc/lpfc_scsi.c | 4 ++-- drivers/scsi/lpfc/lpfc_sli.c | 4 ++-- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-)
drivers/scsi/lpfc/lpfc.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-2020 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-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_attr.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-2020 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-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_crtn.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-2020 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-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_debugfs.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-2020 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-2015 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_disc.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-2020 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-2013 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_hbadisc.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-2020 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-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_init.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-2020 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-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_nportdisc.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-2020 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-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_nvme.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-2020 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-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_nvmet.c +2 -2
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * -* Fibre Channsel Host Bus Adapters. * -* Copyright (C) 2017-2020 Broadcom. All Rights Reserved. The term * +* Fibre Channel Host Bus Adapters. * +* Copyright (C) 2017-2021 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2004-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_scsi.c +2 -2
@@ -1,8 +1,8 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2020 Broadcom. All Rights Reserved. The term * -* “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * +* Copyright (C) 2017-2021 Broadcom. All Rights Reserved. The term * +* “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2004-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. * * www.broadcom.com *
drivers/scsi/lpfc/lpfc_sli.c +2 -2
@@ -1,8 +1,8 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2020 Broadcom. All Rights Reserved. The term * -* “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * +* Copyright (C) 2017-2021 Broadcom. All Rights Reserved. The term * +* “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2004-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. * * www.broadcom.com *
drivers/scsi/lpfc/lpfc_version.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-2020 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-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_vport.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-2020 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-2016 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
Signature · 1 line
2.26.2