I used the "virtio-net-pci,...,in_order=on" to test this series of
patches v3 with regression tests, everything works fine.
Tested-by: Lei Yang <leiyang@redhat.com>
On Mon, Jun 16, 2025 at 4:27 PM Jason Wang <jasowang@redhat.com> wrote:
>
> To be consistent with virtqueue_reset().
>
> Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
> drivers/virtio/virtio_ring.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index b784aab66867..afdd51fc3c9c 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -1005,7 +1005,7 @@ static void virtqueue_vring_init_split(struct vring_virtqueue_split *vring_split
> }
> }
>
> -static void virtqueue_reinit_split(struct vring_virtqueue *vq)
> +static void virtqueue_reset_split(struct vring_virtqueue *vq)
> {
> int num;
>
> @@ -1248,7 +1248,7 @@ static int virtqueue_resize_split(struct virtqueue *_vq, u32 num)
> err_state_extra:
> vring_free_split(&vring_split, vdev, vring_dma_dev(vq));
> err:
> - virtqueue_reinit_split(vq);
> + virtqueue_reset_split(vq);
> return -ENOMEM;
> }
>
> @@ -2092,7 +2092,7 @@ static void virtqueue_vring_attach_packed(struct vring_virtqueue *vq,
> vq->free_head = 0;
> }
>
> -static void virtqueue_reinit_packed(struct vring_virtqueue *vq)
> +static void virtqueue_reset_packed(struct vring_virtqueue *vq)
> {
> memset(vq->packed.vring.device, 0, vq->packed.event_size_in_bytes);
> memset(vq->packed.vring.driver, 0, vq->packed.event_size_in_bytes);
> @@ -2219,7 +2219,7 @@ static int virtqueue_resize_packed(struct virtqueue *_vq, u32 num)
> err_state_extra:
> vring_free_packed(&vring_packed, vdev, vring_dma_dev(vq));
> err_ring:
> - virtqueue_reinit_packed(vq);
> + virtqueue_reset_packed(vq);
> return -ENOMEM;
> }
>
> @@ -2852,9 +2852,9 @@ int virtqueue_reset(struct virtqueue *_vq,
> recycle_done(_vq);
>
> if (vq->packed_ring)
> - virtqueue_reinit_packed(vq);
> + virtqueue_reset_packed(vq);
> else
> - virtqueue_reinit_split(vq);
> + virtqueue_reset_split(vq);
>
> return virtqueue_enable_after_reset(_vq);
> }
> --
> 2.34.1
>
>