- Devel - libvirt List Archives

[libvirt] [PATCH v7] qemu: Introduce state_lock_timeout to qemu.conf
by Yi Wang 17 Sep '18

17 Sep '18

When doing some job holding state lock for a long time, we may come across error: "Timed out during operation: cannot acquire state change lock" Well, sometimes it's not a problem and users want to continue to wait, and this patch allow users decide how long time they can wait the state lock. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- changes in v7: - fix multiplication issue in BeginJobInternal changes in v6: - modify the description in qemu.conf - move the multiplication to BeginJobInternal changes in v5: - adjust position of state lock in aug file - fix state lock time got from conf file from milliseconds to seconds changes in v4: - fix syntax-check error changes in v3: - add user-friendly description and nb of state lock - check validity of stateLockTimeout changes in v2: - change default value to 30 in qemu.conf - set the default value in virQEMUDriverConfigNew() --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 7 +++++++ src/qemu/qemu_conf.c | 14 ++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 5 +---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ddc4bbf..a5601e1 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -100,6 +100,7 @@ module Libvirtd_qemu = | str_entry "lock_manager" let rpc_entry = int_entry "max_queued" + | int_entry "state_lock_timeout" | int_entry "keepalive_interval" | int_entry "keepalive_count" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index cd57b3c..f5e34f1 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -667,6 +667,13 @@ # #max_queued = 0 + +# It is strongly recommended to not touch this setting +# +# Default is 30 +# +#state_lock_timeout = 60 + ################################################################### # Keepalive protocol: # This allows qemu driver to detect broken connections to remote diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index a4f545e..5be37dc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -129,6 +129,9 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) #endif +/* Give up waiting for mutex after 30 seconds */ +#define QEMU_JOB_WAIT_TIME (30) + virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { virQEMUDriverConfigPtr cfg; @@ -346,6 +349,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->glusterDebugLevel = 4; cfg->stdioLogD = true; + cfg->stateLockTimeout = QEMU_JOB_WAIT_TIME; + if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; @@ -863,6 +868,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueInt(conf, "state_lock_timeout", &cfg->stateLockTimeout) < 0) + goto cleanup; + if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) goto cleanup; @@ -1055,6 +1063,12 @@ virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg) return -1; } + if (cfg->stateLockTimeout <= 0) { + virReportError(VIR_ERR_CONF_SYNTAX, "%s", + _("state_lock_timeout must be larger than zero")); + return -1; + } + return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a8d84ef..97cf2e1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,8 @@ struct _virQEMUDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + int stateLockTimeout; + int seccompSandbox; char *migrateHost; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fb..4dea85f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6652,9 +6652,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, priv->job.agentActive == QEMU_AGENT_JOB_NONE)); } -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -6714,7 +6711,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, } priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + then = now + cfg->stateLockTimeout * 1000; retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index f1e8806..8e072d0 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -82,6 +82,7 @@ module Test_libvirtd_qemu = { "relaxed_acs_check" = "1" } { "lock_manager" = "lockd" } { "max_queued" = "0" } +{ "state_lock_timeout" = "60" } { "keepalive_interval" = "5" } { "keepalive_count" = "5" } { "seccomp_sandbox" = "1" } -- 1.8.3.1

4 3

[libvirt] [PATCH] tests: Follow up on qemucaps2xmldata rename
by Andrea Bolognani 17 Sep '18

17 Sep '18

The directory has been renamed in 562990849a9d, but a reference to it was not updated at the same time, causing 'make dist' to fail ever since. Fix it. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Pink Bunny Ears of Shame™ rule. tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 136fe16f71..51be1509e1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -122,7 +122,7 @@ EXTRA_DIST = \ qemuargv2xmldata \ qemublocktestdata \ qemucapabilitiesdata \ - qemucaps2xmldata \ + qemucaps2xmloutdata \ qemuhotplugtestcpus \ qemuhotplugtestdevices \ qemuhotplugtestdomains \ -- 2.17.1

1 0

[libvirt] [PATCH 0/5] qemu: Detect KVM usability correctly
by Andrea Bolognani 17 Sep '18

17 Sep '18

There are a few cases in which we're not reporting the correct information through 'virsh capabilities', leading to applications such as libguestfs attempting to launch KVM guests on a host that doesn't actually support them. Our code is also more complicated than it needs to be due to backwards compatibilty reasons that we no longer care about these days, so we can perform some cleanup there; there are further cleanup opportunities in the same area, but some of them are a bit tricky so I'll leave them for a follow-up series. We also get some extra test coverage pretty much for free. Yay! Andrea Bolognani (5): tests: Reuse qemucapabilities data for qemucaps2xml tests: Add more tests to qemucaps2xml qemu: Drop QEMU_CAPS_ENABLE_KVM qemu: Clarify QEMU_CAPS_KVM qemu: Don't check for /dev/kvm presence src/qemu/qemu_capabilities.c | 27 +--- src/qemu/qemu_capabilities.h | 4 +- tests/qemucapabilitiestest.c | 1 + tests/qemucaps2xmldata/all_1.6.0-1.caps | 129 ------------------ .../nodisksnapshot_1.6.0-1.caps | 128 ----------------- .../caps_1.5.3.x86_64.xml} | 12 +- .../caps_1.6.0.x86_64.xml} | 14 +- .../caps_1.7.0.x86_64.xml} | 12 +- .../caps_2.1.1.x86_64.xml} | 12 +- .../caps_2.10.0.aarch64.xml} | 13 +- .../caps_2.10.0.ppc64.xml} | 14 +- .../caps_2.10.0.s390x.xml} | 14 +- .../caps_2.10.0.x86_64.xml} | 12 +- .../caps_2.11.0.s390x.xml} | 14 +- .../caps_2.11.0.x86_64.xml} | 12 +- .../caps_2.12.0.aarch64.xml} | 13 +- .../caps_2.12.0.ppc64.xml} | 14 +- .../caps_2.12.0.s390x.xml} | 14 +- .../caps_2.12.0.x86_64.xml} | 12 +- .../caps_2.4.0.x86_64.xml} | 12 +- .../caps_2.5.0.x86_64.xml} | 12 +- .../caps_2.6.0.aarch64.xml} | 13 +- .../caps_2.6.0.ppc64.xml} | 14 +- .../caps_2.6.0.x86_64.xml} | 12 +- .../caps_2.7.0.s390x.xml} | 14 +- .../caps_2.7.0.x86_64.xml} | 12 +- .../caps_2.8.0.s390x.xml} | 14 +- .../caps_2.8.0.x86_64.xml} | 12 +- .../caps_2.9.0.ppc64.xml} | 14 +- .../caps_2.9.0.s390x.xml} | 14 +- .../caps_2.9.0.x86_64.xml} | 12 +- .../caps_3.0.0.ppc64.xml} | 14 +- .../caps_3.0.0.riscv32.xml} | 13 +- .../caps_3.0.0.riscv64.xml | 25 ++++ .../caps_3.0.0.x86_64.xml} | 12 +- tests/qemucaps2xmltest.c | 63 +++++++-- tests/qemuxml2argvtest.c | 11 +- 37 files changed, 229 insertions(+), 535 deletions(-) delete mode 100644 tests/qemucaps2xmldata/all_1.6.0-1.caps delete mode 100644 tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_1.5.3.x86_64.xml} (67%) rename tests/{qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml => qemucaps2xmloutdata/caps_1.6.0.x86_64.xml} (60%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_1.7.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.1.1.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.10.0.aarch64.xml} (62%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.10.0.ppc64.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.10.0.s390x.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.10.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.11.0.s390x.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.11.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.12.0.aarch64.xml} (62%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.12.0.ppc64.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.12.0.s390x.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.12.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.4.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.5.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.6.0.aarch64.xml} (62%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.6.0.ppc64.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.6.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.7.0.s390x.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.7.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.8.0.s390x.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.8.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.9.0.ppc64.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.9.0.s390x.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.9.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_3.0.0.ppc64.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_3.0.0.riscv32.xml} (54%) create mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml rename tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_3.0.0.x86_64.xml} (67%) -- 2.17.1

2 11

[libvirt] [PATCHv2 0/6] Introduce syntax-check rule for incorrect indentation and blank first line in function body
by Shi Lei 17 Sep '18

17 Sep '18

v1 here: https://www.redhat.com/archives/libvir-list/2018-September/msg00497.html Diff from v1: (according to the comments from Jano) - Change build-aux/check-spacing.pl rather than cfg.mk - Don't exempt '/' (which matches comments in function) in the rule - Split these two type of error messages and only output the relevant one - Patch 2/4 of v1 divide into two patches by the type of error messages Shi Lei (6): build-aux:check-spacing.pl: Introduce syntax-check rule for incorrect indentation and blank first line in function body src: fix incorrect indentation in function body by checking first line tests: fix incorrect indentation in function body by checking first line src: remove blank first line in function body tests: remove blank first line in function body tools: remove blank first line in function body build-aux/check-spacing.pl | 22 +++++ src/bhyve/bhyve_command.c | 3 - src/bhyve/bhyve_conf.c | 6 +- src/bhyve/bhyve_driver.c | 33 ++++--- src/bhyve/bhyve_monitor.c | 1 - src/bhyve/bhyve_process.c | 1 - src/conf/cpu_conf.c | 1 - src/conf/domain_capabilities.c | 1 - src/conf/domain_conf.c | 12 +-- src/conf/network_conf.c | 2 - src/cpu/cpu_s390.c | 84 ++++++++-------- src/cpu/cpu_x86.c | 1 - src/esx/esx_vi_types.c | 2 +- src/locking/lock_driver_nop.c | 1 - src/network/bridge_driver.c | 1 - src/network/bridge_driver_linux.c | 1 - src/nwfilter/nwfilter_learnipaddr.c | 1 - src/phyp/phyp_driver.c | 1 - src/qemu/qemu_alias.c | 1 - src/qemu/qemu_domain_address.c | 86 ++++++++--------- src/qemu/qemu_driver.c | 1 - src/qemu/qemu_monitor.c | 1 - src/qemu/qemu_monitor_json.c | 1 - src/qemu/qemu_process.c | 1 - src/storage/storage_backend_sheepdog.c | 3 - src/storage/storage_driver.c | 1 - src/storage/storage_util.c | 1 - src/test/test_driver.c | 2 - src/util/vircommand.c | 6 +- src/util/virdnsmasq.c | 1 - src/util/virfile.c | 1 - src/util/virnetdev.c | 49 +++++----- src/util/virnetdevmacvlan.c | 11 +-- src/util/virnetdevvportprofile.c | 2 +- src/util/virstoragefile.c | 1 - src/util/virutil.c | 3 +- src/vbox/vbox_storage.c | 1 - src/vbox/vbox_tmpl.c | 8 +- src/vz/vz_driver.c | 1 - src/vz/vz_sdk.c | 1 - src/xenapi/xenapi_driver.c | 2 - src/xenconfig/xen_common.c | 11 +-- tests/qemuxml2argvmock.c | 2 +- tests/sexpr2xmltest.c | 44 ++++----- tests/virnetdevmock.c | 1 - tests/virnettlshelpers.c | 18 ++-- tests/virshtest.c | 128 ++++++++++++------------- tests/vshtabletest.c | 3 - tests/xml2sexprtest.c | 36 +++---- tools/virsh-volume.c | 1 - tools/virt-admin.c | 1 - 51 files changed, 284 insertions(+), 320 deletions(-) -- 2.17.1

2 8

[libvirt] [PATCH 0/5] Use memfd if possible
by marcandre.lureau＠redhat.com 17 Sep '18

17 Sep '18

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, This is an alternative to "[RFC v2 02/16] qemu: add memfd memory backing", which added a new source type. Instead, Daniel suggested to automatically use memfd for anonymous memory when available. Marc-André Lureau (5): qemu: add memory-backend-memfd capability check qemu: check memory-backend-memfd.hugetlb capability qemu: prefer memfd for anonymous memory conf: drop hugepage non-anoymous memory requirement tests: add qemuxml2argv memfd-memory-numa test src/conf/domain_conf.c | 7 -- src/qemu/qemu_capabilities.c | 10 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 61 +++++++--- .../caps_2.12.0.aarch64.replies | 94 ++++++++++++--- .../caps_2.12.0.aarch64.xml | 4 +- .../caps_2.12.0.ppc64.replies | 90 +++++++++++--- .../caps_2.12.0.ppc64.xml | 4 +- .../caps_2.12.0.s390x.replies | 98 ++++++++++++---- .../caps_2.12.0.s390x.xml | 4 +- .../caps_2.12.0.x86_64.replies | 110 +++++++++++++----- .../caps_2.12.0.x86_64.xml | 4 +- .../caps_3.0.0.ppc64.replies | 90 +++++++++++--- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 4 +- .../caps_3.0.0.riscv32.replies | 86 +++++++++++--- .../caps_3.0.0.riscv32.xml | 2 + .../caps_3.0.0.riscv64.replies | 86 +++++++++++--- .../caps_3.0.0.riscv64.xml | 2 + .../caps_3.0.0.x86_64.replies | 110 +++++++++++++----- .../caps_3.0.0.x86_64.xml | 4 +- tests/qemuxml2argvdata/memfd-memory-numa.args | 28 +++++ tests/qemuxml2argvdata/memfd-memory-numa.xml | 36 ++++++ tests/qemuxml2argvtest.c | 5 + 23 files changed, 760 insertions(+), 181 deletions(-) create mode 100644 tests/qemuxml2argvdata/memfd-memory-numa.args create mode 100644 tests/qemuxml2argvdata/memfd-memory-numa.xml -- 2.19.0.rc1

7 42

[libvirt] [PATCH v2 0/2] Fix issues in qemuARPGetInterfaces and virArpTableGet
by Lin Ma 17 Sep '18

17 Sep '18

v1 -> v2: * Follow Chen Hanxiao's suggestion, Ignore 3 types of virtual interface backends * Adjusted the commit messages of patch 1/2 to reflect the code changes. Lin Ma (2): qemu: Remove network type limitation for qemuARPGetInterfaces virarptable: Return a virArpTablePtr when the nlmsghdr for loop is over src/qemu/qemu_driver.c | 4 +++- src/util/virarptable.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) -- 2.15.1

3 7

[libvirt] [PATCH] conf: Move more PCI functions out of device_conf
by Andrea Bolognani 14 Sep '18

14 Sep '18

Functions that deal with virPCIDeviceAddress exclusively belong to util/virpci. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/device_conf.c | 66 ---------------------------------------- src/conf/device_conf.h | 7 ----- src/libvirt_private.syms | 6 ++-- src/util/virpci.c | 65 +++++++++++++++++++++++++++++++++++++++ src/util/virpci.h | 7 +++++ 5 files changed, 75 insertions(+), 76 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index cbdfbf6ef4..98a419f40f 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -160,59 +160,6 @@ virDomainDeviceInfoAddressIsEqual(const virDomainDeviceInfo *a, return true; } -bool -virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, - bool report) -{ - if (addr->domain > 0xFFFF) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address domain='0x%x', " - "must be <= 0xFFFF"), - addr->domain); - return false; - } - if (addr->bus > 0xFF) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address bus='0x%x', " - "must be <= 0xFF"), - addr->bus); - return false; - } - if (addr->slot > 0x1F) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address slot='0x%x', " - "must be <= 0x1F"), - addr->slot); - return false; - } - if (addr->function > 7) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address function=0x%x, " - "must be <= 7"), - addr->function); - return false; - } - if (virPCIDeviceAddressIsEmpty(addr)) { - if (report) - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Invalid PCI address 0000:00:00, at least " - "one of domain, bus, or slot must be > 0")); - return false; - } - return true; -} - - -bool -virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr) -{ - return !(addr->domain || addr->bus || addr->slot); -} - bool virDeviceInfoPCIAddressIsWanted(const virDomainDeviceInfo *info) { @@ -309,19 +256,6 @@ virPCIDeviceAddressFormat(virBufferPtr buf, return 0; } -bool -virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, - virPCIDeviceAddress *addr2) -{ - if (addr1->domain == addr2->domain && - addr1->bus == addr2->bus && - addr1->slot == addr2->slot && - addr1->function == addr2->function) { - return true; - } - return false; -} - bool virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr) { diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 9f51118e29..407956bd02 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -191,10 +191,6 @@ bool virDomainDeviceInfoAddressIsEqual(const virDomainDeviceInfo *a, bool virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info, int type); -bool virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, - bool report); -bool virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr); - bool virDeviceInfoPCIAddressIsWanted(const virDomainDeviceInfo *info); bool virDeviceInfoPCIAddressIsPresent(const virDomainDeviceInfo *info); @@ -205,9 +201,6 @@ int virPCIDeviceAddressFormat(virBufferPtr buf, virPCIDeviceAddress addr, bool includeTypeInAddr); -bool virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, - virPCIDeviceAddress *addr2); - bool virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr); int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, virDomainDeviceCCWAddressPtr addr); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a0d229a79f..d6662d691d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -108,10 +108,7 @@ virDomainDeviceUSBAddressParseXML; virDomainDeviceVirtioSerialAddressParseXML; virInterfaceLinkFormat; virInterfaceLinkParseXML; -virPCIDeviceAddressEqual; virPCIDeviceAddressFormat; -virPCIDeviceAddressIsEmpty; -virPCIDeviceAddressIsValid; virPCIDeviceAddressParseXML; @@ -2498,10 +2495,13 @@ virObjectUnref; # util/virpci.h virPCIDeviceAddressAsString; +virPCIDeviceAddressEqual; virPCIDeviceAddressGetIOMMUGroupAddresses; virPCIDeviceAddressGetIOMMUGroupNum; virPCIDeviceAddressGetSysfsFile; virPCIDeviceAddressIOMMUGroupIterate; +virPCIDeviceAddressIsEmpty; +virPCIDeviceAddressIsValid; virPCIDeviceAddressParse; virPCIDeviceCopy; virPCIDeviceDetach; diff --git a/src/util/virpci.c b/src/util/virpci.c index 1730d888f7..fb3f04fac3 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1668,6 +1668,71 @@ virPCIDeviceReadID(virPCIDevicePtr dev, const char *id_name) return id_str; } +bool +virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, + bool report) +{ + if (addr->domain > 0xFFFF) { + if (report) + virReportError(VIR_ERR_XML_ERROR, + _("Invalid PCI address domain='0x%x', " + "must be <= 0xFFFF"), + addr->domain); + return false; + } + if (addr->bus > 0xFF) { + if (report) + virReportError(VIR_ERR_XML_ERROR, + _("Invalid PCI address bus='0x%x', " + "must be <= 0xFF"), + addr->bus); + return false; + } + if (addr->slot > 0x1F) { + if (report) + virReportError(VIR_ERR_XML_ERROR, + _("Invalid PCI address slot='0x%x', " + "must be <= 0x1F"), + addr->slot); + return false; + } + if (addr->function > 7) { + if (report) + virReportError(VIR_ERR_XML_ERROR, + _("Invalid PCI address function=0x%x, " + "must be <= 7"), + addr->function); + return false; + } + if (virPCIDeviceAddressIsEmpty(addr)) { + if (report) + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid PCI address 0000:00:00, at least " + "one of domain, bus, or slot must be > 0")); + return false; + } + return true; +} + +bool +virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr) +{ + return !(addr->domain || addr->bus || addr->slot); +} + +bool +virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, + virPCIDeviceAddress *addr2) +{ + if (addr1->domain == addr2->domain && + addr1->bus == addr2->bus && + addr1->slot == addr2->slot && + addr1->function == addr2->function) { + return true; + } + return false; +} + char * virPCIDeviceAddressAsString(virPCIDeviceAddressPtr addr) { diff --git a/src/util/virpci.h b/src/util/virpci.h index b4f72f8f06..16c2eded5e 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -218,6 +218,13 @@ int virPCIGetSysfsFile(char *virPCIDeviceName, char **pci_sysfs_device_link) ATTRIBUTE_RETURN_CHECK; +bool virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, + bool report); +bool virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr); + +bool virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, + virPCIDeviceAddress *addr2); + char *virPCIDeviceAddressAsString(virPCIDeviceAddressPtr addr) ATTRIBUTE_NONNULL(1); -- 2.17.1

3 2

[libvirt] [PATCH] libxl: remove configure check for libxl_domain_config_from_json
by Jim Fehlig 14 Sep '18

14 Sep '18

The libxl_domain_config_from_json API appeared in Xen 4.5, hence there is no need to check for its existence after changing the minimum supported Xen version to 4.6. Remove the check and its use in the tests. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- m4/virt-driver-libxl.m4 | 7 ------- tests/libxlxml2domconfigtest.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4 index 902da11472..70c5c59e6a 100644 --- a/m4/virt-driver-libxl.m4 +++ b/m4/virt-driver-libxl.m4 @@ -56,13 +56,6 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ ],[ LIBXL_LIBS="$LIBXL_LIBS -lxenstore -lxenctrl" ]) - - dnl Check if libxl_domain_config_from_json is available for domXML to - dnl libxl_domain_config tests - LIBS="$LIBS -lxenlight -lxenctrl" - AC_CHECK_FUNCS([libxl_domain_config_from_json]) - CFLAGS="$old_CFLAGS" - LIBS="$old_LIBS" fi AC_SUBST([LIBXL_CFLAGS]) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index b814461acc..eacf8f5615 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -33,7 +33,7 @@ #include "testutils.h" -#if defined(WITH_LIBXL) && defined(WITH_YAJL) && defined(HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON) +#if defined(WITH_LIBXL) && defined(WITH_YAJL) # include "internal.h" # include "viralloc.h" @@ -228,4 +228,4 @@ int main(void) return EXIT_AM_SKIP; } -#endif /* WITH_LIBXL && WITH_YAJL && HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON */ +#endif /* WITH_LIBXL && WITH_YAJL */ -- 2.18.0

2 1

[libvirt] [PATCH 00/10] Introduce x86 Cache Monitoring Technology (CMT)
by Wang Huaqiang 14 Sep '18

14 Sep '18

This series of patches introduced the x86 Cache Monitoring Technology (CMT) to libvirt by interacting with kernel resource control (resctrl) interface. CMT is one of the Intel(R) x86 CPU feature which belongs to the Resource Director Technology (RDT). CMT reports the occupancy of the last level cache, which is shared by all CPU cores. We have serval discussion about the enabling of CMT, please refer to following links for the RFCs. RFCv3 https://www.redhat.com/archives/libvir-list/2018-August/msg01213.html RFCv2 https://www.redhat.com/archives/libvir-list/2018-July/msg00409.html https://www.redhat.com/archives/libvir-list/2018-July/msg01241.html RFCv1 https://www.redhat.com/archives/libvir-list/2018-June/msg00674.html 1. About reason why CMT is necessary in libvirt? The perf events of 'CMT, MBML, MBMT' have been phased out since Linux kernel commit c39a0e2c8850f08249383f2425dbd8dbe4baad69, in libvirt the perf based cmt,mbm will not work with the latest linux kernel. These patches add CMT feature to libvirt through kernel resctrlfs interface. 2. Interfaces for CMT from the high level. 2.1 Query the host capability of CMT. The element 'monitor' represents the host capabilities of CMT. The explanations of involved CMT attributes: - 'maxAllocs' denotes the maximum monitoring groups could be created, which is limited by the number of hardware 'RMID'. - 'threshold' denotes the upper bound of cache occupancy for current group, in bytes, to determine if an RMID can be reused. - element 'feature' denotes the monitoring feature supported. - 'llc_occupancy' is the feature for reporting the last level cache occupancy information. # virsh capabilities ... <cache> <bank id='0' level='3' type='both' size='15' unit='MiB' cpus='0-5'> <control granularity='768' unit='KiB' type='code' maxAllocs='8'/> <control granularity='768' unit='KiB' type='data' maxAllocs='8'/> + <monitor threshold='540672' unit='B' maxAllocs='176'/> + <feature name=llc_occupancy/> + </monitor> </bank> <bank id='1' level='3' type='both' size='15' unit='MiB' cpus='6-11'> <control granularity='768' unit='KiB' type='code' maxAllocs='8'/> <control granularity='768' unit='KiB' type='data' maxAllocs='8'/> + <monitor threshold='540672' unit='B' maxAllocs='176'/> + <feature name=llc_occupancy/> + </monitor> </bank> </cache> ... 2.2 Create cache monitoring group (cache monitor). The main interface for creating monitoring group is through XML file. The proposed configuration is like: <cputune> <cachetune vcpus='1'> <cache id='0' level='3' type='code' size='7680' unit='KiB'/> <cache id='1' level='3' type='data' size='3840' unit='KiB'/> + <monitor vcpus='1'/> </cachetune> <cachetune vcpus='4-7'> + <monitor vcpus='4-6'/> </cachetune> </cputune> In above XML, created 2 cache resctrl allocation groups and 2 resctrl monitoring groups. The changes of cache monitor will be effective in next booting of VM. 2.3 Show CMT result through command 'domstats' Adding the interface in qemu to report this information for resource monitor group through command 'virsh domstats --cpu-total'. Below is a typical output: # virsh domstats 1 --cpu-total Domain: 'ubuntu16.04-base' ... cpu.cache.monitor.count=2 cpu.cache.0.name=vcpus_1 cpu.cache.0.vcpus=1 cpu.cache.0.bank.count=2 cpu.cache.0.bank.0.id=0 cpu.cache.0.bank.0.bytes=4505600 cpu.cache.0.bank.1.id=1 cpu.cache.0.bank.1.bytes=5586944 cpu.cache.1.name=vcpus_4-6 cpu.cache.1.vcpus=4,5,6 cpu.cache.1.bank.count=2 cpu.cache.1.bank.0.id=0 cpu.cache.1.bank.0.bytes=17571840 cpu.cache.1.bank.1.id=1 cpu.cache.1.bank.1.bytes=29106176 **Changes Since RFCv3** In the output of 'domstats', added 'cpu.cache.<cmt_group_index>.bank.<bank_index>.id' to tell the OS assigned cache bank id of current cache. Changes is prefixed with a '+': # virsh domstats 1 --cpu-total Domain: 'ubuntu16.04-base' ... cpu.cache.monitor.count=2 cpu.cache.0.name=vcpus_1 cpu.cache.0.vcpus=1 cpu.cache.0.bank.count=2 + cpu.cache.0.bank.0.id=0 cpu.cache.0.bank.0.bytes=4505600 + cpu.cache.0.bank.1.id=1 cpu.cache.0.bank.1.bytes=5586944 cpu.cache.1.name=vcpus_4-6 cpu.cache.1.vcpus=4,5,6 cpu.cache.1.bank.count=2 + cpu.cache.1.bank.0.id=0 cpu.cache.1.bank.0.bytes=17571840 + cpu.cache.1.bank.1.id=1 cpu.cache.1.bank.1.bytes=29106176 Wang Huaqiang (10): conf: Renamed 'controlBuf' to 'childrenBuf' util: add interface retrieving CMT capability conf: Add CMT capability to host test: add test case for resctrl monitor util: resctrl: refactoring some functions util: Introduce resctrl monitor for CMT conf: refactor virDomainResctrlAppend conf: introduce resctrl monitor group in domain qemu: Introduce resctrl monitoring group qemu: Report cache occupancy (CMT) with domstats .gnulib | 1 - docs/formatdomain.html.in | 14 +- docs/schemas/capability.rng | 28 + docs/schemas/domaincommon.rng | 11 +- src/conf/capabilities.c | 51 +- src/conf/capabilities.h | 1 + src/conf/domain_conf.c | 159 +++++- src/conf/domain_conf.h | 20 + src/libvirt-domain.c | 9 + src/libvirt_private.syms | 6 + src/qemu/qemu_driver.c | 265 ++++++++- src/qemu/qemu_process.c | 40 +- src/util/virresctrl.c | 597 +++++++++++++++++++-- src/util/virresctrl.h | 48 +- tests/genericxml2xmlindata/cachetune-cdp.xml | 2 + .../cachetune-colliding-monitors.xml | 36 ++ tests/genericxml2xmlindata/cachetune-small.xml | 1 + tests/genericxml2xmlindata/cachetune.xml | 3 + tests/genericxml2xmltest.c | 4 + .../resctrl/info/L3_MON/max_threshold_occupancy | 1 + .../linux-resctrl/resctrl/info/L3_MON/mon_features | 3 + .../linux-resctrl/resctrl/info/L3_MON/num_rmids | 1 + tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 6 + 23 files changed, 1208 insertions(+), 99 deletions(-) delete mode 160000 .gnulib create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-monitors.xml create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3_MON/max_threshold_occupancy create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3_MON/mon_features create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3_MON/num_rmids -- 2.7.4

5 41

[libvirt] [PATCH v2] numa: fix unsafe access to numa_nodes_ptr
by Wang Yechao 14 Sep '18

14 Sep '18

numa_nodes_ptr is a global variable in libnuma.so. It is been freed after main thread exits. If we have many running vms, restart the libvirtd service continuously at intervals of a few seconds, the main thread may exit before qemuProcessReconnect thread, and a segfault error occurs. Backstrace as follows: 0 0x00007f40e3d2dd72 in numa_bitmask_isbitset () from /lib64/libnuma.so.1 1 0x00007f40e4d14c55 in virNumaNodeIsAvailable (node=node@entry=0) at util/virnuma.c:396 2 0x00007f40e4d16010 in virNumaGetHostMemoryNodeset () at util/virnuma.c:1011 3 0x00007f40b94ced90 in qemuRestoreCgroupState (vm=0x7f407c39df00, vm=0x7f407c39df00) at qemu/qemu_cgroup.c:877 4 qemuConnectCgroup (driver=driver@entry=0x7f407c21fe80, vm=0x7f407c39df00) at qemu/qemu_cgroup.c:969 5 0x00007f40b94eef93 in qemuProcessReconnect (opaque=<optimized out>) at qemu/qemu_process.c:3531 6 0x00007f40e4d34bd2 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 7 0x00007f40e214ee25 in start_thread () from /lib64/libpthread.so.0 8 0x00007f40e1e7c36d in clone () from /lib64/libc.so.6 Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/util/virnuma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 67e6c86..f06f6b3 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -381,7 +381,10 @@ virNumaGetMaxCPUs(void) bool virNumaNodeIsAvailable(int node) { - return numa_bitmask_isbitset(numa_nodes_ptr, node); + if (numa_nodes_ptr) + return numa_bitmask_isbitset(numa_nodes_ptr, node); + else + return false; } -- 1.8.3.1

2 1