Update lpfc to revision 14.4.0.0
Subsystems (2)
v2 cover Update lpfc to revision 14.4.0.0
Update lpfc to revision 14.4.0.0
This patch set contains fixes identified by static code analyzers, updates to log messaging, bug fixes related to discovery and congestion management, and clean up patches regarding the abuse of shost lock in the driver.
The patches were cut against Martin's 6.9/scsi-queue tree.
Justin Tee (17):
lpfc: Initialize status local variable in lpfc_sli4_repost_sgl_list
lpfc: Fix possible memory leak in lpfc_rcv_padisc
lpfc: Use sg_dma_len API to get struct scatterlist's length
lpfc: Remove D_ID swap log message from trace event logger
lpfc: Allow lpfc_plogi_confirm_nport logic to execute for Fabric nodes
lpfc: Remove NLP_RCV_PLOGI early return during RSCN processing for
ndlps
lpfc: Fix failure to delete vports when discovery is in progress
lpfc: Add condition to delete ndlp object after sending BLS_RJT to an
ABTS
lpfc: Save FPIN frequency statistics upon receipt of peer cgn
notifications
lpfc: Move handling of reset congestion statistics events
lpfc: Remove shost_lock protection for fc_host_port shost APIs
lpfc: Change nlp state statistic counters into atomic_t
lpfc: Protect vport fc_nodes list with an explicit spin lock
lpfc: Change lpfc_vport fc_flag member into a bitmask
lpfc: Change lpfc_vport load_flag member into a bitmask
lpfc: Update lpfc version to 14.4.0.0
lpfc: Copyright updates for 14.4.0.0 patches
drivers/scsi/lpfc/lpfc.h | 94 +++--- drivers/scsi/lpfc/lpfc_attr.c | 107 +++---- drivers/scsi/lpfc/lpfc_bsg.c | 8 +- drivers/scsi/lpfc/lpfc_ct.c | 154 +++++----- drivers/scsi/lpfc/lpfc_debugfs.c | 14 +- drivers/scsi/lpfc/lpfc_els.c | 446 +++++++++++++---------------- drivers/scsi/lpfc/lpfc_hbadisc.c | 350 ++++++++++------------ drivers/scsi/lpfc/lpfc_hw4.h | 4 +- drivers/scsi/lpfc/lpfc_init.c | 137 +++++---- drivers/scsi/lpfc/lpfc_mbox.c | 10 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 91 +++--- drivers/scsi/lpfc/lpfc_nvme.c | 20 +- drivers/scsi/lpfc/lpfc_nvmet.c | 14 +- drivers/scsi/lpfc/lpfc_scsi.c | 10 +- drivers/scsi/lpfc/lpfc_sli.c | 56 ++-- drivers/scsi/lpfc/lpfc_version.h | 6 +- drivers/scsi/lpfc/lpfc_vport.c | 69 ++--- 17 files changed, 717 insertions(+), 873 deletions(-)
Signature · 1 line
2.38.0
PATCH v2 1/17 lpfc: Initialize status local variable in lpfc_sli4_repost_sgl_list
A static code analyzer tool indicates that the local variable called status in the lpfc_sli4_repost_sgl_list routine could be used to print garbage uninitialized values in the routine's log message.
Fix by initializing to zero.
--- drivers/scsi/lpfc/lpfc_sli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_sli.c +1 -1
@@ -7582,7 +7582,7 @@ lpfc_sli4_repost_sgl_list(struct lpfc_hba *phba,struct lpfc_sglq *sglq_entry =NULL ;struct lpfc_sglq *sglq_entry_next =NULL ;struct lpfc_sglq *sglq_entry_first =NULL ; -int status, total_cnt; +int status =0 , total_cnt;int post_cnt =0 , num_posted =0 , block_cnt =0 ;int last_xritag =NO_XRI ;LIST_HEAD (prep_sgl_list);
Signature · 1 line
2.38.0
PATCH v2 2/17 lpfc: Fix possible memory leak in lpfc_rcv_padisc
In reply to Justin TeeThe call to lpfc_sli4_resume_rpi in lpfc_rcv_padisc may return an unsuccessful status. In such cases, the elsiocb is not issued, the completion is not called, and thus the elsiocb resource is leaked.
Check return value after calling lpfc_sli4_resume_rpi and conditionally release the elsiocb resource.
--- drivers/scsi/lpfc/lpfc_nportdisc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_nportdisc.c +4 -2
@@ -748,8 +748,10 @@ lpfc_rcv_padisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,/* Save the ELS cmd */ elsiocb->drvrTimeout = cmd; -lpfc_sli4_resume_rpi (ndlp, - lpfc_mbx_cmpl_resume_rpi, elsiocb); +if (lpfc_sli4_resume_rpi (ndlp, + lpfc_mbx_cmpl_resume_rpi, + elsiocb)) +kfree (elsiocb); goto out; } }
Signature · 1 line
2.38.0
PATCH v2 3/17 lpfc: Use sg_dma_len API to get struct scatterlist's length
In reply to Justin TeeThe sg_dma_len API should be used to retrieve a scatterlist's length instead of directly accessing scatterlist->length.
--- drivers/scsi/lpfc/lpfc_scsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/lpfc/lpfc_scsi.c +4 -4
@@ -2728,14 +2728,14 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd) sgde =scsi_sglist (cmd); blksize =scsi_prot_interval (cmd); data_src = (uint8_t *)sg_virt (sgde); - data_len = sgde->length; + data_len =sg_dma_len (sgde);if ((data_len & (blksize -1 )) ==0 ) chk_guard =1 ; src = (struct scsi_dif_tuple *)sg_virt (sgpe); start_ref_tag =scsi_prot_ref_tag (cmd); start_app_tag = src->app_tag; - len = sgpe->length; + len =sg_dma_len (sgpe);while (src && protsegcnt) {while (len) {
@@ -2800,7 +2800,7 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd) goto out; data_src = (uint8_t *)sg_virt (sgde); - data_len = sgde->length; + data_len =sg_dma_len (sgde);if ((data_len & (blksize -1 )) ==0 ) chk_guard =1 ; }
@@ -2810,7 +2810,7 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd) sgpe =sg_next (sgpe);if (sgpe) { src = (struct scsi_dif_tuple *)sg_virt (sgpe); - len = sgpe->length; + len =sg_dma_len (sgpe); }else { src =NULL ; }
Signature · 1 line
2.38.0
PATCH v2 4/17 lpfc: Remove D_ID swap log message from trace event logger
In reply to Justin TeeD_ID swaps are common during cable swaps in a SAN. Thus, there's no reason to log the event at a KERN_ERR level with the trace event logger.
Change the log level to KERN_INFO and the normal LOG_ELS flag.
--- drivers/scsi/lpfc/lpfc_nportdisc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_nportdisc.c +1 -1
@@ -434,7 +434,7 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, }if (nlp_portwwn !=0 && nlp_portwwn !=wwn_to_u64 (sp->portName.u.wwn)) - lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT, + lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS, "0143 PLOGI recv'd from DID: x%x " "WWPN changed: old %llx new %llx\n", ndlp->nlp_DID,
Signature · 1 line
2.38.0
PATCH v2 5/17 lpfc: Allow lpfc_plogi_confirm_nport logic to execute for Fabric nodes
In reply to Justin TeeRemove the early return NLP_FABRIC check in lpfc_plogi_confirm_nport because it is possible for switch domain controllers to change WWPN.
As a result, allow lpfc_plogi_confirm_nport to detect that a new ndlp should be initialized in such cases. The old ndlp object will be cleaned up when dev_loss_tmo callbk executes.
--- drivers/scsi/lpfc/lpfc_els.c | 49 +++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 17 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +32 -17
@@ -1696,18 +1696,13 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,struct serv_parm *sp;uint8_t name[sizeof (struct lpfc_name )];uint32_t keepDID =0 , keep_nlp_flag =0 ; +int rc;uint32_t keep_new_nlp_flag =0 ;uint16_t keep_nlp_state;u32 keep_nlp_fc4_type =0 ;struct lpfc_nvme_rport *keep_nrport =NULL ;unsigned long *active_rrqs_xri_bitmap =NULL ; -/* Fabric nodes can have the same WWPN so we don't bother searching -* by WWPN. Just return the ndlp that was given to us. -*/ -if (ndlp->nlp_type &NLP_FABRIC ) -return ndlp; - sp = (struct serv_parm *) ((uint8_t *) prsp +sizeof (uint32_t ));memset (name,0 ,sizeof (struct lpfc_name ));
@@ -1717,15 +1712,9 @@ 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 || (new_ndlp == ndlp)) +if (new_ndlp == ndlp)return ndlp; -/* -* Unregister from backend if not done yet. Could have been skipped -* due to ADISC -*/ -lpfc_nlp_unreg_node (vport, new_ndlp); -if (phba->sli_rev ==LPFC_SLI_REV4 ) { active_rrqs_xri_bitmap =mempool_alloc (phba->active_rrq_pool,GFP_KERNEL );
@@ -1742,11 +1731,37 @@ 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)); - keepDID = new_ndlp->nlp_DID; +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 { +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); -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); +/* +* Unregister from backend if not done yet. Could have been +* skipped due to ADISC +*/ +lpfc_nlp_unreg_node (vport, new_ndlp); + } + + keepDID = new_ndlp->nlp_DID;/* 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.38.0
PATCH v2 6/17 lpfc: Remove NLP_RCV_PLOGI early return during RSCN processing for ndlps
In reply to Justin TeeUpon first RSCN receipt of a target server's remote port that is initially acting as an initiator function, the driver marks the ndlp->nlp_type as an initiator role. Then later, when processing an RSCN for a target function role switch, that ndlp remote port is permanently stuck as an initiator role and can never transition to be discovered as an updated target role function.
Remove the NLP_RCV_PLOGI early return if statement clause so that the NLP_NPR_2B_DISC flag gets set. This allows for role change detections.
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/scsi/lpfc/lpfc_hbadisc.c +0 -8
@@ -5774,14 +5774,6 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)if (vport->phba->nvmet_support)return ndlp; -/* If we've already received a PLOGI from this NPort -* we don't need to try to discover it again. -*/ -if (ndlp->nlp_flag &NLP_RCV_PLOGI && - !(ndlp->nlp_type & - (NLP_FCP_TARGET |NLP_NVME_TARGET ))) -return NULL ; -if (ndlp->nlp_state >NLP_STE_UNUSED_NODE && ndlp->nlp_state <NLP_STE_PRLI_ISSUE ) { lpfc_disc_state_machine(vport, ndlp, NULL,
Signature · 1 line
2.38.0
PATCH v2 7/17 lpfc: Fix failure to delete vports when discovery is in progress
In reply to Justin TeeRequests to delete an NPIV port may fail repeatedly if the initial request is received during discovery.
If the FC_UNLOADING load_flag is set, then skip CT response processing for the physical port. This allows discovery processing for other lpfc_vport objects to reach their cmpl routines before deleting the vport.
--- drivers/scsi/lpfc/lpfc_ct.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/lpfc/lpfc_ct.c +4 -4
@@ -943,8 +943,8 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, goto out; } -/* Don't bother processing response if vport is being torn down. */ -if (vport->load_flag &FC_UNLOADING ) { +/* Skip processing response on pport if unloading */ +if (vport == phba->pport && vport->load_flag &FC_UNLOADING ) {if (vport->fc_flag &FC_RSCN_MODE )lpfc_els_flush_rscn (vport); goto out;
@@ -1166,8 +1166,8 @@ lpfc_cmpl_ct_cmd_gid_pt(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, goto out; } -/* Don't bother processing response if vport is being torn down. */ -if (vport->load_flag &FC_UNLOADING ) { +/* Skip processing response on pport if unloading */ +if (vport == phba->pport && vport->load_flag &FC_UNLOADING ) {if (vport->fc_flag &FC_RSCN_MODE )lpfc_els_flush_rscn (vport); goto out;
Signature · 1 line
2.38.0
PATCH v2 8/17 lpfc: Add condition to delete ndlp object after sending BLS_RJT to an ABTS
In reply to Justin TeeThe "Nodelist not empty" log message and an accompanying delay may be observed when deleting an NPIV port or unloading the lpfc driver. This can occur due to receipt of an ABTS for which there is no corresponding login context or ndlp allocated. In such cases, the driver allocates a new ndlp object to send a BLS_RJT after which the ndlp object unintentionally remains in the NLP_STE_UNUSED_NODE state forever.
Add a check to conditionally remove ndlp's initial reference count when queuing a BLS response. If the initial reference is removed, then set the NLP_DROPPED flag to notify other code paths.
--- drivers/scsi/lpfc/lpfc_sli.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +12 -2
@@ -18933,7 +18933,7 @@ lpfc_sli4_seq_abort_rsp(struct lpfc_vport *vport, "oxid:x%x SID:x%x\n", oxid, sid);return ; } -/* Put ndlp onto pport node list */ +/* Put ndlp onto vport node list */ lpfc_enqueue_node (vport, ndlp); }
@@ -18953,7 +18953,7 @@ lpfc_sli4_seq_abort_rsp(struct lpfc_vport *vport,return ; } - ctiocb->vport = phba->pport; + ctiocb->vport = vport; ctiocb->cmd_cmpl = lpfc_sli4_seq_abort_rsp_cmpl; ctiocb->sli4_lxritag =NO_XRI ; ctiocb->sli4_xritag =NO_XRI ;
@@ -19040,6 +19040,16 @@ lpfc_sli4_seq_abort_rsp(struct lpfc_vport *vport, ctiocb->ndlp =NULL ;lpfc_sli_release_iocbq (phba, ctiocb); } + +/* if only usage of this nodelist is BLS response, release initial ref +* to free ndlp when transmit completes +*/ +if (ndlp->nlp_state ==NLP_STE_UNUSED_NODE && + !(ndlp->nlp_flag &NLP_DROPPED ) && + !(ndlp->fc4_xpt_flags & (NVME_XPT_REGD |SCSI_XPT_REGD ))) { + ndlp->nlp_flag |=NLP_DROPPED ; +lpfc_nlp_put (ndlp); + } }/**
Signature · 1 line
2.38.0
PATCH v2 9/17 lpfc: Save FPIN frequency statistics upon receipt of peer cgn notifications
In reply to Justin TeeFPIN frequency is provided by the fabric in peer congestion notifications.
Currently, the frequency is only logged in a message, but it should also be saved into the phba's cgn_fpin statistics member for proper application functionality.
--- drivers/scsi/lpfc/lpfc_els.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/lpfc/lpfc_els.c +3 -0
@@ -10131,6 +10131,9 @@ lpfc_els_rcv_fpin_peer_cgn(struct lpfc_hba *phba, struct fc_tlv_desc *tlv) pc_evt_str =lpfc_get_fpin_congn_event_nm (pc_evt); cnt =be32_to_cpu (pc->pname_count); +/* Capture FPIN frequency */ + phba->cgn_fpin_frequency =be32_to_cpu (pc->event_period); +lpfc_printf_log (phba,KERN_INFO ,LOG_CGN_MGMT |LOG_ELS ,"4684 FPIN Peer Congestion %s (x%x) " "Duration %d mSecs "
Signature · 1 line
2.38.0
PATCH v2 10/17 lpfc: Move handling of reset congestion statistics events
In reply to Justin TeeThe ACQE notification event to reset congestion statistics should be moved into the specific lpfc_sli4_async_sli_evt routine instead of being processed from the generic lpfc_sli4_async_event_proc routine.
--- drivers/scsi/lpfc/lpfc_hw4.h | 2 +- drivers/scsi/lpfc/lpfc_init.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/scsi/lpfc/lpfc_hw4.h +1 -1
@@ -4069,7 +4069,6 @@ struct lpfc_mcqe {#define LPFC_TRAILER_CODE_GRP5 0x5#define LPFC_TRAILER_CODE_FC 0x10#define LPFC_TRAILER_CODE_SLI 0x11 -#define LPFC_TRAILER_CODE_CMSTAT 0x13 };struct lpfc_acqe_link {
@@ -4339,6 +4338,7 @@ struct lpfc_acqe_sli {#define LPFC_SLI_EVENT_TYPE_EEPROM_FAILURE 0x10#define LPFC_SLI_EVENT_TYPE_CGN_SIGNAL 0x11#define LPFC_SLI_EVENT_TYPE_RD_SIGNAL 0x12 +#define LPFC_SLI_EVENT_TYPE_RESET_CM_STATS 0x13 };/*
drivers/scsi/lpfc/lpfc_init.c +6 -3
@@ -94,6 +94,7 @@ static void lpfc_sli4_oas_verify(struct lpfc_hba *phba);static uint16_t lpfc_find_cpu_handle (struct lpfc_hba *,uint16_t ,int );static void lpfc_setup_bg (struct lpfc_hba *,struct Scsi_Host *);static int lpfc_sli4_cgn_parm_chg_evt (struct lpfc_hba *); +static void lpfc_sli4_async_cmstat_evt (struct lpfc_hba *phba);static void lpfc_sli4_prep_dev_for_reset (struct lpfc_hba *phba);static struct scsi_transport_template *lpfc_transport_template =NULL ;
@@ -6636,6 +6637,11 @@ lpfc_sli4_async_sli_evt(struct lpfc_hba *phba, struct lpfc_acqe_sli *acqe_sli) acqe_sli->event_data1, acqe_sli->event_data2, acqe_sli->event_data3);break ; +case LPFC_SLI_EVENT_TYPE_RESET_CM_STATS : +lpfc_printf_log (phba,KERN_INFO ,LOG_CGN_MGMT , +"2905 Reset CM statistics\n" ); +lpfc_sli4_async_cmstat_evt (phba); +break ;default : lpfc_printf_log(phba, KERN_INFO, LOG_SLI, "3193 Unrecognized SLI event, type: 0x%x",
@@ -7346,9 +7352,6 @@ void lpfc_sli4_async_event_proc(struct lpfc_hba *phba)case LPFC_TRAILER_CODE_SLI :lpfc_sli4_async_sli_evt (phba, &cq_event->cqe.acqe_sli);break ; -case LPFC_TRAILER_CODE_CMSTAT : -lpfc_sli4_async_cmstat_evt (phba); -break ;default : lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
Signature · 1 line
2.38.0
PATCH v2 11/17 lpfc: Remove shost_lock protection for fc_host_port shost APIs
In reply to Justin TeeDesiring to reduce the amount of unnecessary shost_lock acquisitions in the lpfc driver, it has been determined that there is no need for shost_lock protection when retrieving fc_host port information because it is only for display to user via sysfs.
--- drivers/scsi/lpfc/lpfc_attr.c | 16 ---------------- 1 file changed, 16 deletions(-)
drivers/scsi/lpfc/lpfc_attr.c +0 -16
@@ -6429,8 +6429,6 @@ lpfc_get_host_port_type(struct Scsi_Host *shost)struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -spin_lock_irq (shost->host_lock); -if (vport->port_type ==LPFC_NPIV_PORT ) {fc_host_port_type (shost) =FC_PORTTYPE_NPIV ; }else if (lpfc_is_link_up (phba)) {
@@ -6447,8 +6445,6 @@ lpfc_get_host_port_type(struct Scsi_Host *shost) } }else fc_host_port_type (shost) =FC_PORTTYPE_UNKNOWN ; - -spin_unlock_irq (shost->host_lock); }/**
@@ -6461,8 +6457,6 @@ lpfc_get_host_port_state(struct Scsi_Host *shost)struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -spin_lock_irq (shost->host_lock); -if (vport->fc_flag &FC_OFFLINE_MODE )fc_host_port_state (shost) =FC_PORTSTATE_OFFLINE ;else {
@@ -6490,8 +6484,6 @@ lpfc_get_host_port_state(struct Scsi_Host *shost)break ; } } - -spin_unlock_irq (shost->host_lock); }/**
@@ -6504,8 +6496,6 @@ lpfc_get_host_speed(struct Scsi_Host *shost)struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_hba *phba = vport->phba; -spin_lock_irq (shost->host_lock); -if ((lpfc_is_link_up (phba)) && (!(phba->hba_flag &HBA_FCOE_MODE ))) {switch (phba->fc_linkspeed) {case LPFC_LINK_SPEED_1GHZ :
@@ -6568,8 +6558,6 @@ lpfc_get_host_speed(struct Scsi_Host *shost) } }else fc_host_speed (shost) =FC_PORTSPEED_UNKNOWN ; - -spin_unlock_irq (shost->host_lock); }/**
@@ -6583,8 +6571,6 @@ lpfc_get_host_fabric_name (struct Scsi_Host *shost)struct lpfc_hba *phba = vport->phba;u64 node_name; -spin_lock_irq (shost->host_lock); - if ((vport->port_state > LPFC_FLOGI) && ((vport->fc_flag & FC_FABRIC) || ((phba->fc_topology == LPFC_TOPOLOGY_LOOP) &&
@@ -6594,8 +6580,6 @@ lpfc_get_host_fabric_name (struct Scsi_Host *shost)/* fabric is local port if there is no F/FL_Port */ node_name =0 ; -spin_unlock_irq (shost->host_lock); -fc_host_fabric_name (shost) = node_name; }
Signature · 1 line
2.38.0
PATCH v2 12/17 lpfc: Change nlp state statistic counters into atomic_t
In reply to Justin TeeThere is no reason to use the shost_lock to synchronize an LLDD statistics counter. Convert all the nlp state statistic counters into atomic_t. Corresponding zeroing, increments, and reads are converted to atomic versions.
--- drivers/scsi/lpfc/lpfc.h | 17 ++++++------ drivers/scsi/lpfc/lpfc_attr.c | 3 ++- drivers/scsi/lpfc/lpfc_els.c | 10 ++++--- drivers/scsi/lpfc/lpfc_hbadisc.c | 46 ++++++++++++++++---------------- drivers/scsi/lpfc/lpfc_init.c | 11 +++++++- 5 files changed, 50 insertions(+), 37 deletions(-)
drivers/scsi/lpfc/lpfc.h +9 -8
@@ -589,14 +589,15 @@ struct lpfc_vport {struct list_head fc_nodes;/* Keep counters for the number of entries in each list. */ -uint16_t fc_plogi_cnt; -uint16_t fc_adisc_cnt; -uint16_t fc_reglogin_cnt; -uint16_t fc_prli_cnt; -uint16_t fc_unmap_cnt; -uint16_t fc_map_cnt; -uint16_t fc_npr_cnt; -uint16_t fc_unused_cnt; +atomic_t fc_plogi_cnt; +atomic_t fc_adisc_cnt; +atomic_t fc_reglogin_cnt; +atomic_t fc_prli_cnt; +atomic_t fc_unmap_cnt; +atomic_t fc_map_cnt; +atomic_t fc_npr_cnt; +atomic_t fc_unused_cnt; +struct serv_parm fc_sparam;/* buffer for our service parameters */ uint32_t fc_myDID;/* fibre channel S_ID */
drivers/scsi/lpfc/lpfc_attr.c +2 -1
@@ -1260,7 +1260,8 @@ lpfc_num_discovered_ports_show(struct device *dev,struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;return scnprintf (buf,PAGE_SIZE ,"%d\n" , - vport->fc_map_cnt + vport->fc_unmap_cnt); +atomic_read (&vport->fc_map_cnt) + +atomic_read (&vport->fc_unmap_cnt)); }/**
drivers/scsi/lpfc/lpfc_els.c +6 -4
@@ -1646,7 +1646,8 @@ lpfc_more_plogi(struct lpfc_vport *vport)lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY ,"0232 Continue discovery with %d PLOGIs to go " "Data: x%x x%x x%x\n" , - vport->num_disc_nodes, vport->fc_plogi_cnt, + vport->num_disc_nodes, +atomic_read (&vport->fc_plogi_cnt), vport->fc_flag, vport->port_state);/* Check to see if there are more PLOGIs to be sent */ if (vport->fc_flag &FC_NLP_MORE )
@@ -2692,7 +2693,7 @@ lpfc_rscn_disc(struct lpfc_vport *vport)/* RSCN discovery */ /* go thru NPR nodes and issue ELS PLOGIs */ -if (vport->fc_npr_cnt) +if (atomic_read (&vport->fc_npr_cnt))if (lpfc_els_disc_plogi (vport))return ;
@@ -2752,7 +2753,7 @@ lpfc_adisc_done(struct lpfc_vport *vport)if (!(vport->fc_flag &FC_ABORT_DISCOVERY )) { vport->num_disc_nodes =0 ;/* go thru NPR list, issue ELS PLOGIs */ -if (vport->fc_npr_cnt) +if (atomic_read (&vport->fc_npr_cnt))lpfc_els_disc_plogi (vport);if (!vport->num_disc_nodes) {spin_lock_irq (shost->host_lock);
@@ -2785,7 +2786,8 @@ lpfc_more_adisc(struct lpfc_vport *vport)lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY ,"0210 Continue discovery with %d ADISCs to go " "Data: x%x x%x x%x\n" , - vport->num_disc_nodes, vport->fc_adisc_cnt, + vport->num_disc_nodes, +atomic_read (&vport->fc_adisc_cnt), vport->fc_flag, vport->port_state);/* Check to see if there are more ADISCs to be sent */ if (vport->fc_flag &FC_NLP_MORE ) {
drivers/scsi/lpfc/lpfc_hbadisc.c +23 -23
107 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_init.c +10 -1
@@ -4770,6 +4770,14 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev) vport->load_flag |=FC_LOADING ; vport->fc_flag |=FC_VPORT_NEEDS_REG_VPI ; vport->fc_rscn_flush =0 ; +atomic_set (&vport->fc_plogi_cnt,0 ); +atomic_set (&vport->fc_adisc_cnt,0 ); +atomic_set (&vport->fc_reglogin_cnt,0 ); +atomic_set (&vport->fc_prli_cnt,0 ); +atomic_set (&vport->fc_unmap_cnt,0 ); +atomic_set (&vport->fc_map_cnt,0 ); +atomic_set (&vport->fc_npr_cnt,0 ); +atomic_set (&vport->fc_unused_cnt,0 );lpfc_get_vport_cfgparam (vport);/* Adjust value in vport */
@@ -4946,7 +4954,8 @@ int lpfc_scan_finished(struct Scsi_Host *shost, unsigned long time) goto finished;if (vport->num_disc_nodes || vport->fc_prli_sent) goto finished; -if (vport->fc_map_cnt ==0 && time <msecs_to_jiffies (2 *1000 )) +if (!atomic_read (&vport->fc_map_cnt) && + time <msecs_to_jiffies (2 *1000 )) goto finished;if ((phba->sli.sli_flag &LPFC_SLI_MBOX_ACTIVE ) !=0 ) goto finished;
Signature · 1 line
2.38.0
PATCH v2 13/17 lpfc: Protect vport fc_nodes list with an explicit spin lock
In reply to Justin TeeIn attempt to reduce the amount of unnecessary shost_lock acquisitions in the lpfc driver, replace shost_lock with an explicit fc_nodes_list_lock spinlock when accessing vport->fc_nodes lists. Although vport memory region is owned by shost->hostdata, it is driver private memory and an explicit fc_nodes list lock for fc_nodes list mutations is more appropriate than locking the entire shost.
--- drivers/scsi/lpfc/lpfc.h | 1 + drivers/scsi/lpfc/lpfc_attr.c | 35 +++++++++++----------- drivers/scsi/lpfc/lpfc_ct.c | 7 ++--- drivers/scsi/lpfc/lpfc_debugfs.c | 12 ++++---- drivers/scsi/lpfc/lpfc_hbadisc.c | 50 ++++++++++++++++---------------- drivers/scsi/lpfc/lpfc_init.c | 2 +- 6 files changed, 53 insertions(+), 54 deletions(-)
drivers/scsi/lpfc/lpfc.h +1 -0
@@ -587,6 +587,7 @@ struct lpfc_vport {#define FC_CT_RPRT_DEFER 0x20/* Defer issuing FDMI RPRT */ struct list_head fc_nodes; +spinlock_t fc_nodes_list_lock;/* spinlock for fc_nodes list */ /* Keep counters for the number of entries in each list. */ atomic_t fc_plogi_cnt;
drivers/scsi/lpfc/lpfc_attr.c +18 -17
@@ -344,6 +344,7 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr,struct lpfc_fc4_ctrl_stat *cstat;uint64_t data1, data2, data3;uint64_t totin, totout, tot; +unsigned long iflags;char *statep;int i;int len =0 ;
@@ -543,7 +544,7 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr,if (strlcat (buf, tmp,PAGE_SIZE ) >=PAGE_SIZE ) goto buffer_done; -spin_lock_irq (shost->host_lock); +spin_lock_irqsave (&vport->fc_nodes_list_lock, iflags);list_for_each_entry (ndlp, &vport->fc_nodes, nlp_listp) { nrport =NULL ;
@@ -617,7 +618,7 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr,if (strlcat (buf, tmp,PAGE_SIZE ) >=PAGE_SIZE ) goto unlock_buf_done; } -spin_unlock_irq (shost->host_lock); +spin_unlock_irqrestore (&vport->fc_nodes_list_lock, iflags);if (!lport) goto buffer_done;
@@ -681,7 +682,7 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr, goto buffer_done; unlock_buf_done: -spin_unlock_irq (shost->host_lock); +spin_unlock_irqrestore (&vport->fc_nodes_list_lock, iflags); buffer_done: len =strnlen (buf,PAGE_SIZE );
@@ -3765,15 +3766,14 @@ lpfc_nodev_tmo_init(struct lpfc_vport *vport, int val)static void lpfc_update_rport_devloss_tmo (struct lpfc_vport *vport) { -struct Scsi_Host *shost;struct lpfc_nodelist *ndlp; +unsigned long iflags;#if (IS_ENABLED (CONFIG_NVME_FC ))struct lpfc_nvme_rport *rport;struct nvme_fc_remote_port *remoteport =NULL ;#endif - shost =lpfc_shost_from_vport (vport); -spin_lock_irq (shost->host_lock); +spin_lock_irqsave (&vport->fc_nodes_list_lock, iflags);list_for_each_entry (ndlp, &vport->fc_nodes, nlp_listp) {if (ndlp->rport) ndlp->rport->dev_loss_tmo = vport->cfg_devloss_tmo;
@@ -3788,7 +3788,7 @@ lpfc_update_rport_devloss_tmo(struct lpfc_vport *vport) vport->cfg_devloss_tmo);#endif } -spin_unlock_irq (shost->host_lock); +spin_unlock_irqrestore (&vport->fc_nodes_list_lock, iflags); }/**
@@ -3974,8 +3974,8 @@ lpfc_vport_param_init(tgt_queue_depth, LPFC_MAX_TGT_QDEPTH,static int lpfc_tgt_queue_depth_set (struct lpfc_vport *vport,uint val) { -struct Scsi_Host *shost =lpfc_shost_from_vport (vport);struct lpfc_nodelist *ndlp; +unsigned long iflags;if (!lpfc_rangecheck (val,LPFC_MIN_TGT_QDEPTH ,LPFC_MAX_TGT_QDEPTH ))return -EINVAL ;
@@ -3983,14 +3983,13 @@ lpfc_tgt_queue_depth_set(struct lpfc_vport *vport, uint val)if (val == vport->cfg_tgt_queue_depth)return 0 ; -spin_lock_irq (shost->host_lock); vport->cfg_tgt_queue_depth = val;/* Next loop thru nodelist and change cmd_qdepth */ +spin_lock_irqsave (&vport->fc_nodes_list_lock, iflags);list_for_each_entry (ndlp, &vport->fc_nodes, nlp_listp) ndlp->cmd_qdepth = vport->cfg_tgt_queue_depth; - -spin_unlock_irq (shost->host_lock); +spin_unlock_irqrestore (&vport->fc_nodes_list_lock, iflags);return 0 ; }
@@ -5236,8 +5235,8 @@ lpfc_vport_param_show(max_scsicmpl_time);static int lpfc_max_scsicmpl_time_set (struct lpfc_vport *vport,int val) { -struct Scsi_Host *shost =lpfc_shost_from_vport (vport);struct lpfc_nodelist *ndlp, *next_ndlp; +unsigned long iflags;if (val == vport->cfg_max_scsicmpl_time)return 0 ;
@@ -5245,13 +5244,13 @@ lpfc_max_scsicmpl_time_set(struct lpfc_vport *vport, int val)return -EINVAL ; vport->cfg_max_scsicmpl_time = val; -spin_lock_irq (shost->host_lock); +spin_lock_irqsave (&vport->fc_nodes_list_lock, iflags);list_for_each_entry_safe (ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {if (ndlp->nlp_state ==NLP_STE_UNUSED_NODE )continue ; ndlp->cmd_qdepth = vport->cfg_tgt_queue_depth; } -spin_unlock_irq (shost->host_lock); +spin_unlock_irqrestore (&vport->fc_nodes_list_lock, iflags);return 0 ; }lpfc_vport_param_store (max_scsicmpl_time);
@@ -6853,17 +6852,19 @@ lpfc_get_node_by_target(struct scsi_target *starget)struct Scsi_Host *shost =dev_to_shost (starget->dev.parent);struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;struct lpfc_nodelist *ndlp; +unsigned long iflags; -spin_lock_irq (shost->host_lock); +spin_lock_irqsave (&vport->fc_nodes_list_lock, iflags);/* Search for this, mapped, target ID */ list_for_each_entry (ndlp, &vport->fc_nodes, nlp_listp) {if (ndlp->nlp_state ==NLP_STE_MAPPED_NODE && starget->id == ndlp->nlp_sid) { -spin_unlock_irq (shost->host_lock); +spin_unlock_irqrestore (&vport->fc_nodes_list_lock, + iflags);return ndlp; } } -spin_unlock_irq (shost->host_lock); +spin_unlock_irqrestore (&vport->fc_nodes_list_lock, iflags);return NULL ; }
drivers/scsi/lpfc/lpfc_ct.c +3 -4
@@ -1853,11 +1853,10 @@ static uint32_t lpfc_find_map_node(struct lpfc_vport *vport) {struct lpfc_nodelist *ndlp, *next_ndlp; -struct Scsi_Host *shost; +unsigned long iflags;uint32_t cnt =0 ; - shost =lpfc_shost_from_vport (vport); -spin_lock_irq (shost->host_lock); +spin_lock_irqsave (&vport->fc_nodes_list_lock, iflags);list_for_each_entry_safe (ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {if (ndlp->nlp_type &NLP_FABRIC )continue ;
@@ -1865,7 +1864,7 @@ lpfc_find_map_node(struct lpfc_vport *vport) (ndlp->nlp_state == NLP_STE_UNMAPPED_NODE)) cnt++; } -spin_unlock_irq (shost->host_lock); +spin_unlock_irqrestore (&vport->fc_nodes_list_lock, iflags);return cnt; }
drivers/scsi/lpfc/lpfc_debugfs.c +5 -7
@@ -806,10 +806,10 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size) {int len =0 ;int i, iocnt, outio, cnt; -struct Scsi_Host *shost =lpfc_shost_from_vport (vport);struct lpfc_hba *phba = vport->phba;struct lpfc_nodelist *ndlp;unsigned char *statep; +unsigned long iflags;struct nvme_fc_local_port *localport;struct nvme_fc_remote_port *nrport =NULL ;struct lpfc_nvme_rport *rport;
@@ -818,7 +818,7 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size) outio =0 ; len +=scnprintf (buf+len, size-len,"\nFCP Nodelist Entries ...\n" ); -spin_lock_irq (shost->host_lock); +spin_lock_irqsave (&vport->fc_nodes_list_lock, iflags);list_for_each_entry (ndlp, &vport->fc_nodes, nlp_listp) { iocnt =0 ;if (!cnt) {
@@ -908,7 +908,7 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size) ndlp->nlp_defer_did); len +=scnprintf (buf+len, size-len,"\n" ); } -spin_unlock_irq (shost->host_lock); +spin_unlock_irqrestore (&vport->fc_nodes_list_lock, iflags); len +=scnprintf (buf + len, size - len,"\nOutstanding IO x%x\n" , outio);
@@ -940,8 +940,6 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)if (!localport) goto out_exit; -spin_lock_irq (shost->host_lock); -/* Port state is only one of two values for now. */ if (localport->port_id) statep ="ONLINE" ;
@@ -953,6 +951,7 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size) localport->port_id, statep); len +=scnprintf (buf + len, size - len,"\tRport List:\n" ); +spin_lock_irqsave (&vport->fc_nodes_list_lock, iflags);list_for_each_entry (ndlp, &vport->fc_nodes, nlp_listp) {/* local short-hand pointer. */ spin_lock (&ndlp->lock);
@@ -1006,8 +1005,7 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)/* Terminate the string. */ len +=scnprintf (buf + len, size - len,"\n" ); } - -spin_unlock_irq (shost->host_lock); +spin_unlock_irqrestore (&vport->fc_nodes_list_lock, iflags); out_exit:return len; }
drivers/scsi/lpfc/lpfc_hbadisc.c +25 -25
158 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_init.c +1 -1
@@ -3829,7 +3829,6 @@ lpfc_offline_prep(struct lpfc_hba *phba, int mbx_action) vports[i]->fc_flag &= ~FC_VFI_REGISTERED ;spin_unlock_irq (shost->host_lock); - shost =lpfc_shost_from_vport (vports[i]);list_for_each_entry_safe (ndlp, next_ndlp, &vports[i]->fc_nodes, nlp_listp) {
@@ -4833,6 +4832,7 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)/* Initialize all internally managed lists. */ INIT_LIST_HEAD (&vport->fc_nodes); +spin_lock_init (&vport->fc_nodes_list_lock);INIT_LIST_HEAD (&vport->rcv_buffer_list);spin_lock_init (&vport->work_port_lock);
Signature · 1 line
2.38.0
PATCH v2 14/17 lpfc: Change lpfc_vport fc_flag member into a bitmask
In reply to Justin TeeIn attempt to reduce the amount of unnecessary shost_lock acquisitions in the lpfc driver, change fc_flag into an unsigned long bitmask and use clear_bit/test_bit bitwise atomic APIs instead of reliance on shost_lock for synchronization.
--- drivers/scsi/lpfc/lpfc.h | 59 ++--- drivers/scsi/lpfc/lpfc_attr.c | 51 ++-- drivers/scsi/lpfc/lpfc_bsg.c | 6 +- drivers/scsi/lpfc/lpfc_ct.c | 132 +++++------ drivers/scsi/lpfc/lpfc_els.c | 360 +++++++++++------------------ drivers/scsi/lpfc/lpfc_hbadisc.c | 218 +++++++---------- drivers/scsi/lpfc/lpfc_init.c | 53 ++--- drivers/scsi/lpfc/lpfc_mbox.c | 8 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 68 +++--- drivers/scsi/lpfc/lpfc_sli.c | 14 +- drivers/scsi/lpfc/lpfc_vport.c | 46 ++-- 11 files changed, 425 insertions(+), 590 deletions(-)
drivers/scsi/lpfc/lpfc.h +31 -28
@@ -535,6 +535,36 @@ struct lpfc_cgn_acqe_stat {atomic64_t warn; }; +enum lpfc_fc_flag { +/* Several of these flags are HBA centric and should be moved to +* phba->link_flag (e.g. FC_PTP, FC_PUBLIC_LOOP) +*/ +FC_PT2PT ,/* pt2pt with no fabric */ +FC_PT2PT_PLOGI ,/* pt2pt initiate PLOGI */ +FC_DISC_TMO ,/* Discovery timer running */ +FC_PUBLIC_LOOP ,/* Public loop */ +FC_LBIT ,/* LOGIN bit in loopinit set */ +FC_RSCN_MODE ,/* RSCN cmd rcv'ed */ +FC_NLP_MORE ,/* More node to process in node tbl */ +FC_OFFLINE_MODE ,/* Interface is offline for diag */ +FC_FABRIC ,/* We are fabric attached */ +FC_VPORT_LOGO_RCVD ,/* LOGO received on vport */ +FC_RSCN_DISCOVERY ,/* Auth all devices after RSCN */ +FC_LOGO_RCVD_DID_CHNG ,/* FDISC on phys port detect DID chng */ +FC_PT2PT_NO_NVME ,/* Don't send NVME PRLI */ +FC_SCSI_SCAN_TMO ,/* scsi scan timer running */ +FC_ABORT_DISCOVERY ,/* we want to abort discovery */ +FC_NDISC_ACTIVE ,/* NPort discovery active */ +FC_BYPASSED_MODE ,/* NPort is in bypassed mode */ +FC_VPORT_NEEDS_REG_VPI ,/* Needs to have its vpi registered */ +FC_RSCN_DEFERRED ,/* A deferred RSCN being processed */ +FC_VPORT_NEEDS_INIT_VPI ,/* Need to INIT_VPI before FDISC */ +FC_VPORT_CVL_RCVD ,/* VLink failed due to CVL */ +FC_VFI_REGISTERED ,/* VFI is registered */ +FC_FDISC_COMPLETED ,/* FDISC completed */ +FC_DISC_DELAYED ,/* Delay NPort discovery */ +}; +struct lpfc_vport {struct lpfc_hba *phba;struct list_head listentry;
@@ -549,34 +579,7 @@ struct lpfc_vport {uint8_t vpi_state;#define LPFC_VPI_REGISTERED 0x1 -uint32_t fc_flag;/* FC flags */ -/* Several of these flags are HBA centric and should be moved to -* phba->link_flag (e.g. FC_PTP, FC_PUBLIC_LOOP) -*/ -#define FC_PT2PT 0x1/* pt2pt with no fabric */ -#define FC_PT2PT_PLOGI 0x2/* pt2pt initiate PLOGI */ -#define FC_DISC_TMO 0x4/* Discovery timer running */ -#define FC_PUBLIC_LOOP 0x8/* Public loop */ -#define FC_LBIT 0x10/* LOGIN bit in loopinit set */ -#define FC_RSCN_MODE 0x20/* RSCN cmd rcv'ed */ -#define FC_NLP_MORE 0x40/* More node to process in node tbl */ -#define FC_OFFLINE_MODE 0x80/* Interface is offline for diag */ -#define FC_FABRIC 0x100/* We are fabric attached */ -#define FC_VPORT_LOGO_RCVD 0x200/* LOGO received on vport */ -#define FC_RSCN_DISCOVERY 0x400/* Auth all devices after RSCN */ -#define FC_LOGO_RCVD_DID_CHNG 0x800/* FDISC on phys port detect DID chng*/ -#define FC_PT2PT_NO_NVME 0x1000/* Don't send NVME PRLI */ -#define FC_SCSI_SCAN_TMO 0x4000/* scsi scan timer running */ -#define FC_ABORT_DISCOVERY 0x8000/* we want to abort discovery */ -#define FC_NDISC_ACTIVE 0x10000/* NPort discovery active */ -#define FC_BYPASSED_MODE 0x20000/* NPort is in bypassed mode */ -#define FC_VPORT_NEEDS_REG_VPI 0x80000/* Needs to have its vpi registered */ -#define FC_RSCN_DEFERRED 0x100000/* A deferred RSCN being processed */ -#define FC_VPORT_NEEDS_INIT_VPI 0x200000/* Need to INIT_VPI before FDISC */ -#define FC_VPORT_CVL_RCVD 0x400000/* VLink failed due to CVL */ -#define FC_VFI_REGISTERED 0x800000/* VFI is registered */ -#define FC_FDISC_COMPLETED 0x1000000/* FDISC completed */ -#define FC_DISC_DELAYED 0x2000000/* Delay NPort discovery */ +unsigned long fc_flag;/* FC flags */ uint32_t ct_flags;#define FC_CT_RFF_ID 0x1/* RFF_ID accepted by switch */
drivers/scsi/lpfc/lpfc_attr.c +26 -25
163 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_bsg.c +3 -3
@@ -1977,7 +1977,7 @@ lpfc_sli4_bsg_set_loopback_mode(struct lpfc_hba *phba, int mode,static int lpfc_sli4_diag_fcport_reg_setup (struct lpfc_hba *phba) { -if (phba->pport->fc_flag &FC_VFI_REGISTERED ) { +if (test_bit (FC_VFI_REGISTERED , &phba->pport->fc_flag)) { lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC, "3136 Port still had vfi registered: " "mydid:x%x, fcfi:%d, vfi:%d, vpi:%d\n",
@@ -3448,7 +3448,7 @@ static int lpfc_bsg_check_cmd_access(struct lpfc_hba *phba,case MBX_RUN_DIAGS :case MBX_RESTART :case MBX_SET_MASK : -if (!(vport->fc_flag &FC_OFFLINE_MODE )) { +if (!test_bit (FC_OFFLINE_MODE , &vport->fc_flag)) { lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC, "2743 Command 0x%x is illegal in on-line " "state\n",
@@ -4886,7 +4886,7 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct bsg_job *job, dd_data->context_un.mbox.outExtWLen = mbox_req->outExtWLen; job->dd_data = dd_data; -if ((vport->fc_flag &FC_OFFLINE_MODE ) || +if (test_bit (FC_OFFLINE_MODE , &vport->fc_flag) || (!(phba->sli.sli_flag &LPFC_SLI_ACTIVE ))) { rc =lpfc_sli_issue_mbox (phba, pmboxq,MBX_POLL );if (rc !=MBX_SUCCESS ) {
drivers/scsi/lpfc/lpfc_ct.c +55 -77
413 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_els.c +139 -221
1,024 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_hbadisc.c +85 -133
632 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_init.c +25 -28
151 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_mbox.c +4 -4
@@ -949,7 +949,7 @@ lpfc_reg_vpi(struct lpfc_vport *vport, LPFC_MBOXQ_t *pmb)* Set the re-reg VPI bit for f/w to update the MAC address. */ if ((phba->sli_rev ==LPFC_SLI_REV4 ) && - !(vport->fc_flag &FC_VPORT_NEEDS_REG_VPI )) + !test_bit (FC_VPORT_NEEDS_REG_VPI , &vport->fc_flag)) mb->un.varRegVpi.upd =1 ; mb->un.varRegVpi.vpi = phba->vpi_ids[vport->vpi];
@@ -2244,7 +2244,7 @@ lpfc_reg_vfi(struct lpfcMboxq *mbox, struct lpfc_vport *vport, dma_addr_t phys)/* Only FC supports upd bit */ if ((phba->sli4_hba.lnk_info.lnk_tp ==LPFC_LNK_TYPE_FC ) && - (vport->fc_flag &FC_VFI_REGISTERED ) && +test_bit (FC_VFI_REGISTERED , &vport->fc_flag) && (!phba->fc_topology_changed))bf_set (lpfc_reg_vfi_upd, reg_vfi,1 );
@@ -2271,8 +2271,8 @@ lpfc_reg_vfi(struct lpfcMboxq *mbox, struct lpfc_vport *vport, dma_addr_t phys) } lpfc_printf_vlog(vport, KERN_INFO, LOG_MBOX, "3134 Register VFI, mydid:x%x, fcfi:%d, " - " vfi:%d, vpi:%d, fc_pname:%x%x fc_flag:x%x" - " port_state:x%x topology chg:%d bbscn_fabric :%d\n", + "vfi:%d, vpi:%d, fc_pname:%x%x fc_flag:x%lx " + "port_state:x%x topology chg:%d bbscn_fabric :%d\n", vport->fc_myDID, phba->fcf.fcfi, phba->sli4_hba.vfi_ids[vport->vfi],
drivers/scsi/lpfc/lpfc_nportdisc.c +29 -39
208 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.c +7 -7
@@ -2909,8 +2909,8 @@ lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) shost =lpfc_shost_from_vport (vport);spin_lock_irq (shost->host_lock); vport->vpi_state |=LPFC_VPI_REGISTERED ; - vport->fc_flag &= ~FC_VPORT_NEEDS_REG_VPI ;spin_unlock_irq (shost->host_lock); +clear_bit (FC_VPORT_NEEDS_REG_VPI , &vport->fc_flag); }if (pmb->u.mb.mbxCommand ==MBX_REG_LOGIN64 ) {
@@ -10888,7 +10888,7 @@ __lpfc_sli_prep_els_req_rsp_s4(struct lpfc_iocbq *cmdiocbq,* all ELS pt2pt protocol traffic as well. */ if ((phba->sli3_options &LPFC_SLI3_NPIV_ENABLED ) || - (vport->fc_flag &FC_PT2PT )) { +test_bit (FC_PT2PT , &vport->fc_flag)) {if (expect_rsp) {bf_set (els_req64_sid, &wqe->els_req, vport->fc_myDID);
@@ -18552,8 +18552,8 @@ lpfc_fc_frame_to_vport(struct lpfc_hba *phba, struct fc_frame_header *fc_hdr,if (did == Fabric_DID)return phba->pport; -if ((phba->pport->fc_flag &FC_PT2PT ) && - !(phba->link_state ==LPFC_HBA_READY )) +if (test_bit (FC_PT2PT , &phba->pport->fc_flag) && + phba->link_state !=LPFC_HBA_READY )return phba->pport; vports =lpfc_create_vport_work_array (phba);
@@ -19507,8 +19507,8 @@ lpfc_sli4_handle_received_buffer(struct lpfc_hba *phba,* The pt2pt protocol allows for discovery frames * to be received without a registered VPI. */ -if (!(vport->fc_flag &FC_PT2PT ) || - (phba->link_state ==LPFC_HBA_READY )) { +if (!test_bit (FC_PT2PT , &vport->fc_flag) || + phba->link_state ==LPFC_HBA_READY ) {lpfc_in_buf_free (phba, &dmabuf->dbuf);return ; }
@@ -22666,7 +22666,7 @@ lpfc_sli_prep_wqe(struct lpfc_hba *phba, struct lpfc_iocbq *job) if_type =bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf);if (if_type >=LPFC_SLI_INTF_IF_TYPE_2 ) { -if (job->vport->fc_flag &FC_PT2PT ) { +if (test_bit (FC_PT2PT , &job->vport->fc_flag)) {bf_set (els_rsp64_sp, &wqe->xmit_els_rsp,1 );bf_set (els_rsp64_sid, &wqe->xmit_els_rsp, job->vport->fc_myDID);
drivers/scsi/lpfc/lpfc_vport.c +21 -25
110 lines not on this page · raw message
Signature · 1 line
2.38.0
PATCH v2 15/17 lpfc: Change lpfc_vport load_flag member into a bitmask
In reply to Justin TeeIn attempt to reduce the amount of unnecessary shost_lock acquisitions in the lpfc driver, change load_flag into an unsigned long bitmask and use clear_bit/test_bit bitwise atomic APIs instead of reliance on shost_lock for synchronization.
Also, correct the test for FC_UNLOADING in lpfc_ct_handle_mibreq, which incorrectly tests vport->fc_flag rather than vport->load_flag.
--- drivers/scsi/lpfc/lpfc.h | 15 ++++--- drivers/scsi/lpfc/lpfc_ct.c | 11 ++--- drivers/scsi/lpfc/lpfc_els.c | 22 +++++----- drivers/scsi/lpfc/lpfc_hbadisc.c | 26 ++++++------ drivers/scsi/lpfc/lpfc_init.c | 64 +++++++++++++----------------- drivers/scsi/lpfc/lpfc_nportdisc.c | 13 +++--- drivers/scsi/lpfc/lpfc_nvme.c | 18 ++++----- drivers/scsi/lpfc/lpfc_nvmet.c | 12 +++--- drivers/scsi/lpfc/lpfc_sli.c | 24 +++++------ drivers/scsi/lpfc/lpfc_vport.c | 23 +++++------ 10 files changed, 108 insertions(+), 120 deletions(-)
drivers/scsi/lpfc/lpfc.h +9 -6
@@ -565,6 +565,14 @@ enum lpfc_fc_flag { FC_DISC_DELAYED, /* Delay NPort discovery */ }; +enum lpfc_load_flag { +FC_LOADING ,/* HBA in process of loading drvr */ +FC_UNLOADING ,/* HBA in process of unloading drvr */ +FC_ALLOW_FDMI ,/* port is ready for FDMI requests */ +FC_ALLOW_VMID ,/* Allow VMID I/Os */ +FC_DEREGISTER_ALL_APP_ID /* Deregister all VMIDs */ +}; +struct lpfc_vport {struct lpfc_hba *phba;struct list_head listentry;
@@ -647,12 +655,7 @@ struct lpfc_vport {struct timer_list els_tmofunc;struct timer_list delayed_disc_tmo; -uint8_t load_flag; -#define FC_LOADING 0x1/* HBA in process of loading drvr */ -#define FC_UNLOADING 0x2/* HBA in process of unloading drvr */ -#define FC_ALLOW_FDMI 0x4/* port is ready for FDMI requests */ -#define FC_ALLOW_VMID 0x8/* Allow VMID I/Os */ -#define FC_DEREGISTER_ALL_APP_ID 0x10/* Deregister all VMIDs */ +unsigned long load_flag;/* Vport Config Parameters */ uint32_t cfg_scan_down;uint32_t cfg_lun_queue_depth;
drivers/scsi/lpfc/lpfc_ct.c +6 -5
@@ -298,7 +298,7 @@ lpfc_ct_handle_mibreq(struct lpfc_hba *phba, struct lpfc_iocbq *ctiocbq) }/* Ignore traffic received during vport shutdown */ -if (test_bit (FC_UNLOADING , &vport->fc_flag)) +if (test_bit (FC_UNLOADING , &vport->load_flag))return ; ndlp =lpfc_findnode_did (vport, did);
@@ -943,7 +943,7 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, }/* Skip processing response on pport if unloading */ -if (vport == phba->pport && vport->load_flag &FC_UNLOADING ) { +if (vport == phba->pport &&test_bit (FC_UNLOADING , &vport->load_flag)) {if (test_bit (FC_RSCN_MODE , &vport->fc_flag))lpfc_els_flush_rscn (vport); goto out;
@@ -1159,7 +1159,7 @@ lpfc_cmpl_ct_cmd_gid_pt(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, }/* Skip processing response on pport if unloading */ -if (vport == phba->pport && vport->load_flag &FC_UNLOADING ) { +if (vport == phba->pport &&test_bit (FC_UNLOADING , &vport->load_flag)) {if (test_bit (FC_RSCN_MODE , &vport->fc_flag))lpfc_els_flush_rscn (vport); goto out;
@@ -3583,7 +3583,8 @@ lpfc_cmpl_ct_cmd_vmid(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, (ctrsp->Explanation != SLI_CT_APP_ID_NOT_AVAILABLE)) {/* If DALLAPP_ID failed retry later */ if (cmd ==SLI_CTAS_DALLAPP_ID ) - vport->load_flag |=FC_DEREGISTER_ALL_APP_ID ; +set_bit (FC_DEREGISTER_ALL_APP_ID , + &vport->load_flag); goto free_res; } }
@@ -3639,7 +3640,7 @@ lpfc_cmpl_ct_cmd_vmid(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,if (!hash_empty (vport->hash_table))hash_for_each (vport->hash_table, bucket, cur, hnode)hash_del (&cur->hnode); - vport->load_flag |=FC_ALLOW_VMID ; +set_bit (FC_ALLOW_VMID , &vport->load_flag);break ;default : lpfc_printf_vlog(vport, KERN_DEBUG, LOG_DISCOVERY,
drivers/scsi/lpfc/lpfc_els.c +11 -11
@@ -4964,7 +4964,7 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, retry =0 ; } -if ((vport->load_flag &FC_UNLOADING ) !=0 ) +if (test_bit (FC_UNLOADING , &vport->load_flag)) retry =0 ; out_retry:
@@ -8232,7 +8232,7 @@ lpfc_els_handle_rscn(struct lpfc_vport *vport)struct lpfc_hba *phba = vport->phba;/* Ignore RSCN if the port is being torn down. */ -if (vport->load_flag &FC_UNLOADING ) { +if (test_bit (FC_UNLOADING , &vport->load_flag)) {lpfc_els_flush_rscn (vport);return 0 ; }
@@ -9449,11 +9449,11 @@ lpfc_els_timeout(struct timer_list *t)spin_lock_irqsave (&vport->work_port_lock, iflag); tmo_posted = vport->work_port_events &WORKER_ELS_TMO ; -if ((!tmo_posted) && (!(vport->load_flag &FC_UNLOADING ))) +if (!tmo_posted && !test_bit (FC_UNLOADING , &vport->load_flag)) vport->work_port_events |=WORKER_ELS_TMO ;spin_unlock_irqrestore (&vport->work_port_lock, iflag); -if ((!tmo_posted) && (!(vport->load_flag &FC_UNLOADING ))) +if (!tmo_posted && !test_bit (FC_UNLOADING , &vport->load_flag))lpfc_worker_wake_up (phba);return ; }
@@ -9489,7 +9489,7 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport)if (unlikely (!pring))return ; -if (phba->pport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &phba->pport->load_flag))return ;spin_lock_irq (&phba->hbalock);
@@ -9565,7 +9565,7 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport)lpfc_issue_hb_tmo (phba);if (!list_empty (&pring->txcmplq)) -if (!(phba->pport->load_flag &FC_UNLOADING )) +if (!test_bit (FC_UNLOADING , &phba->pport->load_flag))mod_timer (&vport->els_tmofunc, jiffies +msecs_to_jiffies (1000 * timeout)); }
@@ -10364,7 +10364,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, goto dropit;/* Ignore traffic received during vport shutdown. */ -if (vport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &vport->load_flag)) goto dropit;/* If NPort discovery is delayed drop incoming ELS */
@@ -10785,7 +10785,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,return ; dropit: -if (vport && !(vport->load_flag &FC_UNLOADING )) +if (vport && !test_bit (FC_UNLOADING , &vport->load_flag)) lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT, "0111 Dropping received ELS cmd " "Data: x%x x%x x%x x%x\n",
@@ -10981,8 +10981,8 @@ lpfc_do_scr_ns_plogi(struct lpfc_hba *phba, struct lpfc_vport *vport) }if ((phba->cfg_enable_SmartSAN || - (phba->cfg_fdmi_on ==LPFC_FDMI_SUPPORT )) && - (vport->load_flag &FC_ALLOW_FDMI )) + phba->cfg_fdmi_on ==LPFC_FDMI_SUPPORT ) && +test_bit (FC_ALLOW_FDMI , &vport->load_flag))lpfc_start_fdmi (vport); }
@@ -12014,7 +12014,7 @@ lpfc_sli4_vport_delete_els_xri_aborted(struct lpfc_vport *vport)* node and the vport is unloading, the xri aborted wcqe * likely isn't coming back. Just release the sgl. */ -if ((vport->load_flag &FC_UNLOADING ) && +if (test_bit (FC_UNLOADING , &vport->load_flag) && ndlp->nlp_DID == Fabric_DID) {list_del (&sglq_entry->list); sglq_entry->state =SGL_FREED ;
drivers/scsi/lpfc/lpfc_hbadisc.c +13 -13
@@ -169,13 +169,13 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)lpfc_printf_vlog (ndlp->vport,KERN_INFO ,LOG_NODE ,"3181 dev_loss_callbk x%06x, rport x%px flg x%x " -"load_flag x%x refcnt %u state %d xpt x%x\n" , +"load_flag x%lx refcnt %u state %d xpt x%x\n" , ndlp->nlp_DID, ndlp->rport, ndlp->nlp_flag, vport->load_flag,kref_read (&ndlp->kref), ndlp->nlp_state, ndlp->fc4_xpt_flags);/* Don't schedule a worker thread event if the vport is going down. */ -if (vport->load_flag &FC_UNLOADING ) { +if (test_bit (FC_UNLOADING , &vport->load_flag)) {spin_lock_irqsave (&ndlp->lock, iflags); ndlp->rport =NULL ;
@@ -263,7 +263,7 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport) }else {lpfc_printf_vlog (ndlp->vport,KERN_INFO ,LOG_NODE ,"3188 worker thread is stopped %s x%06x, " -" rport x%px flg x%x load_flag x%x refcnt " +" rport x%px flg x%x load_flag x%lx refcnt " "%d\n" , __func__, ndlp->nlp_DID, ndlp->rport, ndlp->nlp_flag, vport->load_flag,kref_read (&ndlp->kref));
@@ -911,7 +911,7 @@ lpfc_work_list_done(struct lpfc_hba *phba) free_evt =0 ;break ;case LPFC_EVT_RESET_HBA : -if (!(phba->pport->load_flag &FC_UNLOADING )) +if (!test_bit (FC_UNLOADING , &phba->pport->load_flag))lpfc_reset_hba (phba);break ; }
@@ -1358,7 +1358,7 @@ lpfc_linkup_port(struct lpfc_vport *vport)struct Scsi_Host *shost =lpfc_shost_from_vport (vport);struct lpfc_hba *phba = vport->phba; -if ((vport->load_flag &FC_UNLOADING ) !=0 ) +if (test_bit (FC_UNLOADING , &vport->load_flag))return ; lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,
@@ -3924,7 +3924,7 @@ lpfc_mbx_cmpl_unreg_vpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)lpfc_printf_vlog (vport,KERN_ERR ,LOG_TRACE_EVENT ,"2798 Unreg_vpi failed vpi 0x%x, mb status = 0x%x\n" , vport->vpi, mb->mbxStatus); -if (!(phba->pport->load_flag &FC_UNLOADING )) +if (!test_bit (FC_UNLOADING , &phba->pport->load_flag))lpfc_workq_post_event (phba,NULL ,NULL ,LPFC_EVT_RESET_HBA ); }
@@ -3939,7 +3939,7 @@ lpfc_mbx_cmpl_unreg_vpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)* This shost reference might have been taken at the beginning of * lpfc_vport_delete() */ -if ((vport->load_flag &FC_UNLOADING ) && (vport != phba->pport)) +if (test_bit (FC_UNLOADING , &vport->load_flag) && vport != phba->pport)scsi_host_put (shost); }
@@ -4490,7 +4490,7 @@ lpfc_register_remote_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_type);/* Don't add the remote port if unloading. */ -if (vport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &vport->load_flag))return ; ndlp->rport = rport =fc_remote_port_add (shost,0 , &rport_ids);
@@ -5235,13 +5235,13 @@ lpfc_set_unreg_login_mbx_cmpl(struct lpfc_hba *phba, struct lpfc_vport *vport, mbox->mbox_cmpl = lpfc_nlp_logo_unreg; }else if (phba->sli_rev ==LPFC_SLI_REV4 && - (!(vport->load_flag &FC_UNLOADING )) && + !test_bit (FC_UNLOADING , &vport->load_flag) && (bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) >=LPFC_SLI_INTF_IF_TYPE_2 ) && (kref_read (&ndlp->kref) >0 )) { mbox->mbox_cmpl = lpfc_sli4_unreg_rpi_cmpl_clr; }else { -if (vport->load_flag &FC_UNLOADING ) { +if (test_bit (FC_UNLOADING , &vport->load_flag)) {if (phba->sli_rev ==LPFC_SLI_REV4 ) {spin_lock_irqsave (&ndlp->lock, iflags); ndlp->nlp_flag |=NLP_RELEASE_RPI ;
@@ -5349,7 +5349,7 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)* will issue a LOGO here and keep the rpi alive if * not unloading. */ -if (!(vport->load_flag &FC_UNLOADING )) { +if (!test_bit (FC_UNLOADING , &vport->load_flag)) { ndlp->nlp_flag &= ~NLP_UNREG_INP ;lpfc_issue_els_logo (vport, ndlp,0 ); ndlp->nlp_prev_state = ndlp->nlp_state;
@@ -6925,8 +6925,8 @@ lpfc_unregister_fcf_rescan(struct lpfc_hba *phba)* If driver is not unloading, check if there is any other * FCF record that can be used for discovery. */ -if ((phba->pport->load_flag &FC_UNLOADING ) || - (phba->link_state <LPFC_LINK_UP )) +if (test_bit (FC_UNLOADING , &phba->pport->load_flag) || + phba->link_state <LPFC_LINK_UP )return ;/* This is considered as the initial FCF discovery scan */
drivers/scsi/lpfc/lpfc_init.c +27 -37
201 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_nportdisc.c +6 -7
@@ -859,8 +859,8 @@ lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,* If we are here first then vport_delete is going to wait * for discovery to complete. */ -if (!(vport->load_flag &FC_UNLOADING ) && - active_vlink_present) { +if (!test_bit (FC_UNLOADING , &vport->load_flag) && + active_vlink_present) {/* * If there are other active VLinks present, * re-instantiate the Vlink using FDISC.
@@ -1145,9 +1145,8 @@ lpfc_disc_illegal(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, phba = vport->phba;/* Release the RPI if reglogin completing */ -if (!(phba->pport->load_flag &FC_UNLOADING ) && - (evt ==NLP_EVT_CMPL_REG_LOGIN ) && - (!pmb->u.mb.mbxStatus)) { +if (!test_bit (FC_UNLOADING , &phba->pport->load_flag) && + evt ==NLP_EVT_CMPL_REG_LOGIN && !pmb->u.mb.mbxStatus) { rpi = pmb->u.mb.un.varWords[0 ];lpfc_release_rpi (phba, vport, ndlp, rpi); }
@@ -1571,8 +1570,8 @@ lpfc_cmpl_reglogin_plogi_issue(struct lpfc_vport *vport, phba = vport->phba;/* Release the RPI */ -if (!(phba->pport->load_flag &FC_UNLOADING ) && - !mb->mbxStatus) { +if (!test_bit (FC_UNLOADING , &phba->pport->load_flag) && + !mb->mbxStatus) { rpi = pmb->u.mb.un.varWords[0 ];lpfc_release_rpi (phba, vport, ndlp, rpi); }
drivers/scsi/lpfc/lpfc_nvme.c +9 -9
@@ -94,7 +94,7 @@ lpfc_nvme_create_queue(struct nvme_fc_local_port *pnvme_lport, lport = (struct lpfc_nvme_lport *)pnvme_lport->private; vport = lport->vport; -if (!vport || vport->load_flag &FC_UNLOADING || +if (!vport ||test_bit (FC_UNLOADING , &vport->load_flag) || vport->phba->hba_flag &HBA_IOQ_FLUSH )return -ENODEV ;
@@ -674,7 +674,7 @@ lpfc_nvme_ls_req(struct nvme_fc_local_port *pnvme_lport,return -EINVAL ; vport = lport->vport; -if (vport->load_flag &FC_UNLOADING || +if (test_bit (FC_UNLOADING , &vport->load_flag) || vport->phba->hba_flag &HBA_IOQ_FLUSH )return -ENODEV ;
@@ -765,7 +765,7 @@ lpfc_nvme_xmt_ls_rsp(struct nvme_fc_local_port *localport,struct lpfc_nvme_lport *lport;int rc; -if (axchg->phba->pport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &axchg->phba->pport->load_flag))return -ENODEV ; lport = (struct lpfc_nvme_lport *)localport->private;
@@ -810,7 +810,7 @@ lpfc_nvme_ls_abort(struct nvme_fc_local_port *pnvme_lport,return ; vport = lport->vport; -if (vport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &vport->load_flag))return ; ndlp =lpfc_findnode_did (vport, pnvme_rport->port_id);
@@ -1567,7 +1567,7 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport, phba = vport->phba; -if ((unlikely (vport->load_flag &FC_UNLOADING )) || +if ((unlikely (test_bit (FC_UNLOADING , &vport->load_flag))) || phba->hba_flag &HBA_IOQ_FLUSH ) {lpfc_printf_vlog (vport,KERN_INFO ,LOG_NVME_IOERR ,"6124 Fail IO, Driver unload\n" );
@@ -1886,7 +1886,7 @@ lpfc_nvme_fcp_abort(struct nvme_fc_local_port *pnvme_lport,if (unlikely (!freqpriv))return ; -if (vport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &vport->load_flag))return ;/* Announce entry to new IO submit field. */
@@ -2263,7 +2263,7 @@ lpfc_nvme_lport_unreg_wait(struct lpfc_vport *vport,if (!vport->localport ||test_bit (HBA_PCI_ERR , &vport->phba->bit_flags) || phba->link_state ==LPFC_HBA_ERROR || - vport->load_flag &FC_UNLOADING ) +test_bit (FC_UNLOADING , &vport->load_flag))return ; lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
@@ -2625,7 +2625,7 @@ lpfc_nvme_unregister_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)* return values is ignored. The upcall is a courtesy to the * transport. */ -if (vport->load_flag &FC_UNLOADING || +if (test_bit (FC_UNLOADING , &vport->load_flag) ||unlikely (vport->phba->link_state ==LPFC_HBA_ERROR )) (void )nvme_fc_set_remoteport_devloss (remoteport,0 );
@@ -2644,7 +2644,7 @@ lpfc_nvme_unregister_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)"port_state x%x\n" , ret, remoteport->port_state); -if (vport->load_flag &FC_UNLOADING ) { +if (test_bit (FC_UNLOADING , &vport->load_flag)) {/* Only 1 thread can drop the initial node * reference. Check if another thread has set * NLP_DROPPED.
drivers/scsi/lpfc/lpfc_nvmet.c +6 -6
@@ -872,7 +872,7 @@ __lpfc_nvme_xmt_ls_rsp(struct lpfc_async_xchg_ctx *axchg,struct ulp_bde64 bpl;int rc; -if (phba->pport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &phba->pport->load_flag))return -ENODEV ; lpfc_printf_log(phba, KERN_INFO, LOG_NVME_DISC,
@@ -984,7 +984,7 @@ lpfc_nvmet_xmt_ls_rsp(struct nvmet_fc_target_port *tgtport,struct lpfc_nvmet_tgtport *nvmep = tgtport->private;int rc; -if (axchg->phba->pport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &axchg->phba->pport->load_flag))return -ENODEV ; rc =__lpfc_nvme_xmt_ls_rsp (axchg, ls_rsp, lpfc_nvmet_xmt_ls_rsp_cmp);
@@ -1022,7 +1022,7 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport,int id;#endif -if (phba->pport->load_flag &FC_UNLOADING ) { +if (test_bit (FC_UNLOADING , &phba->pport->load_flag)) { rc = -ENODEV ; goto aerr; }
@@ -1145,7 +1145,7 @@ lpfc_nvmet_xmt_fcp_abort(struct nvmet_fc_target_port *tgtport,struct lpfc_queue *wq;unsigned long flags; -if (phba->pport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &phba->pport->load_flag))return ;if (!ctxp->hdwq)
@@ -1317,7 +1317,7 @@ lpfc_nvmet_ls_req(struct nvmet_fc_target_port *targetport,return -EINVAL ; phba = lpfc_nvmet->phba; -if (phba->pport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &phba->pport->load_flag))return -EINVAL ; hstate =atomic_read (&lpfc_nvmet->state);
@@ -1353,7 +1353,7 @@ lpfc_nvmet_ls_abort(struct nvmet_fc_target_port *targetport,int ret; phba = lpfc_nvmet->phba; -if (phba->pport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &phba->pport->load_flag))return ; ndlp = (struct lpfc_nodelist *)hosthandle;
drivers/scsi/lpfc/lpfc_sli.c +12 -12
@@ -1036,7 +1036,7 @@ lpfc_handle_rrq_active(struct lpfc_hba *phba) }spin_unlock_irqrestore (&phba->hbalock, iflags);if ((!list_empty (&phba->active_rrq_list)) && - (!(phba->pport->load_flag &FC_UNLOADING ))) + (!test_bit (FC_UNLOADING , &phba->pport->load_flag)))mod_timer (&phba->rrq_tmr, next_time);list_for_each_entry_safe (rrq, nextrrq, &send_rrq, list) {list_del (&rrq->list);
@@ -1180,12 +1180,12 @@ lpfc_set_rrq_active(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,return -EINVAL ;spin_lock_irqsave (&phba->hbalock, iflags); -if (phba->pport->load_flag &FC_UNLOADING ) { +if (test_bit (FC_UNLOADING , &phba->pport->load_flag)) { phba->hba_flag &= ~HBA_RRQ_ACTIVE ; goto out; } -if (ndlp->vport && (ndlp->vport->load_flag &FC_UNLOADING )) +if (ndlp->vport &&test_bit (FC_UNLOADING , &ndlp->vport->load_flag)) goto out;if (!ndlp->active_rrqs_xri_bitmap)
@@ -1732,7 +1732,7 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, (ulp_command != CMD_ABORT_XRI_CN) && (ulp_command != CMD_CLOSE_XRI_CN)) {BUG_ON (!piocb->vport); -if (!(piocb->vport->load_flag &FC_UNLOADING )) +if (!test_bit (FC_UNLOADING , &piocb->vport->load_flag))mod_timer (&piocb->vport->els_tmofunc, jiffies +msecs_to_jiffies (1000 * (phba->fc_ratov <<1 )));
@@ -2882,7 +2882,7 @@ lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)* If a REG_LOGIN succeeded after node is destroyed or node * is in re-discovery driver need to cleanup the RPI. */ -if (!(phba->pport->load_flag &FC_UNLOADING ) && +if (!test_bit (FC_UNLOADING , &phba->pport->load_flag) && pmb->u.mb.mbxCommand ==MBX_REG_LOGIN64 && !pmb->u.mb.mbxStatus) { mp = (struct lpfc_dmabuf *)pmb->ctx_buf;
@@ -2904,7 +2904,7 @@ lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) }if ((pmb->u.mb.mbxCommand ==MBX_REG_VPI ) && - !(phba->pport->load_flag &FC_UNLOADING ) && + !test_bit (FC_UNLOADING , &phba->pport->load_flag) && !pmb->u.mb.mbxStatus) { shost =lpfc_shost_from_vport (vport);spin_lock_irq (shost->host_lock);
@@ -2927,7 +2927,7 @@ lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) vport,KERN_INFO ,LOG_MBOX |LOG_DISCOVERY ,"1438 UNREG cmpl deferred mbox x%x " -"on NPort x%x Data: x%x x%x x%px x%x x%x\n" , +"on NPort x%x Data: x%x x%x x%px x%lx x%x\n" , ndlp->nlp_rpi, ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_defer_did, ndlp, vport->load_flag, kref_read(&ndlp->kref));
@@ -3235,7 +3235,7 @@ lpfc_nvme_unsol_ls_handler(struct lpfc_hba *phba, struct lpfc_iocbq *piocb)lpfc_nvmeio_data (phba,"NVME LS RCV: xri x%x sz %d from %06x\n" , oxid, size, sid); -if (phba->pport->load_flag &FC_UNLOADING ) { +if (test_bit (FC_UNLOADING , &phba->pport->load_flag)) { failwhy ="Driver Unloading" ; }else if (!(phba->cfg_enable_fc4_type &LPFC_ENABLE_NVME )) { failwhy ="NVME FC4 Disabled" ;
@@ -3940,7 +3940,7 @@ void lpfc_poll_eratt(struct timer_list *t)if (!(phba->hba_flag &HBA_SETUP ))return ; -if (phba->pport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &phba->pport->load_flag))return ;/* Here we will also keep track of interrupts per sec of the hba */
@@ -12428,7 +12428,7 @@ lpfc_sli_issue_abort_iotag(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,* If we're unloading, don't abort iocb on the ELS ring, but change * the callback so that nothing happens when it finishes. */ -if ((vport->load_flag &FC_UNLOADING ) && +if (test_bit (FC_UNLOADING , &vport->load_flag) && pring->ringno ==LPFC_ELS_RING ) {if (cmdiocb->cmd_flag &LPFC_IO_FABRIC ) cmdiocb->fabric_cmd_cmpl = lpfc_ignore_els_cmpl;
@@ -14658,7 +14658,7 @@ lpfc_sli4_sp_handle_rcqe(struct lpfc_hba *phba, struct lpfc_rcqe *rcqe) fc_hdr->fh_r_ctl == FC_RCTL_DD_UNSOL_DATA) {spin_unlock_irqrestore (&phba->hbalock, iflags);/* Handle MDS Loopback frames */ -if (!(phba->pport->load_flag &FC_UNLOADING )) +if (!test_bit (FC_UNLOADING , &phba->pport->load_flag))lpfc_sli4_handle_mds_loopback (phba->pport, dma_buf);else
@@ -19457,7 +19457,7 @@ lpfc_sli4_handle_received_buffer(struct lpfc_hba *phba, fc_hdr->fh_r_ctl == FC_RCTL_DD_UNSOL_DATA) { vport = phba->pport;/* Handle MDS Loopback frames */ -if (!(phba->pport->load_flag &FC_UNLOADING )) +if (!test_bit (FC_UNLOADING , &phba->pport->load_flag))lpfc_sli4_handle_mds_loopback (vport, dmabuf);else lpfc_in_buf_free (phba, &dmabuf->dbuf);
drivers/scsi/lpfc/lpfc_vport.c +9 -14
@@ -408,7 +408,7 @@ lpfc_vport_create(struct fc_vport *fc_vport, bool disable) vport->fc_vport = fc_vport;/* At this point we are fully registered with SCSI Layer. */ - vport->load_flag |=FC_ALLOW_FDMI ; +set_bit (FC_ALLOW_FDMI , &vport->load_flag);if (phba->cfg_enable_SmartSAN || (phba->cfg_fdmi_on ==LPFC_FDMI_SUPPORT )) {/* Setup appropriate attribute masks */
@@ -538,7 +538,7 @@ disable_vport(struct fc_vport *fc_vport)struct lpfc_nodelist *ndlp =NULL ;/* Can't disable during an outstanding delete. */ -if (vport->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &vport->load_flag))return 0 ; ndlp =lpfc_findnode_did (vport, Fabric_DID);
@@ -571,7 +571,6 @@ enable_vport(struct fc_vport *fc_vport)struct lpfc_vport *vport = *(struct lpfc_vport **)fc_vport->dd_data;struct lpfc_hba *phba = vport->phba;struct lpfc_nodelist *ndlp =NULL ; -struct Scsi_Host *shost =lpfc_shost_from_vport (vport);if ((phba->link_state <LPFC_LINK_UP ) || (phba->fc_topology ==LPFC_TOPOLOGY_LOOP )) {
@@ -579,9 +578,7 @@ enable_vport(struct fc_vport *fc_vport)return VPORT_OK ; } -spin_lock_irq (shost->host_lock); - vport->load_flag |=FC_LOADING ; -spin_unlock_irq (shost->host_lock); +set_bit (FC_LOADING , &vport->load_flag);if (test_bit (FC_VPORT_NEEDS_INIT_VPI , &vport->fc_flag)) {lpfc_issue_init_vpi (vport); goto out;
@@ -639,22 +636,20 @@ lpfc_vport_delete(struct fc_vport *fc_vport)/* If the vport is a static vport fail the deletion. */ if ((vport->vport_flag &STATIC_VPORT ) && - !(phba->pport->load_flag &FC_UNLOADING )) { + !test_bit (FC_UNLOADING , &phba->pport->load_flag)) {lpfc_printf_vlog (vport,KERN_ERR ,LOG_TRACE_EVENT ,"1837 vport_delete failed: Cannot delete " "static vport.\n" );return VPORT_ERROR ; } -spin_lock_irq (&phba->hbalock); - vport->load_flag |=FC_UNLOADING ; -spin_unlock_irq (&phba->hbalock); +set_bit (FC_UNLOADING , &vport->load_flag);/* * If we are not unloading the driver then prevent the vport_delete * from happening until after this vport's discovery is finished. */ -if (!(phba->pport->load_flag &FC_UNLOADING )) { +if (!test_bit (FC_UNLOADING , &phba->pport->load_flag)) {int check_count =0 ; while (check_count < ((phba->fc_ratov * 3) + 3) && vport->port_state > LPFC_VPORT_FAILED &&
@@ -721,7 +716,7 @@ lpfc_vport_delete(struct fc_vport *fc_vport) goto skip_logo; } -if (!(phba->pport->load_flag &FC_UNLOADING )) +if (!test_bit (FC_UNLOADING , &phba->pport->load_flag))lpfc_discovery_wait (vport); skip_logo:
@@ -732,7 +727,7 @@ lpfc_vport_delete(struct fc_vport *fc_vport)lpfc_sli_host_down (vport);lpfc_stop_vport_timers (vport); -if (!(phba->pport->load_flag &FC_UNLOADING )) { +if (!test_bit (FC_UNLOADING , &phba->pport->load_flag)) {lpfc_unreg_all_rpis (vport);lpfc_unreg_default_rpis (vport);/*
@@ -769,7 +764,7 @@ lpfc_create_vport_work_array(struct lpfc_hba *phba)return NULL ;spin_lock_irq (&phba->port_list_lock);list_for_each_entry (port_iterator, &phba->port_list, listentry) { -if (port_iterator->load_flag &FC_UNLOADING ) +if (test_bit (FC_UNLOADING , &port_iterator->load_flag))continue ;if (!scsi_host_get (lpfc_shost_from_vport (port_iterator))) { lpfc_printf_vlog(port_iterator, KERN_ERR,
Signature · 1 line
2.38.0
PATCH v2 16/17 lpfc: Update lpfc version to 14.4.0.0
In reply to Justin TeeUpdate lpfc version to 14.4.0.0
--- drivers/scsi/lpfc/lpfc_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_version.h +1 -1
@@ -20,7 +20,7 @@* included with this package. * *******************************************************************/ -#define LPFC_DRIVER_VERSION "14.2.0.17" +#define LPFC_DRIVER_VERSION "14.4.0.0"#define LPFC_DRIVER_NAME "lpfc"/* Used for SLI 2/3 */
Signature · 1 line
2.38.0
PATCH v2 17/17 lpfc: Copyright updates for 14.4.0.0 patches
In reply to Justin TeeUpdate copyrights to 2024 for files modified in the 14.4.0.0 patch set.
--- drivers/scsi/lpfc/lpfc.h | 2 +- drivers/scsi/lpfc/lpfc_attr.c | 2 +- drivers/scsi/lpfc/lpfc_bsg.c | 2 +- drivers/scsi/lpfc/lpfc_ct.c | 2 +- drivers/scsi/lpfc/lpfc_debugfs.c | 2 +- drivers/scsi/lpfc/lpfc_els.c | 2 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/lpfc/lpfc_hw4.h | 2 +- drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_mbox.c | 2 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 2 +- drivers/scsi/lpfc/lpfc_nvme.c | 2 +- drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- drivers/scsi/lpfc/lpfc_scsi.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 2 +- drivers/scsi/lpfc/lpfc_version.h | 4 ++-- drivers/scsi/lpfc/lpfc_vport.c | 2 +- 17 files changed, 18 insertions(+), 18 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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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_bsg.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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2009-2015 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex. *
drivers/scsi/lpfc/lpfc_ct.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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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_els.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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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_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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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_hw4.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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 Broadcom. All Rights Reserved. The term * * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. * * Copyright (C) 2009-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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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_mbox.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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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 +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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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 +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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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_sli.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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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_version.h +2 -2
@@ -1,7 +1,7 @@/******************************************************************* * This file is part of the Emulex Linux Device Driver for * * Fibre Channel Host Bus Adapters. * -* Copyright (C) 2017-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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. *
@@ -32,6 +32,6 @@#define LPFC_MODULE_DESC "Emulex LightPulse Fibre Channel SCSI driver " \ LPFC_DRIVER_VERSION -#define LPFC_COPYRIGHT "Copyright (C) 2017-2023 Broadcom. All Rights " \ +#define LPFC_COPYRIGHT "Copyright (C) 2017-2024 Broadcom. All Rights " \ "Reserved. The term \"Broadcom\" refers to Broadcom Inc. " \ "and/or its subsidiaries."
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-2023 Broadcom. All Rights Reserved. The term * +* Copyright (C) 2017-2024 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.38.0
Quoted 44 lines · Justin Tee
Update lpfc to revision 14.4.0.0
This patch set contains fixes identified by static code analyzers, updates to log messaging, bug fixes related to discovery and congestion management, and clean up patches regarding the abuse of shost lock in the driver.
The patches were cut against Martin's 6.9/scsi-queue tree.
Justin Tee (17):
lpfc: Initialize status local variable inlpfc_sli4_repost_sgl_list
lpfc: Fix possible memory leak inlpfc_rcv_padisc
lpfc: Usesg_dma_lenAPI to get struct scatterlist's length
lpfc: RemoveD_IDswap log message from trace event logger
lpfc: Allowlpfc_plogi_confirm_nportlogic to execute for Fabric nodes
lpfc: RemoveNLP_RCV_PLOGIearly return during RSCN processing for
ndlps
lpfc: Fix failure to delete vports when discovery is in progress
lpfc: Add condition to delete ndlp object after sendingBLS_RJTto an
ABTS
lpfc: Save FPIN frequency statistics upon receipt of peer cgn
notifications
lpfc: Move handling of reset congestion statistics events
lpfc: Removeshost_lockprotection forfc_host_portshost APIs
lpfc: Change nlp state statistic counters intoatomic_t
lpfc: Protect vportfc_nodeslist with an explicit spin lock
lpfc: Changelpfc_vportfc_flagmember into a bitmask
lpfc: Changelpfc_vportload_flagmember into a bitmask
lpfc: Update lpfc version to 14.4.0.0
lpfc: Copyright updates for 14.4.0.0 patchesdrivers/scsi/lpfc/lpfc.h | 94 +++--- drivers/scsi/lpfc/lpfc_attr.c | 107 +++---- drivers/scsi/lpfc/lpfc_bsg.c | 8 +- drivers/scsi/lpfc/lpfc_ct.c | 154 +++++----- drivers/scsi/lpfc/lpfc_debugfs.c | 14 +- drivers/scsi/lpfc/lpfc_els.c | 446 +++++++++++++---------------- drivers/scsi/lpfc/lpfc_hbadisc.c | 350 ++++++++++------------ drivers/scsi/lpfc/lpfc_hw4.h | 4 +- drivers/scsi/lpfc/lpfc_init.c | 137 +++++---- drivers/scsi/lpfc/lpfc_mbox.c | 10 +-
Quoted 12 lines
drivers/scsi/lpfc/lpfc_nportdisc.c | 91 +++--- drivers/scsi/lpfc/lpfc_nvme.c | 20 +- drivers/scsi/lpfc/lpfc_nvmet.c | 14 +- drivers/scsi/lpfc/lpfc_scsi.c | 10 +- drivers/scsi/lpfc/lpfc_sli.c | 56 ++-- drivers/scsi/lpfc/lpfc_version.h | 6 +- drivers/scsi/lpfc/lpfc_vport.c | 69 ++--- 17 files changed, 717 insertions(+), 873 deletions(-)Signature · 1 line
2.38.0
For the series
Signature · 1 line
Himanshu Madhani Oracle Linux Engineering
Martin K. Petersen
AppliedJustin,
Quoted 5 lines
Update lpfc to revision 14.4.0.0
This patch set contains fixes identified by static code analyzers, updates to log messaging, bug fixes related to discovery and congestion management, and clean up patches regarding the abuse of shost lock in the driver.
Applied to 6.9/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 9 lines · Justin Tee
Update lpfc to revision 14.4.0.0
This patch set contains fixes identified by static code analyzers, updates to log messaging, bug fixes related to discovery and congestion management, and clean up patches regarding the abuse of shost lock in the driver.
The patches were cut against Martin's 6.9/scsi-queue tree.
[...]
Applied to 6.9/scsi-queue, thanks!
[01/17] lpfc: Initialize status local variable in lpfc_sli4_repost_sgl_list
https://git.kernel.org/mkp/scsi/c/3d0f9342ae20 [02/17] lpfc: Fix possible memory leak in lpfc_rcv_padisc https://git.kernel.org/mkp/scsi/c/2ae917d4bcab [03/17] lpfc: Use sg_dma_len API to get struct scatterlist's length https://git.kernel.org/mkp/scsi/c/aa7674bd8da5 [04/17] lpfc: Remove D_ID swap log message from trace event logger https://git.kernel.org/mkp/scsi/c/b76beac1a4f5 [05/17] lpfc: Allow lpfc_plogi_confirm_nport logic to execute for Fabric nodes https://git.kernel.org/mkp/scsi/c/e1b3acad0d7b [06/17] lpfc: Remove NLP_RCV_PLOGI early return during RSCN processing for ndlps https://git.kernel.org/mkp/scsi/c/a801d57a110d [07/17] lpfc: Fix failure to delete vports when discovery is in progress https://git.kernel.org/mkp/scsi/c/7bb6cb7bb21c [08/17] lpfc: Add condition to delete ndlp object after sending BLS_RJT to an ABTS https://git.kernel.org/mkp/scsi/c/900db34ad265 [09/17] lpfc: Save FPIN frequency statistics upon receipt of peer cgn notifications https://git.kernel.org/mkp/scsi/c/6ca396c5e3c4 [10/17] lpfc: Move handling of reset congestion statistics events https://git.kernel.org/mkp/scsi/c/140bd888ed0d [11/17] lpfc: Remove shost_lock protection for fc_host_port shost APIs https://git.kernel.org/mkp/scsi/c/4be4ad6cd237 [12/17] lpfc: Change nlp state statistic counters into atomic_t https://git.kernel.org/mkp/scsi/c/0dfd9cbc187c [13/17] lpfc: Protect vport fc_nodes list with an explicit spin lock https://git.kernel.org/mkp/scsi/c/9bb36777d0a2 [14/17] lpfc: Change lpfc_vport fc_flag member into a bitmask https://git.kernel.org/mkp/scsi/c/a645b8c1f5bc [15/17] lpfc: Change lpfc_vport load_flag member into a bitmask https://git.kernel.org/mkp/scsi/c/e39811bec6b1 [16/17] lpfc: Update lpfc version to 14.4.0.0 https://git.kernel.org/mkp/scsi/c/5b22878daf48 [17/17] lpfc: Copyright updates for 14.4.0.0 patches https://git.kernel.org/mkp/scsi/c/ea4044e4dd0d
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering