lkml.org 
[lkml]   [2018]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH v4 13/14] nvmet-rdma: Use new SGL alloc/free helper for requests
    Use the new helpers introduced in the previous patch to allocate
    the SGLs for the request.

    Seeing we use req.transfer_len as the length of the SGL it is
    set earlier and cleared on any error. It also seems to be unnecessary
    to accumulate the length as the map_sgl functions should only ever
    be called once.

    Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Sagi Grimberg <sagi@grimberg.me>
    ---
    drivers/nvme/target/rdma.c | 20 ++++++++++++--------
    1 file changed, 12 insertions(+), 8 deletions(-)

    diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
    index 52e0c5d579a7..f7a3459d618f 100644
    --- a/drivers/nvme/target/rdma.c
    +++ b/drivers/nvme/target/rdma.c
    @@ -430,7 +430,7 @@ static void nvmet_rdma_release_rsp(struct nvmet_rdma_rsp *rsp)
    }

    if (rsp->req.sg != &rsp->cmd->inline_sg)
    - sgl_free(rsp->req.sg);
    + nvmet_req_free_sgl(&rsp->req);

    if (unlikely(!list_empty_careful(&queue->rsp_wr_wait_list)))
    nvmet_rdma_process_wr_wait_list(queue);
    @@ -564,24 +564,24 @@ static u16 nvmet_rdma_map_sgl_keyed(struct nvmet_rdma_rsp *rsp,
    {
    struct rdma_cm_id *cm_id = rsp->queue->cm_id;
    u64 addr = le64_to_cpu(sgl->addr);
    - u32 len = get_unaligned_le24(sgl->length);
    u32 key = get_unaligned_le32(sgl->key);
    int ret;

    + rsp->req.transfer_len = get_unaligned_le24(sgl->length);
    +
    /* no data command? */
    - if (!len)
    + if (!rsp->req.transfer_len)
    return 0;

    - rsp->req.sg = sgl_alloc(len, GFP_KERNEL, &rsp->req.sg_cnt);
    - if (!rsp->req.sg)
    - return NVME_SC_INTERNAL;
    + ret = nvmet_req_alloc_sgl(&rsp->req, &rsp->queue->nvme_sq);
    + if (ret < 0)
    + goto error_out;

    ret = rdma_rw_ctx_init(&rsp->rw, cm_id->qp, cm_id->port_num,
    rsp->req.sg, rsp->req.sg_cnt, 0, addr, key,
    nvmet_data_dir(&rsp->req));
    if (ret < 0)
    - return NVME_SC_INTERNAL;
    - rsp->req.transfer_len += len;
    + goto error_out;
    rsp->n_rdma += ret;

    if (invalidate) {
    @@ -590,6 +590,10 @@ static u16 nvmet_rdma_map_sgl_keyed(struct nvmet_rdma_rsp *rsp,
    }

    return 0;
    +
    +error_out:
    + rsp->req.transfer_len = 0;
    + return NVME_SC_INTERNAL;
    }

    static u16 nvmet_rdma_map_sgl(struct nvmet_rdma_rsp *rsp)
    --
    2.11.0
    \
     
     \ /
      Last update: 2018-04-24 01:35    [W:3.398 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site