> On May 10, 2022, at 1:00 PM, James Smart <jsmart2021@xxxxxxxxx> wrote:
>
> Modify the nvme io path to look for vmid support and call the
> transport to obtain the io's appid value.
>
> Signed-off-by: Gaurav Srivastava <gaurav.srivastava@xxxxxxxxxxxx>
> Signed-off-by: James Smart <jsmart2021@xxxxxxxxx>
> ---
> drivers/scsi/lpfc/lpfc_nvme.c | 45 +++++++++++++++++++++++++++++++++++
> 1 file changed, 45 insertions(+)
>
> diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
> index 5385f4de5523..335e90633933 100644
> --- a/drivers/scsi/lpfc/lpfc_nvme.c
> +++ b/drivers/scsi/lpfc/lpfc_nvme.c
> @@ -1279,6 +1279,19 @@ lpfc_nvme_prep_io_cmd(struct lpfc_vport *vport,
>
> /* Words 13 14 15 are for PBDE support */
>
> + /* add the VMID tags as per switch response */
> + if (unlikely(lpfc_ncmd->cur_iocbq.cmd_flag & LPFC_IO_VMID)) {
> + if (phba->pport->vmid_priority_tagging) {
> + bf_set(wqe_ccpe, &wqe->fcp_iwrite.wqe_com, 1);
> + bf_set(wqe_ccp, &wqe->fcp_iwrite.wqe_com,
> + lpfc_ncmd->cur_iocbq.vmid_tag.cs_ctl_vmid);
> + } else {
> + bf_set(wqe_appid, &wqe->fcp_iwrite.wqe_com, 1);
> + bf_set(wqe_wqes, &wqe->fcp_iwrite.wqe_com, 1);
> + wqe->words[31] = lpfc_ncmd->cur_iocbq.vmid_tag.app_id;
> + }
> + }
> +
> pwqeq->vport = vport;
> return 0;
> }
> @@ -1504,6 +1517,11 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,
> struct lpfc_nvme_fcpreq_priv *freqpriv;
> struct nvme_common_command *sqe;
> uint64_t start = 0;
> +#if (IS_ENABLED(CONFIG_NVME_FC))
> + u8 *uuid = NULL;
> + int err;
> + enum dma_data_direction iodir;
> +#endif
>
> /* Validate pointers. LLDD fault handling with transport does
> * have timing races.
> @@ -1662,6 +1680,33 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,
> lpfc_ncmd->ndlp = ndlp;
> lpfc_ncmd->qidx = lpfc_queue_info->qidx;
>
> +#if (IS_ENABLED(CONFIG_NVME_FC))
> + /* check the necessary and sufficient condition to support VMID */
> + if (lpfc_is_vmid_enabled(phba) &&
> + (ndlp->vmid_support ||
> + phba->pport->vmid_priority_tagging ==
> + LPFC_VMID_PRIO_TAG_ALL_TARGETS)) {
> + /* is the I/O generated by a VM, get the associated virtual */
> + /* entity id */
> + uuid = nvme_fc_io_getuuid(pnvme_fcreq);
> +
> + if (uuid) {
> + if (pnvme_fcreq->io_dir == NVMEFC_FCP_WRITE)
> + iodir = DMA_TO_DEVICE;
> + else if (pnvme_fcreq->io_dir == NVMEFC_FCP_READ)
> + iodir = DMA_FROM_DEVICE;
> + else
> + iodir = DMA_NONE;
> +
> + err = lpfc_vmid_get_appid(vport, uuid, iodir,
> + (union lpfc_vmid_io_tag *)
> + &lpfc_ncmd->cur_iocbq.vmid_tag);
> + if (!err)
> + lpfc_ncmd->cur_iocbq.cmd_flag |= LPFC_IO_VMID;
> + }
> + }
> +#endif
> +
> /*
> * Issue the IO on the WQ indicated by index in the hw_queue_handle.
> * This identfier was create in our hardware queue create callback
> --
> 2.26.2
>
Reviewed-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
--
Himanshu Madhani Oracle Linux Engineering
