Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b05e9fe authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: cleanup: remove nrport from nvme command structure 



An hba-wide lock is taken in the nvme io completion routine. The lock
covers null'ing of the nrport pointer in the cmd structure.

The nrport member isn't necessary. After extracting the pointer from the
command, the pointer was dereferenced to get the fc discovery node
pointer. But the fc discovery node pointer is alrady in the command
structure so the dereferrence was unnecessary.

Eliminated the nrport structure member and its use, which also eliminates
the port-wide lock.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b8837a0f

drivers/scsi/lpfc/lpfc_nvme.c

+7 −23
Original line number Diff line number Diff line
@@ -961,18 +961,16 @@ lpfc_nvme_io_cmd_wqe_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn, 
	struct nvmefc_fcp_req *nCmd;

	struct nvme_fc_ersp_iu *ep;

	struct nvme_fc_cmd_iu *cp;

	struct lpfc_nvme_rport *rport;

	struct lpfc_nodelist *ndlp;

	struct lpfc_nvme_fcpreq_priv *freqpriv;

	struct lpfc_nvme_lport *lport;

	struct lpfc_nvme_ctrl_stat *cstat;

	unsigned long flags;

	uint32_t code, status, idx;

	uint16_t cid, sqhd, data;

	uint32_t *ptr;



	/* Sanity check on return of outstanding command */

	if (!lpfc_ncmd || !lpfc_ncmd->nvmeCmd || !lpfc_ncmd->nrport) {

	if (!lpfc_ncmd || !lpfc_ncmd->nvmeCmd) {

		if (!lpfc_ncmd) {

			lpfc_printf_vlog(vport, KERN_ERR,

					 LOG_NODE | LOG_NVME_IOERR,
@@ -983,16 +981,14 @@ lpfc_nvme_io_cmd_wqe_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn, 


		lpfc_printf_vlog(vport, KERN_ERR, LOG_NODE | LOG_NVME_IOERR,

				 "6066 Missing cmpl ptrs: lpfc_ncmd %p, "

				 "nvmeCmd %p nrport %p\n",

				 lpfc_ncmd, lpfc_ncmd->nvmeCmd,

				 lpfc_ncmd->nrport);

				 "nvmeCmd %p\n",

				 lpfc_ncmd, lpfc_ncmd->nvmeCmd);



		/* Release the lpfc_ncmd regardless of the missing elements. */

		lpfc_release_nvme_buf(phba, lpfc_ncmd);

		return;

	}

	nCmd = lpfc_ncmd->nvmeCmd;

	rport = lpfc_ncmd->nrport;

	status = bf_get(lpfc_wcqe_c_status, wcqe);



	if (vport->localport) {
@@ -1016,19 +1012,12 @@ lpfc_nvme_io_cmd_wqe_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn, 
	 * Catch race where our node has transitioned, but the

	 * transport is still transitioning.

	 */

	ndlp = rport->ndlp;

	ndlp = lpfc_ncmd->ndlp;

	if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) {

		lpfc_printf_vlog(vport, KERN_ERR, LOG_NODE | LOG_NVME_IOERR,

				 "6061 rport %p,  DID x%06x node not ready.\n",

				 rport, rport->remoteport->port_id);



		ndlp = lpfc_findnode_did(vport, rport->remoteport->port_id);

		if (!ndlp) {

		lpfc_printf_vlog(vport, KERN_ERR, LOG_NVME_IOERR,

				 "6062 Ignoring NVME cmpl.  No ndlp\n");

		goto out_err;

	}

	}



	code = bf_get(lpfc_wcqe_c_code, wcqe);

	if (code == CQE_CODE_NVME_ERSP) {
@@ -1168,10 +1157,6 @@ lpfc_nvme_io_cmd_wqe_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn, 
		lpfc_ncmd->nvmeCmd = NULL;

	}



	spin_lock_irqsave(&phba->hbalock, flags);

	lpfc_ncmd->nrport = NULL;

	spin_unlock_irqrestore(&phba->hbalock, flags);



	/* Call release with XB=1 to queue the IO into the abort list. */

	lpfc_release_nvme_buf(phba, lpfc_ncmd);

}
@@ -1585,7 +1570,6 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport, 
	 */

	freqpriv->nvme_buf = lpfc_ncmd;

	lpfc_ncmd->nvmeCmd = pnvme_fcreq;

	lpfc_ncmd->nrport = rport;

	lpfc_ncmd->ndlp = ndlp;

	lpfc_ncmd->start_time = jiffies;

drivers/scsi/lpfc/lpfc_nvme.h

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ struct lpfc_nvme_rport { 
struct lpfc_nvme_buf {

	struct list_head list;

	struct nvmefc_fcp_req *nvmeCmd;

	struct lpfc_nvme_rport *nrport;

	struct lpfc_nodelist *ndlp;



	uint32_t timeout;