- Devel - libvirt List Archives

generation of virtproxd socket files
by Jim Fehlig 09 Feb '21

09 Feb '21

Hi All, I received a report [1] and verified that virtproxyd*.socket files have broken syntax. E.g. from virtproxyd.socket [Unit] Description=Libvirt proxy local socket Before=virtproxyd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtproxyd.socket should 'Conflicts' with the libvirtd sockets. I suspect this regressed in the switch to meson. I checked a libvirt 6.0.0 installation and indeed it has Conflicts=libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket I blame it on Monday and my mind stuck in the weekend, but I spent too much time trying to figure out how those socket files are generated before writing this mail. It would be much appreciated if someone can give me a nudge in the right direction :-). Regards, Jim [1] https://bugzilla.opensuse.org/show_bug.cgi?id=1181838

4 4

[PATCH 0/2] Fix two memleaks in virQEMUCapsLoadMachines()
by Michal Privoznik 09 Feb '21

09 Feb '21

*** BLURB HERE *** Michal Prívozník (2): qemu_capabilities: Don't leak @str in virQEMUCapsLoadMachines() qemu_capabilities: Parse "deprecated" in virQEMUCapsLoadMachines() properly src/qemu/qemu_capabilities.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.26.2

3 4

[libvirt PATCH 0/9] fix cgroups on systemd hosts
by Pavel Hrdina 09 Feb '21

09 Feb '21

When running on host with systemd there is an ownership issue of the root VM cgroup. When it is created for us by systemd using machined the owner of the root VM cgroup is systemd and we should not touch any of the files as systemd can and will modify any values configured there. Basically we had the issue since introduction of machined support in libvirt 1.1.1 back in 2013. With systemd implementing more cgroup APIs the `systemctl daemon-reload` would change more values configured by libvirt. The solution to the issue is to use systemd DBus APIs to configure cgroups but unfortunately they don't cover everything that libvirt needs. For that reason we will use systemd DBus APIs only for values that affect sibling cgroups where the resources are distributed proportionally, such as blkio.weight or cpu.shares. For the remaining resources we will keep the current code where we work with the files directly but we move everything into a child cgroup of the VM root cgroup where we are free to do whatever we like including thread configuration. Pavel Hrdina (9): virsystemd: export virSystemdHasMachined virsystemd: introduce virSystemdGetMachineByPID virsystemd: introduce virSystemdGetMachineUnitByPID vircgroup: use DBus call to systemd for some APIs vircgroupv1: refactor virCgroupV1DetectPlacement vircgroupv2: move task into cgroup before enabling controllers vircgroup: introduce virCgroupV1Exists and virCgroupV2Exists vircgroup: introduce nested cgroup to properly work with systemd tests: add cgroup nested tests docs/cgroups.html.in | 29 +- src/libvirt_private.syms | 2 + src/util/vircgroup.c | 300 ++++++++++++++---- src/util/vircgroupbackend.h | 5 + src/util/vircgrouppriv.h | 10 + src/util/vircgroupv1.c | 122 +++++-- src/util/vircgroupv2.c | 82 ++++- src/util/virsystemd.c | 105 +++++- src/util/virsystemd.h | 4 + tests/vircgroupdata/systemd-legacy.cgroups | 12 + tests/vircgroupdata/systemd-legacy.mounts | 11 + .../vircgroupdata/systemd-legacy.self.cgroup | 11 + tests/vircgroupdata/systemd-unified.cgroups | 13 + tests/vircgroupdata/systemd-unified.mounts | 1 + .../vircgroupdata/systemd-unified.self.cgroup | 1 + tests/vircgrouptest.c | 72 +++++ tests/virsystemdtest.c | 39 ++- 17 files changed, 687 insertions(+), 132 deletions(-) create mode 100644 tests/vircgroupdata/systemd-legacy.cgroups create mode 100644 tests/vircgroupdata/systemd-legacy.mounts create mode 100644 tests/vircgroupdata/systemd-legacy.self.cgroup create mode 100644 tests/vircgroupdata/systemd-unified.cgroups create mode 100644 tests/vircgroupdata/systemd-unified.mounts create mode 100644 tests/vircgroupdata/systemd-unified.self.cgroup -- 2.29.2

2 10

[PATCH 00/40] Replace various string helpers (and fixes for surrounding code)
by Peter Krempa 09 Feb '21

09 Feb '21

This series mainly focuses on removal of virStringListAdd which tries to promote the use of a string list without counter variable as a dynamic array. This means that every operation counts the number of elements and when used in a loop resutls in O(n^2) algorithms. To discourage it's future buggy use remove the helpers completely. The end of the series then replaces some libvirt helpers for string lists by the glib equivalents. Patches: 1-3,18,24-25,28: cleanups 4-6: fix buggy iteration and memory handling in qemuNamespaceUnlinkPaths 7: helpers for easy use of GSList + char * 8-17,19-20: Don't use virStringListAdd inside of loops and prepare for removal 21: Remove virStringListAdd and virStringListRemove 22-23: Open-code and remove virStringListGetFirstWithPrefix 26-27: Replace virStringListHasString by g_strv_contains 29-34: Preparation and removal of virStringListLength (mostly inefficient iteration) 35-37,40: Replace/reimplement virStringSplit(Count) by g_strsplit 38-39: Replace virStringListJoin by g_strjoinv Peter Krempa (40): qemuMonitorJSONObjectProperty: Make 'str' member const util: virmacmap: Use g_autofree for virJSONValue util: macmap: Remove unused cleanup labels and 'ret' variables qemuDomainGetPreservedMounts: Refactor to return NULL-terminated string lists qemuNamespaceUnlinkPaths: Fix wrong use of iterator variable qemuNamespaceUnlinkPaths: Fix inconsistent cleanup handling util: Add helpers for auto-freeing GSList filled with strings qemu: namespace: Don't use 'virStringListAdd' inside loops virHookCall: Don't use 'virStringListAdd' to construct list in loop qemuInteropFetchConfigs: Don't use 'virStringListAdd' to construct list virCPUDefCheckFeatures: Don't use 'virStringListAdd' to construct list x86ModelParseFeatures: Don't construct list using 'virStringListAdd' virResctrlInfoGetMonitorPrefix: Don't use 'virStringListAdd' to construct list virResctrlMonitorGetStats: Don't use 'virStringListAdd' qemu: Convert 'priv->dbusVMStateIds' to a GSList util: macmap: Convert to use GSList for storing macs instead of string lists xenParseXLNamespaceData: Pre-calculate the length of array virfirewalltest: Shuffle the code around to remove a loop virfirewalltest: Avoid use of 'virStringListAdd' qemusecuritytest: Store 'notRestored' files in a hash table util: virstring: Remove virStringListAdd and virStringListRemove virCgroupGetValueForBlkDev: Rewrite lookup of returned string virStringListGetFirstWithPrefix: Remove unused helper vz: Replace virStringSplitCount(, , , NULL) with virStringSplit qemuProcessUpdateDevices: Refactor cleanup and memory handling Replace virStringListHasString by g_strv_contains util: virstring: Remove virStringListHasString virStorageBackendSheepdogAddVolume: Clean up memory handling qemufirmwaretest: Base iteration on string lists qemuvhostusertest: Base iteration on string lists Replace virStringListLength where actual lenght is not needed virPolkitCheckAuth: Avoid virStringListLength in loop condition Replace virStringListLength by g_strv_length util: virstring: Remove virStringListLength Replace virStringSplit with g_strsplit util: virstring: Remove virStringSplit virStringSplitCount: Reimplement using g_strsplit and g_strv_length Replace virStringListJoin by g_strjoinv util: virstring: Remove virStringListJoin virstringtest: Remove testing of virStringSplitCount src/bhyve/bhyve_command.c | 2 +- src/bhyve/bhyve_parse_command.c | 4 +- src/conf/cpu_conf.c | 14 +- src/conf/storage_conf.c | 2 +- src/cpu/cpu_arm.c | 2 +- src/cpu/cpu_x86.c | 8 +- src/libvirt_private.syms | 11 +- src/libxl/libxl_conf.c | 8 +- src/libxl/xen_common.c | 8 +- src/libxl/xen_xl.c | 49 +-- src/lxc/lxc_native.c | 14 +- src/qemu/qemu_capabilities.c | 8 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_conf.c | 4 +- src/qemu/qemu_dbus.c | 19 +- src/qemu/qemu_dbus.h | 2 +- src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_firmware.c | 5 +- src/qemu/qemu_interop_config.c | 13 +- src/qemu/qemu_migration.c | 10 +- src/qemu/qemu_monitor.c | 19 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 5 +- src/qemu/qemu_monitor_json.h | 4 +- src/qemu/qemu_namespace.c | 283 +++++++++--------- src/qemu/qemu_process.c | 37 +-- src/qemu/qemu_qapi.c | 2 +- src/qemu/qemu_slirp.c | 7 +- src/qemu/qemu_vhost_user.c | 4 +- src/rpc/virnetsocket.c | 4 +- src/storage/storage_backend_sheepdog.c | 15 +- src/storage/storage_backend_zfs.c | 6 +- .../storage_source_backingstore.c | 8 +- src/util/meson.build | 1 + src/util/vircgroup.c | 26 +- src/util/vircgroupv2.c | 2 +- src/util/vircommand.c | 2 +- src/util/virdevmapper.c | 2 +- src/util/virfile.c | 2 +- src/util/virfirewall.c | 2 +- src/util/virfirmware.c | 4 +- src/util/virglibutil.c | 27 ++ src/util/virglibutil.h | 28 ++ src/util/virhook.c | 15 +- src/util/virmacmap.c | 175 ++++++----- src/util/virmacmap.h | 6 +- src/util/virpolkit.c | 13 +- src/util/virprocess.c | 5 +- src/util/virresctrl.c | 17 +- src/util/virstring.c | 226 +------------- src/util/virstring.h | 24 +- src/vz/vz_sdk.c | 2 +- tests/qemufirmwaretest.c | 24 +- tests/qemumonitorjsontest.c | 6 +- tests/qemusecuritymock.c | 19 +- tests/qemusecuritytest.c | 14 +- tests/qemusecuritytest.h | 4 +- tests/qemuvhostusertest.c | 24 +- tests/qemuxml2argvtest.c | 2 +- tests/vboxsnapshotxmltest.c | 2 +- tests/virconftest.c | 4 +- tests/virfirewalltest.c | 30 +- tests/virmacmaptest.c | 21 +- tests/virstringtest.c | 211 +------------ tools/virsh-completer.c | 7 +- tools/virsh-domain.c | 14 +- tools/virsh-host.c | 4 +- tools/virt-login-shell-helper.c | 2 +- tools/vsh.c | 2 +- 71 files changed, 595 insertions(+), 965 deletions(-) create mode 100644 src/util/virglibutil.c create mode 100644 src/util/virglibutil.h -- 2.29.2

3 52

[PATCH v2 00/13] Introduce virtio-mem <memory/> model
by Michal Privoznik 09 Feb '21

09 Feb '21

v2 of: https://listman.redhat.com/archives/libvir-list/2021-January/msg00965.html diff to v1: - Rebased onto current master - Introduced new MEMORY_DEVICE_SIZE_CHANGE event - Forbade using virtio-mem among with memballoon - Wrote kbase article - Hopefully, worked in all Peter's review suggestions New patches in this series: 02, 03, 09, 13. The rest was more or less okay. Daniel ACKed it. I will amend his tag to respective commit message before pushing. Michal Prívozník (13): virhostmem: Introduce virHostMemGetTHPSize() qemu_process: Deduplicate code in qemuProcessNeedHugepagesPath() qemu_process: Drop needless check in qemuProcessNeedMemoryBackingPath() qemu_capabilities: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI conf: Introduce virtio-mem <memory/> model qemu: Build command line for virtio-mem qemu: Wire up <memory/> live update qemu: Wire up MEMORY_DEVICE_SIZE_CHANGE event Introduce MEMORY_DEVICE_SIZE_CHANGE event qemu: Refresh the actual size of virtio-mem on monitor reconnect virsh: Introduce update-memory command news: document recent virtio memory addition kbase: Document virtio-mem NEWS.rst | 7 + docs/formatdomain.rst | 58 ++++- docs/kbase/index.rst | 4 + docs/kbase/memorydevices.rst | 160 ++++++++++++++ docs/kbase/meson.build | 1 + docs/manpages/virsh.rst | 30 +++ docs/schemas/domaincommon.rng | 16 ++ examples/c/misc/event-test.c | 17 ++ include/libvirt/libvirt-domain.h | 23 ++ src/conf/domain_conf.c | 115 +++++++++- src/conf/domain_conf.h | 15 ++ src/conf/domain_event.c | 84 +++++++ src/conf/domain_event.h | 10 + src/conf/domain_validate.c | 39 ++++ src/libvirt_private.syms | 5 + src/qemu/qemu_alias.c | 10 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 +- src/qemu/qemu_domain.c | 67 +++++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 38 +++- src/qemu/qemu_driver.c | 209 +++++++++++++++++- src/qemu/qemu_hotplug.c | 18 ++ src/qemu/qemu_hotplug.h | 5 + src/qemu/qemu_monitor.c | 37 ++++ src/qemu/qemu_monitor.h | 27 +++ src/qemu/qemu_monitor_json.c | 95 ++++++-- src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 101 +++++++-- src/qemu/qemu_validate.c | 22 +- src/remote/remote_daemon_dispatch.c | 30 +++ src/remote/remote_driver.c | 32 +++ src/remote/remote_protocol.x | 15 +- src/remote_protocol-structs | 7 + src/security/security_apparmor.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + src/util/virhostmem.c | 63 ++++++ src/util/virhostmem.h | 3 + tests/domaincapsmock.c | 9 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + ...mory-hotplug-virtio-mem.x86_64-latest.args | 48 ++++ .../memory-hotplug-virtio-mem.xml | 64 ++++++ tests/qemuxml2argvtest.c | 1 + ...emory-hotplug-virtio-mem.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 170 ++++++++++++++ 50 files changed, 1619 insertions(+), 68 deletions(-) create mode 100644 docs/kbase/memorydevices.rst create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml -- 2.26.2

1 13

[PATCH 0/4] tests: qemu: Update test data after dropping old machine types
by Peter Krempa 09 Feb '21

09 Feb '21

qemu dropped pc-1.0/pc-1.1/pc-1.2 for the upcoming release, fix some tests and update the data. The two other disk test updates bump the oldest qemu machine type in the _LATEST tests to 2.9, which should be okay for some time. Peter Krempa (4): qemuxml2argvdata: disk-cdrom-network: Remove specific machine type qemuxml2argvdata: disk-cache: Remove specific machine type qemuxml2argvdata: luks-disks-source-qcow2: Remove specific machine type qemucapabilitiesdata: Update 6.0.0 x86_64 capability test data .../caps_6.0.0.x86_64.replies | 2485 +++++++++-------- .../caps_6.0.0.x86_64.xml | 10 +- .../disk-cache.x86_64-2.12.0.args | 2 +- .../disk-cache.x86_64-2.6.0.args | 2 +- .../disk-cache.x86_64-2.7.0.args | 2 +- .../disk-cache.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-cache.xml | 2 +- .../qemuxml2argvdata/disk-cdrom-network.args | 2 +- .../disk-cdrom-network.x86_64-2.12.0.args | 2 +- .../disk-cdrom-network.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-network.xml | 2 +- .../luks-disks-source-qcow2.args | 2 +- ...luks-disks-source-qcow2.x86_64-latest.args | 3 +- .../luks-disks-source-qcow2.xml | 2 +- .../disk-cache.x86_64-2.12.0.xml | 2 +- .../disk-cache.x86_64-2.6.0.xml | 2 +- .../disk-cache.x86_64-2.7.0.xml | 2 +- .../disk-cache.x86_64-latest.xml | 2 +- .../luks-disks-source-qcow2.x86_64-latest.xml | 2 +- 19 files changed, 1281 insertions(+), 1250 deletions(-) -- 2.29.2

2 6

[libvirt PATCH] gitlab: Fix build container dependencies for build jobs
by Andrea Bolognani 09 Feb '21

09 Feb '21

A couple of these were wrong, resulting in the build job not waiting for the correct container to be built before starting. Fixes: 77296c807b18d22286be4b0ba5595d13103910a1 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- "How did this get past review?" O:-) Pushed as trivial. .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5221e8b5b6..5779b1b8b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -486,7 +486,7 @@ mipsel-debian-10: s390x-debian-sid: extends: .cross_build_job needs: - - s390x-debian-10-container + - s390x-debian-sid-container variables: NAME: debian-sid CROSS: s390x @@ -502,7 +502,7 @@ i686-debian-sid: ppc64le-debian-sid: extends: .cross_build_job needs: - - ppc64le-debian-10-container + - ppc64le-debian-sid-container variables: NAME: debian-sid CROSS: ppc64le -- 2.26.2

1 0

[PATCH] rpc: avoid crash when system time jump back
by BiaoxiangYe 08 Feb '21

08 Feb '21

From: BiaoXiang Ye <yebiaoxiang(a)huawei.com> Setting the system time backward would lead to a multiplication overflow in function virKeepAliveStart. FunctionvirKeepAliveTimerInternal got the same bug too. Backtrace below: #0 0x0000ffffae898470 in raise () from /usr/lib64/libc.so.6 #1 0x0000ffffae89981c in abort () from /usr/lib64/libc.so.6 #2 0x0000ffffaf9a36a8 in __mulvsi3 () from /usr/lib64/libvirt.so.0 #3 0x0000ffffaf8fd9e8 in virKeepAliveStart (ka=0xaaaaf954ce10, interval=interval@entry=0, count=count@entry=0) at ../../src/rpc/virkeepalive.c:283 #4 0x0000ffffaf908560 in virNetServerClientStartKeepAlive (client=0xaaaaf954cbe0) at ../../src/rpc/virnetserverclient.c:1628 #5 0x0000aaaac57eb6dc in remoteDispatchConnectSupportsFeature (server=0xaaaaf95309d0, msg=0xaaaaf9549d90, ret=0xffff8c007fc0, args=0xffff8c002e70, rerr=0xffff9ea054a0, client=0xaaaaf954cbe0) at ../../src/remote/remote_daemon_dispatch.c:5063 #6 remoteDispatchConnectSupportsFeatureHelper (server=0xaaaaf95309d0, client=0xaaaaf954cbe0, msg=0xaaaaf9549d90, rerr=0xffff9ea054a0, args=0xffff8c002e70, ret=0xffff8c007fc0) at ./remote/remote_daemon_dispatch_stubs.h:3503 #7 0x0000ffffaf9053a4 in virNetServerProgramDispatchCall(msg=0xaaaaf9549d90, client=0xaaaaf954cbe0, server=0x0, prog=0xaaaaf953a170) at ../../src/rpc/virnetserverprogram.c:451 #8 virNetServerProgramDispatch (prog=0xaaaaf953a170, server=0x0, server@entry=0xaaaaf95309d0, client=0xaaaaf954cbe0, msg=0xaaaaf9549d90) at ../../src/rpc/virnetserverprogram.c:306 #9 0x0000ffffaf90a6bc in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0xaaaaf95309d0) at ../../src/rpc/virnetserver.c:137 #10 virNetServerHandleJob (jobOpaque=0xaaaaf950df80, opaque=0xaaaaf95309d0) at ../../src/rpc/virnetserver.c:154 #11 0x0000ffffaf812e14 in virThreadPoolWorker (opaque=<optimized out>) at ../../src/util/virthreadpool.c:163 #12 0x0000ffffaf81237c in virThreadHelper (data=<optimized out>) at ../../src/util/virthread.c:246 #13 0x0000ffffaea327ac in ?? () from /usr/lib64/libpthread.so.0 #14 0x0000ffffae93747c in ?? () from /usr/lib64/libc.so.6 (gdb) frame 3 #3 0x0000ffffaf8fd9e8 in virKeepAliveStart (ka=0xaaaaf954ce10, interval=interval@entry=0, count=count@entry=0) at ../../src/rpc/virkeepalive.c:283 283 timeout = ka->interval - delay; (gdb) list 278 now = time(NULL); 279 delay = now - ka->lastPacketReceived; <='delay' got a negative value 280 if (delay > ka->interval) 281 timeout = 0; 282 else 283 timeout = ka->interval - delay; 284 ka->intervalStart = now - (ka->interval - timeout); 285 ka->timer = virEventAddTimeout(timeout * 1000, virKeepAliveTimer, <= multiplication overflow 286 ka, virObjectFreeCallback); 287 if (ka->timer < 0) (gdb) p now $2 = 18288001 (gdb) p ka->lastPacketReceived $3 = 1609430405 Signed-off-by: BiaoXiang Ye <yebiaoxiang(a)huawei.com> --- src/rpc/virkeepalive.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index 860b91b6b1..e662484ea6 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -119,12 +119,25 @@ virKeepAliveTimerInternal(virKeepAlivePtr ka, if (ka->interval <= 0 || ka->intervalStart == 0) return false; + if (now < ka->intervalStart) { + VIR_WARN("system time jump back detected. now=%ld," + " intervalStart=%ld", + now, ka->intervalStart); + ka->intervalStart = now; + } + if (now - ka->intervalStart < ka->interval) { timeval = ka->interval - (now - ka->intervalStart); virEventUpdateTimeout(ka->timer, timeval * 1000); return false; } + if (now < ka->lastPacketReceived) { + VIR_WARN("system time jump back detected. now=%ld," + " lastPacketReceived=%ld", + now, ka->lastPacketReceived); + ka->lastPacketReceived = now; + } timeval = now - ka->lastPacketReceived; PROBE(RPC_KEEPALIVE_TIMEOUT, "ka=%p client=%p countToDeath=%d idle=%d", @@ -271,6 +284,13 @@ virKeepAliveStart(virKeepAlivePtr ka, ka, ka->client, interval, count); now = time(NULL); + if (now < ka->lastPacketReceived) { + VIR_WARN("system time jump back detected. now=%ld," + " lastPacketReceived=%ld", + now, ka->lastPacketReceived); + ka->lastPacketReceived = now; + } + delay = now - ka->lastPacketReceived; if (delay > ka->interval) timeout = 0; -- 2.23.0

3 2

[PATCH] qemu: Release <memory/> device address on failed hotplug
by Michal Privoznik 08 Feb '21

08 Feb '21

A few commits back I've introduced new 'virtio-pmem' <memory/> device. Since it's virtio it goes onto PCI bus. Therefore, on hotplug new PCI address is generated (or provided one is reserved). However, if hotplug fails (for whatever reason) the address needs to be released. This is different to 'dimm' type of address because for that type we don't keep a map of used slots rather generate one on each address assign request. The map is then thrown away. But for PCI addresses we keep internal state and thus has to keep it updated. Therefore, this new qemuDomainReleaseMemoryDeviceSlot() function is NOP for those models which use 'dimm' address type ('dimm' and 'nvdimm'). While I'm at it, let's release the address in case of hot unplug. Not that is supported (any such attempt fails with the following error: "virtio based memory devices cannot be unplugged" But if QEMU ever implements hot unplug then we don't have to remember to fix our code. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain_address.c | 23 +++++++++++++++++++++++ src/qemu/qemu_domain_address.h | 3 +++ src/qemu/qemu_hotplug.c | 6 ++++++ 3 files changed, 32 insertions(+) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 1171dc5b14..68dbf9e95b 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -3122,6 +3122,29 @@ qemuDomainAssignMemoryDeviceSlot(virQEMUDriverPtr driver, } +void +qemuDomainReleaseMemoryDeviceSlot(virDomainObjPtr vm, + virDomainMemoryDefPtr mem) +{ + switch (mem->model) { + case VIR_DOMAIN_MEMORY_MODEL_DIMM: + case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: + /* We don't need to release anything. Slot map is not + * kept around. It's constructed every time when + * assigning new slot. */ + break; + + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: + qemuDomainReleaseDeviceAddress(vm, &mem->info); + break; + + case VIR_DOMAIN_MEMORY_MODEL_NONE: + case VIR_DOMAIN_MEMORY_MODEL_LAST: + break; + } +} + + static int qemuDomainAssignMemorySlots(virDomainDefPtr def) { diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index 20a46160d5..bfd56e163e 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -60,6 +60,9 @@ int qemuDomainAssignMemoryDeviceSlot(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainMemoryDefPtr mem); +void qemuDomainReleaseMemoryDeviceSlot(virDomainObjPtr vm, + virDomainMemoryDefPtr mem); + int qemuDomainEnsureVirtioAddress(bool *releaseAddr, virDomainObjPtr vm, virDomainDeviceDefPtr dev, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 94c3df6368..dc2b46057c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2400,6 +2400,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, g_autofree char *devstr = NULL; g_autofree char *objalias = NULL; bool objAdded = false; + bool releaseaddr = false; bool teardownlabel = false; bool teardowncgroup = false; bool teardowndevice = false; @@ -2416,6 +2417,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (qemuDomainAssignMemoryDeviceSlot(driver, vm, mem) < 0) goto cleanup; + releaseaddr = true; /* in cases where we are using a VM with aliases generated according to the * index of the memory device we need to keep continue using that scheme */ @@ -2492,6 +2494,8 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (teardowndevice && qemuDomainNamespaceTeardownMemory(vm, mem) < 0) VIR_WARN("Unable to remove memory device from /dev"); + if (releaseaddr) + qemuDomainReleaseMemoryDeviceSlot(vm, mem); } virJSONValueFree(props); @@ -4457,6 +4461,8 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, if (qemuProcessDestroyMemoryBackingPath(driver, vm, mem) < 0) VIR_WARN("Unable to destroy memory backing path"); + qemuDomainReleaseMemoryDeviceSlot(vm, mem); + virDomainMemoryDefFree(mem); /* fix the balloon size */ -- 2.26.2

2 1

[libvirt PATCH] conf: allow virtio driver attributes for vhostuser disk
by Pavel Hrdina 08 Feb '21

08 Feb '21

All of these options are actually supported by vhostuser disk so we should allow them to be usable. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_validate.c | 20 ------------------- .../disk-vhostuser.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/disk-vhostuser.xml | 2 +- .../disk-vhostuser.x86_64-latest.xml | 2 +- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 222a9386f6..6b3e892332 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -322,26 +322,6 @@ virDomainDiskVhostUserValidate(const virDomainDiskDef *disk) /* Unsupported driver elements */ - if (disk->virtio) { - if (disk->virtio->iommu != VIR_TRISTATE_SWITCH_ABSENT) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("iommu is not supported with vhostuser disk")); - return -1; - } - - if (disk->virtio->ats != VIR_TRISTATE_SWITCH_ABSENT) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("ats is not supported with vhostuser disk")); - return -1; - } - - if (disk->virtio->packed != VIR_TRISTATE_SWITCH_ABSENT) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("packed is not supported with vhostuser disk")); - return -1; - } - } - if (disk->src->metadataCacheMaxSize > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("metadata_cache is not supported with vhostuser disk")); diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args index b24b2c0b4f..30acd7c78b 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args @@ -33,8 +33,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device vhost-user-blk-pci,bus=pci.0,addr=0x2,chardev=chr-vu-virtio-disk0,\ id=virtio-disk0,bootindex=1 \ -chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,reconnect=10 \ --device vhost-user-blk-pci,bus=pci.0,addr=0x3,chardev=chr-vu-virtio-disk1,\ -id=virtio-disk1 \ +-device vhost-user-blk-pci,iommu_platform=on,ats=on,packed=on,bus=pci.0,\ +addr=0x3,chardev=chr-vu-virtio-disk1,id=virtio-disk1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/disk-vhostuser.xml b/tests/qemuxml2argvdata/disk-vhostuser.xml index c96ef9119c..cbe2804e39 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.xml +++ b/tests/qemuxml2argvdata/disk-vhostuser.xml @@ -20,7 +20,7 @@ <boot order='1'/> </disk> <disk type='vhostuser' device='disk'> - <driver name='qemu' type='raw'/> + <driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/> <source type='unix' path='/tmp/vhost1.sock'> <reconnect enabled='yes' timeout='10'/> </source> diff --git a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml index 9712dc0b12..87f5ec46ac 100644 --- a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml @@ -28,7 +28,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </disk> <disk type='vhostuser' device='disk' snapshot='no'> - <driver name='qemu' type='raw'/> + <driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/> <source type='unix' path='/tmp/vhost1.sock'> <reconnect enabled='yes' timeout='10'/> </source> -- 2.29.2

3 3