Commit 45ebc7e6 authored by Laurent Vivier's avatar Laurent Vivier Committed by Paolo Abeni
Browse files

virtio_ring: Fix error reporting in virtqueue_resize 



The virtqueue_resize() function was not correctly propagating error codes
from its internal resize helper functions, specifically
virtqueue_resize_packet() and virtqueue_resize_split(). If these helpers
returned an error, but the subsequent call to virtqueue_enable_after_reset()
succeeded, the original error from the resize operation would be masked.
Consequently, virtqueue_resize() could incorrectly report success to its
caller despite an underlying resize failure.

This change restores the original code behavior:

       if (vdev->config->enable_vq_after_reset(_vq))
               return -EBUSY;

       return err;

Fix: commit ad48d53b ("virtio_ring: separate the logic of reset/enable from virtqueue_resize")
Cc: xuanzhuo@linux.alibaba.com
Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Link: https://patch.msgid.link/20250521092236.661410-2-lvivier@redhat.com


Tested-by: default avatarLei Yang <leiyang@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 5177373c

drivers/virtio/virtio_ring.c

+6 −2
Original line number Diff line number Diff line
@@ -2797,7 +2797,7 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num, 
		     void (*recycle_done)(struct virtqueue *vq))

{

	struct vring_virtqueue *vq = to_vvq(_vq);

	int err;

	int err, err_reset;



	if (num > vq->vq.num_max)

		return -E2BIG;
@@ -2819,7 +2819,11 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num, 
	else

		err = virtqueue_resize_split(_vq, num);



	return virtqueue_enable_after_reset(_vq);

	err_reset = virtqueue_enable_after_reset(_vq);

	if (err_reset)

		return err_reset;



	return err;

}

EXPORT_SYMBOL_GPL(virtqueue_resize);