Re: [PATCH v1 2/6] virtio: remove flags check for unmap split indirect desc

[Jason Wang <jasowang@xxxxxxxxxx>]

在 2022/2/10 下午4:51, Xuan Zhuo 写道:
> 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@xxxxxxxxxxxxxxxxx>


Acked-by: Jason Wang <jasowang@xxxxxxxxxx>


> ---
>   drivers/virtio/virtio_ring.c | 18 +++++-------------
>   1 file changed, 5 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index 7cf3ae057833..fadd0a7503e9 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -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,

_______________________________________________
Virtualization mailing list
Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/virtualization