Commit 34e08191 authored Feb 20, 2019 by Chaitanya Kulkarni Committed by Christoph Hellwig Feb 21, 2019

nvme-rdma: use nr_phys_segments when map rq to sgl



Use blk_rq_nr_phys_segments() instead of blk_rq_payload_bytes() to check
if a command contains data to be mapped.  This fixes the case where
a struct request contains LBAs, but it has no payload, such as
Write Zeroes support.

Fixes: 6e02318e ("nvme: add support for the Write Zeroes command")
Reported-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Tested-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent 77141dc6

drivers/nvme/host/rdma.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1142,7 +1142,7 @@ static void nvme_rdma_unmap_data(struct nvme_rdma_queue *queue,
		struct nvme_rdma_device *dev = queue->device;
		struct ib_device *ibdev = dev->dev;

		if (!blk_rq_payload_bytes(rq))
		if (!blk_rq_nr_phys_segments(rq))
		return;

		if (req->mr) {
		@@ -1265,7 +1265,7 @@ static int nvme_rdma_map_data(struct nvme_rdma_queue *queue,

		c->common.flags \|= NVME_CMD_SGL_METABUF;

		if (!blk_rq_payload_bytes(rq))
		if (!blk_rq_nr_phys_segments(rq))
		return nvme_rdma_set_sg_null(c);

		req->sg_table.sgl = req->first_sgl;

Admin message