- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Don't special case mdevs when assigning PCI addresses
by Andrea Bolognani 02 Jun '17

02 Jun '17

We can treat mdevs the same as all other PCI hostdevs and figure out whether they are PCI Express or legacy PCI by checking the size of their config space. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_domain_address.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 2106b34..3277d18 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -645,9 +645,6 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, return pcieFlags; } - if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV) - return pcieFlags; - if (!(pciDev = virPCIDeviceNew(hostAddr->domain, hostAddr->bus, hostAddr->slot, -- 2.7.4

3 3

[libvirt] [PATCH v2] daemon: Don't initialize SASL context if not necessary
by Peter Krempa 02 Jun '17

02 Jun '17

SASL context would be initialized even if the corresponding TCP or TLS sockets are not enabled. fe772f24a68 attempted to fix the symptom by commenting out the settings, but that did not fix the root cause. 3c647ee4bbb later reverted those changes so that the more secure algorithm is used. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1450095 --- v2: Fix the message also if SASL authentication and the TCP/TLS sockets are explicitly enabled in config bug --listen is not specified. daemon/libvirtd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 891238bcb..bac4bc1b6 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -613,11 +613,11 @@ daemonSetupNetworking(virNetServerPtr srv, #if WITH_SASL if (config->auth_unix_rw == REMOTE_AUTH_SASL || - config->auth_unix_ro == REMOTE_AUTH_SASL || + (sock_path_ro && config->auth_unix_ro == REMOTE_AUTH_SASL) || # if WITH_GNUTLS - config->auth_tls == REMOTE_AUTH_SASL || + (ipsock && config->listen_tls && config->auth_tls == REMOTE_AUTH_SASL) || # endif - config->auth_tcp == REMOTE_AUTH_SASL) { + (ipsock && config->listen_tcp && config->auth_tcp == REMOTE_AUTH_SASL)) { saslCtxt = virNetSASLContextNewServer( (const char *const*)config->sasl_allowed_username_list); if (!saslCtxt) -- 2.12.2

2 1

[libvirt] [PATCH] daemon: Don't initialize SASL context if not necessary
by Peter Krempa 02 Jun '17

02 Jun '17

SASL context would be initialized even if the corresponding TCP or TLS sockets are not enabled. fe772f24a68 attempted to fix the symptom by commenting out the settings, but that did not fix the root cause. 3c647ee4bbb later reverted those changes so that the more secure algorithm is used. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1450095 --- daemon/libvirtd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 891238bcb..4a242e3e5 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -613,11 +613,11 @@ daemonSetupNetworking(virNetServerPtr srv, #if WITH_SASL if (config->auth_unix_rw == REMOTE_AUTH_SASL || - config->auth_unix_ro == REMOTE_AUTH_SASL || + (sock_path_ro && config->auth_unix_ro == REMOTE_AUTH_SASL) || # if WITH_GNUTLS - config->auth_tls == REMOTE_AUTH_SASL || + (config->listen_tls && config->auth_tls == REMOTE_AUTH_SASL) || # endif - config->auth_tcp == REMOTE_AUTH_SASL) { + (config->listen_tcp && config->auth_tcp == REMOTE_AUTH_SASL)) { saslCtxt = virNetSASLContextNewServer( (const char *const*)config->sasl_allowed_username_list); if (!saslCtxt) -- 2.12.2

2 2

[libvirt] [V3 PATCH] RFC: Reimplement cache allocation for a VM
by Eli Qiao 02 Jun '17

02 Jun '17

From: Eli Qiao <liyong.qiao(a)intel.com> This is a RFC patch for the reimplement of `support cache tune(CAT) in libvirt`[1]. This patch defines some structs to represent data struct in linux resctrl fs which will be used later to do cache allocation. The patch expose a private interface `virResctrlFreeSchemata`, which will be used to query the cache allocation on the host. Also added unit test cases to test this interface can works well. There are already patch sets[2] to address it, and functional works, but people doesn't like it cause it has global variable, and missing unit test case for new added capabilites, etc. Martin has proposed a test infra to do vircaps2xmltest, and I extened it on top of it to extend resctrl control[3], this is kinds of new desiged apart from [2], so I propose this RFC patch to do some rework on it. [1] https://www.redhat.com/archives/libvir-list/2017-January/msg00683.html [2] https://www.redhat.com/archives/libvir-list/2017-March/msg00181.html [3] https://www.redhat.com/archives/libvir-list/2017-April/msg00516.html --- include/libvirt/virterror.h | 1 + src/Makefile.am | 1 + src/libvirt_private.syms | 7 + src/util/virerror.c | 1 + src/util/virresctrl.c | 390 ++++++++++++++++++++++++++++++ src/util/virresctrl.h | 72 ++++++ tests/Makefile.am | 8 +- tests/virresctrldata/L3-free.schemata | 1 + tests/virresctrldata/L3CODE-free.schemata | 1 + tests/virresctrldata/L3DATA-free.schemata | 1 + tests/virresctrldata/linux-resctrl | 1 + tests/virresctrldata/linux-resctrl-cdp | 1 + tests/virresctrltest.c | 119 +++++++++ 13 files changed, 603 insertions(+), 1 deletion(-) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h create mode 100644 tests/virresctrldata/L3-free.schemata create mode 100644 tests/virresctrldata/L3CODE-free.schemata create mode 100644 tests/virresctrldata/L3DATA-free.schemata create mode 120000 tests/virresctrldata/linux-resctrl create mode 120000 tests/virresctrldata/linux-resctrl-cdp create mode 100644 tests/virresctrltest.c diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 2efee8f..4bc0c74 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -132,6 +132,7 @@ typedef enum { VIR_FROM_PERF = 65, /* Error from perf */ VIR_FROM_LIBSSH = 66, /* Error from libssh connection transport */ + VIR_FROM_RESCTRL = 67, /* Error from resctrl */ # ifdef VIR_ENUM_SENTINELS VIR_ERR_DOMAIN_LAST diff --git a/src/Makefile.am b/src/Makefile.am index 0b7cfc8..08ad5b4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -167,6 +167,7 @@ UTIL_SOURCES = \ util/virprocess.c util/virprocess.h \ util/virqemu.c util/virqemu.h \ util/virrandom.h util/virrandom.c \ + util/virresctrl.h util/virresctrl.c \ util/virrotatingfile.h util/virrotatingfile.c \ util/virscsi.c util/virscsi.h \ util/virscsihost.c util/virscsihost.h \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 429b095..cdd3467 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2424,6 +2424,13 @@ virRandomGenerateWWN; virRandomInt; +# util/virresctrl.h +virResctrlBitmap2String; +virResctrlFreeSchemata; +virResctrlGetFreeCache; +virResctrlTypeToString; + + # util/virrotatingfile.h virRotatingFileReaderConsume; virRotatingFileReaderFree; diff --git a/src/util/virerror.c b/src/util/virerror.c index ef17fb5..02fabcc 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -139,6 +139,7 @@ VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST, "Perf", /* 65 */ "Libssh transport layer", + "Resource Control", ) diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c new file mode 100644 index 0000000..d3822ed --- /dev/null +++ b/src/util/virresctrl.c @@ -0,0 +1,390 @@ +/* + * virresctrl.c: methods for managing resource control + * + * Copyright (C) 2017 Intel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Eli Qiao <liyong.qiao(a)intel.com> + */ + +#include <config.h> +#include <fcntl.h> +#include <sys/file.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include "virresctrl.h" +#include "virerror.h" +#include "virlog.h" +#include "viralloc.h" +#include "virstring.h" +#include "virfile.h" + +VIR_LOG_INIT("util.resctrl"); + +#define VIR_FROM_THIS VIR_FROM_RESCTRL +#define SYSFS_RESCTRL_PATH "/sys/fs/resctrl" +#define MAX_CBM_LEN 20 + +VIR_ENUM_IMPL(virResctrl, VIR_RESCTRL_TYPE_LAST, + "L3", + "L3CODE", + "L3DATA") + +/** + * a virResctrlGroup represents a resource control group, it's a directory + * under /sys/fs/resctrl. + * e.g. /sys/fs/resctrl/CG1 + * |-- cpus + * |-- schemata + * `-- tasks + * # cat schemata + * L3DATA:0=fffff;1=fffff + * L3CODE:0=fffff;1=fffff + * + * Besides, it can also represent the default resource control group of the + * host. + */ + +typedef struct _virResctrlGroup virResctrlGroup; +typedef virResctrlGroup *virResctrlGroupPtr; +struct _virResctrlGroup { + char *name; /* resource group name, NULL for default host group */ + size_t n_tasks; /* number of tasks assigned to the resource group */ + char **tasks; /* task id list */ + + virResctrlSchemataPtr schemata[VIR_RESCTRL_TYPE_LAST]; /* Array for schemata */ +}; + +/* All resource control groups on this host, including default resource group */ +typedef struct _virResctrlHost virResctrlHost; +typedef virResctrlHost *virResctrlHostPtr; +struct _virResctrlHost { + size_t n_groups; /* number of resource control group */ + virResctrlGroupPtr *groups; /* list of resource control group */ +}; + +void +virResctrlFreeSchemata(virResctrlSchemataPtr ptr) +{ + size_t i; + + if (!ptr) + return; + for (i = 0; i < ptr->n_masks; i++) { + virBitmapFree(ptr->masks[i]->mask); + VIR_FREE(ptr->masks[i]); + } + + VIR_FREE(ptr->masks); + VIR_FREE(ptr); + ptr = NULL; +} + +static void +virResctrlFreeGroup(virResctrlGroupPtr ptr) +{ + size_t i; + + if (!ptr) + return; + + + virStringListFree(ptr->tasks); + VIR_FREE(ptr->name); + + for (i = 0; i < VIR_RESCTRL_TYPE_LAST; i++) + virResctrlFreeSchemata(ptr->schemata[i]); + + VIR_FREE(ptr); + ptr = NULL; +} + +/* Return specify type of schemata string from schematalval. + e.g., 0=f;1=f */ +static int +virResctrlGetSchemataString(virResctrlType type, + const char *schemataval, + char **schematastr) +{ + int rc = -1; + char *prefix = NULL; + char **lines = NULL; + + if (virAsprintf(&prefix, + "%s:", + virResctrlTypeToString(type)) < 0) + return -1; + + lines = virStringSplit(schemataval, "\n", 0); + + if (VIR_STRDUP(*schematastr, + virStringListGetFirstWithPrefix(lines, prefix)) < 0) + goto cleanup; + + if (*schematastr == NULL) + rc = -1; + else + rc = 0; + + cleanup: + VIR_FREE(prefix); + virStringListFree(lines); + return rc; +} + +static +virBitmapPtr virResctrlMask2Bitmap(const char *mask) +{ + virBitmapPtr bitmap; + unsigned int tmp; + size_t i; + + if (virStrToLong_ui(mask, NULL, 16, &tmp) < 0) + return NULL; + + bitmap = virBitmapNewQuiet(MAX_CBM_LEN); + + for (i = 0; i < MAX_CBM_LEN; i++) { + if (((tmp & 0x1) == 0x1) && + (virBitmapSetBit(bitmap, i) < 0)) + goto error; + tmp = tmp >> 1; + } + + return bitmap; + + error: + virBitmapFree(bitmap); + return NULL; +} + +char *virResctrlBitmap2String(virBitmapPtr bitmap) +{ + char *tmp; + char *ret = NULL; + char *p; + tmp = virBitmapString(bitmap); + // skip "0x" + p = tmp + 2; + + // find first non-0 position + while (*++p == '0'); + + if (VIR_STRDUP(ret, p) < 0) + ret = NULL; + + VIR_FREE(tmp); + return ret; +} + +static int +virResctrlParseSchemata(const char* schemata_str, + virResctrlSchemataPtr schemata) +{ + VIR_DEBUG("schemata_str=%s, schemata=%p", schemata_str, schemata); + + int ret = -1; + size_t i; + virResctrlMaskPtr mask; + char **schemata_list; + char *mask_str; + + /* parse 0=fffff;1=f */ + schemata_list = virStringSplit(schemata_str, ";", 0); + + if (!schemata_list) + goto cleanup; + + for (i = 0; schemata_list[i] != NULL; i++) { + /* parse 0=fffff */ + mask_str = strchr(schemata_list[i], '='); + + if (!mask_str) + goto cleanup; + + if (VIR_ALLOC(mask) < 0) + goto cleanup; + + mask->cache_id = i; + mask->mask = virResctrlMask2Bitmap(mask_str + 1); + + if (VIR_APPEND_ELEMENT(schemata->masks, + schemata->n_masks, + mask) < 0) { + VIR_FREE(mask); + goto cleanup; + } + + } + ret = 0; + + cleanup: + virStringListFree(schemata_list); + return ret; +} + +static int +virResctrlLoadGroup(const char *name, + virResctrlHostPtr host) +{ + VIR_DEBUG("name=%s, host=%p\n", name, host); + + int ret = -1; + char *schemataval = NULL; + char *schemata_str = NULL; + virResctrlType i; + int rv; + virResctrlGroupPtr grp; + virResctrlSchemataPtr schemata; + + rv = virFileReadValueString(&schemataval, + SYSFS_RESCTRL_PATH "/%s/schemata", + name ? name : ""); + + if (rv < 0) + return -1; + + if (VIR_ALLOC(grp) < 0) + goto cleanup; + + if (VIR_STRDUP(grp->name, name) < 0) + goto cleanup; + + for (i = 0; i < VIR_RESCTRL_TYPE_LAST; i++) { + rv = virResctrlGetSchemataString(i, schemataval, &schemata_str); + + if (rv < 0) + continue; + + if (VIR_ALLOC(schemata) < 0) + goto cleanup; + + schemata->type = i; + + if (virResctrlParseSchemata(schemata_str, schemata) < 0) { + VIR_FREE(schemata); + VIR_FREE(schemata_str); + goto cleanup; + } + + grp->schemata[i] = schemata; + VIR_FREE(schemata_str); + } + + if (VIR_APPEND_ELEMENT(host->groups, + host->n_groups, + grp) < 0) { + virResctrlFreeGroup(grp); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(schemataval); + return ret; +} + +static int +virResctrlLoadHost(virResctrlHostPtr host) +{ + int ret = -1; + int rv = -1; + DIR *dirp = NULL; + char *path = NULL; + struct dirent *ent; + + VIR_DEBUG("host=%p\n", host); + + rv = virDirOpenIfExists(&dirp, SYSFS_RESCTRL_PATH); + + if (rv < 0) + goto cleanup; + + /* load default group first */ + if (virResctrlLoadGroup(NULL, host) < 0) + goto cleanup; + + while ((rv = virDirRead(dirp, &ent, path)) > 0) { + /* resctrl is not hierarchical, only read directory under + /sys/fs/resctrl */ + if ((ent->d_type != DT_DIR) || STREQ(ent->d_name, "info")) + continue; + + if (virResctrlLoadGroup(ent->d_name, host) < 0) + goto cleanup; + } + + ret = 0; + + cleanup: + virDirClose(&dirp); + return ret; +} + +static void +virResctrlRefreshHost(virResctrlHostPtr host) +{ + virResctrlGroupPtr default_grp = NULL; + virResctrlGroupPtr grp = NULL; + virResctrlSchemataPtr schemata = NULL; + size_t i, j; + virResctrlType t; + + default_grp = host->groups[0]; + + /* Loop each other resource group except default group */ + for (i = 1; i < host->n_groups; i++) { + grp = host->groups[i]; + for (t = 0; t < VIR_RESCTRL_TYPE_LAST; t++) { + schemata = grp->schemata[t]; + if (schemata != NULL) { + for (j = 0; j < schemata->n_masks; j++) + virBitmapSubtract(default_grp->schemata[t]->masks[j]->mask, + schemata->masks[j]->mask); + } + } + } +} + +virResctrlSchemataPtr +virResctrlGetFreeCache(virResctrlType type) +{ + VIR_DEBUG("type=%d", type); + virResctrlHostPtr host = NULL; + virResctrlSchemataPtr schemata = NULL; + size_t i; + + if (VIR_ALLOC(host) < 0) + return NULL; + + if (virResctrlLoadHost(host) < 0) + return NULL; + + /* default group come the first one */ + virResctrlRefreshHost(host); + + schemata = host->groups[0]->schemata[type]; + + for (i = 1; i < host->n_groups; i++) + virResctrlFreeGroup(host->groups[i]); + VIR_FREE(host->groups); + host = NULL; + + return schemata; +} diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h new file mode 100644 index 0000000..7c9a1b7 --- /dev/null +++ b/src/util/virresctrl.h @@ -0,0 +1,72 @@ +/* + * virresctrl.h: header for managing resctrl control + * + * Copyright (C) 2017 Intel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Eli Qiao <liyong.qiao(a)intel.com> + */ + +#ifndef __VIR_RESCTRL_H__ +# define __VIR_RESCTRL_H__ + +#include "virutil.h" +#include "virbitmap.h" + +typedef enum { + VIR_RESCTRL_TYPE_L3, + VIR_RESCTRL_TYPE_L3_CODE, + VIR_RESCTRL_TYPE_L3_DATA, + + VIR_RESCTRL_TYPE_LAST +} virResctrlType; + +VIR_ENUM_DECL(virResctrl); + +/* + * a virResctrlMask represents one of mask object in a + * resource control group. + * e.g., 0=f + */ +typedef struct _virResctrlMask virResctrlMask; +typedef virResctrlMask *virResctrlMaskPtr; +struct _virResctrlMask { + unsigned int cache_id; /* cache resource id */ + virBitmapPtr mask; /* the cbm mask */ +}; + +/* + * a virResctrlSchemata represents schemata objects of specific type of + * resource in a resource control group. + * eg: L3:0=f,1=ff + */ +typedef struct _virResctrlSchemata virResctrlSchemata; +typedef virResctrlSchemata *virResctrlSchemataPtr; +struct _virResctrlSchemata { + virResctrlType type; /* resource control type, e.g., L3 */ + size_t n_masks; /* number of masks */ + virResctrlMaskPtr *masks; /* list of mask */ +}; + +/* Get free cache of the host, result saved in schemata */ +virResctrlSchemataPtr virResctrlGetFreeCache(virResctrlType type); + +/* Get mask string from Bitmap */ +char *virResctrlBitmap2String(virBitmapPtr bitmap); + +void virResctrlFreeSchemata(virResctrlSchemataPtr ptr); +#endif diff --git a/tests/Makefile.am b/tests/Makefile.am index 7673329..0dcef4f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -229,6 +229,7 @@ if WITH_LINUX test_programs += fchosttest test_programs += scsihosttest test_programs += vircaps2xmltest +test_programs += virresctrltest test_libraries += virusbmock.la \ virnetdevbandwidthmock.la \ virnumamock.la \ @@ -1156,8 +1157,13 @@ virnumamock_la_CFLAGS = $(AM_CFLAGS) virnumamock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virnumamock_la_LIBADD = $(MOCKLIBS_LIBS) +virresctrltest_SOURCES = \ + virresctrltest.c testutils.h testutils.c virfilewrapper.h virfilewrapper.c +virresctrltest_LDADD = $(LDADDS) + else ! WITH_LINUX -EXTRA_DIST += vircaps2xmltest.c virnumamock.c virfilewrapper.c virfilewrapper.h +EXTRA_DIST += vircaps2xmltest.c virnumamock.c virfilewrapper.c \ + virfilewrapper.h virresctrltest.c endif ! WITH_LINUX if WITH_NSS diff --git a/tests/virresctrldata/L3-free.schemata b/tests/virresctrldata/L3-free.schemata new file mode 100644 index 0000000..9b47d25 --- /dev/null +++ b/tests/virresctrldata/L3-free.schemata @@ -0,0 +1 @@ +L3:0=1ffff;1=1ffff diff --git a/tests/virresctrldata/L3CODE-free.schemata b/tests/virresctrldata/L3CODE-free.schemata new file mode 100644 index 0000000..7039c45 --- /dev/null +++ b/tests/virresctrldata/L3CODE-free.schemata @@ -0,0 +1 @@ +L3CODE:0=cffff;1=cffff diff --git a/tests/virresctrldata/L3DATA-free.schemata b/tests/virresctrldata/L3DATA-free.schemata new file mode 100644 index 0000000..30f1cbd --- /dev/null +++ b/tests/virresctrldata/L3DATA-free.schemata @@ -0,0 +1 @@ +L3DATA:0=3ffff;1=3ffff diff --git a/tests/virresctrldata/linux-resctrl b/tests/virresctrldata/linux-resctrl new file mode 120000 index 0000000..069dfb2 --- /dev/null +++ b/tests/virresctrldata/linux-resctrl @@ -0,0 +1 @@ +../vircaps2xmldata/linux-resctrl \ No newline at end of file diff --git a/tests/virresctrldata/linux-resctrl-cdp b/tests/virresctrldata/linux-resctrl-cdp new file mode 120000 index 0000000..c5a973f --- /dev/null +++ b/tests/virresctrldata/linux-resctrl-cdp @@ -0,0 +1 @@ +../vircaps2xmldata/linux-resctrl-cdp \ No newline at end of file diff --git a/tests/virresctrltest.c b/tests/virresctrltest.c new file mode 100644 index 0000000..4eaa925 --- /dev/null +++ b/tests/virresctrltest.c @@ -0,0 +1,119 @@ +/* + * Copyright (C) Intel, Inc. 2017 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Eli Qiao <liyong.qiao(a)intel.com> + */ + +#include <config.h> +#include <stdlib.h> + +#include "testutils.h" +#include "virbitmap.h" +#include "virfilewrapper.h" +#include "virresctrl.h" + + +#define VIR_FROM_THIS VIR_FROM_NONE + +struct virResctrlData { + const char *filename; + virResctrlType type; +}; + +static void +GetSchemataStr(virResctrlSchemataPtr schemata, char **str) +{ + size_t i; + + virBuffer buf = VIR_BUFFER_INITIALIZER; + virBufferAsprintf(&buf, "%s:%u=%s", + virResctrlTypeToString(schemata->type), + schemata->masks[0]->cache_id, + virResctrlBitmap2String(schemata->masks[0]->mask)); + + for (i = 1; i < schemata->n_masks; i ++) + virBufferAsprintf(&buf, ";%u=%s", + schemata->masks[i]->cache_id, + virResctrlBitmap2String(schemata->masks[i]->mask)); + + *str = virBufferContentAndReset(&buf); +} + +static int +test_virResctrl(const void *opaque) +{ + struct virResctrlData *data = (struct virResctrlData *) opaque; + char *dir = NULL; + char *resctrl = NULL; + int ret = -1; + virResctrlSchemataPtr schemata = NULL; + char *schemata_str = NULL; + char *schemata_file; + + if (virAsprintf(&resctrl, "%s/virresctrldata/linux-%s/resctrl", + abs_srcdir, data->filename) < 0) + goto cleanup; + + if (virAsprintf(&schemata_file, "%s/virresctrldata/%s-free.schemata", + abs_srcdir, virResctrlTypeToString(data->type)) < 0) + goto cleanup; + + if (virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl) < 0) + goto cleanup; + + if ((schemata = virResctrlGetFreeCache(data->type)) == NULL) + goto cleanup; + + virFileWrapperClearPrefixes(); + + GetSchemataStr(schemata, &schemata_str); + + if (virTestCompareToFile(schemata_str, schemata_file) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(dir); + VIR_FREE(resctrl); + //VIR_FREE(schemata_str); + virResctrlFreeSchemata(schemata); + return ret; +} + +static int +mymain(void) +{ + int ret = 0; + +#define DO_TEST_FULL(filename, type) \ + do { \ + struct virResctrlData data = {filename, \ + type}; \ + if (virTestRun(filename, test_virResctrl, &data) < 0) \ + ret = -1; \ + } while (0) + + DO_TEST_FULL("resctrl", VIR_RESCTRL_TYPE_L3); + DO_TEST_FULL("resctrl-cdp", VIR_RESCTRL_TYPE_L3_CODE); + DO_TEST_FULL("resctrl-cdp", VIR_RESCTRL_TYPE_L3_DATA); + + return ret; +} + +VIR_TEST_MAIN(mymain) -- 1.9.1

1 0

[libvirt] [PATCH] util: removing dead code inside virstoragefile.
by Julio Faracco 02 Jun '17

02 Jun '17

The host address or the socket path have already been checked at the begining of the function virStorageSourceParseNBDColonString(). So, when the parameter is not a unix socket, there is no reason to check the address again because if it does not exists, the logic will fail in the first IF conditional. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virstoragefile.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index b43acf6..6d8ada9 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2635,13 +2635,6 @@ virStorageSourceParseNBDColonString(const char *nbdstr, goto cleanup; } else { - if (!backing[1]) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing host name in nbd string '%s'"), - nbdstr); - goto cleanup; - } - if (VIR_STRDUP(src->hosts->name, backing[1]) < 0) goto cleanup; -- 2.7.4

2 1

[libvirt] [PATCH] util: fixing wrong comparison inside virStoragePermsCopy().
by Julio Faracco 02 Jun '17

02 Jun '17

VIR_STRDUP returns -1 if the string copy was not successful. So, the current comparison/logic is throwing an error when VIR_STRDUP() returns 1. Only when source is NULL, it is considering as a success which is not right. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 6d8ada9..e82a7fb 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1974,7 +1974,7 @@ virStoragePermsCopy(const virStoragePerms *src) ret->uid = src->uid; ret->gid = src->gid; - if (VIR_STRDUP(ret->label, src->label)) + if (VIR_STRDUP(ret->label, src->label) < 0) goto error; return ret; -- 2.7.4

2 1

[libvirt] [PATCH] Post-release version bump to 3.5.0
by Peter Krempa 02 Jun '17

02 Jun '17

--- Pushed as trivial. configure.ac | 2 +- docs/news.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 246f4e077..1af5538ee 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [3.4.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [3.5.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/news.xml b/docs/news.xml index 25316fc18..b5ae53760 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -33,6 +33,14 @@ --> <libvirt> + <release version="v3.5.0" date="unreleased"> + <section title="New features"> + </section> + <section title="Improvements"> + </section> + <section title="Bug fixes"> + </section> + </release> <release version="v3.4.0" date="2017-06-02"> <section title="New features"> <change> -- 2.12.2

1 0

[libvirt] Release of libvirt-3.4.0
by Daniel Veillard 02 Jun '17

02 Jun '17

It's out ! The release is tagged in git, the tree is open ! I pushed the signed tartball and rpms to the usual place: ftp://libvirt.org/libvirt/ I also rolled out the libvirt-python-3.4.0 release that you can find at ftp://libvirt.org/libvirt/python/ This is a feature and improvements driven release, as you can see below there is a number of point with direct user visible improvements: * New features - Improved streams to efficiently transfer sparseness New extension to virStream was implemented so that virStorageVolDownload and virStorageVolUpload can preserve file sparseness. - I/O APIC type can be specified for QEMU/KVM domains The ioapic tag was added to domain features, so the type of the I/O APIC can now be specified (e.g. putting it in userspace for KVM domains). - The reason for VM shutdown is reported, if known QEMU 2.10 will be able to report the reason for shutting down (whether that was caused by the guest or not), and libvirt is prepared for that and reports that information in its shutdown event as well, if it is known. * Improvements - Repository now has new README.md file The new file uses markdown syntax, so it looks better on github and possibly other web pages, but it has also more useful information. The old README is now symlink to the new file. - qemu: Use GICv2 by default for aarch64/virt TCG guests The emulated GICv3 has some limitations that make it unusable as a default; use GICv2 until they're sorted out. This change makes it once again possible to run aarch64/virt guests on a x86_64 host without having to tweak their configuration. - Additional capabilities for the node_device module Introduce two new capabilities to the node_device module. The first is for CCW devices, most common on the S390 architecture. The second is for fibre channel-backed SCSI devices and exposes the fc_remote_port sub-capability to SCSI target devices. - Node devices now report Mediated device capabilities Endpoint devices support new mdev capability and their parents now report the supported types in new mdev_types capability. - Capabilities now report information about host caches If supported in the kernel, host capabilities will now list L3 caches. The code for other levels was added as well, but only L3 caches are reported currently. - POWER9 CPU model was added It is now properly reported in host capabilities. - libxl: NUMA sibling distances are now reported in host capabilities - VMDK version 3 files are now properly detected - Interrupt remapping and Extended interrupt mode for IOMMU devices These two new features can now be controlled with new <driver intremap='on/off' eim='on/off'/> tag for iommu devices. - Graphics in libxl domains now have default addresses Even though there were default addresses before this change, they were not saved in the XML. It is now possible to see and control the listen addresses properly. - Default USB controllers are now added for devices in libxl domains Even though they were added automatically when USB device was attached, they could've been missing in some other cases. The logic is now fixed so there are always USB controllers, even if there was none of them in the specified XML. - Limits for RPC messages were increased Hitting the RPC limits we have is easier every day, so they were increased once again and some guessing logic was improved as well. It is now possible to get more stats than ever using the virConnectGetAllDomainStats() call and push through even bigger requests and replies for all APIs. * Bug fixes - qemu: Create memory_backing_dir on startup Libvirt's policy is that directories are created on startup if they don't exist. We've missed this one. - PCIe 4.0 cards now report proper link speeds It could happen that the link speed for PCIe devices was not properly reported or the nodedev-dumpxml just failed. That was due to mistake in the field width, but should now work properly. - qemu: Do not report errors on shutdown For some users, in some rare cases, it could happen that there was an error message "internal error: End of file from qemu monitor" in the logs even though no problem happened. The detection of these false positives was improved and such errors should not show any more. - User-specified UNIX socket paths for virtio channels should not be reset It could happen, in some cases, that libvirt would mistake a user-specified path for its own generated one and thus remove it from the XML. The detection of such addresses was improved now. - Fix address reservation during RNG hot-plug When error occurred in a specific point in time during the hot-plug of an RNG device, it could happen that an address was released even though another device was already using it, making it possible to hot-plug another device with that address, effectively having duplicated addresses in the XML. Thanks everybody for your help with the release, be it code, reviews, bug reports, doc, etc! Enjoy ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH V2] maint: add sanitizers to the build process
by claudioandre.br＠gmail.com 02 Jun '17

02 Jun '17

From: Claudio André <claudioandre.br(a)gmail.com> Sanitizers are based on compile-time instrumentation. They are available in gcc and clang for a range of supported operation systems and platforms. More info at: https://github.com/google/sanitizers The address sanitizer finds bugs related to addressing memory: use after free, heap buffer overflow, stack buffer overflow, memory leaks, ... The undefined behavior sanitizer detects situations not prescribed by the language specification: bound violations, data overflows, ... The llvm.org states that Sanitizers have found thousands of bugs everywhere. Sanitizers running during CI can prevent bugs from taking up residence. They are helper tools to maintain bugs out. --- * Harmless (the new flags are disabled by default) * Real example of it working: Direct leak of 1432 byte(s) in 1 object(s) allocated from: #0 0x4cea00 in calloc /home/ben/development/llvm/3.5/final/llvm.src/projects/compiler-rt/lib/asan/asan_malloc_linux.cc:56:3 #1 0x2b0459e834a6 in virAlloc /home/travis/build/claudioandre/libvirt/src/util/viralloc.c:144:24 #2 0x2b045a010af4 in virDomainDefNew /home/travis/build/claudioandre/libvirt/src/conf/domain_conf.c:2923:9 #3 0x2b045a010af4 in virDomainDefParseXML /home/travis/build/claudioandre/libvirt/src/conf/domain_conf.c:16923 #4 0x2b045a0106a1 in virDomainDefParseNode /home/travis/build/claudioandre/libvirt/src/conf/domain_conf.c:18764:11 #5 0x2b045a0105ba in virDomainDefParse /home/travis/build/claudioandre/libvirt/src/conf/domain_conf.c:18708:15 #6 0x4ec396 in testCompareMemLock /home/travis/build/claudioandre/libvirt/tests/qemumemlocktest.c:45:17 #7 0x4ede56 in virTestRun /home/travis/build/claudioandre/libvirt/tests/testutils.c:180:11 #8 0x4ec194 in mymain /home/travis/build/claudioandre/libvirt/tests/qemumemlocktest.c:119:5 #9 0x4f0f9c in virTestMain /home/travis/build/claudioandre/libvirt/tests/testutils.c:1019:11 #10 0x2b045b221f44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21f44) m4/virt-compile-warnings.m4 | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 768a5c8..269f14d 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -166,12 +166,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ wantwarn="$wantwarn -Wno-format" fi - # This should be < 256 really. Currently we're down to 4096, - # but using 1024 bytes sized buffers (mostly for virStrerror) - # stops us from going down further - gl_WARN_ADD(["-Wframe-larger-than=4096"], [STRICT_FRAME_LIMIT_CFLAGS]) - gl_WARN_ADD(["-Wframe-larger-than=25600"], [RELAXED_FRAME_LIMIT_CFLAGS]) - # Extra special flags dnl -fstack-protector stuff passes gl_WARN_ADD with gcc dnl on Mingw32, but fails when actually used @@ -259,4 +253,33 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_EQUAL_EXPR], 1, [Define to 1 if gcc -Wlogical-op reports false positive 'or' equal expr]) fi + + dnl Check for support for Sanitizers + dnl Check for -fsanitize=address and -fsanitize=undefined support + LIBVIRT_ARG_ENABLE([ASAN], [build with address sanitizer support], [no]) + SAN_CFLAGS= + + AS_IF([test "x$enable_asan" = "xyes"], [ + gl_COMPILER_OPTION_IF([-fsanitize=address -fno-omit-frame-pointer], [ + SAN_CFLAGS="-fsanitize=address" + ]) + ]) + + LIBVIRT_ARG_ENABLE([UBSAN], [build with undefined behavior sanitizer support], [no]) + AS_IF([test "x$enable_ubsan" = "xyes"], [ + gl_COMPILER_OPTION_IF([-fsanitize=undefined -fno-omit-frame-pointer], [ + SAN_CFLAGS="$SAN_CFLAGS -fsanitize=undefined" + ]) + ]) + + AS_IF([ test -n "${SAN_CFLAGS}"], [ + gl_AS_VAR_APPEND([WARN_CFLAGS], [" $SAN_CFLAGS -fno-omit-frame-pointer"]) + gl_AS_VAR_APPEND([LDFLAGS], [" $SAN_CFLAGS -ldl"]) + ],[ + # This should be < 256 really. Currently we're down to 4096, + # but using 1024 bytes sized buffers (mostly for virStrerror) + # stops us from going down further + gl_WARN_ADD(["-Wframe-larger-than=4096"], [STRICT_FRAME_LIMIT_CFLAGS]) + gl_WARN_ADD(["-Wframe-larger-than=25600"], [RELAXED_FRAME_LIMIT_CFLAGS]) + ]) ]) -- 2.11.0

1 0

[libvirt] [PATCH 0/1] Enable code coverage on CI
by claudioandre.br＠gmail.com 01 Jun '17

01 Jun '17

From: Claudio André <claudioandre.br(a)gmail.com> *** *** NOTE: In order to add links to demonstrate it working, I'm using a cover letter for only 1 patch. Sorry about this! It is possible to see how it behaves, just access: - https://gist.github.com/claudioandre/60b262ff8c110133c0a94d5f0ce2362c - https://coveralls.io/builds/11681156 ==== Claudio André (1): CI: add code coverage analysis .travis.yml | 11 ++++++++++- README.md | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) -- 2.11.0

4 8