Commit 12b2aaad authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

nvme-rdma: fix in-casule data send for chained sgls 



We have only 2 inline sg entries and we allow 4 sg entries for the send
wr sge. Larger sgls entries will be chained. However when we build
in-capsule send wr sge, we iterate without taking into account that the
sgl may be chained and still fit in-capsule (which can happen if the sgl
is bigger than 2, but lower-equal to 4).

Fix in-capsule data mapping to correctly iterate chained sgls.

Fixes: 38e18002 ("nvme-rdma: Avoid preallocating big SGL for data")
Reported-by: default avatarWalker, Benjamin <benjamin.walker@intel.com>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarMax Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent a4b58f17

drivers/nvme/host/rdma.c

+3 −2
Original line number Diff line number Diff line
@@ -1320,16 +1320,17 @@ static int nvme_rdma_map_sg_inline(struct nvme_rdma_queue *queue, 
		int count)

{

	struct nvme_sgl_desc *sg = &c->common.dptr.sgl;

	struct scatterlist *sgl = req->data_sgl.sg_table.sgl;

	struct ib_sge *sge = &req->sge[1];

	struct scatterlist *sgl;

	u32 len = 0;

	int i;



	for (i = 0; i < count; i++, sgl++, sge++) {

	for_each_sg(req->data_sgl.sg_table.sgl, sgl, count, i) {

		sge->addr = sg_dma_address(sgl);

		sge->length = sg_dma_len(sgl);

		sge->lkey = queue->device->pd->local_dma_lkey;

		len += sge->length;

		sge++;

	}



	sg->addr = cpu_to_le64(queue->ctrl->ctrl.icdoff);