Skip to content

Commit d7344a2

Browse files
fengidrimstsirkin
authored andcommitted
virtio_ring: support add premapped buf
If the vq is the premapped mode, use the sg_dma_address() directly. Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> Message-Id: <20230810123057.43407-5-xuanzhuo@linux.alibaba.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
1 parent 8daafe9 commit d7344a2

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

drivers/virtio/virtio_ring.c

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,11 @@ static struct device *vring_dma_dev(const struct vring_virtqueue *vq)
361361
static int vring_map_one_sg(const struct vring_virtqueue *vq, struct scatterlist *sg,
362362
enum dma_data_direction direction, dma_addr_t *addr)
363363
{
364+
if (vq->premapped) {
365+
*addr = sg_dma_address(sg);
366+
return 0;
367+
}
368+
364369
if (!vq->use_dma_api) {
365370
/*
366371
* 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,
639644
dma_addr_t addr = vring_map_single(
640645
vq, desc, total_sg * sizeof(struct vring_desc),
641646
DMA_TO_DEVICE);
642-
if (vring_mapping_error(vq, addr))
647+
if (vring_mapping_error(vq, addr)) {
648+
if (vq->premapped)
649+
goto free_indirect;
650+
643651
goto unmap_release;
652+
}
644653

645654
virtqueue_add_desc_split(_vq, vq->split.vring.desc,
646655
head, addr,
@@ -706,6 +715,7 @@ static inline int virtqueue_add_split(struct virtqueue *_vq,
706715
i = vring_unmap_one_split(vq, i);
707716
}
708717

718+
free_indirect:
709719
if (indirect)
710720
kfree(desc);
711721

@@ -1307,8 +1317,12 @@ static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq,
13071317
addr = vring_map_single(vq, desc,
13081318
total_sg * sizeof(struct vring_packed_desc),
13091319
DMA_TO_DEVICE);
1310-
if (vring_mapping_error(vq, addr))
1320+
if (vring_mapping_error(vq, addr)) {
1321+
if (vq->premapped)
1322+
goto free_desc;
1323+
13111324
goto unmap_release;
1325+
}
13121326

13131327
vq->packed.vring.desc[head].addr = cpu_to_le64(addr);
13141328
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,
13661380
for (i = 0; i < err_idx; i++)
13671381
vring_unmap_desc_packed(vq, &desc[i]);
13681382

1383+
free_desc:
13691384
kfree(desc);
13701385

13711386
END_USE(vq);

0 commit comments

Comments
 (0)