- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Forbid slashes in shmem name
by Martin Kletzander 20 Feb '17

20 Feb '17

With that users could access files outside /dev/shm. That itself isn't a security problem, but might cause some errors we want to avoid. So let's forbid slashes as we do with domain and volume names and also mention that in the schema. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1395496 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/schemas/domaincommon.rng | 6 +++++- src/qemu/qemu_process.c | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index cc6e0d0c0d65..00cdc93bca59 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3598,7 +3598,11 @@ <define name="shmem"> <element name="shmem"> - <attribute name="name"/> + <attribute name="name"> + <data type="string"> + <param name="pattern">[^/]*</param> + </data> + </attribute> <interleave> <optional> <element name="model"> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 184440dc1af6..0f63668100a6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4586,6 +4586,26 @@ qemuProcessStartValidateVideo(virDomainObjPtr vm, static int +qemuProcessStartValidateShmem(virDomainObjPtr vm) +{ + size_t i; + + for (i = 0; i < vm->def->nshmems; i++) { + virDomainShmemDefPtr shmem = vm->def->shmems[i]; + + if (strchr(shmem->name, '/')) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("shmem name '%s' must not contain '/'"), + shmem->name); + return -1; + } + } + + return 0; +} + + +static int qemuProcessStartValidateXML(virQEMUDriverPtr driver, virDomainObjPtr vm, virQEMUCapsPtr qemuCaps, @@ -4661,6 +4681,9 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, if (qemuProcessStartValidateVideo(vm, qemuCaps) < 0) return -1; + if (qemuProcessStartValidateShmem(vm) < 0) + return -1; + VIR_DEBUG("Checking for any possible (non-fatal) issues"); qemuProcessStartWarnShmem(vm); -- 2.11.0

3 3

[libvirt] [PATCH] qemu: Check for maximum vcpus exceeding cpu topology
by Kothapally Madhu Pavan 20 Feb '17

20 Feb '17

This patch will prevent guest to start when the maximum vcpus are greater than cpu topology limit. Currently similar checks do exist only during setvcpus. The patch adds the missing check. The c9cb35c255222 reverted similar check to avoid older configs from vanishing. The current patch adds it in domain validation part to be consistent with the original intent. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/qemu/qemu_process.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 184440d..f0d42b8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3738,6 +3738,13 @@ qemuValidateCpuCount(virDomainDefPtr def, return -1; } + if (def->cpu->sockets && virDomainDefGetVcpusMax(def) > + def->cpu->sockets * def->cpu->cores * def->cpu->threads) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Maximum CPUs greater than topology limit")); + return -1; + } + if (maxCpus > 0 && virDomainDefGetVcpusMax(def) > maxCpus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Maximum CPUs greater than specified machine type limit"));

4 4

[libvirt] [PATCH 0/2] QEMU caps data
by Pavel Hrdina 20 Feb '17

20 Feb '17

Pavel Hrdina (2): tests: update QEMU 2.8.0 caps data tests: add QEMU 2.9.0 caps data .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 107 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 7 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 14671 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 302 + tests/qemucapabilitiestest.c | 1 + 5 files changed, 15049 insertions(+), 39 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml -- 2.11.1

2 4

[libvirt] [PATCH v2] qemu: Allow @rednernode for virgl domains
by Michal Privoznik 20 Feb '17

20 Feb '17

When enabling virgl, qemu opens /dev/dri/render*. So far, we are not allowing that in devices cgroup nor creating the file in domain's namespace and thus requiring users to set the paths in qemu.conf. This, however, is suboptimal as it allows access to ALL qemu processes even those which don't have virgl configured. Now that we have a way to specify render node that qemu will use we can be more cautious and enable just that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Technically, this is v2 of: https://www.redhat.com/archives/libvir-list/2017-February/msg00497.html diff to v1: - now that we have @rendernode for <gl/> which selects just one path (and does it in predictable fashion) only that path is enabled in the CGgroups and created in the namespace. src/qemu/qemu_cgroup.c | 27 +++++++++++++++++++++++++++ src/qemu/qemu_domain.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 209cbc275..f0729743a 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -335,6 +335,28 @@ qemuTeardownHostdevCgroup(virDomainObjPtr vm, return ret; } + +static int +qemuSetupGraphicsCgroup(virDomainObjPtr vm, + virDomainGraphicsDefPtr gfx) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + const char *rendernode = gfx->data.spice.rendernode; + int ret; + + if (gfx->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE || + gfx->data.spice.gl != VIR_TRISTATE_BOOL_YES || + !rendernode) + return 0; + + ret = virCgroupAllowDevicePath(priv->cgroup, rendernode, + VIR_CGROUP_DEVICE_RW, false); + virDomainAuditCgroupPath(vm, priv->cgroup, "allow", rendernode, + "rw", ret == 0); + return ret; +} + + static int qemuSetupBlkioCgroup(virDomainObjPtr vm) { @@ -604,6 +626,11 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, goto cleanup; } + for (i = 0; i < vm->def->ngraphics; i++) { + if (qemuSetupGraphicsCgroup(vm, vm->def->graphics[i]) < 0) + goto cleanup; + } + for (i = 0; i < vm->def->ninputs; i++) { if (qemuSetupInputCgroup(vm, vm->def->inputs[i]) < 0) goto cleanup; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 92a9a105c..ea4b28288 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7526,6 +7526,42 @@ qemuDomainSetupTPM(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, } +static int +qemuDomainSetupGraphics(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, + virDomainGraphicsDefPtr gfx, + const char *devPath) +{ + const char *rendernode = gfx->data.spice.rendernode; + + if (gfx->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE || + gfx->data.spice.gl != VIR_TRISTATE_BOOL_YES || + !rendernode) + return 0; + + return qemuDomainCreateDevice(rendernode, devPath, false); +} + + +static int +qemuDomainSetupAllGraphics(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *devPath) +{ + size_t i; + + VIR_DEBUG("Setting up graphics"); + for (i = 0; i < vm->def->ngraphics; i++) { + if (qemuDomainSetupGraphics(driver, + vm->def->graphics[i], + devPath) < 0) + return -1; + } + + VIR_DEBUG("Setup all graphics"); + return 0; +} + + static int qemuDomainSetupInput(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainInputDefPtr input, @@ -7679,6 +7715,9 @@ qemuDomainBuildNamespace(virQEMUDriverPtr driver, if (qemuDomainSetupTPM(driver, vm, devPath) < 0) goto cleanup; + if (qemuDomainSetupAllGraphics(driver, vm, devPath) < 0) + goto cleanup; + if (qemuDomainSetupAllInputs(driver, vm, devPath) < 0) goto cleanup; -- 2.11.0

2 2

[libvirt] [PATCH] news: add entries for recent nodedev driver improvements
by Michal Privoznik 20 Feb '17

20 Feb '17

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/news.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 54337f782..8d53e0797 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -63,6 +63,23 @@ other than what's required for remote access of libvirtd. </description> </change> + <change> + <summary> + qemu: add rendernode argument + </summary> + <description> + Add a new attribute 'rendernode' to <gl> spice element. + </description> + </change> + <change> + <summary> + nodedev: add drm capability + </summary> + <description> + Add a new 'drm' capability for Direct Rendering Manager (DRM) + devices, providing device type information. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.11.0

2 1

[libvirt] [PATCH] tests: Add couple of nodedev tests
by Michal Privoznik 20 Feb '17

20 Feb '17

With recent DRM device addition we report more devices. I happen to have some on my system therefore add the nodedev XMLs intou our test suite so that we make sure we won't break it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/nodedevschemadata/drm_card0.xml | 9 +++++++++ tests/nodedevschemadata/drm_controlD64.xml | 9 +++++++++ tests/nodedevschemadata/drm_renderD128.xml | 9 +++++++++ tests/nodedevxml2xmltest.c | 3 +++ 4 files changed, 30 insertions(+) create mode 100644 tests/nodedevschemadata/drm_card0.xml create mode 100644 tests/nodedevschemadata/drm_controlD64.xml create mode 100644 tests/nodedevschemadata/drm_renderD128.xml diff --git a/tests/nodedevschemadata/drm_card0.xml b/tests/nodedevschemadata/drm_card0.xml new file mode 100644 index 000000000..307bada1a --- /dev/null +++ b/tests/nodedevschemadata/drm_card0.xml @@ -0,0 +1,9 @@ +<device> + <name>drm_card0</name> + <path>/sys/devices/pci0000:00/0000:00:02.0/drm/card0</path> + <devnode type='dev'>/dev/dri/card0</devnode> + <parent>pci_0000_00_02_0</parent> + <capability type='drm'> + <type>primary</type> + </capability> +</device> diff --git a/tests/nodedevschemadata/drm_controlD64.xml b/tests/nodedevschemadata/drm_controlD64.xml new file mode 100644 index 000000000..4f36a7068 --- /dev/null +++ b/tests/nodedevschemadata/drm_controlD64.xml @@ -0,0 +1,9 @@ +<device> + <name>drm_controlD64</name> + <path>/sys/devices/pci0000:00/0000:00:02.0/drm/controlD64</path> + <devnode type='dev'>/dev/dri/controlD64</devnode> + <parent>pci_0000_00_02_0</parent> + <capability type='drm'> + <type>control</type> + </capability> +</device> diff --git a/tests/nodedevschemadata/drm_renderD128.xml b/tests/nodedevschemadata/drm_renderD128.xml new file mode 100644 index 000000000..7ae5474b1 --- /dev/null +++ b/tests/nodedevschemadata/drm_renderD128.xml @@ -0,0 +1,9 @@ +<device> + <name>drm_renderD128</name> + <path>/sys/devices/pci0000:00/0000:00:02.0/drm/renderD128</path> + <devnode type='dev'>/dev/dri/renderD128</devnode> + <parent>pci_0000_00_02_0</parent> + <capability type='drm'> + <type>render</type> + </capability> +</device> diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index 5e1ae170c..5a8dd7dee 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -101,6 +101,9 @@ mymain(void) DO_TEST("pci_0000_02_10_7_sriov_pf_vfs_all"); DO_TEST("pci_0000_02_10_7_sriov_pf_vfs_all_header_type"); DO_TEST("drm_renderD129"); + DO_TEST("drm_card0"); + DO_TEST("drm_controlD64"); + DO_TEST("drm_renderD128"); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.11.0

2 2

[libvirt] [PATCH 0/7] qemu: Be more cautious about allowed devices
by Michal Privoznik 20 Feb '17

20 Feb '17

As discussed here [1], it's unsafe to allow /dev/vfio/vfio to all the domains (even those not doing PCI assignemnt). The same goes for /dev/dri/*. 1: https://www.redhat.com/archives/libvir-list/2017-February/msg00267.html Michal Privoznik (7): qemu_cgroup: Kill qemuSetupHostUSBDeviceCgroup qemu_cgroup: Kill qemuSetupHostSCSIDeviceCgroup qemu_cgroup: Kill qemuSetupHostSCSIVHostDeviceCgroup qemuSetupHostdevCgroup: Use qemuDomainGetHostdevPath qemuDomainGetHostdevPath: Create /dev/vfio/vfio iff needed qemuDomainGetHostdevPath: Report /dev/vfio/vfio less frequently qemu: Allow /dev/dri/render* for virgl domains src/qemu/qemu.conf | 2 +- src/qemu/qemu_cgroup.c | 311 +++++++++++-------------------------- src/qemu/qemu_domain.c | 207 ++++++++++++++++++++---- src/qemu/qemu_domain.h | 7 + src/qemu/test_libvirtd_qemu.aug.in | 1 - 5 files changed, 274 insertions(+), 254 deletions(-) -- 2.11.0

2 15

[libvirt] [PATCH] util: virvhba: fix typo that breaks build on non-linux systems
by Pavel Hrdina 19 Feb '17

19 Feb '17

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed as build breaker, found by ci.centos.org. src/util/virvhba.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virvhba.c b/src/util/virvhba.c index 3a052f7b2e..203ba43a3d 100644 --- a/src/util/virvhba.c +++ b/src/util/virvhba.c @@ -476,7 +476,7 @@ virVHBAPathExists(const char *sysfs_prefix ATTRIBUTE_UNUSED, bool -virVHBAVportIsCapable(const char *sysfs_prefix ATTRIBUTE_UNUSED, +virVHBAIsVportCapable(const char *sysfs_prefix ATTRIBUTE_UNUSED, int host ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); -- 2.11.1

1 0

[libvirt] [PATCH 00/15] Add more vHBA related tests and module-arize the code
by John Ferlan 18 Feb '17

18 Feb '17

Don't be scared off by the quantity of patches... There's quite a bit of code motion and function renaming going on before being able to more easily add tests that will ensure that from a nodedev perspective creation and deletion of the vHBA will work properly and it's possible to test the various ways to create a vHBA (nothing provide, a parent by name provided, a parent by wwnn/wwpn provided, and a parent by fabric_wwn provided). I did run this through the coverity checking code with no errors... John Ferlan (15): tests: Alter test_driver HBA name/data to be closer to reality test: Add new NPIV capable HBA and a vHBA test: Add helper to create vHBA for testNodeDeviceCreateXML tests: Create a more realistic vHBA test: Fix fchosttest resource leak util: Create a new virvhba module and move/rename API's util: Move/rename virStoragePoolGetVhbaSCSIHostParent to virvhba util: Reduce complexity of virVHBAGetParent util: Move scsi_host specific functions from virutil tests: Add new fchosttest tests for management of a vHBA nodedev: Keep the node device lock longer in nodeDeviceDestroy nodedev: Rework virNodeDeviceGetParentHost tests: Add createVHBAByNodeDevice-no-parent to fchosttest tests: Add createVHBAByNodeDevice-parent-wwn to fchosttest tests: Add createVHBAByNodeDevice-parent-fabric-wwn to fchosttest po/POTFILES.in | 2 + src/Makefile.am | 2 + src/conf/node_device_conf.c | 76 +++- src/conf/node_device_conf.h | 19 +- src/conf/storage_conf.c | 100 ++--- src/conf/storage_conf.h | 5 - src/libvirt_private.syms | 32 +- src/node_device/node_device_driver.c | 92 ++-- src/node_device/node_device_linux_sysfs.c | 24 +- src/storage/storage_backend_scsi.c | 68 +-- src/test/test_driver.c | 178 ++++++-- src/util/virscsi.c | 4 + src/util/virscsihost.c | 297 ++++++++++++ src/util/virscsihost.h | 40 ++ src/util/virutil.c | 724 ------------------------------ src/util/virutil.h | 47 -- src/util/virvhba.c | 591 ++++++++++++++++++++++++ src/util/virvhba.h | 59 +++ tests/fchosttest.c | 183 ++++++-- tests/objecteventtest.c | 6 +- tests/scsihosttest.c | 16 +- tests/virrandommock.c | 9 + 22 files changed, 1463 insertions(+), 1111 deletions(-) create mode 100644 src/util/virscsihost.c create mode 100644 src/util/virscsihost.h create mode 100644 src/util/virvhba.c create mode 100644 src/util/virvhba.h -- 2.7.4

2 40

[libvirt] [PATCH] nodedev: fix build with clang
by Roman Bogorodskiy 18 Feb '17

18 Feb '17

Build fails with: conf/node_device_conf.c:825:62: error: comparison of unsigned enum expression < 0 is always false [-Werror,-Wtautological-compare] if ((data->drm.type = virNodeDevDRMTypeFromString(type)) < 0) { ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ conf/node_device_conf.c:1801:59: error: comparison of unsigned enum expression < 0 is always false [-Werror,-Wtautological-compare] if ((type = virNodeDevDevnodeTypeFromString(tmp)) < 0) { ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ 2 errors generated. Fix by using intermediate variable to store the result similarly to how it's done for other FromString* calls. --- Pushed under the build-breaker rule. src/conf/node_device_conf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index b3063d9ec..c15c917a2 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -814,7 +814,7 @@ virNodeDevCapDRMParseXML(xmlXPathContextPtr ctxt, virNodeDevCapDataPtr data) { xmlNodePtr orignode; - int ret = -1; + int ret = -1, val; char *type = NULL; orignode = ctxt->node; @@ -822,11 +822,12 @@ virNodeDevCapDRMParseXML(xmlXPathContextPtr ctxt, type = virXPathString("string(./type[1])", ctxt); - if ((data->drm.type = virNodeDevDRMTypeFromString(type)) < 0) { + if ((val = virNodeDevDRMTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown drm type '%s' for '%s'"), type, def->name); goto out; } + data->drm.type = val; ret = 0; @@ -1791,6 +1792,7 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node = nodes[i]; char *tmp = virXMLPropString(node, "type"); virNodeDevDevnodeType type; + int val; if (!tmp) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1798,12 +1800,13 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, goto error; } - if ((type = virNodeDevDevnodeTypeFromString(tmp)) < 0) { + if ((val = virNodeDevDevnodeTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown devnode type '%s'"), tmp); VIR_FREE(tmp); goto error; } + type = val; switch (type) { case VIR_NODE_DEV_DEVNODE_DEV: -- 2.11.0

1 0