Skip to content

Commit b41cb3b

Browse files
jasowangmstsirkin
authored andcommitted
virtio: rename dma helpers
Following patch will introduce virtio mapping function to avoid abusing DMA API for device that doesn't do DMA. To ease the introduction, this patch rename "dma" to "map" for the current dma mapping helpers. Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> Signed-off-by: Jason Wang <jasowang@redhat.com> Message-Id: <20250821064641.5025-4-jasowang@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Tested-by: Lei Yang <leiyang@redhat.com> Reviewed-by: Eugenio Pérez <eperezma@redhat.com>
1 parent 447beec commit b41cb3b

3 files changed

Lines changed: 77 additions & 77 deletions

File tree

drivers/net/virtio_net.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -962,16 +962,16 @@ static void virtnet_rq_unmap(struct receive_queue *rq, void *buf, u32 len)
962962
if (dma->need_sync && len) {
963963
offset = buf - (head + sizeof(*dma));
964964

965-
virtqueue_dma_sync_single_range_for_cpu(rq->vq, dma->addr,
965+
virtqueue_map_sync_single_range_for_cpu(rq->vq, dma->addr,
966966
offset, len,
967967
DMA_FROM_DEVICE);
968968
}
969969

970970
if (dma->ref)
971971
return;
972972

973-
virtqueue_dma_unmap_single_attrs(rq->vq, dma->addr, dma->len,
974-
DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC);
973+
virtqueue_unmap_single_attrs(rq->vq, dma->addr, dma->len,
974+
DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC);
975975
put_page(page);
976976
}
977977

@@ -1038,13 +1038,13 @@ static void *virtnet_rq_alloc(struct receive_queue *rq, u32 size, gfp_t gfp)
10381038

10391039
dma->len = alloc_frag->size - sizeof(*dma);
10401040

1041-
addr = virtqueue_dma_map_single_attrs(rq->vq, dma + 1,
1042-
dma->len, DMA_FROM_DEVICE, 0);
1043-
if (virtqueue_dma_mapping_error(rq->vq, addr))
1041+
addr = virtqueue_map_single_attrs(rq->vq, dma + 1,
1042+
dma->len, DMA_FROM_DEVICE, 0);
1043+
if (virtqueue_map_mapping_error(rq->vq, addr))
10441044
return NULL;
10451045

10461046
dma->addr = addr;
1047-
dma->need_sync = virtqueue_dma_need_sync(rq->vq, addr);
1047+
dma->need_sync = virtqueue_map_need_sync(rq->vq, addr);
10481048

10491049
/* Add a reference to dma to prevent the entire dma from
10501050
* being released during error handling. This reference
@@ -5952,9 +5952,9 @@ static int virtnet_xsk_pool_enable(struct net_device *dev,
59525952
if (!rq->xsk_buffs)
59535953
return -ENOMEM;
59545954

5955-
hdr_dma = virtqueue_dma_map_single_attrs(sq->vq, &xsk_hdr, vi->hdr_len,
5956-
DMA_TO_DEVICE, 0);
5957-
if (virtqueue_dma_mapping_error(sq->vq, hdr_dma)) {
5955+
hdr_dma = virtqueue_map_single_attrs(sq->vq, &xsk_hdr, vi->hdr_len,
5956+
DMA_TO_DEVICE, 0);
5957+
if (virtqueue_map_mapping_error(sq->vq, hdr_dma)) {
59585958
err = -ENOMEM;
59595959
goto err_free_buffs;
59605960
}
@@ -5983,8 +5983,8 @@ static int virtnet_xsk_pool_enable(struct net_device *dev,
59835983
err_rq:
59845984
xsk_pool_dma_unmap(pool, 0);
59855985
err_xsk_map:
5986-
virtqueue_dma_unmap_single_attrs(rq->vq, hdr_dma, vi->hdr_len,
5987-
DMA_TO_DEVICE, 0);
5986+
virtqueue_unmap_single_attrs(rq->vq, hdr_dma, vi->hdr_len,
5987+
DMA_TO_DEVICE, 0);
59885988
err_free_buffs:
59895989
kvfree(rq->xsk_buffs);
59905990
return err;
@@ -6011,8 +6011,8 @@ static int virtnet_xsk_pool_disable(struct net_device *dev, u16 qid)
60116011

60126012
xsk_pool_dma_unmap(pool, 0);
60136013

6014-
virtqueue_dma_unmap_single_attrs(sq->vq, sq->xsk_hdr_dma_addr,
6015-
vi->hdr_len, DMA_TO_DEVICE, 0);
6014+
virtqueue_unmap_single_attrs(sq->vq, sq->xsk_hdr_dma_addr,
6015+
vi->hdr_len, DMA_TO_DEVICE, 0);
60166016
kvfree(rq->xsk_buffs);
60176017

60186018
return err;

0 commit comments

Comments
 (0)