Commit a0750fae authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

blk-mq-dma: always initialize dma state 



Ensure the dma state is initialized when we're not using the contiguous
iova, otherwise the caller may be using a stale state from a previous
request that could use the coalesed iova allocation.

Fixes: 2f6b2565 ("block: accumulate memory segment gaps per bio")
Reported-by: default avatarSebastian Ott <sebott@redhat.com>
Tested-by: default avatarSebastian Ott <sebott@redhat.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f22ecf9c

block/blk-mq-dma.c

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ static bool blk_dma_map_iter_start(struct request *req, struct device *dma_dev, 
	if (blk_can_dma_map_iova(req, dma_dev) &&

	    dma_iova_try_alloc(dma_dev, state, vec.paddr, total_len))

		return blk_rq_dma_map_iova(req, dma_dev, state, iter, &vec);

	memset(state, 0, sizeof(*state));

	return blk_dma_map_direct(req, dma_dev, iter, &vec);

}