Commit d7344a2f authored by Xuan Zhuo's avatar Xuan Zhuo Committed by Michael S. Tsirkin

virtio_ring: support add premapped buf

If the vq is the premapped mode, use the sg_dma_address() directly.
Signed-off-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Message-Id: <20230810123057.43407-5-xuanzhuo@linux.alibaba.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 8daafe9e
...@@ -361,6 +361,11 @@ static struct device *vring_dma_dev(const struct vring_virtqueue *vq) ...@@ -361,6 +361,11 @@ static struct device *vring_dma_dev(const struct vring_virtqueue *vq)
static int vring_map_one_sg(const struct vring_virtqueue *vq, struct scatterlist *sg, static int vring_map_one_sg(const struct vring_virtqueue *vq, struct scatterlist *sg,
enum dma_data_direction direction, dma_addr_t *addr) enum dma_data_direction direction, dma_addr_t *addr)
{ {
if (vq->premapped) {
*addr = sg_dma_address(sg);
return 0;
}
if (!vq->use_dma_api) { if (!vq->use_dma_api) {
/* /*
* If DMA is not used, KMSAN doesn't know that the scatterlist * If DMA is not used, KMSAN doesn't know that the scatterlist
...@@ -639,8 +644,12 @@ static inline int virtqueue_add_split(struct virtqueue *_vq, ...@@ -639,8 +644,12 @@ static inline int virtqueue_add_split(struct virtqueue *_vq,
dma_addr_t addr = vring_map_single( dma_addr_t addr = vring_map_single(
vq, desc, total_sg * sizeof(struct vring_desc), vq, desc, total_sg * sizeof(struct vring_desc),
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (vring_mapping_error(vq, addr)) if (vring_mapping_error(vq, addr)) {
if (vq->premapped)
goto free_indirect;
goto unmap_release; goto unmap_release;
}
virtqueue_add_desc_split(_vq, vq->split.vring.desc, virtqueue_add_desc_split(_vq, vq->split.vring.desc,
head, addr, head, addr,
...@@ -706,6 +715,7 @@ static inline int virtqueue_add_split(struct virtqueue *_vq, ...@@ -706,6 +715,7 @@ static inline int virtqueue_add_split(struct virtqueue *_vq,
i = vring_unmap_one_split(vq, i); i = vring_unmap_one_split(vq, i);
} }
free_indirect:
if (indirect) if (indirect)
kfree(desc); kfree(desc);
...@@ -1307,8 +1317,12 @@ static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq, ...@@ -1307,8 +1317,12 @@ static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq,
addr = vring_map_single(vq, desc, addr = vring_map_single(vq, desc,
total_sg * sizeof(struct vring_packed_desc), total_sg * sizeof(struct vring_packed_desc),
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (vring_mapping_error(vq, addr)) if (vring_mapping_error(vq, addr)) {
if (vq->premapped)
goto free_desc;
goto unmap_release; goto unmap_release;
}
vq->packed.vring.desc[head].addr = cpu_to_le64(addr); vq->packed.vring.desc[head].addr = cpu_to_le64(addr);
vq->packed.vring.desc[head].len = cpu_to_le32(total_sg * vq->packed.vring.desc[head].len = cpu_to_le32(total_sg *
...@@ -1366,6 +1380,7 @@ static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq, ...@@ -1366,6 +1380,7 @@ static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq,
for (i = 0; i < err_idx; i++) for (i = 0; i < err_idx; i++)
vring_unmap_desc_packed(vq, &desc[i]); vring_unmap_desc_packed(vq, &desc[i]);
free_desc:
kfree(desc); kfree(desc);
END_USE(vq); END_USE(vq);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment