- Devel - libvirt List Archives

[libvirt] [PATCH] qemu_cgroup: Only try to allow devices if devices CGroup's available
by Michal Privoznik 23 Feb '17

23 Feb '17

When a domain needs an access to some device (be it a disk, RNG, chardev, whatever), we have to allow it in the devices CGroup (if it is available), because by default we disallow all the devices. But some of the functions that are responsible for setting up devices CGroup are lacking check whether there is any CGroup available. Thus users might be unable to hotplug some devices: virsh # attach-device fedora rng.xml error: Failed to attach device from rng.xml error: internal error: Controller 'devices' is not mounted Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_cgroup.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f0729743a..42a47a798 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -176,6 +176,9 @@ qemuSetupChrSourceCgroup(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; int ret; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + if (source->type != VIR_DOMAIN_CHR_TYPE_DEV) return 0; @@ -197,6 +200,9 @@ qemuTeardownChrSourceCgroup(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; int ret; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + if (source->type != VIR_DOMAIN_CHR_TYPE_DEV) return 0; @@ -247,6 +253,9 @@ qemuSetupInputCgroup(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; int ret = 0; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + switch (dev->type) { case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: VIR_DEBUG("Process path '%s' for input device", dev->source.evdev); @@ -270,6 +279,9 @@ qemuSetupHostdevCgroup(virDomainObjPtr vm, size_t i, npaths = 0; int rv, ret = -1; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + if (qemuDomainGetHostdevPath(NULL, dev, false, &npaths, &path, &perms) < 0) goto cleanup; @@ -344,6 +356,9 @@ qemuSetupGraphicsCgroup(virDomainObjPtr vm, const char *rendernode = gfx->data.spice.rendernode; int ret; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + if (gfx->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE || gfx->data.spice.gl != VIR_TRISTATE_BOOL_YES || !rendernode) @@ -481,6 +496,9 @@ qemuSetupRNGCgroup(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; int rv; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + if (rng->backend == VIR_DOMAIN_RNG_BACKEND_RANDOM) { VIR_DEBUG("Setting Cgroup ACL for RNG device"); rv = virCgroupAllowDevicePath(priv->cgroup, @@ -505,6 +523,9 @@ qemuTeardownRNGCgroup(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; int rv; + if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) + return 0; + if (rng->backend == VIR_DOMAIN_RNG_BACKEND_RANDOM) { VIR_DEBUG("Tearing down Cgroup ACL for RNG device"); rv = virCgroupDenyDevicePath(priv->cgroup, -- 2.11.0

2 1

[libvirt] [PATCH resend v2 0/2] Allow saving QEMU libvirt state to a pipe
by Chen Hanxiao 23 Feb '17

23 Feb '17

This series introduce flag VIR_DOMAIN_SAVE_DIRECT to enable command 'save' to write to PIPE. Base upon patches from Roy Keene <rkeene(a)knightpoint.com> with some fixes. Change from original patch: 1) Check whether the specified path is a PIPE. 2) Rebase on upstream. 3) Add doc for virsh command v2-resend: rebase on upstream v2: rename VIR_DOMAIN_SAVE_PIPE to VIR_DOMAIN_SAVE_DIRECT remove S_ISFIFO check Chen Hanxiao (2): qemu: Allow saving QEMU libvirt state to a pipe virsh: introduce flage --direct for save command include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 54 ++++++++++++++++++++++++++-------------- tools/virsh-domain.c | 6 +++++ tools/virsh.pod | 5 +++- 4 files changed, 47 insertions(+), 19 deletions(-) -- 2.7.4

1 2

[libvirt] [PATCH v2] qemu_capabilities: introduce QEMU_CAPS_SD_CARD to probe sd-card drivers
by Chen Hanxiao 23 Feb '17

23 Feb '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> This patch introduces QEMU_CAPS_SD_CARD for probing whether qemu support SD card by: {"execute": "device-list-properties", "arguments":{"typename":"sd-card"}} It will be helpful for apps which used cmd 'virsh domcaps` etc. Also helpful for: https://bugzilla.redhat.com/show_bug.cgi?id=1387218 Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v2: rebased on upstream src/qemu/qemu_capabilities.c | 9 +++++++-- src/qemu/qemu_capabilities.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5b5e3ac..da983ff 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -358,6 +358,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "query-cpu-model-expansion", /* 245 */ "virtio-net.host_mtu", "spice-rendernode", + "sd-card", ); @@ -1625,6 +1626,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "ivshmem-plain", QEMU_CAPS_DEVICE_IVSHMEM_PLAIN }, { "ivshmem-doorbell", QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL }, { "vhost-scsi", QEMU_CAPS_DEVICE_VHOST_SCSI }, + { "sd-card", QEMU_CAPS_SD_CARD }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = { @@ -5215,8 +5217,7 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_IDE, VIR_DOMAIN_DISK_BUS_SCSI, - VIR_DOMAIN_DISK_BUS_VIRTIO, - /* VIR_DOMAIN_DISK_BUS_SD */); + VIR_DOMAIN_DISK_BUS_VIRTIO); /* PowerPC pseries based VMs do not support floppy device */ if (!ARCH_IS_PPC64(qemuCaps->arch) || @@ -5225,6 +5226,10 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE)) VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_USB); + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SD_CARD)) + VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_SD); + return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0f998c4..746bd9c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -394,6 +394,7 @@ typedef enum { QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion */ QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */ QEMU_CAPS_SPICE_RENDERNODE, /* -spice rendernode */ + QEMU_CAPS_SD_CARD, /* -sd abc.img */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; -- 2.7.4

1 0

[libvirt] [PATCH] test: fix pcie-root-port-too-many test
by Laine Stump 23 Feb '17

23 Feb '17

While reviewing a patch from Andrea that modified this test case, I realized that although it was "properly failing" (it's a negative test), that it was failing for the wrong reason (the MULTIFUNCTION cap wasn't set in the test case, so it was saying that multifunction=on wasn't supported by the QEMU binary; instead it should have been complaining that it had run out of PCI slots of the appropriate type and couldn't automatically add any more). This improper failure had started when I added the patch to automatically aggregate pcie-root-ports onto multiple functions of each pcie-root slot, but I hadn't noticed it because the test still failed. This patch corrects the test case to 1) set the MULTIFUNCTION flag in the caps, and 2) attempt to add 241 pcie-root-ports to a domain. Since there are 30 slots available on a pcie-root (slot 0 is reserved, and slot 31 is used by the integrated SATA controller), and a pcie-root-port can only be placed on a function of a slot on pcie-root, the maximum number of pcie-root-ports in any domain is 240. --- .../qemuxml2argv-pcie-root-port-too-many.xml | 273 ++++++++++++++++++--- tests/qemuxml2argvtest.c | 1 + 2 files changed, 242 insertions(+), 32 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml index 5234e3b..d7ac64a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml @@ -20,41 +20,250 @@ <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='pci' index='0' model='pcie-root'/> - <controller type='pci' index='1' model='pcie-root-port'/> - <controller type='pci' index='2' model='pcie-root-port'/> - <controller type='pci' index='3' model='pcie-root-port'/> - <controller type='pci' index='4' model='pcie-root-port'/> - <controller type='pci' index='5' model='pcie-root-port'/> - <controller type='pci' index='6' model='pcie-root-port'/> - <controller type='pci' index='7' model='pcie-root-port'/> - <controller type='pci' index='8' model='pcie-root-port'/> - <controller type='pci' index='9' model='pcie-root-port'/> - <controller type='pci' index='10' model='pcie-root-port'/> - <controller type='pci' index='11' model='pcie-root-port'/> - <controller type='pci' index='12' model='pcie-root-port'/> - <controller type='pci' index='13' model='pcie-root-port'/> - <controller type='pci' index='14' model='pcie-root-port'/> - <controller type='pci' index='15' model='pcie-root-port'/> - <controller type='pci' index='16' model='pcie-root-port'/> - <controller type='pci' index='17' model='pcie-root-port'/> - <controller type='pci' index='18' model='pcie-root-port'/> - <controller type='pci' index='19' model='pcie-root-port'/> - <controller type='pci' index='20' model='pcie-root-port'/> - <controller type='pci' index='21' model='pcie-root-port'/> - <controller type='pci' index='22' model='pcie-root-port'/> - <controller type='pci' index='23' model='pcie-root-port'/> - <controller type='pci' index='24' model='pcie-root-port'/> - <controller type='pci' index='25' model='pcie-root-port'/> - <controller type='pci' index='26' model='pcie-root-port'/> - <controller type='pci' index='27' model='pcie-root-port'/> - <controller type='pci' index='28' model='pcie-root-port'/> - <controller type='pci' index='29' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> + <controller type='pci' model='pcie-root-port'/> <controller type='sata' index='0'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> - <video> - <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/> - </video> <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8d737fd..81217df 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2041,6 +2041,7 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, + QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); -- 2.9.3

2 1

[libvirt] [PATCH v2 0/3] Use non-blacklisted family/model/stepping for Haswell CPU model
by Eduardo Habkost 22 Feb '17

22 Feb '17

Changes v1 -> v2: * Coding style fixes * Make series simpler: * Don't use trick: char vendor[static (CPUID_VENDOR_SZ + 1)] because it confuses checkpatch.pl * Removed patch "Add explicit array size to x86_cpu_vendor_words2str()" * Rebased on top of my x86-next branch: https://github.com/ehabkost/qemu x86-next Git branch for testing: https://github.com/ehabkost/qemu-hacks work/x86-rtm-blacklist Diff from v1: diff --git a/target/i386/cpu.h b/target/i386/cpu.h index cd94726e43..647435a1d9 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1431,7 +1431,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, void cpu_clear_apic_feature(CPUX86State *env); void host_cpuid(uint32_t function, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); -void host_vendor_fms(char vendor[static (CPUID_VENDOR_SZ + 1)], int *family, int *model, int *stepping); +void host_vendor_fms(char *vendor, int *family, int *model, int *stepping); /* helper.c */ int x86_cpu_handle_mmu_fault(CPUState *cpu, vaddr addr, diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 25c6c5e115..eab1ad7935 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -682,7 +682,7 @@ void host_cpuid(uint32_t function, uint32_t count, *edx = vec[3]; } -void host_vendor_fms(char vendor[static (CPUID_VENDOR_SZ + 1)], int *family, int *model, int *stepping) +void host_vendor_fms(char *vendor, int *family, int *model, int *stepping) { uint32_t eax, ebx, ecx, edx; @@ -1570,7 +1570,8 @@ static void host_x86_cpu_class_init(ObjectClass *oc, void *data) xcc->kvm_required = true; xcc->ordering = 9; - host_vendor_fms(host_cpudef.vendor, &host_cpudef.family, &host_cpudef.model, &host_cpudef.stepping); + host_vendor_fms(host_cpudef.vendor, &host_cpudef.family, + &host_cpudef.model, &host_cpudef.stepping); cpu_x86_fill_model_id(host_cpudef.model_id); --- A recent glibc commit[1] added a blacklist to ensure it won't use TSX on hosts that are known to have a broken TSX implementation. Our existing Haswell CPU model has a blacklisted family/model/stepping combination, so it has to be updated to make sure guests will really use TSX. This is done by patch 5/5. However, to do this safely we need to ensure the host CPU is not a blacklisted one, so we won't mislead guests by exposing known-to-be-good FMS values on a known-to-be-broken host. This is done by patch 3/5. [1] https://sourceware.org/git/?p=glibc.git;a=commit;h=2702856bf45c82cf8e69f206… --- Cc: dgilbert(a)redhat.com Cc: fweimer(a)redhat.com Cc: carlos(a)redhat.com Cc: triegel(a)redhat.com Cc: berrange(a)redhat.com Cc: jdenemar(a)redhat.com Cc: pbonzini(a)redhat.com Eduardo Habkost (3): i386: host_vendor_fms() helper function i386/kvm: Blacklist TSX on known broken hosts i386: Change stepping of Haswell to non-blacklisted value include/hw/i386/pc.h | 5 +++++ target/i386/cpu.h | 1 + target/i386/cpu.c | 31 ++++++++++++++++++++++--------- target/i386/kvm.c | 17 +++++++++++++++++ 4 files changed, 45 insertions(+), 9 deletions(-) -- 2.11.0.259.g40922b1

1 3

Re: [libvirt] [Qemu-devel] [PATCH] qdev: Make "hotplugged" property read-only
by Eduardo Habkost 22 Feb '17

22 Feb '17

(CCing libvir-list and Laine) On Tue, Jan 03, 2017 at 05:53:27PM +0100, Igor Mammedov wrote: > On Tue, 3 Jan 2017 17:10:15 +0100 > Paolo Bonzini <pbonzini(a)redhat.com> wrote: > > > > > > > On 03/01/2017 15:22, Eduardo Habkost wrote: > > >> I didn't know that. Is this documented somewhere? > > >> Is it actually used by any existing software? > > > not that I know of. But users should be fixed if they are not using it. > > > > > > I see. The problem is that the mechanism is undocumented, > > > untested, and seems very likely to trigger bugs in device code. > > > > I agree. Why can't hotplugged be migrated? > It's probably not migrated because of it's not runtime/guest modified > state so we don't have to migrate it as it's know in advance. > > For now it should set manually on CLI (-device) with the rest of > hotplugged device properties. As this recommendation has the potential to trigger hidden bugs (and known to trigger a bug in QEMU <= 2.8), I would like it to be properly documented, and the documentation/recommendations reviewed following the usual patch review process. While we don't do that, setting "hotplugged=true" on the command-line is an unused, undocumented, untested (and unsupported?) feature. -- Eduardo

1 1

[libvirt] [PATCH 0/6] qemu: PCI-related bug fixes and cleanups
by Andrea Bolognani 22 Feb '17

22 Feb '17

Patches 1-3 are straightforward code cleanups. Patch 4 is a massive reduction in the size of our test suite, achieved by removing legacy PCI controllers from test cases that don't need them. Patch 5 removes some incorrect assumptions that, for all intents and purposes, made the availablilty of pci-bridge mandatory even for guests that only used PCIe controllers and devices. Patch 6 reduces the test suite in size further by dropping the capabilities that are no longer required after patch 5: if you apply this patch before the previous one and run the test suite, you'll get a lot of failures. Andrea Bolognani (6): conf: Remove dead code qemu: Make switch statements more strict conf: Make switch statements more strict tests: Reduce usage of legacy PCI controllers on PCIe machines qemu: Allow multiple bridges when pci-bridges is not available tests: Reduce QEMU_CAPS_DEVICE_{DMI_TO_,}PCI_BRIDGE usage src/conf/domain_addr.c | 17 +- src/conf/domain_conf.c | 12 +- src/qemu/qemu_command.c | 23 +-- src/qemu/qemu_domain_address.c | 10 +- .../qemuxml2argv-boot-floppy-q35.args | 5 +- .../qemuxml2argv-boot-floppy-q35.xml | 10 +- .../qemuxml2argv-bootindex-floppy-q35.args | 5 +- .../qemuxml2argv-bootindex-floppy-q35.xml | 10 +- .../qemuxml2argv-intel-iommu-machine.args | 5 +- .../qemuxml2argv-intel-iommu-machine.xml | 13 +- .../qemuxml2argvdata/qemuxml2argv-intel-iommu.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-intel-iommu.xml | 13 +- .../qemuxml2argv-pcie-expander-bus-bad-bus.xml | 18 +- .../qemuxml2argv-pcie-expander-bus.args | 136 ++++++------- .../qemuxml2argv-pcie-expander-bus.xml | 85 ++++---- .../qemuxml2argv-pcie-root-port-too-many.xml | 6 +- .../qemuxml2argv-pcie-root-port.args | 6 +- .../qemuxml2argv-pcie-root-port.xml | 6 +- .../qemuxml2argv-pcie-switch-downstream-port.args | 22 +- .../qemuxml2argv-pcie-switch-downstream-port.xml | 18 +- .../qemuxml2argv-pcie-switch-upstream-port.args | 10 +- .../qemuxml2argv-pcie-switch-upstream-port.xml | 10 +- .../qemuxml2argv-pcihole64-q35.args | 2 - .../qemuxml2argv-pcihole64-q35.xml | 2 - .../qemuxml2argv-q35-dmi-bad-address1.xml | 5 +- .../qemuxml2argv-q35-dmi-bad-address2.xml | 21 +- .../qemuxml2argv-q35-wrong-root.xml | 7 - tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 - tests/qemuxml2argvdata/qemuxml2argv-q35.xml | 7 - .../qemuxml2argv-usb-controller-default-q35.args | 2 - .../qemuxml2argv-usb-controller-default-q35.xml | 5 - .../qemuxml2argv-usb-controller-explicit-q35.args | 2 - .../qemuxml2argv-usb-controller-explicit-q35.xml | 5 - .../qemuxml2argv-vcpu-placement-static.xml | 6 - tests/qemuxml2argvtest.c | 83 ++------ .../qemuxml2xmlout-intel-iommu.xml | 13 +- .../qemuxml2xmlout-pcie-expander-bus.xml | 225 ++++++++++----------- .../qemuxml2xmlout-pcie-root-port.xml | 15 +- .../qemuxml2xmlout-pcie-switch-downstream-port.xml | 61 +++--- .../qemuxml2xmlout-pcie-switch-upstream-port.xml | 25 +-- .../qemuxml2xmlout-pcihole64-q35.xml | 9 - tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 9 - .../qemuxml2xmlout-usb-controller-default-q35.xml | 9 - .../qemuxml2xmlout-usb-controller-explicit-q35.xml | 9 - .../qemuxml2xmlout-vcpu-placement-static.xml | 9 - tests/qemuxml2xmltest.c | 56 ++--- 46 files changed, 354 insertions(+), 680 deletions(-) -- 2.7.4

2 16

[libvirt] [PATCH] virsh: Alter formatting a bit for output of domstats fields
by John Ferlan 22 Feb '17

22 Feb '17

Alter the formatting of each line to not give the appearance of one long run-on sentance and to be consistent between the various elements of collected/displayed data. The formatting should fit within the 80 character display. This removes the need for commas at the end of each line. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh.pod | 163 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 93 insertions(+), 70 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index a470409..c3cd6bb 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -885,67 +885,85 @@ Note that - depending on the hypervisor type and version or the domain state - not all of the following statistics may be returned. When selecting the I<--state> group the following fields are returned: -"state.state" - state of the VM, returned as number from virDomainState enum, -"state.reason" - reason for entering given state, returned as int from -virDomain*Reason enum corresponding to given state. + + "state.state" - state of the VM, returned as number from + virDomainState enum + "state.reason" - reason for entering given state, returned + as int from virDomain*Reason enum corresponding + to given state I<--cpu-total> returns: -"cpu.time" - total cpu time spent for this domain in nanoseconds, -"cpu.user" - user cpu time spent in nanoseconds, -"cpu.system" - system cpu time spent in nanoseconds + + "cpu.time" - total cpu time spent for this domain in nanoseconds + "cpu.user" - user cpu time spent in nanoseconds + "cpu.system" - system cpu time spent in nanoseconds I<--balloon> returns: -"balloon.current" - the memory in kiB currently used, -"balloon.maximum" - the maximum memory in kiB allowed, -"balloon.swap_in" - the amount of data read from swap space (in kB), -"balloon.swap_out" - the amount of memory written out to swap space (in kB), -"balloon.major_fault" - the number of page faults then disk IO was required, -"balloon.minor_fault" - the number of other page faults, -"balloon.unused" - the amount of memory left unused by the system (in kB), -"balloon.available" - the amount of usable memory as seen by the domain (in kB), -"balloon.rss" - Resident Set Size of running domain's process (in kB), -"balloon.usable" - the amount of memory which can be reclaimed by balloon -without causing host swapping (in KB), -"balloon.last-update" - timestamp of the last update of statistics (in seconds) + + "balloon.current" - the memory in kiB currently used + "balloon.maximum" - the maximum memory in kiB allowed + "balloon.swap_in" - the amount of data read from swap space (in kB) + "balloon.swap_out" - the amount of memory written out to swap + space (in kB) + "balloon.major_fault" - the number of page faults then disk IO + was required + "balloon.minor_fault" - the number of other page faults + "balloon.unused" - the amount of memory left unused by the + system (in kB) + "balloon.available" - the amount of usable memory as seen by + the domain (in kB) + "balloon.rss" - Resident Set Size of running domain's process + (in kB) + "balloon.usable" - the amount of memory which can be reclaimed by + balloon without causing host swapping (in KB) + "balloon.last-update" - timestamp of the last update of statistics + (in seconds) I<--vcpu> returns: -"vcpu.current" - current number of online virtual CPUs, -"vcpu.maximum" - maximum number of online virtual CPUs, -"vcpu.<num>.state" - state of the virtual CPU <num>, as number -from virVcpuState enum, -"vcpu.<num>.time" - virtual cpu time spent by virtual CPU <num> - (in microseconds), -"vcpu.<num>.wait" - virtual cpu time spent by virtual CPU <num> -waiting on I/O (in microseconds), -"vcpu.<num>.halted" - virtual CPU <num> is halted: yes or no (may indicate -the processor is idle or even disabled, depending on the architecture) + + "vcpu.current" - current number of online virtual CPUs + "vcpu.maximum" - maximum number of online virtual CPUs + "vcpu.<num>.state" - state of the virtual CPU <num>, as + number from virVcpuState enum + "vcpu.<num>.time" - virtual cpu time spent by virtual + CPU <num> (in microseconds) + "vcpu.<num>.wait" - virtual cpu time spent by virtual + CPU <num> waiting on I/O (in microseconds) + "vcpu.<num>.halted" - virtual CPU <num> is halted: yes or + no (may indicate the processor is idle + or even disabled, depending on the + architecture) I<--interface> returns: -"net.count" - number of network interfaces on this domain, -"net.<num>.name" - name of the interface <num>, -"net.<num>.rx.bytes" - number of bytes received, -"net.<num>.rx.pkts" - number of packets received, -"net.<num>.rx.errs" - number of receive errors, -"net.<num>.rx.drop" - number of receive packets dropped, -"net.<num>.tx.bytes" - number of bytes transmitted, -"net.<num>.tx.pkts" - number of packets transmitted, -"net.<num>.tx.errs" - number of transmission errors, -"net.<num>.tx.drop" - number of transmit packets dropped + + "net.count" - number of network interfaces on this domain + "net.<num>.name" - name of the interface <num> + "net.<num>.rx.bytes" - number of bytes received + "net.<num>.rx.pkts" - number of packets received + "net.<num>.rx.errs" - number of receive errors + "net.<num>.rx.drop" - number of receive packets dropped + "net.<num>.tx.bytes" - number of bytes transmitted + "net.<num>.tx.pkts" - number of packets transmitted + "net.<num>.tx.errs" - number of transmission errors + "net.<num>.tx.drop" - number of transmit packets dropped I<--perf> returns the statistics of all enabled perf events: -"perf.cmt" - the cache usage in Byte currently used, -"perf.mbmt" - total system bandwidth from one level of cache, -"perf.mbml" - bandwidth of memory traffic for a memory controller, -"perf.cpu_cycles" - the count of cpu cycles (total/elapsed), -"perf.instructions" - the count of instructions, -"perf.cache_references" - the count of cache hits, -"perf.cache_misses" - the count of caches misses, -"perf.branch_instructions" - the count of branch instructions, -"perf.branch_misses" - the count of branch misses, -"perf.bus_cycles" - the count of bus cycles, -"perf.stalled_cycles_frontend" - the count of stalled frontend cpu cycles, -"perf.stalled_cycles_backend" - the count of stalled backend cpu cycles, -"perf.ref_cpu_cycles" - the count of ref cpu cycles + + "perf.cmt" - the cache usage in Byte currently used + "perf.mbmt" - total system bandwidth from one level of cache + "perf.mbml" - bandwidth of memory traffic for a memory controller + "perf.cpu_cycles" - the count of cpu cycles (total/elapsed) + "perf.instructions" - the count of instructions + "perf.cache_references" - the count of cache hits + "perf.cache_misses" - the count of caches misses + "perf.branch_instructions" - the count of branch instructions + "perf.branch_misses" - the count of branch misses + "perf.bus_cycles" - the count of bus cycles + "perf.stalled_cycles_frontend" - the count of stalled frontend + cpu cycles + "perf.stalled_cycles_backend" - the count of stalled backend + cpu cycles + "perf.ref_cpu_cycles" - the count of ref cpu cycles See the B<perf> command for more details about each event. @@ -954,25 +972,30 @@ domain. Using the I<--backing> flag extends this information to cover all resources in the backing chain, rather than the default of limiting information to the active layer for each guest disk. Information listed includes: -"block.count" - number of block devices being listed, -"block.<num>.name" - name of the target of the block device <num> (the -same name for multiple entries if I<--backing> is present), -"block.<num>.backingIndex" - when I<--backing> is present, matches up -with the <backingStore> index listed in domain XML for backing files, -"block.<num>.path" - file source of block device <num>, if it is a -local file or block device, -"block.<num>.rd.reqs" - number of read requests, -"block.<num>.rd.bytes" - number of read bytes, -"block.<num>.rd.times" - total time (ns) spent on reads, -"block.<num>.wr.reqs" - number of write requests, -"block.<num>.wr.bytes" - number of written bytes, -"block.<num>.wr.times" - total time (ns) spent on writes, -"block.<num>.fl.reqs" - total flush requests, -"block.<num>.fl.times" - total time (ns) spent on cache flushing, -"block.<num>.errors" - Xen only: the 'oo_req' value, -"block.<num>.allocation" - offset of highest written sector in bytes, -"block.<num>.capacity" - logical size of source file in bytes, -"block.<num>.physical" - physical size of source file in bytes + + "block.count" - number of block devices being listed + "block.<num>.name" - name of the target of the block + device <num> (the same name for + multiple entries if I<--backing> + is present) + "block.<num>.backingIndex" - when I<--backing> is present, + matches up with the <backingStore> + index listed in domain XML for + backing files + "block.<num>.path" - file source of block device <num>, if + it is a local file or block device + "block.<num>.rd.reqs" - number of read requests + "block.<num>.rd.bytes" - number of read bytes + "block.<num>.rd.times" - total time (ns) spent on reads + "block.<num>.wr.reqs" - number of write requests + "block.<num>.wr.bytes" - number of written bytes + "block.<num>.wr.times" - total time (ns) spent on writes + "block.<num>.fl.reqs" - total flush requests + "block.<num>.fl.times" - total time (ns) spent on cache flushing + "block.<num>.errors" - Xen only: the 'oo_req' value + "block.<num>.allocation" - offset of highest written sector in bytes + "block.<num>.capacity" - logical size of source file in bytes + "block.<num>.physical" - physical size of source file in bytes Selecting a specific statistics groups doesn't guarantee that the daemon supports the selected group of stats. Flag I<--enforce> -- 2.7.4

2 2

[libvirt] [RFC] Substitute poll by epoll in virEventPollRunOnce
by Derbyshev Dmitriy 22 Feb '17

22 Feb '17

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> This makes it possible to avoid allocations in virEventPollMakePollFDs, as well as generally reduces time spent in kernel if handles remain the same, which should generally be true. __________________________________________ Questions: 1) What to do with probe in virEventPollRunOnce? 2) Are ifdef an acceptable solution to epoll avaliability issues? 3) Is using MAX_POLL_EVENTS_AT_ONCE constant a valid solution? 4) some fds are sometimes added twice, but only once with events!=0? This complicates virEventPoll*Handle fuctions. At the very least, it is called twice in _dbus_watch_list_set_functions. Signed-off-by: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> --- configure.ac | 26 +++++ src/util/vireventpoll.c | 205 ++++++++++++++++++++++++++++++++++++--- src/util/vireventpoll.h | 5 + tests/commanddata/test3epoll.log | 15 +++ tests/commandtest.c | 4 + 5 files changed, 242 insertions(+), 13 deletions(-) create mode 100644 tests/commanddata/test3epoll.log diff --git a/configure.ac b/configure.ac index dfc536f..c985ccc 100644 --- a/configure.ac +++ b/configure.ac @@ -2695,6 +2695,32 @@ AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash] AC_DEFINE_UNQUOTED([base64_encode],[libvirt_gl_base64_encode],[Hack to avoid symbol clash]) AC_DEFINE_UNQUOTED([base64_encode_alloc],[libvirt_gl_base64_encode_alloc],[Hack to avoid symbol clash]) +AC_ARG_ENABLE([epoll], + [AS_HELP_STRING([--enable-epoll],[use epoll(4) on Linux])], + [enable_epoll=$enableval], [enable_epoll=auto]) +if test x$enable_epoll = xno; then + have_linux_epoll=no +else + AC_MSG_CHECKING([for Linux epoll(4)]) + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [ + #ifndef __linux__ + #error This is not Linux + #endif + #include <sys/epoll.h> + ], + [epoll_create1 (EPOLL_CLOEXEC);])], + [have_linux_epoll=yes], + [have_linux_epoll=no]) + AC_MSG_RESULT([$have_linux_epoll]) +fi +if test x$enable_epoll,$have_linux_epoll = xyes,no; then + AC_MSG_ERROR([epoll support explicitly enabled but not available]) +fi +if test "x$have_linux_epoll" = xyes; then + AC_DEFINE_UNQUOTED([HAVE_LINUX_EPOLL], 1, [whether epoll is supported]) +fi + AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index 81ecab4..1541706 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -25,7 +25,11 @@ #include <stdlib.h> #include <string.h> -#include <poll.h> +#ifdef HAVE_LINUX_EPOLL +# include <sys/epoll.h> +#else +# include <poll.h> +#endif #include <sys/time.h> #include <errno.h> #include <unistd.h> @@ -87,6 +91,9 @@ struct virEventPollLoop { size_t timeoutsCount; size_t timeoutsAlloc; struct virEventPollTimeout *timeouts; +#ifdef HAVE_LINUX_EPOLL + int epollfd; +#endif }; /* Only have one event loop */ @@ -109,6 +116,11 @@ int virEventPollAddHandle(int fd, int events, virFreeCallback ff) { int watch; +#ifdef HAVE_LINUX_EPOLL + size_t i; + struct epoll_event ev; +#endif + int native = virEventPollToNativeEvents(events); virMutexLock(&eventLoop.lock); if (eventLoop.handlesCount == eventLoop.handlesAlloc) { EVENT_DEBUG("Used %zu handle slots, adding at least %d more", @@ -124,8 +136,7 @@ int virEventPollAddHandle(int fd, int events, eventLoop.handles[eventLoop.handlesCount].watch = watch; eventLoop.handles[eventLoop.handlesCount].fd = fd; - eventLoop.handles[eventLoop.handlesCount].events = - virEventPollToNativeEvents(events); + eventLoop.handles[eventLoop.handlesCount].events = native; eventLoop.handles[eventLoop.handlesCount].cb = cb; eventLoop.handles[eventLoop.handlesCount].ff = ff; eventLoop.handles[eventLoop.handlesCount].opaque = opaque; @@ -133,7 +144,30 @@ int virEventPollAddHandle(int fd, int events, eventLoop.handlesCount++; +#ifdef HAVE_LINUX_EPOLL + ev.events = native; + ev.data.fd = fd; + if (epoll_ctl(eventLoop.epollfd, EPOLL_CTL_ADD, fd, &ev) < 0) { + if (errno == EEXIST) { + for (i = 0; i < eventLoop.handlesCount; i++) { + if (eventLoop.handles[i].fd == fd && + !eventLoop.handles[i].deleted) { + ev.events |= eventLoop.handles[i].events; + } + } + if (epoll_ctl(eventLoop.epollfd, EPOLL_CTL_MOD, fd, &ev) < 0) { + virMutexUnlock(&eventLoop.lock); + return -1; + } + } + else { + virMutexUnlock(&eventLoop.lock); + return -1; + } + } +#else virEventPollInterruptLocked(); +#endif PROBE(EVENT_POLL_ADD_HANDLE, "watch=%d fd=%d events=%d cb=%p opaque=%p ff=%p", @@ -145,8 +179,14 @@ int virEventPollAddHandle(int fd, int events, void virEventPollUpdateHandle(int watch, int events) { +#ifdef HAVE_LINUX_EPOLL + struct epoll_event ev; + size_t i, j; +#else size_t i; +#endif bool found = false; + int native = virEventPollToNativeEvents(events); PROBE(EVENT_POLL_UPDATE_HANDLE, "watch=%d events=%d", watch, events); @@ -159,13 +199,34 @@ void virEventPollUpdateHandle(int watch, int events) virMutexLock(&eventLoop.lock); for (i = 0; i < eventLoop.handlesCount; i++) { if (eventLoop.handles[i].watch == watch) { - eventLoop.handles[i].events = - virEventPollToNativeEvents(events); + eventLoop.handles[i].events = native; +#ifndef HAVE_LINUX_EPOLL virEventPollInterruptLocked(); +#endif found = true; break; } } + +#ifdef HAVE_LINUX_EPOLL + ev.events = native; + for (j = 0; j < eventLoop.handlesCount; j++) { + if (eventLoop.handles[i].fd == eventLoop.handles[i].fd && + !eventLoop.handles[i].deleted && + i != j) { + ev.events |= eventLoop.handles[i].events; + } + } + ev.data.fd = eventLoop.handles[i].fd; + + if (found && epoll_ctl(eventLoop.epollfd, EPOLL_CTL_MOD, + eventLoop.handles[i].fd, &ev) < 0) { + VIR_WARN("Update for existing handle watch %d failed", watch); + virMutexUnlock(&eventLoop.lock); + return; + } +#endif + virMutexUnlock(&eventLoop.lock); if (!found) @@ -180,7 +241,12 @@ void virEventPollUpdateHandle(int watch, int events) */ int virEventPollRemoveHandle(int watch) { +#ifdef HAVE_LINUX_EPOLL + struct epoll_event ev; + size_t i, j; +#else size_t i; +#endif PROBE(EVENT_POLL_REMOVE_HANDLE, "watch=%d", watch); @@ -196,15 +262,47 @@ int virEventPollRemoveHandle(int watch) continue; if (eventLoop.handles[i].watch == watch) { - EVENT_DEBUG("mark delete %zu %d", i, eventLoop.handles[i].fd); - eventLoop.handles[i].deleted = 1; - virEventPollInterruptLocked(); + break; + } + } + + if (i == eventLoop.handlesCount) { + virMutexUnlock(&eventLoop.lock); + return -1; + } + +#ifdef HAVE_LINUX_EPOLL + ev.events = 0; + for (j = 0; j < eventLoop.handlesCount; j++) { + if (eventLoop.handles[j].fd == eventLoop.handles[i].fd && + !eventLoop.handles[j].deleted && + i != j) { + ev.events |= eventLoop.handles[i].events; + } + } + + ev.data.fd = eventLoop.handles[i].fd; + if (ev.events) { + if (epoll_ctl(eventLoop.epollfd, EPOLL_CTL_MOD, eventLoop.handles[i].fd, + &ev) < 0) { virMutexUnlock(&eventLoop.lock); - return 0; + return -1; } } + else { + if (epoll_ctl(eventLoop.epollfd, EPOLL_CTL_DEL, eventLoop.handles[i].fd, + &ev) < 0) { + virMutexUnlock(&eventLoop.lock); + return -1; + } + } +#endif + + EVENT_DEBUG("mark delete %zu %d", i, eventLoop.handles[i].fd); + eventLoop.handles[i].deleted = 1; + virEventPollInterruptLocked(); virMutexUnlock(&eventLoop.lock); - return -1; + return 0; } @@ -373,6 +471,7 @@ static int virEventPollCalculateTimeout(int *timeout) return 0; } +#ifndef HAVE_LINUX_EPOLL /* * Allocate a pollfd array containing data for all registered * file handles. The caller must free the returned data struct @@ -409,6 +508,7 @@ static struct pollfd *virEventPollMakePollFDs(int *nfds) { return fds; } +#endif /* @@ -472,7 +572,11 @@ static int virEventPollDispatchTimeouts(void) * * Returns 0 upon success, -1 if an error occurred */ +#ifdef HAVE_LINUX_EPOLL +static int virEventPollDispatchHandles(int nfds, struct epoll_event *events) +#else static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) +#endif { size_t i, n; VIR_DEBUG("Dispatch %d", nfds); @@ -482,7 +586,11 @@ static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) * in the fds array we've got */ for (i = 0, n = 0; n < nfds && i < eventLoop.handlesCount; n++) { while (i < eventLoop.handlesCount && +#ifdef HAVE_LINUX_EPOLL + (eventLoop.handles[i].fd != events[n].data.fd || +#else (eventLoop.handles[i].fd != fds[n].fd || +#endif eventLoop.handles[i].events == 0)) { i++; } @@ -496,16 +604,25 @@ static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) continue; } +#ifdef HAVE_LINUX_EPOLL + if (events[n].events) { + int hEvents = virEventPollFromNativeEvents(events[n].events); +#else if (fds[n].revents) { + int hEvents = virEventPollFromNativeEvents(fds[n].revents); +#endif virEventHandleCallback cb = eventLoop.handles[i].cb; int watch = eventLoop.handles[i].watch; void *opaque = eventLoop.handles[i].opaque; - int hEvents = virEventPollFromNativeEvents(fds[n].revents); PROBE(EVENT_POLL_DISPATCH_HANDLE, "watch=%d events=%d", watch, hEvents); virMutexUnlock(&eventLoop.lock); +#ifdef HAVE_LINUX_EPOLL + (cb)(watch, events[n].data.fd, hEvents, opaque); +#else (cb)(watch, fds[n].fd, hEvents, opaque); +#endif virMutexLock(&eventLoop.lock); } } @@ -618,7 +735,11 @@ static void virEventPollCleanupHandles(void) */ int virEventPollRunOnce(void) { +#ifdef HAVE_LINUX_EPOLL + struct epoll_event events[MAX_POLL_EVENTS_AT_ONCE]; +#else struct pollfd *fds = NULL; +#endif int ret, timeout, nfds; virMutexLock(&eventLoop.lock); @@ -628,17 +749,29 @@ int virEventPollRunOnce(void) virEventPollCleanupTimeouts(); virEventPollCleanupHandles(); - if (!(fds = virEventPollMakePollFDs(&nfds)) || - virEventPollCalculateTimeout(&timeout) < 0) +#ifndef HAVE_LINUX_EPOLL + if (!(fds = virEventPollMakePollFDs(&nfds))) + goto error; +#endif + if (virEventPollCalculateTimeout(&timeout) < 0) goto error; virMutexUnlock(&eventLoop.lock); retry: +#ifdef HAVE_LINUX_EPOLL +//FIXME: PROBE handles + PROBE(EVENT_POLL_RUN, + "nhandles=%d timeout=%d", + 42, timeout); + nfds = ret = epoll_wait(eventLoop.epollfd, events, + MAX_POLL_EVENTS_AT_ONCE, timeout); +#else PROBE(EVENT_POLL_RUN, "nhandles=%d timeout=%d", nfds, timeout); ret = poll(fds, nfds, timeout); +#endif if (ret < 0) { EVENT_DEBUG("Poll got error event %d", errno); if (errno == EINTR || errno == EAGAIN) @@ -653,22 +786,32 @@ int virEventPollRunOnce(void) if (virEventPollDispatchTimeouts() < 0) goto error; +#ifdef HAVE_LINUX_EPOLL + if (ret > 0 && + virEventPollDispatchHandles(nfds, events) < 0) + goto error; +#else if (ret > 0 && virEventPollDispatchHandles(nfds, fds) < 0) goto error; +#endif virEventPollCleanupTimeouts(); virEventPollCleanupHandles(); eventLoop.running = 0; virMutexUnlock(&eventLoop.lock); +#ifndef HAVE_LINUX_EPOLL VIR_FREE(fds); +#endif return 0; error: virMutexUnlock(&eventLoop.lock); error_unlocked: +#ifndef HAVE_LINUX_EPOLL VIR_FREE(fds); +#endif return -1; } @@ -698,6 +841,17 @@ int virEventPollInit(void) return -1; } +#ifdef HAVE_LINUX_EPOLL + eventLoop.epollfd = epoll_create1(0); + if (eventLoop.epollfd < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to initialize epoll")); + VIR_FORCE_CLOSE(eventLoop.wakeupfd[0]); + VIR_FORCE_CLOSE(eventLoop.wakeupfd[1]); + return -1; + } +#endif + if (virEventPollAddHandle(eventLoop.wakeupfd[0], VIR_EVENT_HANDLE_READABLE, virEventPollHandleWakeup, NULL, NULL) < 0) { @@ -706,6 +860,9 @@ int virEventPollInit(void) eventLoop.wakeupfd[0]); VIR_FORCE_CLOSE(eventLoop.wakeupfd[0]); VIR_FORCE_CLOSE(eventLoop.wakeupfd[1]); +#ifdef HAVE_LINUX_EPOLL + VIR_FORCE_CLOSE(eventLoop.epollfd); +#endif return -1; } @@ -742,6 +899,16 @@ int virEventPollToNativeEvents(int events) { int ret = 0; +#ifdef HAVE_LINUX_EPOLL + if (events & VIR_EVENT_HANDLE_READABLE) + ret |= EPOLLIN; + if (events & VIR_EVENT_HANDLE_WRITABLE) + ret |= EPOLLOUT; + if (events & VIR_EVENT_HANDLE_ERROR) + ret |= EPOLLERR; + if (events & VIR_EVENT_HANDLE_HANGUP) + ret |= EPOLLHUP; +#else if (events & VIR_EVENT_HANDLE_READABLE) ret |= POLLIN; if (events & VIR_EVENT_HANDLE_WRITABLE) @@ -750,6 +917,7 @@ virEventPollToNativeEvents(int events) ret |= POLLERR; if (events & VIR_EVENT_HANDLE_HANGUP) ret |= POLLHUP; +#endif return ret; } @@ -757,6 +925,16 @@ int virEventPollFromNativeEvents(int events) { int ret = 0; +#ifdef HAVE_LINUX_EPOLL + if (events & EPOLLIN) + ret |= VIR_EVENT_HANDLE_READABLE; + if (events & EPOLLOUT) + ret |= VIR_EVENT_HANDLE_WRITABLE; + if (events & EPOLLERR) + ret |= VIR_EVENT_HANDLE_ERROR; + if (events & EPOLLHUP) + ret |= VIR_EVENT_HANDLE_HANGUP; +#else if (events & POLLIN) ret |= VIR_EVENT_HANDLE_READABLE; if (events & POLLOUT) @@ -767,5 +945,6 @@ virEventPollFromNativeEvents(int events) ret |= VIR_EVENT_HANDLE_ERROR; if (events & POLLHUP) ret |= VIR_EVENT_HANDLE_HANGUP; +#endif return ret; } diff --git a/src/util/vireventpoll.h b/src/util/vireventpoll.h index 8844c9c..172009a 100644 --- a/src/util/vireventpoll.h +++ b/src/util/vireventpoll.h @@ -26,6 +26,11 @@ # include "internal.h" +# ifdef HAVE_LINUX_EPOLL +/* Maximum number of events that are returned by epoll in virEventPollRunOnce */ +# define MAX_POLL_EVENTS_AT_ONCE 10 +# endif + /** * virEventPollAddHandle: register a callback for monitoring file handle events * diff --git a/tests/commanddata/test3epoll.log b/tests/commanddata/test3epoll.log new file mode 100644 index 0000000..e4619b3 --- /dev/null +++ b/tests/commanddata/test3epoll.log @@ -0,0 +1,15 @@ +ENV:DISPLAY=:0.0 +ENV:HOME=/home/test +ENV:HOSTNAME=test +ENV:LANG=C +ENV:LOGNAME=testTMPDIR=/tmp +ENV:PATH=/usr/bin:/bin +ENV:USER=test +FD:0 +FD:1 +FD:2 +FD:6 +FD:8 +DAEMON:no +CWD:/tmp +UMASK:0022 diff --git a/tests/commandtest.c b/tests/commandtest.c index 7bf5447..6b23659 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -227,7 +227,11 @@ static int test3(const void *unused ATTRIBUTE_UNUSED) goto cleanup; } +#ifdef HAVE_LINUX_EPOLL + ret = checkoutput("test3epoll", NULL); +#else ret = checkoutput("test3", NULL); +#endif cleanup: virCommandFree(cmd); -- 1.9.5.msysgit.0

4 4

[libvirt] [PATCH v2 0/4] Virtio-crypto device support
by Longpeng(Mike) 22 Feb '17

22 Feb '17

As virtio-crypto has been supported in QEMU 2.8 and the frontend driver has been merged in linux 4.10, so it's necessary to support virtio-crypto in libvirt. --- Changes since v1: - split patch [Martin] - rebase on master [Martin] - add docs/tests/schema [Martin] - fix typos [Gonglei] --- Longpeng(Mike) (4): docs: schema: Add basic documentation for the virtual crypto device support conf: Parse virtio-crypto in the domain XML qemu: Implement support for 'builtin' backend for virtio-crypto tests: Add testcase for virtio-crypto XML parsing docs/formatdomain.html.in | 60 ++++++ docs/schemas/domaincommon.rng | 27 +++ src/conf/domain_conf.c | 213 ++++++++++++++++++++- src/conf/domain_conf.h | 32 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_alias.c | 20 ++ src/qemu/qemu_alias.h | 3 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 132 +++++++++++++ src/qemu/qemu_command.h | 3 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain_address.c | 25 +++ src/qemu/qemu_driver.c | 6 + src/qemu/qemu_hotplug.c | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 + .../qemuxml2argv-virtio-crypto-builtin.xml | 26 +++ .../qemuxml2argv-virtio-crypto.args | 22 +++ .../qemuxml2xmlout-virtio-crypto-builtin.xml | 31 +++ tests/qemuxml2xmltest.c | 2 + 21 files changed, 616 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-crypto-builtin.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-crypto.args create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-crypto-builtin.xml -- 1.8.3.1

4 13