66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
From 6dc398327ebe7fcfe78b3df4fe9c1386bafef552 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
|
Date: Tue, 6 Sep 2022 17:07:16 +0200
|
|
Subject: [PATCH] vdpa: Add vhost_vdpa_net_load_mq
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Same way as with the MAC, restore the expected number of queues at
|
|
device's start.
|
|
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
Signed-off-by: fangyi <eric.fangyi@huawei.com>
|
|
---
|
|
net/vhost-vdpa.c | 26 ++++++++++++++++++++++++++
|
|
1 file changed, 26 insertions(+)
|
|
|
|
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
|
|
index 15cd38b52e..b32fe5e68a 100644
|
|
--- a/net/vhost-vdpa.c
|
|
+++ b/net/vhost-vdpa.c
|
|
@@ -408,6 +408,28 @@ static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n)
|
|
return 0;
|
|
}
|
|
|
|
+static int vhost_vdpa_net_load_mq(VhostVDPAState *s,
|
|
+ const VirtIONet *n)
|
|
+{
|
|
+ struct virtio_net_ctrl_mq mq;
|
|
+ uint64_t features = n->parent_obj.guest_features;
|
|
+ ssize_t dev_written;
|
|
+
|
|
+ if (!(features & BIT_ULL(VIRTIO_NET_F_MQ))) {
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ mq.virtqueue_pairs = cpu_to_le16(n->curr_queue_pairs);
|
|
+ dev_written = vhost_vdpa_net_load_cmd(s, VIRTIO_NET_CTRL_MQ,
|
|
+ VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET, &mq,
|
|
+ sizeof(mq));
|
|
+ if (unlikely(dev_written < 0)) {
|
|
+ return dev_written;
|
|
+ }
|
|
+
|
|
+ return *s->status != VIRTIO_NET_OK;
|
|
+}
|
|
+
|
|
static int vhost_vdpa_net_load(NetClientState *nc)
|
|
{
|
|
VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc);
|
|
@@ -426,6 +448,10 @@ static int vhost_vdpa_net_load(NetClientState *nc)
|
|
if (unlikely(r < 0)) {
|
|
return r;
|
|
}
|
|
+ r = vhost_vdpa_net_load_mq(s, n);
|
|
+ if (unlikely(r)) {
|
|
+ return r;
|
|
+ }
|
|
|
|
return 0;
|
|
}
|
|
--
|
|
2.27.0
|
|
|