Commit 201e52ff authored by Jason Wang's avatar Jason Wang Committed by Michael S. Tsirkin
Browse files

virtio_ring: rename dma_handle to map_handle 



Following patch will introduce virtio map operations which means the
address is not necessarily used for DMA. Let's rename the dma_handle
to map_handle first.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Message-Id: <20250821064641.5025-6-jasowang@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Tested-by: default avatarLei Yang <leiyang@redhat.com>
Reviewed-by: default avatarEugenio Pérez <eperezma@redhat.com>
parent b16060c5

drivers/virtio/virtio_ring.c

+6 −6
Original line number Diff line number Diff line
@@ -305,18 +305,18 @@ size_t virtio_max_dma_size(const struct virtio_device *vdev) 
EXPORT_SYMBOL_GPL(virtio_max_dma_size);



static void *vring_alloc_queue(struct virtio_device *vdev, size_t size,

			       dma_addr_t *dma_handle, gfp_t flag,

			       dma_addr_t *map_handle, gfp_t flag,

			       union virtio_map map)

{

	if (vring_use_map_api(vdev)) {

		return dma_alloc_coherent(map.dma_dev, size,

					  dma_handle, flag);

					  map_handle, flag);

	} else {

		void *queue = alloc_pages_exact(PAGE_ALIGN(size), flag);



		if (queue) {

			phys_addr_t phys_addr = virt_to_phys(queue);

			*dma_handle = (dma_addr_t)phys_addr;

			*map_handle = (dma_addr_t)phys_addr;



			/*

			 * Sanity check: make sure we dind't truncate
@@ -329,7 +329,7 @@ static void *vring_alloc_queue(struct virtio_device *vdev, size_t size, 
			 * warning and abort if we end up with an

			 * unrepresentable address.

			 */

			if (WARN_ON_ONCE(*dma_handle != phys_addr)) {

			if (WARN_ON_ONCE(*map_handle != phys_addr)) {

				free_pages_exact(queue, PAGE_ALIGN(size));

				return NULL;

			}
@@ -339,11 +339,11 @@ static void *vring_alloc_queue(struct virtio_device *vdev, size_t size, 
}



static void vring_free_queue(struct virtio_device *vdev, size_t size,

			     void *queue, dma_addr_t dma_handle,

			     void *queue, dma_addr_t map_handle,

			     union virtio_map map)

{

	if (vring_use_map_api(vdev))

		dma_free_coherent(map.dma_dev, size, queue, dma_handle);

		dma_free_coherent(map.dma_dev, size, queue, map_handle);

	else

		free_pages_exact(queue, PAGE_ALIGN(size));

}