virtio_ring: add a func argument 'recycle_done' to virtqueue_resize()

When virtqueue_resize() has actually recycled all unused buffers,
additional work may be required in some cases. Relying solely on its
return status is fragile, so introduce a new function argument
'recycle_done', which is invoked when the recycle really occurs.

Cc: <stable@vger.kernel.org> # v6.11+
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index fc89c5e1a207f37c6bf6f1538a9474db9d74a34b..e10bc9e6b0722cf1ea41b2eaf4d665ce04174902 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -3331,7 +3331,7 @@ static int virtnet_rx_resize(struct virtnet_info *vi,
 
        virtnet_rx_pause(vi, rq);
 
-       err = virtqueue_resize(rq->vq, ring_num, virtnet_rq_unmap_free_buf);
+       err = virtqueue_resize(rq->vq, ring_num, virtnet_rq_unmap_free_buf, NULL);
        if (err)
                netdev_err(vi->dev, "resize rx fail: rx queue index: %d err: %d\n", qindex, err);
 
@@ -3394,7 +3394,7 @@ static int virtnet_tx_resize(struct virtnet_info *vi, struct send_queue *sq,
 
        virtnet_tx_pause(vi, sq);
 
-       err = virtqueue_resize(sq->vq, ring_num, virtnet_sq_free_unused_buf);
+       err = virtqueue_resize(sq->vq, ring_num, virtnet_sq_free_unused_buf, NULL);
        if (err)
                netdev_err(vi->dev, "resize tx fail: tx queue index: %d err: %d\n", qindex, err);
 

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 82a7d2cbc70450e4fc0ce5c38bdc01d649ff336a..6af8cf6a619e0a9c2c9873fdcac2bcd28737b3cd 100644 (file)
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -2772,6 +2772,7 @@ EXPORT_SYMBOL_GPL(vring_create_virtqueue_dma);
  * @_vq: the struct virtqueue we're talking about.
  * @num: new ring num
  * @recycle: callback to recycle unused buffers
+ * @recycle_done: callback to be invoked when recycle for all unused buffers done
  *
  * When it is really necessary to create a new vring, it will set the current vq
  * into the reset state. Then call the passed callback to recycle the buffer
@@ -2792,7 +2793,8 @@ EXPORT_SYMBOL_GPL(vring_create_virtqueue_dma);
  *
  */
 int virtqueue_resize(struct virtqueue *_vq, u32 num,
-                    void (*recycle)(struct virtqueue *vq, void *buf))
+                    void (*recycle)(struct virtqueue *vq, void *buf),
+                    void (*recycle_done)(struct virtqueue *vq))
 {
        struct vring_virtqueue *vq = to_vvq(_vq);
        int err;
@@ -2809,6 +2811,8 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num,
        err = virtqueue_disable_and_recycle(_vq, recycle);
        if (err)
                return err;
+       if (recycle_done)
+               recycle_done(_vq);
 
        if (vq->packed_ring)
                err = virtqueue_resize_packed(_vq, num);

diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 57cc4b07fd1758fa04c2b2e4ccb70f33502427e1..0aa7df4ed5ca38939bf614da7bbe460aa8d5a861 100644 (file)
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -109,7 +109,8 @@ dma_addr_t virtqueue_get_avail_addr(const struct virtqueue *vq);
 dma_addr_t virtqueue_get_used_addr(const struct virtqueue *vq);
 
 int virtqueue_resize(struct virtqueue *vq, u32 num,
-                    void (*recycle)(struct virtqueue *vq, void *buf));
+                    void (*recycle)(struct virtqueue *vq, void *buf),
+                    void (*recycle_done)(struct virtqueue *vq));
 int virtqueue_reset(struct virtqueue *vq,
                    void (*recycle)(struct virtqueue *vq, void *buf));