Commit b4282ebc authored by Xuan Zhuo's avatar Xuan Zhuo Committed by Michael S. Tsirkin
Browse files

virtio_ring: remove flags check for unmap split indirect desc 



When calling vring_unmap_one_split_indirect(), it will not encounter the
situation that the flags contains VRING_DESC_F_INDIRECT. So remove this
logic.

Signed-off-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Link: https://lore.kernel.org/r/20220224110402.108161-3-xuanzhuo@linux.alibaba.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent d80dc15b

drivers/virtio/virtio_ring.c

+5 −13
Original line number Diff line number Diff line
@@ -379,20 +379,12 @@ static void vring_unmap_one_split_indirect(const struct vring_virtqueue *vq, 


	flags = virtio16_to_cpu(vq->vq.vdev, desc->flags);



	if (flags & VRING_DESC_F_INDIRECT) {

		dma_unmap_single(vring_dma_dev(vq),

				 virtio64_to_cpu(vq->vq.vdev, desc->addr),

				 virtio32_to_cpu(vq->vq.vdev, desc->len),

				 (flags & VRING_DESC_F_WRITE) ?

				 DMA_FROM_DEVICE : DMA_TO_DEVICE);

	} else {

	dma_unmap_page(vring_dma_dev(vq),

		       virtio64_to_cpu(vq->vq.vdev, desc->addr),

		       virtio32_to_cpu(vq->vq.vdev, desc->len),

		       (flags & VRING_DESC_F_WRITE) ?

		       DMA_FROM_DEVICE : DMA_TO_DEVICE);

}

}



static unsigned int vring_unmap_one_split(const struct vring_virtqueue *vq,

					  unsigned int i)