On Mon, Mar 24, 2025 at 6:44 AM Jason Wang <jasow...@redhat.com> 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 <jasow...@redhat.com>
Acked-by: Eugenio Pérez <epere...@redhat.com>
> ---
> drivers/virtio/virtio_ring.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index 619869e80309..3fab40648c75 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -812,11 +812,10 @@ static bool more_used_split(const struct
> vring_virtqueue *vq)
> return virtqueue_poll_split(vq, vq->last_used_idx);
> }
>
> -static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
> +static void *virtqueue_get_buf_ctx_split(struct vring_virtqueue *vq,
> unsigned int *len,
> void **ctx)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> void *ret;
> unsigned int i;
> u16 last_used;
> @@ -838,9 +837,9 @@ static void *virtqueue_get_buf_ctx_split(struct virtqueue
> *_vq,
> virtio_rmb(vq->weak_barriers);
>
> last_used = (vq->last_used_idx & (vq->split.vring.num - 1));
> - i = virtio32_to_cpu(_vq->vdev,
> + i = virtio32_to_cpu(vq->vq.vdev,
> vq->split.vring.used->ring[last_used].id);
> - *len = virtio32_to_cpu(_vq->vdev,
> + *len = virtio32_to_cpu(vq->vq.vdev,
> vq->split.vring.used->ring[last_used].len);
>
> if (unlikely(i >= vq->split.vring.num)) {
> @@ -862,7 +861,7 @@ static void *virtqueue_get_buf_ctx_split(struct virtqueue
> *_vq,
> if (!(vq->split.avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT))
> virtio_store_mb(vq->weak_barriers,
> &vring_used_event(&vq->split.vring),
> - cpu_to_virtio16(_vq->vdev,
> vq->last_used_idx));
> + cpu_to_virtio16(vq->vq.vdev,
> vq->last_used_idx));
>
> LAST_ADD_TIME_INVALID(vq);
>
> @@ -1721,11 +1720,10 @@ static bool more_used_packed(const struct
> vring_virtqueue *vq)
> return virtqueue_poll_packed(vq, READ_ONCE(vq->last_used_idx));
> }
>
> -static void *virtqueue_get_buf_ctx_packed(struct virtqueue *_vq,
> +static void *virtqueue_get_buf_ctx_packed(struct vring_virtqueue *vq,
> unsigned int *len,
> void **ctx)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 last_used, id, last_used_idx;
> bool used_wrap_counter;
> void *ret;
> @@ -2521,8 +2519,8 @@ void *virtqueue_get_buf_ctx(struct virtqueue *_vq,
> unsigned int *len,
> {
> struct vring_virtqueue *vq = to_vvq(_vq);
>
> - return vq->packed_ring ? virtqueue_get_buf_ctx_packed(_vq, len, ctx) :
> - virtqueue_get_buf_ctx_split(_vq, len, ctx);
> + return vq->packed_ring ? virtqueue_get_buf_ctx_packed(vq, len, ctx) :
> + virtqueue_get_buf_ctx_split(vq, len, ctx);
> }
> EXPORT_SYMBOL_GPL(virtqueue_get_buf_ctx);
>
> --
> 2.42.0
>
