75 lines
2.2 KiB
Diff
75 lines
2.2 KiB
Diff
|
From 466adb0e641f5c918cbea84e962ae9352f440663 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
||
|
|
Date: Thu, 11 Aug 2022 14:28:47 +0200
|
||
|
|
Subject: [PATCH 22/29] vdpa: Add vhost_vdpa_net_load_mq
|
||
|
|
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: [22/25] 01e861ad39d6b8e15870296f508726565101213b (redhat/centos-stream/src/qemu-kvm)
|
||
|
|
|
||
|
|
Upstream: Not merged yet
|
||
|
|
|
||
|
|
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: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
---
|
||
|
|
net/vhost-vdpa.c | 26 ++++++++++++++++++++++++++
|
||
|
|
1 file changed, 26 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
|
||
|
|
index e799e744cd..3950e4f25d 100644
|
||
|
|
--- a/net/vhost-vdpa.c
|
||
|
|
+++ b/net/vhost-vdpa.c
|
||
|
|
@@ -400,6 +400,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);
|
||
|
|
@@ -418,6 +440,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.31.1
|
||
|
|
|