scsi: lpfc: Standardize discovery object logging format

Code inspection showed lpfc was using three different pointer formats when
logging discovery object pointers.

Standardize the pointer format to x%px.

Note: %px use is limited to discovery objects in order to aid core
analysis.

Link: https://lore.kernel.org/r/20210412013127.2387-14-jsmart2021@gmail.com
Co-developed-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 8da9e18a1fde1ef7129ee81730ab4b50fb30dab7..b9bccd8fc3558708d6dc1315f32341462cc24d17 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -777,7 +777,7 @@ lpfc_prep_node_fc4type(struct lpfc_vport *vport, uint32_t Did, uint8_t fc4_type)
 
                        lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
                                         "0239 Skip x%06x NameServer Rsp "
-                                        "Data: x%x x%x %p\n",
+                                        "Data: x%x x%x x%px\n",
                                         Did, vport->fc_flag,
                                         vport->fc_rscn_id_cnt, ndlp);
                }

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 03977a2268fecb5b0496ba0689e0e785c8ad9235..f5a898c2c9043b42300eb33bff743f912f145f53 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -102,20 +102,20 @@ lpfc_rport_invalid(struct fc_rport *rport)
 
        rdata = rport->dd_data;
        if (!rdata) {
-               pr_err("**** %s: NULL dd_data on rport %p SID x%x\n",
+               pr_err("**** %s: NULL dd_data on rport x%px SID x%x\n",
                       __func__, rport, rport->scsi_target_id);
                return -EINVAL;
        }
 
        ndlp = rdata->pnode;
        if (!rdata->pnode) {
-               pr_err("**** %s: NULL ndlp on rport %p SID x%x\n",
+               pr_err("**** %s: NULL ndlp on rport x%px SID x%x\n",
                       __func__, rport, rport->scsi_target_id);
                return -EINVAL;
        }
 
        if (!ndlp->vport) {
-               pr_err("**** %s: Null vport on ndlp %p, DID x%x rport %p "
+               pr_err("**** %s: Null vport on ndlp x%px, DID x%x rport x%px "
                       "SID x%x\n", __func__, ndlp, ndlp->nlp_DID, rport,
                       rport->scsi_target_id);
                return -EINVAL;
@@ -168,7 +168,7 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)
                ndlp->nlp_sid, ndlp->nlp_DID, ndlp->nlp_flag);
 
        lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_NODE,
-                        "3181 dev_loss_callbk x%06x, rport %p flg x%x "
+                        "3181 dev_loss_callbk x%06x, rport x%px flg x%x "
                         "load_flag x%x refcnt %d\n",
                         ndlp->nlp_DID, ndlp->rport, ndlp->nlp_flag,
                         vport->load_flag, kref_read(&ndlp->kref));
@@ -6168,7 +6168,7 @@ lpfc_nlp_release(struct kref *kref)
                ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_type);
 
        lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
-                       "0279 %s: ndlp:%p did %x refcnt:%d rpi:%x\n",
+                        "0279 %s: ndlp: x%px did %x refcnt:%d rpi:%x\n",
                         __func__, ndlp, ndlp->nlp_DID,
                         kref_read(&ndlp->kref), ndlp->nlp_rpi);
 

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index c80fd7d49f6e67b59d1397803cd5b895010b9cf1..1e4c792bb660e45458d249aeac39a143fffb4cf9 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -3552,7 +3552,7 @@ lpfc_offline_prep(struct lpfc_hba *phba, int mbx_action)
                                        lpfc_printf_vlog(vports[i], KERN_INFO,
                                                 LOG_NODE | LOG_DISCOVERY,
                                                 "0011 Free RPI x%x on "
-                                                "ndlp: %p did x%x\n",
+                                                "ndlp: x%px did x%x\n",
                                                 ndlp->nlp_rpi, ndlp,
                                                 ndlp->nlp_DID);
                                        lpfc_sli4_free_rpi(phba, ndlp->nlp_rpi);

diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index 4d78eadb65c0a2006fd9884ae7bb32117ab8875d..41e49f61fac2c2b9f1b6ed6cc26b4d478e58aee6 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@ -190,14 +190,14 @@ lpfc_nvme_remoteport_delete(struct nvme_fc_remote_port *remoteport)
 
        ndlp = rport->ndlp;
        if (!ndlp) {
-               pr_err("**** %s: NULL ndlp on rport %p remoteport %p\n",
+               pr_err("**** %s: NULL ndlp on rport x%px remoteport x%px\n",
                       __func__, rport, remoteport);
                goto rport_err;
        }
 
        vport = ndlp->vport;
        if (!vport) {
-               pr_err("**** %s: Null vport on ndlp %p, ste x%x rport %p\n",
+               pr_err("**** %s: Null vport on ndlp x%px, ste x%x rport x%px\n",
                       __func__, ndlp, ndlp->nlp_state, rport);
                goto rport_err;
        }
@@ -209,7 +209,7 @@ lpfc_nvme_remoteport_delete(struct nvme_fc_remote_port *remoteport)
         * calling state machine to remove the node.
         */
        lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC,
-                       "6146 remoteport delete of remoteport %p\n",
+                       "6146 remoteport delete of remoteport x%px\n",
                        remoteport);
        spin_lock_irq(&ndlp->lock);
 
@@ -317,7 +317,7 @@ __lpfc_nvme_ls_req_cmp(struct lpfc_hba *phba,  struct lpfc_vport *vport,
        status = bf_get(lpfc_wcqe_c_status, wcqe) & LPFC_IOCB_STATUS_MASK;
 
        lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC,
-                        "6047 NVMEx LS REQ %px cmpl DID %x Xri: %x "
+                        "6047 NVMEx LS REQ x%px cmpl DID %x Xri: %x "
                         "status %x reason x%x cmd:x%px lsreg:x%px bmp:x%px "
                         "ndlp:x%px\n",
                         pnvme_lsreq, ndlp ? ndlp->nlp_DID : 0,
@@ -339,7 +339,7 @@ __lpfc_nvme_ls_req_cmp(struct lpfc_hba *phba,  struct lpfc_vport *vport,
        else
                lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
                                 "6046 NVMEx cmpl without done call back? "
-                                "Data %px DID %x Xri: %x status %x\n",
+                                "Data x%px DID %x Xri: %x status %x\n",
                                pnvme_lsreq, ndlp ? ndlp->nlp_DID : 0,
                                cmdwqe->sli4_xritag, status);
        if (ndlp) {
@@ -707,7 +707,7 @@ __lpfc_nvme_ls_abort(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
 
        lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC | LOG_NVME_ABTS,
                         "6040 NVMEx LS REQ Abort: Issue LS_ABORT for lsreq "
-                        "x%p rqstlen:%d rsplen:%d %pad %pad\n",
+                        "x%px rqstlen:%d rsplen:%d %pad %pad\n",
                         pnvme_lsreq, pnvme_lsreq->rqstlen,
                         pnvme_lsreq->rsplen, &pnvme_lsreq->rqstdma,
                         &pnvme_lsreq->rspdma);
@@ -736,7 +736,7 @@ __lpfc_nvme_ls_abort(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                return 0;
 
        lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC | LOG_NVME_ABTS,
-                        "6213 NVMEx LS REQ Abort: Unable to locate req x%p\n",
+                        "6213 NVMEx LS REQ Abort: Unable to locate req x%px\n",
                         pnvme_lsreq);
        return -EINVAL;
 }
@@ -1839,7 +1839,7 @@ lpfc_nvme_fcp_abort(struct nvme_fc_local_port *pnvme_lport,
                lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
                                 "6144 Outstanding NVME I/O Abort Request "
                                 "still pending on nvme_fcreq x%px, "
-                                "lpfc_ncmd %px xri x%x\n",
+                                "lpfc_ncmd x%px xri x%x\n",
                                 pnvme_fcreq, lpfc_nbuf,
                                 nvmereq_wqe->sli4_xritag);
                goto out_unlock;

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 85f6a066de5a8acb5b9da8496938f51f5396a300..eefbb9b2279848589b672df3c4280a89c944518a 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -4292,7 +4292,7 @@ lpfc_fcp_io_cmd_wqe_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn,
                u32 *lp = (u32 *)cmd->sense_buffer;
 
                lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP,
-                                "9039 Iodone <%d/%llu> cmd x%p, error "
+                                "9039 Iodone <%d/%llu> cmd x%px, error "
                                 "x%x SNS x%x x%x Data: x%x x%x\n",
                                 cmd->device->id, cmd->device->lun, cmd,
                                 cmd->result, *lp, *(lp + 3), cmd->retries,

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 11145a78dbe9dc79df68fb8117870dd1aae8e4f1..06ccc0157bd88697795ead959299b5175b88a2fc 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -2656,7 +2656,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 %px x%x x%x\n",
+                               "on NPort x%x Data: x%x x%x x%px x%x x%x\n",
                                ndlp->nlp_rpi, ndlp->nlp_DID,
                                ndlp->nlp_flag, ndlp->nlp_defer_did,
                                ndlp, vport->load_flag, kref_read(&ndlp->kref));
@@ -2721,7 +2721,7 @@ lpfc_sli4_unreg_rpi_cmpl_clr(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                                         vport, KERN_INFO, LOG_MBOX | LOG_SLI,
                                         "0010 UNREG_LOGIN vpi:%x "
                                         "rpi:%x DID:%x defer x%x flg x%x "
-                                        "%px\n",
+                                        "x%px\n",
                                         vport->vpi, ndlp->nlp_rpi,
                                         ndlp->nlp_DID, ndlp->nlp_defer_did,
                                         ndlp->nlp_flag,
@@ -3023,7 +3023,7 @@ lpfc_nvme_unsol_ls_handler(struct lpfc_hba *phba, struct lpfc_iocbq *piocb)
                                goto out_fail;
 
                        lpfc_printf_log(phba, KERN_ERR, LOG_NODE,
-                                       "6206 NVMET unsol ls_req ndlp %p "
+                                       "6206 NVMET unsol ls_req ndlp x%px "
                                        "DID x%x xflags x%x refcnt %d\n",
                                        ndlp, ndlp->nlp_DID,
                                        ndlp->fc4_xpt_flags,