lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 324/475] scsi: qla2xxx: Fix missed DMA unmap for NVMe ls requests
    Date
    From: Arun Easi <aeasi@marvell.com>

    commit c85ab7d9e27a80e48d5b7d7fb2fe2b0fdb2de523 upstream.

    At NVMe ELS request time, request structure is DMA mapped and never
    unmapped. Fix this by calling the unmap on ELS completion.

    Link: https://lore.kernel.org/r/20220310092604.22950-5-njavali@marvell.com
    Fixes: e84067d74301 ("scsi: qla2xxx: Add FC-NVMe F/W initialization and transport registration")
    Cc: stable@vger.kernel.org
    Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
    Signed-off-by: Arun Easi <aeasi@marvell.com>
    Signed-off-by: Nilesh Javali <njavali@marvell.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/scsi/qla2xxx/qla_nvme.c | 17 +++++++++++++++++
    1 file changed, 17 insertions(+)

    --- a/drivers/scsi/qla2xxx/qla_nvme.c
    +++ b/drivers/scsi/qla2xxx/qla_nvme.c
    @@ -157,6 +157,18 @@ out:
    qla2xxx_rel_qpair_sp(sp->qpair, sp);
    }

    +static void qla_nvme_ls_unmap(struct srb *sp, struct nvmefc_ls_req *fd)
    +{
    + if (sp->flags & SRB_DMA_VALID) {
    + struct srb_iocb *nvme = &sp->u.iocb_cmd;
    + struct qla_hw_data *ha = sp->fcport->vha->hw;
    +
    + dma_unmap_single(&ha->pdev->dev, nvme->u.nvme.cmd_dma,
    + fd->rqstlen, DMA_TO_DEVICE);
    + sp->flags &= ~SRB_DMA_VALID;
    + }
    +}
    +
    static void qla_nvme_release_ls_cmd_kref(struct kref *kref)
    {
    struct srb *sp = container_of(kref, struct srb, cmd_kref);
    @@ -173,6 +185,8 @@ static void qla_nvme_release_ls_cmd_kref
    spin_unlock_irqrestore(&priv->cmd_lock, flags);

    fd = priv->fd;
    +
    + qla_nvme_ls_unmap(sp, fd);
    fd->done(fd, priv->comp_status);
    out:
    qla2x00_rel_sp(sp);
    @@ -319,6 +333,8 @@ static int qla_nvme_ls_req(struct nvme_f
    dma_sync_single_for_device(&ha->pdev->dev, nvme->u.nvme.cmd_dma,
    fd->rqstlen, DMA_TO_DEVICE);

    + sp->flags |= SRB_DMA_VALID;
    +
    rval = qla2x00_start_sp(sp);
    if (rval != QLA_SUCCESS) {
    ql_log(ql_log_warn, vha, 0x700e,
    @@ -326,6 +342,7 @@ static int qla_nvme_ls_req(struct nvme_f
    wake_up(&sp->nvme_ls_waitq);
    sp->priv = NULL;
    priv->sp = NULL;
    + qla_nvme_ls_unmap(sp, fd);
    qla2x00_rel_sp(sp);
    return rval;
    }

    \
     
     \ /
      Last update: 2022-04-14 17:10    [W:4.063 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site