forked from rpms/libvirt
91 lines
4.2 KiB
Diff
91 lines
4.2 KiB
Diff
|
From 68b294cf8e9c5e0f0f14b14e63178b2bf7a9f7e2 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <68b294cf8e9c5e0f0f14b14e63178b2bf7a9f7e2@dist-git>
|
||
|
|
From: Jonathon Jongsma <jjongsma@redhat.com>
|
||
|
|
Date: Tue, 29 Mar 2022 14:24:36 -0500
|
||
|
|
Subject: [PATCH] qemu: fix hotplug for multiqueue vdpa net device
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
While commit a5e659f0 removed the restriction against multiple queues
|
||
|
|
for the vdpa net device, there were some missing pieces. Configuring a
|
||
|
|
device statically and then starting the domain worked as expected, but
|
||
|
|
hotplugging a device didn't have the expected multiqueue support
|
||
|
|
enabled. Add the missing bits.
|
||
|
|
|
||
|
|
Consider the following device xml:
|
||
|
|
<interface type="vdpa">
|
||
|
|
<mac address="00:11:22:33:44:03" />
|
||
|
|
<source dev="/dev/vhost-vdpa-0" />
|
||
|
|
<model type="virtio" />
|
||
|
|
<driver queues='2' />
|
||
|
|
</interface>
|
||
|
|
|
||
|
|
Without this patch, hotplugging the above XML description resulted in
|
||
|
|
the following:
|
||
|
|
{"execute":"netdev_add","arguments":{"type":"vhost-vdpa","vhostdev":"/dev/fdset/0","id":"hostnet1"},"id":"libvirt-392"}
|
||
|
|
{"execute":"device_add","arguments":{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:03","bus":"pci.5","addr":"0x0"},"id":"libvirt-393"}
|
||
|
|
|
||
|
|
With the patch, hotplugging results in the following:
|
||
|
|
{"execute":"netdev_add","arguments":{"type":"vhost-vdpa","vhostdev":"/dev/fdset/0","queues":2,"id":"hostnet1"},"id":"libvirt-392"}
|
||
|
|
{"execute":"device_add","arguments":{"driver":"virtio-net-pci","mq":true,"vectors":6,"netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:03","bus":"pci.5","addr":"0x0"},"id":"libvirt-393"}
|
||
|
|
|
||
|
|
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2024406
|
||
|
|
|
||
|
|
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
|
||
|
|
(cherry picked from commit 3832db21084661d00438dfbb4bad865816157dd9)
|
||
|
|
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_command.c | 4 ++++
|
||
|
|
src/qemu/qemu_hotplug.c | 3 +++
|
||
|
|
tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args | 2 +-
|
||
|
|
3 files changed, 8 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
||
|
|
index 509bab08ef..ee0e611513 100644
|
||
|
|
--- a/src/qemu/qemu_command.c
|
||
|
|
+++ b/src/qemu/qemu_command.c
|
||
|
|
@@ -4349,6 +4349,10 @@ qemuBuildHostNetProps(virDomainNetDef *net,
|
||
|
|
if (virJSONValueObjectAdd(&netprops, "s:type", "vhost-vdpa", NULL) < 0 ||
|
||
|
|
virJSONValueObjectAppendString(netprops, "vhostdev", vdpadev) < 0)
|
||
|
|
return NULL;
|
||
|
|
+
|
||
|
|
+ if (net->driver.virtio.queues > 1 &&
|
||
|
|
+ virJSONValueObjectAppendNumberUlong(netprops, "queues", net->driver.virtio.queues) < 0)
|
||
|
|
+ return NULL;
|
||
|
|
break;
|
||
|
|
|
||
|
|
case VIR_DOMAIN_NET_TYPE_HOSTDEV:
|
||
|
|
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
|
||
|
|
index 04c6600f26..c10493e212 100644
|
||
|
|
--- a/src/qemu/qemu_hotplug.c
|
||
|
|
+++ b/src/qemu/qemu_hotplug.c
|
||
|
|
@@ -1364,6 +1364,9 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
|
||
|
|
break;
|
||
|
|
|
||
|
|
case VIR_DOMAIN_NET_TYPE_VDPA:
|
||
|
|
+ queueSize = net->driver.virtio.queues;
|
||
|
|
+ if (!queueSize)
|
||
|
|
+ queueSize = 1;
|
||
|
|
if (qemuDomainAdjustMaxMemLock(vm, false) < 0)
|
||
|
|
goto cleanup;
|
||
|
|
adjustmemlock = true;
|
||
|
|
diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args
|
||
|
|
index 61ba85a847..3e45ab6870 100644
|
||
|
|
--- a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args
|
||
|
|
+++ b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args
|
||
|
|
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
|
||
|
|
-boot strict=on \
|
||
|
|
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
|
||
|
|
-add-fd set=0,fd=1732,opaque=/dev/vhost-vdpa-0 \
|
||
|
|
--netdev vhost-vdpa,vhostdev=/dev/fdset/0,id=hostnet0 \
|
||
|
|
+-netdev vhost-vdpa,vhostdev=/dev/fdset/0,queues=2,id=hostnet0 \
|
||
|
|
-device virtio-net-pci,mq=on,vectors=6,netdev=hostnet0,id=net0,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x2 \
|
||
|
|
-audiodev '{"id":"audio1","driver":"none"}' \
|
||
|
|
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
|
||
|
|
--
|
||
|
|
2.35.1
|
||
|
|
|