]> git.baikalelectronics.ru Git - kernel.git/commitdiff
virtio_ring: remove flags check for unmap split indirect desc
authorXuan Zhuo <xuanzhuo@linux.alibaba.com>
Thu, 24 Feb 2022 11:03:55 +0000 (19:03 +0800)
committerMichael S. Tsirkin <mst@redhat.com>
Mon, 28 Mar 2022 20:52:58 +0000 (16:52 -0400)
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: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Link: https://lore.kernel.org/r/20220224110402.108161-3-xuanzhuo@linux.alibaba.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
drivers/virtio/virtio_ring.c

index 7cf3ae057833fc5c79d954154b14012faee242f6..fadd0a7503e9e4d838e53d7cda44e754b6d2e098 100644 (file)
@@ -379,19 +379,11 @@ 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);
-       }
+       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,