From: Justin Tee <justintee8345@gmail.com>
To: linux-scsi@vger.kernel.org
Cc: jsmart833426@gmail.com, justin.tee@broadcom.com,
Justin Tee <justintee8345@gmail.com>
Subject: [PATCH 12/14] lpfc: Update ELS ACC logging for diagnostic troubleshooting
Date: Thu, 4 Jun 2026 12:29:35 -0700 [thread overview]
Message-ID: <20260604192937.65605-13-justintee8345@gmail.com> (raw)
In-Reply-To: <20260604192937.65605-1-justintee8345@gmail.com>
Currently, there are ELS ACC routines that lack debug log messages to
indicate when ACC frame transmission run into issues. The generic
lpfc_els_rsp_acc and more specific ACC routines are updated to log when
there is an issue with transmitting the frame. The routines are also
updated to return different return codes when encountering various
transmission issues and their function comment header is updated.
Signed-off-by: Justin Tee <justintee8345@gmail.com>
---
drivers/scsi/lpfc/lpfc_els.c | 187 ++++++++++++++++++++++++++---------
1 file changed, 141 insertions(+), 46 deletions(-)
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 38a23646538e..27ccd3ad4b7a 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -4037,13 +4037,8 @@ lpfc_els_rcv_rdf(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
int rc;
rc = lpfc_els_rsp_acc(vport, ELS_CMD_RDF, cmdiocb, ndlp, NULL);
- /* Send LS_ACC */
- if (rc) {
- lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS | LOG_CGN_MGMT,
- "1623 Failed to RDF_ACC from x%x for x%x Data: %d\n",
- ndlp->nlp_DID, vport->fc_myDID, rc);
+ if (rc)
return -EIO;
- }
rc = lpfc_issue_els_rdf(vport, 0);
/* Issue new RDF for reregistering */
@@ -5777,7 +5772,10 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
*
* Return code
* 0 - Successfully issued acc response
- * 1 - Failed to issue acc response
+ * -ENOMEM - IOCB not prepped successfully
+ * -EIO - The IOCB failed to issue successfully
+ * -ENODEV - No associated node for IOCB
+ * -EACCES - ACC unhandled for this command
**/
int
lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,
@@ -5796,6 +5794,8 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,
int rc;
ELS_PKT *els_pkt_ptr;
struct fc_els_rdf_resp *rdf_resp;
+ int err;
+ uint32_t old_opcode = 0;
switch (flag) {
case ELS_CMD_ACC:
@@ -5804,7 +5804,8 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,
ndlp, ndlp->nlp_DID, ELS_CMD_ACC);
if (!elsiocb) {
clear_bit(NLP_LOGO_ACC, &ndlp->nlp_flag);
- return 1;
+ err = -ENOMEM;
+ goto err_out;
}
if (phba->sli_rev == LPFC_SLI_REV4) {
@@ -5839,8 +5840,10 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,
cmdsize = (sizeof(struct serv_parm) + sizeof(uint32_t));
elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry,
ndlp, ndlp->nlp_DID, ELS_CMD_ACC);
- if (!elsiocb)
- return 1;
+ if (!elsiocb) {
+ err = -ENOMEM;
+ goto err_out;
+ }
if (phba->sli_rev == LPFC_SLI_REV4) {
wqe = &elsiocb->wqe;
@@ -5917,8 +5920,10 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,
cmdsize = sizeof(uint32_t) + sizeof(PRLO);
elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry,
ndlp, ndlp->nlp_DID, ELS_CMD_PRLO);
- if (!elsiocb)
- return 1;
+ if (!elsiocb) {
+ err = -ENOMEM;
+ goto err_out;
+ }
if (phba->sli_rev == LPFC_SLI_REV4) {
wqe = &elsiocb->wqe;
@@ -5955,8 +5960,10 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,
cmdsize = sizeof(*rdf_resp);
elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry,
ndlp, ndlp->nlp_DID, ELS_CMD_ACC);
- if (!elsiocb)
- return 1;
+ if (!elsiocb) {
+ err = -ENOMEM;
+ goto err_out;
+ }
if (phba->sli_rev == LPFC_SLI_REV4) {
wqe = &elsiocb->wqe;
@@ -5991,7 +5998,8 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,
rdf_resp->lsri.rqst_w0.cmd = ELS_RDF;
break;
default:
- return 1;
+ err = -EACCES;
+ goto err_out;
}
if (test_bit(NLP_LOGO_ACC, &ndlp->nlp_flag)) {
if (!test_bit(NLP_RPI_REGISTERED, &ndlp->nlp_flag) &&
@@ -6006,7 +6014,8 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,
elsiocb->ndlp = lpfc_nlp_get(ndlp);
if (!elsiocb->ndlp) {
lpfc_els_free_iocb(phba, elsiocb);
- return 1;
+ err = -ENODEV;
+ goto err_out;
}
rc = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0);
@@ -6027,7 +6036,8 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,
lpfc_els_free_iocb(phba, elsiocb);
lpfc_nlp_put(ndlp);
- return 1;
+ err = -EIO;
+ goto err_out;
}
/* Xmit ELS ACC response tag <ulpIoTag> */
@@ -6039,6 +6049,17 @@ 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, kref_read(&ndlp->kref));
return 0;
+
+err_out:
+ if (oldiocb->cmd_dmabuf && oldiocb->cmd_dmabuf->virt)
+ old_opcode = *(uint32_t *)oldiocb->cmd_dmabuf->virt;
+
+ lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
+ "1027 Xmit ELS ACC Unsuccessful: "
+ "cmd: x%x, error_code: %d "
+ "S_ID: x%x\n", old_opcode, err,
+ vport->fc_myDID);
+ return err;
}
/**
@@ -6253,7 +6274,9 @@ lpfc_issue_els_edc_rsp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
*
* Return code
* 0 - Successfully issued acc adisc response
- * 1 - Failed to issue adisc acc response
+ * -ENOMEM - IOCB not prepped successfully
+ * -EIO - The IOCB failed to issue successfully
+ * -ENODEV - No associated node for IOCB
**/
int
lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
@@ -6268,12 +6291,15 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
uint16_t cmdsize;
int rc;
u32 ulp_context;
+ int err;
cmdsize = sizeof(uint32_t) + sizeof(ADISC);
elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,
ndlp->nlp_DID, ELS_CMD_ACC);
- if (!elsiocb)
- return 1;
+ if (!elsiocb) {
+ err = -ENOMEM;
+ goto err_out;
+ }
if (phba->sli_rev == LPFC_SLI_REV4) {
wqe = &elsiocb->wqe;
@@ -6320,17 +6346,26 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
elsiocb->ndlp = lpfc_nlp_get(ndlp);
if (!elsiocb->ndlp) {
lpfc_els_free_iocb(phba, elsiocb);
- return 1;
+ err = -ENODEV;
+ goto err_out;
}
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);
- return 1;
+ err = -EIO;
+ goto err_out;
}
return 0;
+
+err_out:
+ lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
+ "1025 Xmit ADISC ACC Unsuccessful: "
+ "error_code: %d S_ID: x%x\n",
+ err, vport->fc_myDID);
+ return err;
}
/**
@@ -6350,7 +6385,10 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
*
* Return code
* 0 - Successfully issued acc prli response
- * 1 - Failed to issue acc prli response
+ * -ENOMEM - IOCB not prepped successfully
+ * -EIO - The IOCB failed to issue successfully
+ * -ENODEV - No associated node for IOCB
+ * -EACCES - Acc not needed for this command
**/
int
lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
@@ -6370,6 +6408,7 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
struct lpfc_dmabuf *req_buf;
int rc;
u32 elsrspcmd, ulp_context;
+ int err;
/* Need the incoming PRLI payload to determine if the ACC is for an
* FC4 or NVME PRLI type. The PRLI type is at word 1.
@@ -6391,13 +6430,16 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
cmdsize = sizeof(uint32_t) + sizeof(struct lpfc_nvme_prli);
elsrspcmd = (ELS_CMD_ACC | (ELS_CMD_NVMEPRLI & ~ELS_RSP_MASK));
} else {
- return 1;
+ err = -EACCES;
+ goto err_out;
}
elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,
ndlp->nlp_DID, elsrspcmd);
- if (!elsiocb)
- return 1;
+ if (!elsiocb) {
+ err = -ENOMEM;
+ goto err_out;
+ }
if (phba->sli_rev == LPFC_SLI_REV4) {
wqe = &elsiocb->wqe;
@@ -6512,17 +6554,28 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
elsiocb->ndlp = lpfc_nlp_get(ndlp);
if (!elsiocb->ndlp) {
lpfc_els_free_iocb(phba, elsiocb);
- return 1;
+ err = -ENODEV;
+ goto err_out;
}
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);
- return 1;
+ err = -EIO;
+ goto err_out;
}
return 0;
+
+err_out:
+ lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
+ "1026 Xmit PRLI ACC Unsuccessful: "
+ "cmd: x%x, error_code: %d "
+ "S_ID: x%x\n",
+ *(uint32_t *)oldiocb->cmd_dmabuf->virt, err,
+ vport->fc_myDID);
+ return err;
}
/**
@@ -6543,7 +6596,9 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
*
* Return code
* 0 - Successfully issued acc rnid response
- * 1 - Failed to issue acc rnid response
+ * -ENOMEM - IOCB not prepped successfully
+ * -EIO - The IOCB failed to issue successfully
+ * -ENODEV - No associated node for IOCB
**/
static int
lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format,
@@ -6558,6 +6613,7 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format,
uint16_t cmdsize;
int rc;
u32 ulp_context;
+ int err;
cmdsize = sizeof(uint32_t) + sizeof(uint32_t)
+ (2 * sizeof(struct lpfc_name));
@@ -6566,8 +6622,10 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format,
elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,
ndlp->nlp_DID, ELS_CMD_ACC);
- if (!elsiocb)
- return 1;
+ if (!elsiocb) {
+ err = -ENOMEM;
+ goto err_out;
+ }
if (phba->sli_rev == LPFC_SLI_REV4) {
wqe = &elsiocb->wqe;
@@ -6626,17 +6684,26 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format,
elsiocb->ndlp = lpfc_nlp_get(ndlp);
if (!elsiocb->ndlp) {
lpfc_els_free_iocb(phba, elsiocb);
- return 1;
+ err = -ENODEV;
+ goto err_out;
}
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);
- return 1;
+ err = -EIO;
+ goto err_out;
}
return 0;
+
+err_out:
+ lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
+ "1028 Xmit RNID ACC Unsuccessful: "
+ "error_code: %d S_ID: x%x\n",
+ err, vport->fc_myDID);
+ return err;
}
/**
@@ -6696,7 +6763,9 @@ lpfc_els_clear_rrq(struct lpfc_vport *vport,
*
* Return code
* 0 - Successfully issued acc echo response
- * 1 - Failed to issue acc echo response
+ * -ENOMEM - IOCB not prepped successfully
+ * -EIO - The IOCB failed to issue successfully
+ * -ENODEV - No associated node for IOCB
**/
static int
lpfc_els_rsp_echo_acc(struct lpfc_vport *vport, uint8_t *data,
@@ -6710,6 +6779,7 @@ lpfc_els_rsp_echo_acc(struct lpfc_vport *vport, uint8_t *data,
uint16_t cmdsize;
int rc;
u32 ulp_context;
+ int err;
if (phba->sli_rev == LPFC_SLI_REV4)
cmdsize = oldiocb->wcqe_cmpl.total_data_placed;
@@ -6723,8 +6793,10 @@ lpfc_els_rsp_echo_acc(struct lpfc_vport *vport, uint8_t *data,
cmdsize = LPFC_BPL_SIZE;
elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,
ndlp->nlp_DID, ELS_CMD_ACC);
- if (!elsiocb)
- return 1;
+ if (!elsiocb) {
+ err = -ENOMEM;
+ goto err_out;
+ }
if (phba->sli_rev == LPFC_SLI_REV4) {
wqe = &elsiocb->wqe;
@@ -6760,17 +6832,26 @@ lpfc_els_rsp_echo_acc(struct lpfc_vport *vport, uint8_t *data,
elsiocb->ndlp = lpfc_nlp_get(ndlp);
if (!elsiocb->ndlp) {
lpfc_els_free_iocb(phba, elsiocb);
- return 1;
+ err = -ENODEV;
+ goto err_out;
}
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);
- return 1;
+ err = -EIO;
+ goto err_out;
}
return 0;
+
+err_out:
+ lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
+ "1029 Xmit ECHO ACC Unsuccessful: "
+ "error_code: %d S_ID: x%x\n",
+ err, vport->fc_myDID);
+ return err;
}
/**
@@ -8473,14 +8554,14 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
vport->fc_rscn_id_list[vport->fc_rscn_id_cnt++] = pcmd;
/* Indicate we are done walking fc_rscn_id_list on this vport */
vport->fc_rscn_flush = 0;
+ /* Send back ACC */
+ lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);
/*
* If we zero, cmdiocb->cmd_dmabuf, the calling routine will
* not try to free it.
*/
cmdiocb->cmd_dmabuf = NULL;
lpfc_set_disctmo(vport);
- /* Send back ACC */
- lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);
/* send RECOVERY event for ALL nodes that match RSCN payload */
lpfc_rscn_recovery_check(vport);
return lpfc_els_handle_rscn(vport);
@@ -9280,7 +9361,9 @@ lpfc_send_rrq(struct lpfc_hba *phba, struct lpfc_node_rrq *rrq)
*
* Return code
* 0 - Successfully issued ACC RPL ELS command
- * 1 - Failed to issue ACC RPL ELS command
+ * -ENOMEM - IOCB not prepped successfully
+ * -EIO - The IOCB failed to issue successfully
+ * -ENODEV - No associated node for IOCB
**/
static int
lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize,
@@ -9294,12 +9377,15 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize,
struct lpfc_iocbq *elsiocb;
uint8_t *pcmd;
u32 ulp_context;
+ int err;
elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,
ndlp->nlp_DID, ELS_CMD_ACC);
- if (!elsiocb)
- return 1;
+ if (!elsiocb) {
+ err = -ENOMEM;
+ goto err_out;
+ }
ulp_context = get_job_ulpcontext(phba, elsiocb);
if (phba->sli_rev == LPFC_SLI_REV4) {
@@ -9342,17 +9428,26 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize,
elsiocb->ndlp = lpfc_nlp_get(ndlp);
if (!elsiocb->ndlp) {
lpfc_els_free_iocb(phba, elsiocb);
- return 1;
+ err = -ENODEV;
+ goto err_out;
}
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);
- return 1;
+ err = -EIO;
+ goto err_out;
}
return 0;
+
+err_out:
+ lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
+ "1030 Xmit ELS RPL ACC Unsuccessful: "
+ "error_code: %d S_ID: x%x\n",
+ err, vport->fc_myDID);
+ return err;
}
/**
@@ -9587,7 +9682,7 @@ lpfc_els_rcv_fan(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
* @ndlp: pointer to a node-list data structure.
*
* Return code
- * 0 - Successfully processed echo iocb (currently always return 0)
+ * 0 - Successfully processed edc iocb (currently always return 0)
**/
static int
lpfc_els_rcv_edc(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
--
2.38.0
next prev parent reply other threads:[~2026-06-04 18:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-04 19:29 [PATCH 00/14] Update lpfc to revision 15.0.0.1 Justin Tee
2026-06-04 19:29 ` [PATCH 01/14] lpfc: Fix use-after-free in lpfc_cmpl_ct_cmd_vmid Justin Tee
2026-06-04 19:29 ` [PATCH 02/14] lpfc: Early return out of lpfc_els_abort when HBA_SETUP flag is not set Justin Tee
2026-06-04 19:29 ` [PATCH 03/14] lpfc: Fix kernel oops when unmapping scsi dma buffers for an aborted cmd Justin Tee
2026-06-04 19:29 ` [PATCH 04/14] lpfc: Check fc4_xpt_flags before decrementing ndlp kref on FDISC error Justin Tee
2026-06-04 19:29 ` [PATCH 05/14] lpfc: Add handling for when PLOGI or PRLI is dropped during link failure Justin Tee
2026-06-04 19:29 ` [PATCH 06/14] lpfc: Fix ndlp use-after-free during repeated RSCN and rediscovery sequence Justin Tee
2026-06-04 19:29 ` [PATCH 07/14] lpfc: Rework I/O flush ordering when unloading driver Justin Tee
2026-06-04 19:29 ` [PATCH 08/14] lpfc: Improve PLOGI retry handling for large SAN configurations Justin Tee
2026-06-04 19:29 ` [PATCH 09/14] lpfc: Send inhibited ABORT_WQE when PLOGI CQE SEQUENCE_TMO is received Justin Tee
2026-06-04 19:29 ` [PATCH 10/14] lpfc: Remove slowpath cqe process limiter in slow ring event handler Justin Tee
2026-06-04 19:29 ` [PATCH 11/14] lpfc: Put iocbq on phba->txq when ELS WQ is full or ELS SGL unavailable Justin Tee
2026-06-04 19:29 ` Justin Tee [this message]
2026-06-04 19:29 ` [PATCH 13/14] lpfc: Refactor calls on fc_disctmo to lpfc_set_disctmo in RSCN handler Justin Tee
2026-06-04 19:29 ` [PATCH 14/14] lpfc: Update lpfc version to 15.0.0.1 Justin Tee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260604192937.65605-13-justintee8345@gmail.com \
--to=justintee8345@gmail.com \
--cc=jsmart833426@gmail.com \
--cc=justin.tee@broadcom.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox