Finally recover the inflight descriptors at vhost_net_start.
TODO: Abstract it properly instead of using SVQ directly.
Signed-off-by: Eugenio Pérez <epere...@redhat.com>
---
hw/net/vhost_net.c | 34 ++++++++++++++++++++++++++++++++++
hw/virtio/vhost-vdpa.c | 11 -----------
2 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 480f4ac0a1..9a49046c53 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -428,6 +428,40 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
}
}
+ for (i = 0; i < data_queue_pairs; i++) {
+ struct vhost_vdpa *v;
+
+ peer = qemu_get_peer(ncs, i);
+ if (peer->info->type != NET_CLIENT_DRIVER_VHOST_VDPA) {
+ continue;
+ }
+ net = get_vhost_net(peer);
+ v = net->dev.opaque;
+
+ if (!v->shadow_vqs_enabled) {
+ return 0;
+ }
+
+ for (size_t i = 0; i < v->dev->nvqs; ++i) {
+ VirtIONetQueue *q = &n->vqs[(i + v->dev->vq_index) / 2];
+ size_t num = i % 2 ? q->tx_inflight_num : q->rx_inflight_num;
+ g_autofree VirtQueueElement **inflight = NULL;
+
+ assert(v->dev->vq_index % 2 == 0);
+ inflight = g_steal_pointer(i % 2 ? &q->tx_inflight
+ : &q->rx_inflight);
+ for (size_t j = 0; j < num; ++j) {
+ int r;
+
+ r = vhost_svq_add_element(g_ptr_array_index(v->shadow_vqs, i),
+ inflight[j]);
+
+ /* TODO: Proper error handling */
+ assert(r == 0);
+ }
+ }
+ }
+
return 0;
err_start:
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 7468e44b87..c54cb82cb5 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -1167,18 +1167,7 @@ static int vhost_vdpa_set_vring_base(struct vhost_dev
*dev,
struct vhost_vring_state *ring)
{
struct vhost_vdpa *v = dev->opaque;
- VirtQueue *vq = virtio_get_queue(dev->vdev, ring->index);
- /*
- * vhost-vdpa devices does not support in-flight requests. Set all of them
- * as available.
- *
- * TODO: This is ok for networking, but other kinds of devices might
- * have problems with these retransmissions.
- */
- while (virtqueue_rewind(vq, 1)) {
- continue;
- }
if (v->shadow_vqs_enabled) {
/*
* Device vring base was set at device start. SVQ base is handled by
--
2.31.1
