Re: [PATCH 29/29] lpfc: nvmet: Add Send LS Request and Abort LS Request support

[Hannes Reinecke <hare@suse.de>]

On 2/5/20 7:37 PM, James Smart wrote:
> Now that common helpers exist, add the ability to Send an NVME LS Request
> and to Abort an outstanding LS Request to the nvmet side of the driver.
> 
> Signed-off-by: Paul Ely <paul.ely@broadcom.com>
> Signed-off-by: James Smart <jsmart2021@gmail.com>
> ---
>  drivers/scsi/lpfc/lpfc_nvme.h  |   8 +++
>  drivers/scsi/lpfc/lpfc_nvmet.c | 128 +++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 136 insertions(+)
> 
> diff --git a/drivers/scsi/lpfc/lpfc_nvme.h b/drivers/scsi/lpfc/lpfc_nvme.h
> index b3c439a91482..60f9e87b3b1c 100644
> --- a/drivers/scsi/lpfc/lpfc_nvme.h
> +++ b/drivers/scsi/lpfc/lpfc_nvme.h
> @@ -166,6 +166,14 @@ struct lpfc_nvmet_tgtport {
>  	atomic_t defer_ctx;
>  	atomic_t defer_fod;
>  	atomic_t defer_wqfull;
> +
> +	/* Stats counters - ls_reqs, ls_aborts, host_invalidate */
> +	atomic_t xmt_ls_reqs;
> +	atomic_t xmt_ls_cmpls;
> +	atomic_t xmt_ls_err;
> +	atomic_t cmpl_ls_err;
> +	atomic_t cmpl_ls_xb;
> +	atomic_t cmpl_ls_reqs;
>  };
>  
>  struct lpfc_nvmet_ctx_info {
> diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c
> index df0378fd4b59..1182412573c3 100644
> --- a/drivers/scsi/lpfc/lpfc_nvmet.c
> +++ b/drivers/scsi/lpfc/lpfc_nvmet.c
> @@ -1283,6 +1283,122 @@ lpfc_nvmet_defer_rcv(struct nvmet_fc_target_port *tgtport,
>  	spin_unlock_irqrestore(&ctxp->ctxlock, iflag);
>  }
>  
> +/**
> + * lpfc_nvmet_ls_req_cmp - completion handler for a nvme ls request
> + * @phba: Pointer to HBA context object
> + * @cmdwqe: Pointer to driver command WQE object.
> + * @wcqe: Pointer to driver response CQE object.
> + *
> + * This function is the completion handler for NVME LS requests.
> + * The function updates any states and statistics, then calls the
> + * generic completion handler to finish completion of the request.
> + **/
> +static void
> +lpfc_nvmet_ls_req_cmp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdwqe,
> +		       struct lpfc_wcqe_complete *wcqe)
> +{
> +	struct lpfc_vport *vport = cmdwqe->vport;
> +	uint32_t status;
> +	struct lpfc_nvmet_tgtport *tgtp;
> +
> +	status = bf_get(lpfc_wcqe_c_status, wcqe) & LPFC_IOCB_STATUS_MASK;
> +
> +	if (!phba->targetport)
> +		goto finish;
> +
> +	tgtp = phba->targetport->private;
> +	if (tgtp) {
> +		atomic_inc(&tgtp->cmpl_ls_reqs);
> +		if (status) {
> +			if (bf_get(lpfc_wcqe_c_xb, wcqe))
> +				atomic_inc(&tgtp->cmpl_ls_xb);
> +			atomic_inc(&tgtp->cmpl_ls_err);
> +		}
> +	}
> +
> +finish:
> +	__lpfc_nvme_ls_req_cmp(phba, vport, cmdwqe, wcqe);
> +}
> +
> +/**
> + * lpfc_nvmet_ls_req - Issue an Link Service request
> + * @targetport - pointer to target instance registered with nvmet transport.
> + * @hosthandle - hosthandle set by the driver in a prior ls_rqst_rcv.
> + *               Driver sets this value to the ndlp pointer.
> + * @pnvme_lsreq - the transport nvme_ls_req structure for the LS
> + *
> + * Driver registers this routine to handle any link service request
> + * from the nvme_fc transport to a remote nvme-aware port.
> + *
> + * Return value :
> + *   0 - Success
> + *   non-zero: various error codes, in form of -Exxx
> + **/
> +static int
> +lpfc_nvmet_ls_req(struct nvmet_fc_target_port *targetport,
> +		  void *hosthandle,
> +		  struct nvmefc_ls_req *pnvme_lsreq)
> +{
> +	struct lpfc_nvmet_tgtport *lpfc_nvmet = targetport->private;
> +	struct lpfc_hba *phba;
> +	struct lpfc_nodelist *ndlp;
> +	int ret;
> +	u32 hstate;
> +
> +	if (!lpfc_nvmet)
> +		return -EINVAL;
> +
> +	phba = lpfc_nvmet->phba;
> +	if (phba->pport->load_flag & FC_UNLOADING)
> +		return -EINVAL;
> +
> +	hstate = atomic_read(&lpfc_nvmet->state);
> +	if (hstate == LPFC_NVMET_INV_HOST_ACTIVE)
> +		return -EACCES;
> +
> +	ndlp = (struct lpfc_nodelist *)hosthandle;
> +
> +	atomic_inc(&lpfc_nvmet->xmt_ls_reqs);
> +
> +	ret = __lpfc_nvme_ls_req(phba->pport, ndlp, pnvme_lsreq,
> +				 lpfc_nvmet_ls_req_cmp);
> +	if (ret)
> +		atomic_inc(&lpfc_nvmet->xmt_ls_err);
> +
> +	return ret;
> +}
> +
> +/**
> + * lpfc_nvmet_ls_abort - Abort a prior NVME LS request
> + * @targetport: Transport targetport, that LS was issued from.
> + * @hosthandle - hosthandle set by the driver in a prior ls_rqst_rcv.
> + *               Driver sets this value to the ndlp pointer.
> + * @pnvme_lsreq - the transport nvme_ls_req structure for LS to be aborted
> + *
> + * Driver registers this routine to abort an NVME LS request that is
> + * in progress (from the transports perspective).
> + **/
> +static void
> +lpfc_nvmet_ls_abort(struct nvmet_fc_target_port *targetport,
> +		    void *hosthandle,
> +		    struct nvmefc_ls_req *pnvme_lsreq)
> +{
> +	struct lpfc_nvmet_tgtport *lpfc_nvmet = targetport->private;
> +	struct lpfc_hba *phba;
> +	struct lpfc_nodelist *ndlp;
> +	int ret;
> +
> +	phba = lpfc_nvmet->phba;
> +	if (phba->pport->load_flag & FC_UNLOADING)
> +		return;
> +
> +	ndlp = (struct lpfc_nodelist *)hosthandle;
> +
> +	ret = __lpfc_nvme_ls_abort(phba->pport, ndlp, pnvme_lsreq);
> +	if (!ret)
> +		atomic_inc(&lpfc_nvmet->xmt_ls_abort);
> +}
> +
>  static void
>  lpfc_nvmet_host_release(void *hosthandle)
>  {
> @@ -1325,6 +1441,8 @@ static struct nvmet_fc_target_template lpfc_tgttemplate = {
>  	.fcp_req_release = lpfc_nvmet_xmt_fcp_release,
>  	.defer_rcv	= lpfc_nvmet_defer_rcv,
>  	.discovery_event = lpfc_nvmet_discovery_event,
> +	.ls_req         = lpfc_nvmet_ls_req,
> +	.ls_abort       = lpfc_nvmet_ls_abort,
>  	.host_release   = lpfc_nvmet_host_release,
>  
>  	.max_hw_queues  = 1,
> @@ -1336,6 +1454,7 @@ static struct nvmet_fc_target_template lpfc_tgttemplate = {
>  	.target_features = 0,
>  	/* sizes of additional private data for data structures */
>  	.target_priv_sz = sizeof(struct lpfc_nvmet_tgtport),
> +	.lsrqst_priv_sz = 0,
>  };
>  
>  static void
> @@ -1638,6 +1757,9 @@ lpfc_nvmet_create_targetport(struct lpfc_hba *phba)
>  		atomic_set(&tgtp->xmt_fcp_xri_abort_cqe, 0);
>  		atomic_set(&tgtp->xmt_fcp_abort, 0);
>  		atomic_set(&tgtp->xmt_fcp_abort_cmpl, 0);
> +		atomic_set(&tgtp->xmt_ls_reqs, 0);
> +		atomic_set(&tgtp->xmt_ls_cmpls, 0);
> +		atomic_set(&tgtp->xmt_ls_err, 0);
>  		atomic_set(&tgtp->xmt_abort_unsol, 0);
>  		atomic_set(&tgtp->xmt_abort_sol, 0);
>  		atomic_set(&tgtp->xmt_abort_rsp, 0);
> @@ -1645,6 +1767,12 @@ lpfc_nvmet_create_targetport(struct lpfc_hba *phba)
>  		atomic_set(&tgtp->defer_ctx, 0);
>  		atomic_set(&tgtp->defer_fod, 0);
>  		atomic_set(&tgtp->defer_wqfull, 0);
> +		atomic_set(&tgtp->xmt_ls_reqs, 0);
> +		atomic_set(&tgtp->xmt_ls_cmpls, 0);
> +		atomic_set(&tgtp->xmt_ls_err, 0);
> +		atomic_set(&tgtp->cmpl_ls_err, 0);
> +		atomic_set(&tgtp->cmpl_ls_xb, 0);
> +		atomic_set(&tgtp->cmpl_ls_reqs, 0);
>  	}
>  	return error;
>  }
> 
Same story: any ideas of making this conditional to allow for enabling
statistics separately?

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		           Kernel Storage Architect
hare@suse.de			                  +49 911 74053 688
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), GF: Felix Imendörffer

_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme