62 lines
2.3 KiB
Diff
62 lines
2.3 KiB
Diff
|
From 9e23182c5249f876e56ef9a31b22476b5268f246 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
||
|
|
Date: Thu, 11 Aug 2022 16:40:07 +0200
|
||
|
|
Subject: [PATCH 24/29] virtio-net: Update virtio-net curr_queue_pairs in vdpa
|
||
|
|
backends
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
RH-MergeRequest: 117: vDPA SVQ Multiqueue support
|
||
|
|
RH-Jira: RHELX-57
|
||
|
|
RH-Acked-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
RH-Acked-by: Cindy Lu <lulu@redhat.com>
|
||
|
|
RH-Acked-by: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
RH-Commit: [24/25] e0e6978394d6496a7e12cf8424b2e9cb87281a90 (redhat/centos-stream/src/qemu-kvm)
|
||
|
|
|
||
|
|
Upstream: Not merged yet
|
||
|
|
|
||
|
|
It was returned as error before. Instead of it, simply update the
|
||
|
|
corresponding field so qemu can send it in the migration data.
|
||
|
|
|
||
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
---
|
||
|
|
hw/net/virtio-net.c | 17 ++++++-----------
|
||
|
|
1 file changed, 6 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
||
|
|
index dd0d056fde..63a8332cd0 100644
|
||
|
|
--- a/hw/net/virtio-net.c
|
||
|
|
+++ b/hw/net/virtio-net.c
|
||
|
|
@@ -1412,19 +1412,14 @@ static int virtio_net_handle_mq(VirtIONet *n, uint8_t cmd,
|
||
|
|
return VIRTIO_NET_ERR;
|
||
|
|
}
|
||
|
|
|
||
|
|
- /* Avoid changing the number of queue_pairs for vdpa device in
|
||
|
|
- * userspace handler. A future fix is needed to handle the mq
|
||
|
|
- * change in userspace handler with vhost-vdpa. Let's disable
|
||
|
|
- * the mq handling from userspace for now and only allow get
|
||
|
|
- * done through the kernel. Ripples may be seen when falling
|
||
|
|
- * back to userspace, but without doing it qemu process would
|
||
|
|
- * crash on a recursive entry to virtio_net_set_status().
|
||
|
|
- */
|
||
|
|
+ n->curr_queue_pairs = queue_pairs;
|
||
|
|
if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_VHOST_VDPA) {
|
||
|
|
- return VIRTIO_NET_ERR;
|
||
|
|
+ /*
|
||
|
|
+ * Avoid updating the backend for a vdpa device: We're only interested
|
||
|
|
+ * in updating the device model queues.
|
||
|
|
+ */
|
||
|
|
+ return VIRTIO_NET_OK;
|
||
|
|
}
|
||
|
|
-
|
||
|
|
- n->curr_queue_pairs = queue_pairs;
|
||
|
|
/* stop the backend before changing the number of queue_pairs to avoid handling a
|
||
|
|
* disabled queue */
|
||
|
|
virtio_net_set_status(vdev, vdev->status);
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|