Re: [PATCH 05/19] virtio_ring: switch to use vring_virtqueue for virtqueue_kick_prepare 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.
>
> Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx>

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

> ---
>  drivers/virtio/virtio_ring.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index 94ce711963e6..cf3ab6404698 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -713,9 +713,8 @@ static inline int virtqueue_add_split(struct virtqueue *_vq,
>         return -ENOMEM;
>  }
>
> -static bool virtqueue_kick_prepare_split(struct virtqueue *_vq)
> +static bool virtqueue_kick_prepare_split(struct vring_virtqueue *vq)
>  {
> -       struct vring_virtqueue *vq = to_vvq(_vq);
>         u16 new, old;
>         bool needs_kick;
>
> @@ -732,12 +731,12 @@ static bool virtqueue_kick_prepare_split(struct virtqueue *_vq)
>         LAST_ADD_TIME_INVALID(vq);
>
>         if (vq->event) {
> -               needs_kick = vring_need_event(virtio16_to_cpu(_vq->vdev,
> +               needs_kick = vring_need_event(virtio16_to_cpu(vq->vq.vdev,
>                                         vring_avail_event(&vq->split.vring)),
>                                               new, old);
>         } else {
>                 needs_kick = !(vq->split.vring.used->flags &
> -                                       cpu_to_virtio16(_vq->vdev,
> +                                       cpu_to_virtio16(vq->vq.vdev,
>                                                 VRING_USED_F_NO_NOTIFY));
>         }
>         END_USE(vq);
> @@ -1597,9 +1596,8 @@ static inline int virtqueue_add_packed(struct virtqueue *_vq,
>         return -EIO;
>  }
>
> -static bool virtqueue_kick_prepare_packed(struct virtqueue *_vq)
> +static bool virtqueue_kick_prepare_packed(struct vring_virtqueue *vq)
>  {
> -       struct vring_virtqueue *vq = to_vvq(_vq);
>         u16 new, old, off_wrap, flags, wrap_counter, event_idx;
>         bool needs_kick;
>         union {
> @@ -2454,8 +2452,8 @@ bool virtqueue_kick_prepare(struct virtqueue *_vq)
>  {
>         struct vring_virtqueue *vq = to_vvq(_vq);
>
> -       return vq->packed_ring ? virtqueue_kick_prepare_packed(_vq) :
> -                                virtqueue_kick_prepare_split(_vq);
> +       return vq->packed_ring ? virtqueue_kick_prepare_packed(vq) :
> +                                virtqueue_kick_prepare_split(vq);
>  }
>  EXPORT_SYMBOL_GPL(virtqueue_kick_prepare);
>
> --
> 2.42.0
>