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: 2f6b2565d4 ("block: accumulate memory segment gaps per bio")
Reported-by: Sebastian Ott <sebott@redhat.com>
Tested-by: Sebastian Ott <sebott@redhat.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1354/merge
parent
f22ecf9c14
commit
a0750fae73
|
|
@ -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) &&
|
if (blk_can_dma_map_iova(req, dma_dev) &&
|
||||||
dma_iova_try_alloc(dma_dev, state, vec.paddr, total_len))
|
dma_iova_try_alloc(dma_dev, state, vec.paddr, total_len))
|
||||||
return blk_rq_dma_map_iova(req, dma_dev, state, iter, &vec);
|
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);
|
return blk_dma_map_direct(req, dma_dev, iter, &vec);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue