Re: [PATCH 11/19] virtio_ring: switch to use vring_virtqueue for detach_unused_buf variants

[Eugenio Perez Martin]

On Mon, Mar 24, 2025 at 6:44 AM Jason Wang <jasowang@xxxxxxxxxx> wrote:
>
> Those variants are used internally so let's switch to use
> vring_virtqueue as parameter to be consistent with other internal
> virtqueue helpers.
>

Acked-by: Eugenio Pérez <eperezma@xxxxxxxxxx>

> Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx>
> ---
>  drivers/virtio/virtio_ring.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index f754da8c2ac6..19aa24d62d20 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -950,9 +950,8 @@ static bool virtqueue_enable_cb_delayed_split(struct vring_virtqueue *vq)
>         return true;
>  }
>
> -static void *virtqueue_detach_unused_buf_split(struct virtqueue *_vq)
> +static void *virtqueue_detach_unused_buf_split(struct vring_virtqueue *vq)
>  {
> -       struct vring_virtqueue *vq = to_vvq(_vq);
>         unsigned int i;
>         void *buf;
>
> @@ -965,7 +964,7 @@ static void *virtqueue_detach_unused_buf_split(struct virtqueue *_vq)
>                 buf = vq->split.desc_state[i].data;
>                 detach_buf_split(vq, i, NULL);
>                 vq->split.avail_idx_shadow--;
> -               vq->split.vring.avail->idx = cpu_to_virtio16(_vq->vdev,
> +               vq->split.vring.avail->idx = cpu_to_virtio16(vq->vq.vdev,
>                                 vq->split.avail_idx_shadow);
>                 END_USE(vq);
>                 return buf;
> @@ -1892,9 +1891,8 @@ static bool virtqueue_enable_cb_delayed_packed(struct vring_virtqueue *vq)
>         return true;
>  }
>
> -static void *virtqueue_detach_unused_buf_packed(struct virtqueue *_vq)
> +static void *virtqueue_detach_unused_buf_packed(struct vring_virtqueue *vq)
>  {
> -       struct vring_virtqueue *vq = to_vvq(_vq);
>         unsigned int i;
>         void *buf;
>
> @@ -2642,8 +2640,8 @@ void *virtqueue_detach_unused_buf(struct virtqueue *_vq)
>  {
>         struct vring_virtqueue *vq = to_vvq(_vq);
>
> -       return vq->packed_ring ? virtqueue_detach_unused_buf_packed(_vq) :
> -                                virtqueue_detach_unused_buf_split(_vq);
> +       return vq->packed_ring ? virtqueue_detach_unused_buf_packed(vq) :
> +                                virtqueue_detach_unused_buf_split(vq);
>  }
>  EXPORT_SYMBOL_GPL(virtqueue_detach_unused_buf);
>
> --
> 2.42.0
>