- Devel - libvirt List Archives

[libvirt] [PATCH v4 0/3] Multiple cleanups within interfaceobj and interface driver
by John Ferlan 05 Jun '17

05 Jun '17

v3: https://www.redhat.com/archives/libvir-list/2017-May/msg01161.html NB: The first 7 patches from v3 were pushed since they were ACK'd. Difference in v4: Patch 1 was essentially ACK'd, but I chose to hold onto it to show the context Patch 2 is the new patch/context - move the @def processing into ObjNew Patch 3 is mostly unchanged; however, I realized during processing of the other code that with the model chosen in virInterfaceObjListAssignDef to return an object that has had both the @lock and @ref incremented so that callers can use the EndAPI to effectively Unlock and Unref that means when calling virInterfaceObjListRemove all that's done is a single Unlock/Unref leaving the object with still 1 reference (and undeleted). That means the caller (testInterfaceUndefine) must make that Unref call of the object. This is no different than how Domain's work, although it's a bit more obtuse there because callers of domain add will make that "second" reference to the object and my goal in this is to be a bit more obvious... The easier way to think about this is for objects only in one list, when leaving the Add/Assign API's, there are 2 Refs and 1 Lock on the object. For objects in 2 lists, there are 3 Refs and 1 Lock. Each caller always calls EndAPI dropping a Ref and the Lock. When it's time to Remove the object, a Find is done - which increments a Ref and Lock and then the Remove API called. The Remove API will effectively Unref for the object in a list (once or twice) and return the Unlocked object w/ 1 Ref. John Ferlan (3): interface: Introduce virInterfaceObjNew interface: Consume @def in virInterfaceObjNew interface: Convert virInterfaceObj to use virObjectLockable po/POTFILES.in | 1 - src/conf/virinterfaceobj.c | 108 +++++++++++++++++++++++++++------------------ src/conf/virinterfaceobj.h | 9 ++-- src/libvirt_private.syms | 3 +- src/test/test_driver.c | 16 +++---- 5 files changed, 77 insertions(+), 60 deletions(-) -- 2.9.4

2 6

[libvirt] [PATCH] audit: Fix the output message for shmem
by Martin Kletzander 05 Jun '17

05 Jun '17

After some discussion on and off the linux-audit mailing list, we should use different fields for the audit messages. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1218603 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_audit.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 2d9ff5e3ffea..1e667af73c4f 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -983,15 +983,13 @@ virDomainAuditShmem(virDomainObjPtr vm, char uuidstr[VIR_UUID_STRING_BUFLEN]; char *vmname = virAuditEncode("vm", vm->def->name); const char *srcpath = virDomainAuditChardevPath(&def->server.chr); - char *src = virAuditEncode("server", VIR_AUDIT_STR(srcpath)); - char *shmem = virAuditEncode("shmem", VIR_AUDIT_STR(def->name)); const char *virt = virDomainVirtTypeToString(vm->def->virtType); - char *size = NULL; + char *shmpath = NULL; virUUIDFormat(vm->def->uuid, uuidstr); - if (!vmname || !src || !shmem || - virAsprintfQuiet(&size, "%llu", def->size) < 0) { + if (!vmname || + virAsprintfQuiet(&shmpath, "/dev/shm/%s", def->name) < 0) { VIR_WARN("OOM while encoding audit message"); goto cleanup; } @@ -1002,14 +1000,18 @@ virDomainAuditShmem(virDomainObjPtr vm, virt = "?"; } - VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, - "virt=%s resrc=shmem reason=%s %s uuid=%s size=%s %s %s", - virt, reason, vmname, uuidstr, size, shmem, src); + if (def->server.enabled) { + VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, + "virt=%s resrc=ivshmem-socket reason=%s %s uuid=%s path=%s", + virt, reason, vmname, uuidstr, VIR_AUDIT_STR(srcpath)); + } else { + VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, + "virt=%s resrc=shmem reason=%s %s uuid=%s size=%llu path=%s", + virt, reason, vmname, uuidstr, def->size, VIR_AUDIT_STR(shmpath)); + } cleanup: VIR_FREE(vmname); - VIR_FREE(src); - VIR_FREE(size); - VIR_FREE(shmem); + VIR_FREE(shmpath); return; } -- 2.13.0

2 2

[libvirt] [PATCH] Capabilities: add step to cache control
by Eli Qiao 05 Jun '17

05 Jun '17

This patch adds cache control step size under control tag. step is calculated by total_cache_size / cbm_length. This will be needed while later doing cache allocation to calculate cbm bits. Besides, count host's cbm length by counting bit instead of checking cbm_mask length, along with test case updated. Signed-off-by: Eli Qiao <qiaoliyong(a)gmail.com> --- docs/schemas/capability.rng | 3 +++ src/conf/capabilities.c | 19 ++++++++++++++++--- src/conf/capabilities.h | 1 + .../linux-resctrl/resctrl/info/L3/cbm_mask | 2 +- .../linux-resctrl/resctrl/info/L3/min_cbm_bits | 2 +- .../linux-resctrl/resctrl/info/L3/num_closids | 2 +- tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml | 8 ++++---- tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 4 ++-- 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index e5cbfa3..6be7ac9 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -276,6 +276,9 @@ <attribute name='min'> <ref name='unsignedInt'/> </attribute> + <attribute name='step'> + <ref name='unsignedInt'/> + </attribute> <attribute name='unit'> <ref name='unit'/> </attribute> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 3becc7e..d1266e6 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -908,9 +908,10 @@ virCapabilitiesFormatCaches(virBufferPtr buf, for (j = 0; j < bank->ncontrols; j++) { bool min_kilos = !(bank->controls[j]->min % 1024); virBufferAsprintf(&controlBuf, - "<control min='%llu' unit='%s' " + "<control min='%llu' step='%llu' unit='%s' " "type='%s' maxAllocs='%u'/>\n", bank->controls[j]->min >> (min_kilos * 10), + bank->controls[j]->step >> (min_kilos * 10), min_kilos ? "KiB" : "B", virCacheTypeToString(bank->controls[j]->scope), bank->controls[j]->max_allocation); @@ -1602,6 +1603,8 @@ virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, char *cbm_mask = NULL; char *type_upper = NULL; unsigned int min_cbm_bits = 0; + unsigned int cbm_mask_val = 0; + unsigned int cbm_mask_len = 0; virCapsHostCacheControlPtr control; if (VIR_ALLOC(control) < 0) @@ -1632,8 +1635,18 @@ virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, virStringTrimOptionalNewline(cbm_mask); - /* cbm_mask: cache bit mask, it's in hex, eg: fffff */ - control->min = min_cbm_bits * bank->size / (strlen(cbm_mask) * 4); + /* cbm_mask: cache bit mask, it's in hex, e.g. fffff or 7ff */ + if (virStrToLong_uip(cbm_mask, NULL, 16, &cbm_mask_val) < 0) + goto cleanup; + + while (cbm_mask_val & 0x1) { + cbm_mask_val = cbm_mask_val >> 1; + cbm_mask_len ++; + } + + control->step = bank->size / cbm_mask_len; + + control->min = min_cbm_bits * control->step; control->scope = scope; diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index ee87d59..2cc9bdc 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -152,6 +152,7 @@ typedef struct _virCapsHostCacheControl virCapsHostCacheControl; typedef virCapsHostCacheControl *virCapsHostCacheControlPtr; struct _virCapsHostCacheControl { unsigned long long min; /* minimum cache control size in B */ + unsigned long long step; /* cache control step size in B */ virCacheType scope; /* data, code or both */ unsigned int max_allocation; /* max number of supported allocations */ }; diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask index 78031da..d482bbb 100644 --- a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask +++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask @@ -1 +1 @@ -fffff +7ff diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits index 0cfbf08..d00491f 100644 --- a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits +++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits @@ -1 +1 @@ -2 +1 diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids index b8626c4..b6a7d89 100644 --- a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids +++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids @@ -1 +1 @@ -4 +16 diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml index 49aa0b9..98893b6 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml @@ -42,12 +42,12 @@ </topology> <cache> <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> - <control min='768' unit='KiB' type='code' maxAllocs='8'/> - <control min='768' unit='KiB' type='data' maxAllocs='8'/> + <control min='768' step='768' unit='KiB' type='code' maxAllocs='8'/> + <control min='768' step='768' unit='KiB' type='data' maxAllocs='8'/> </bank> <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> - <control min='768' unit='KiB' type='code' maxAllocs='8'/> - <control min='768' unit='KiB' type='data' maxAllocs='8'/> + <control min='768' step='768' unit='KiB' type='code' maxAllocs='8'/> + <control min='768' step='768' unit='KiB' type='data' maxAllocs='8'/> </bank> </cache> </host> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml index cb78b4a..b54f08e 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml @@ -42,10 +42,10 @@ </topology> <cache> <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> - <control min='1536' unit='KiB' type='both' maxAllocs='4'/> + <control min='1429876' step='1429876' unit='B' type='both' maxAllocs='16'/> </bank> <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> - <control min='1536' unit='KiB' type='both' maxAllocs='4'/> + <control min='1429876' step='1429876' unit='B' type='both' maxAllocs='16'/> </bank> </cache> </host> -- 1.9.1

2 1

[libvirt] [PATCH go-xml] add emulator supported
by zhenwei.pi 05 Jun '17

05 Jun '17

--- domain.go | 1 + domain_test.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/domain.go b/domain.go index dcb8f65..723e761 100644 --- a/domain.go +++ b/domain.go @@ -307,6 +307,7 @@ type DomainDeviceList struct { Channels []DomainChardev `xml:"channel"` MemBalloon *DomainMemBalloon `xml:"memballoon"` Sounds []DomainSound `xml:"sound"` + Emulator string `xml:"emulator,omitempty"` } type DomainMemory struct { diff --git a/domain_test.go b/domain_test.go index 632b714..9efbd6b 100644 --- a/domain_test.go +++ b/domain_test.go @@ -572,6 +572,9 @@ var domainTestData = []struct { DomainCPUFeature{Policy: "disable", Name: "lahf_lm"}, }, }, + Devices: &DomainDeviceList{ + Emulator: "/bin/qemu-kvm", + }, }, Expected: []string{ `<domain type="kvm">`, @@ -582,6 +585,9 @@ var domainTestData = []struct { ` <topology sockets="1" cores="2" threads="1"></topology>`, ` <feature policy="disable" name="lahf_lm"></feature>`, ` </cpu>`, + ` <devices>`, + ` <emulator>/bin/qemu-kvm</emulator>`, + ` </devices>`, `</domain>`, }, }, -- 2.7.4

2 1

[libvirt] [PATCH] Reset the whole stack in testutils
by Martin Kletzander 05 Jun '17

05 Jun '17

The memset() was resetting only 30 bytes in the array (size of the array), but it is array of pointers. Since it is a static array, let's just reset it by its size. Found by gcc-7.1: testutils.c: In function 'virTestRun': testutils.c:243:13: error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size] memset(testAllocStack, 0, ARRAY_CARDINALITY(testAllocStack)); ^~~~~~ Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial an also under the build-breaker rule. I'm still getting one more error in config.h that probably needs fixing in autoconf: ../config.h:2994:48: warning: this use of "defined" may not be portable [-Wexpansion-to-defined] || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ Let me know if you know how I could help with that. tests/testutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index 4fb2338bb1de..4b8cf79ef939 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -240,7 +240,7 @@ virTestRun(const char *title, for (i = start; i < end; i++) { bool missingFail = false; # ifdef TEST_OOM_TRACE - memset(testAllocStack, 0, ARRAY_CARDINALITY(testAllocStack)); + memset(testAllocStack, 0, sizeof(testAllocStack)); ntestAllocStack = 0; # endif virAllocTestOOM(i + 1, 1); -- 2.13.0

2 2

[libvirt] libvirt-tck failures after sparse stream support
by Jim Fehlig 05 Jun '17

05 Jun '17

Hi Michal, I noticed some of the libvirt-tck tests fail with 3.4.0 RC2. I bisected the failure to commit 07c2399c01. The failing tests are 400-vol-download.t, 405-vol-download-all.t, and 410-vol-download-nonblock.t. Looking at the tests, they all create a pool and vol, write some data to the vol, create an MD5 digest of a subset of vol data, download the subset of the vol, and finally compare MD5 digest of dowloaded vol vs original. If the digests are different the test fails. For reference, here is the first test http://libvirt.org/git/?p=libvirt-tck.git;a=blob;f=scripts/storage/400-vol-… All three tests randomly fail with commit 07c2399c01. When the tests fail, it is always the case that 'length' was > 0. I.e. I have not seen the tests fail with offset=0, length=0 or offset=1024*1024, length=0. Regards, Jim

2 1

[libvirt] FYI build currently broken w/ glibc >= 2.25.90
by Daniel P. Berrange 05 Jun '17

05 Jun '17

FYI, there is currently a bug in gnulib that is breaking build for anything with glibc >= 2.25.90 (aka current Fedora 27 rawhide) http://lists.gnu.org/archive/html/bug-gnulib/2017-06/msg00003.html Hopefully gnulib will accept my proposed fix soon... Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

[libvirt] [PATCH] bhyveargv2xmltest: Fix call of virDomainDefCheckABIStability
by Michal Privoznik 05 Jun '17

05 Jun '17

In 4f0aeed I've expanded the list of arguments for virDomainDefCheckABIStability() but I forgot to fix bhyveargv2xmltest. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial and build-breaker rules. tests/bhyveargv2xmltest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index bde7d0e05..9db3750ac 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -74,7 +74,7 @@ testCompareXMLToArgvFiles(const char *xmlfile, } } - if (vmdef && !virDomainDefCheckABIStability(vmdef, vmdef)) { + if (vmdef && !virDomainDefCheckABIStability(vmdef, vmdef, driver.xmlopt)) { VIR_TEST_DEBUG("ABI stability check failed on %s", xmlfile); goto fail; } -- 2.13.0

1 0

[libvirt] [PATCH 0/3] Behave better for users of virStream
by Martin Kletzander 05 Jun '17

05 Jun '17

So I was playing with one program and I was getting weird behaviour. It was also mentioned on the list by someone for some other client they were writing. I found out what we were both missing was callback removal before/after finish/abort was called. The problem is that was not intuitive at all. In the docs we only have an example for blocking streams, there is no mention of the callbacks and the behaviour that libvirt has. I first wanted to fix the documentation, but then I realized it should never make sense to have a callback after stream has ended, so why not behave nicely for callers. Since they should be removing the callback right before the finish, there shouldn't even be any error message after they upgrade. To be even nicer we could make RemoveCallback() not fail when there is no callback registered (like DomainSuspend() when the domain is already suspended). Martin Kletzander (3): Make virNetClientStreamEventRemoveCallback's errors optional remote: Consolidate remoteStream{Abort,Finish} functions virStream: Remove callbacks on Abort/Finish src/remote/remote_driver.c | 42 +++++++++++------------------------------- src/rpc/virnetclientstream.c | 10 +++++++--- src/rpc/virnetclientstream.h | 3 ++- src/util/virfdstream.c | 12 ++++++++++++ 4 files changed, 32 insertions(+), 35 deletions(-) -- 2.13.0

3 10

[libvirt] [V4 RESEND PATCH] Expose resource control capabilites on cache bank
by taget 05 Jun '17

05 Jun '17

From: Eli Qiao <liyong.qiao(a)intel.com> * This patch amends the cache bank capability as follow: <cache> <bank id='0' level='3' type='unified' size='15360' unit='KiB' cpus='0-5'> <control min='768' unit='KiB' scope='both' max_allocation='4'/> </bank> <bank id='1' level='3' type='unified' size='15360' unit='KiB' cpus='6-11'> <control min='768' unit='KiB' scope='both' max_allocation='4'/> </bank> </cache> For CDP enabled on x86 arch, we will have: <cache> <bank id='0' level='3' type='unified' size='15360' unit='KiB' cpus='0-5'> <control min='768' unit='KiB' scope='code' max_allocation='4'/> <control min='768' unit='KiB' scope='data' max_allocation='4'/> </bank> ... * Added a new testdata directory `linux-resctrl-cdp` to test CDP enabled case. * Along with vircaps2xmltest case updated. P.S. here the scope is from /sys/fs/resctrl/info/L3{"" "code" "data"}, I keep it capital upper as I need to use a macro to convert from enum to string easily. Signed-off-by: Eli Qiao <liyong.qiao(a)intel.com> --- docs/schemas/capability.rng | 20 ++++ src/conf/capabilities.c | 133 ++++++++++++++++++++- src/conf/capabilities.h | 10 ++ .../vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus | 1 + .../linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask | 1 + .../resctrl/info/L3CODE/min_cbm_bits | 1 + .../resctrl/info/L3CODE/num_closids | 1 + .../linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask | 1 + .../resctrl/info/L3DATA/min_cbm_bits | 1 + .../resctrl/info/L3DATA/num_closids | 1 + .../linux-resctrl-cdp/resctrl/manualres/cpus | 1 + .../linux-resctrl-cdp/resctrl/manualres/schemata | 2 + .../linux-resctrl-cdp/resctrl/manualres/tasks | 0 .../linux-resctrl-cdp/resctrl/schemata | 2 + .../linux-resctrl-cdp/resctrl/tasks | 0 tests/vircaps2xmldata/linux-resctrl-cdp/system | 1 + .../vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml | 55 +++++++++ tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 8 +- tests/vircaps2xmltest.c | 8 ++ 19 files changed, 244 insertions(+), 3 deletions(-) create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/tasks create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks create mode 120000 tests/vircaps2xmldata/linux-resctrl-cdp/system create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 26f0aa2..927fc18 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -277,6 +277,26 @@ <attribute name='cpus'> <ref name='cpuset'/> </attribute> + <zeroOrMore> + <element name='control'> + <attribute name='min'> + <ref name='unsignedInt'/> + </attribute> + <attribute name='unit'> + <ref name='unit'/> + </attribute> + <attribute name='scope'> + <choice> + <value>both</value> + <value>code</value> + <value>data</value> + </choice> + </attribute> + <attribute name='max_allocation'> + <ref name='unsignedInt'/> + </attribute> + </element> + </zeroOrMore> </element> </oneOrMore> </element> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index d699b08..c4a1fdf 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -51,6 +51,7 @@ #define VIR_FROM_THIS VIR_FROM_CAPABILITIES #define SYSFS_SYSTEM_PATH "/sys/devices/system" +#define SYSFS_RESCTRL_PATH "/sys/fs/resctrl" VIR_LOG_INIT("conf.capabilities") @@ -872,6 +873,9 @@ virCapabilitiesFormatCaches(virBufferPtr buf, virCapsHostCacheBankPtr *caches) { size_t i = 0; + size_t j = 0; + int indent = virBufferGetIndent(buf, false); + virBuffer controlBuf = VIR_BUFFER_INITIALIZER; if (!ncaches) return 0; @@ -893,13 +897,35 @@ virCapabilitiesFormatCaches(virBufferPtr buf, */ virBufferAsprintf(buf, "<bank id='%u' level='%u' type='%s' " - "size='%llu' unit='%s' cpus='%s'/>\n", + "size='%llu' unit='%s' cpus='%s'", bank->id, bank->level, virCacheTypeToString(bank->type), bank->size >> (kilos * 10), kilos ? "KiB" : "B", cpus_str); + virBufferAdjustIndent(&controlBuf, indent + 4); + for (j = 0; j < bank->ncontrols; j++) { + bool min_kilos = !(bank->controls[j]->min % 1024); + virBufferAsprintf(&controlBuf, + "<control min='%llu' unit='%s' " + "scope='%s' max_allocation='%u'/>\n", + bank->controls[j]->min >> (min_kilos * 10), + min_kilos ? "KiB" : "B", + virCacheTypeToString(bank->controls[j]->scope), + bank->controls[j]->max_allocation); + } + + if (virBufferUse(&controlBuf)) { + virBufferAddLit(buf, ">\n"); + virBufferAddBuffer(buf, &controlBuf); + virBufferAddLit(buf, "</bank>\n"); + + } else { + virBufferAddLit(buf, "/>\n"); + } + + virBufferFreeAndReset(&controlBuf); VIR_FREE(cpus_str); } @@ -1519,13 +1545,102 @@ virCapsHostCacheBankEquals(virCapsHostCacheBankPtr a, void virCapsHostCacheBankFree(virCapsHostCacheBankPtr ptr) { + size_t i; + if (!ptr) return; virBitmapFree(ptr->cpus); + for (i = 0; i < ptr->ncontrols; i++) + VIR_FREE(ptr->controls[i]); + VIR_FREE(ptr->controls); VIR_FREE(ptr); } +/* test which TYPE of cache control supported + * -1: don't support + * 0: cat + * 1: cdp + */ +static int +virCapabilitiesGetCacheControlType(virCapsHostCacheBankPtr bank) +{ + int ret = -1; + char *path = NULL; + if (virAsprintf(&path, + SYSFS_RESCTRL_PATH "/info/L%u", + bank->level) < 0) + return -1; + + if (virFileExists(path)) { + ret = 0; + } else { + VIR_FREE(path); + /* for CDP enabled case, CODE and DATA will show together */ + if (virAsprintf(&path, + SYSFS_RESCTRL_PATH "/info/L%uCODE", + bank->level) < 0) + return -1; + if (virFileExists(path)) + ret = 1; + } + + VIR_FREE(path); + return ret; +} + +static int +virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, + virCacheType scope) +{ + int ret = -1; + char *path = NULL; + char *cbm_mask = NULL; + char *type_upper = NULL; + virCapsHostCacheControlPtr control; + + if (VIR_ALLOC(control) < 0) + goto cleanup; + + if ((scope > VIR_CACHE_TYPE_BOTH) + && (virStringToUpper(&type_upper, virCacheTypeToString(scope)) < 0)) + goto cleanup; + + if (virFileReadValueUint(&control->max_allocation, + SYSFS_RESCTRL_PATH "/info/L%u%s/num_closids", + bank->level, + type_upper ? type_upper : "") < 0) + goto cleanup; + + if (virFileReadValueString(&cbm_mask, + SYSFS_RESCTRL_PATH + "/info/L%u%s/cbm_mask", + bank->level, + type_upper ? type_upper: "") < 0) + goto cleanup; + + virStringTrimOptionalNewline(cbm_mask); + + /* cbm_mask: cache bit mask, it's in hex, eg: fffff */ + control->min = bank->size / (strlen(cbm_mask) * 4); + + control->scope = scope; + + if (VIR_APPEND_ELEMENT(bank->controls, + bank->ncontrols, + control) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(path); + VIR_FREE(cbm_mask); + VIR_FREE(type_upper); + VIR_FREE(control); + return ret; +} + int virCapabilitiesInitCaches(virCapsPtr caps) { @@ -1534,6 +1649,7 @@ virCapabilitiesInitCaches(virCapsPtr caps) ssize_t pos = -1; DIR *dirp = NULL; int ret = -1; + int typeret; char *path = NULL; char *type = NULL; struct dirent *ent = NULL; @@ -1607,12 +1723,27 @@ virCapabilitiesInitCaches(virCapsPtr caps) SYSFS_SYSTEM_PATH, pos, ent->d_name) < 0) goto cleanup; + typeret = virCapabilitiesGetCacheControlType(bank); + + if (typeret == 0) { + if (virCapabilitiesGetCacheControl(bank, + VIR_CACHE_TYPE_BOTH) < 0) + goto cleanup; + } else if (typeret == 1) { + if ((virCapabilitiesGetCacheControl(bank, + VIR_CACHE_TYPE_CODE) < 0) || + (virCapabilitiesGetCacheControl(bank, + VIR_CACHE_TYPE_DATA) < 0)) + goto cleanup; + } + kernel_type = virCacheKernelTypeFromString(type); if (kernel_type < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown cache type '%s'"), type); goto cleanup; } + bank->type = kernel_type; VIR_FREE(type); diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index a8cccf7..ee87d59 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -148,6 +148,14 @@ typedef enum { VIR_ENUM_DECL(virCache); +typedef struct _virCapsHostCacheControl virCapsHostCacheControl; +typedef virCapsHostCacheControl *virCapsHostCacheControlPtr; +struct _virCapsHostCacheControl { + unsigned long long min; /* minimum cache control size in B */ + virCacheType scope; /* data, code or both */ + unsigned int max_allocation; /* max number of supported allocations */ +}; + typedef struct _virCapsHostCacheBank virCapsHostCacheBank; typedef virCapsHostCacheBank *virCapsHostCacheBankPtr; struct _virCapsHostCacheBank { @@ -156,6 +164,8 @@ struct _virCapsHostCacheBank { unsigned long long size; /* B */ virCacheType type; /* Data, Instruction or Unified */ virBitmapPtr cpus; /* All CPUs that share this bank */ + size_t ncontrols; + virCapsHostCacheControlPtr *controls; }; typedef struct _virCapsHost virCapsHost; diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus new file mode 100644 index 0000000..b3a79aa --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus @@ -0,0 +1 @@ +ffffff,ffffffff,ffffffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask new file mode 100755 index 0000000..78031da --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask @@ -0,0 +1 @@ +fffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits new file mode 100755 index 0000000..d00491f --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids new file mode 100755 index 0000000..45a4fb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask new file mode 100755 index 0000000..78031da --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask @@ -0,0 +1 @@ +fffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits new file mode 100755 index 0000000..d00491f --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids new file mode 100755 index 0000000..45a4fb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus new file mode 100644 index 0000000..ede4cc2 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus @@ -0,0 +1 @@ +000000,00000000,00000000 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata new file mode 100644 index 0000000..a0ef381 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata @@ -0,0 +1,2 @@ +L3DATA:0=c0000;1=c0000 +L3CODE:0=30000;1=30000 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/tasks b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/tasks new file mode 100644 index 0000000..e69de29 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata new file mode 100644 index 0000000..89dc76b --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata @@ -0,0 +1,2 @@ +L3DATA:0=fffff;1=fffff +L3CODE:0=fffff;1=fffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks new file mode 100644 index 0000000..e69de29 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/system b/tests/vircaps2xmldata/linux-resctrl-cdp/system new file mode 120000 index 0000000..2f3a1d9 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/system @@ -0,0 +1 @@ +../linux-resctrl/system/ \ No newline at end of file diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml new file mode 100644 index 0000000..c9f460d --- /dev/null +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml @@ -0,0 +1,55 @@ +<capabilities> + + <host> + <cpu> + <arch>x86_64</arch> + </cpu> + <power_management/> + <migration_features> + <live/> + </migration_features> + <topology> + <cells num='2'> + <cell id='0'> + <memory unit='KiB'>1048576</memory> + <pages unit='KiB' size='4'>2048</pages> + <pages unit='KiB' size='2048'>4096</pages> + <pages unit='KiB' size='1048576'>6144</pages> + <cpus num='6'> + <cpu id='0' socket_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='0' core_id='1' siblings='1'/> + <cpu id='2' socket_id='0' core_id='2' siblings='2'/> + <cpu id='3' socket_id='0' core_id='3' siblings='3'/> + <cpu id='4' socket_id='0' core_id='4' siblings='4'/> + <cpu id='5' socket_id='0' core_id='5' siblings='5'/> + </cpus> + </cell> + <cell id='1'> + <memory unit='KiB'>2097152</memory> + <pages unit='KiB' size='4'>4096</pages> + <pages unit='KiB' size='2048'>6144</pages> + <pages unit='KiB' size='1048576'>8192</pages> + <cpus num='6'> + <cpu id='6' socket_id='1' core_id='0' siblings='6'/> + <cpu id='7' socket_id='1' core_id='1' siblings='7'/> + <cpu id='8' socket_id='1' core_id='2' siblings='8'/> + <cpu id='9' socket_id='1' core_id='3' siblings='9'/> + <cpu id='10' socket_id='1' core_id='4' siblings='10'/> + <cpu id='11' socket_id='1' core_id='5' siblings='11'/> + </cpus> + </cell> + </cells> + </topology> + <cache> + <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> + <control min='768' unit='KiB' scope='code' max_allocation='8'/> + <control min='768' unit='KiB' scope='data' max_allocation='8'/> + </bank> + <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> + <control min='768' unit='KiB' scope='code' max_allocation='8'/> + <control min='768' unit='KiB' scope='data' max_allocation='8'/> + </bank> + </cache> + </host> + +</capabilities> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml index 6677791..04a5eb8 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml @@ -41,8 +41,12 @@ </cells> </topology> <cache> - <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'/> - <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'/> + <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> + <control min='768' unit='KiB' scope='both' max_allocation='4'/> + </bank> + <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> + <control min='768' unit='KiB' scope='both' max_allocation='4'/> + </bank> </cache> </host> diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index 137598e..ae1cd52 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -47,6 +47,7 @@ test_virCapabilities(const void *opaque) char *capsXML = NULL; char *path = NULL; char *dir = NULL; + char *resctrl = NULL; int ret = -1; /* @@ -58,7 +59,12 @@ test_virCapabilities(const void *opaque) data->resctrl ? "/system" : "") < 0) goto cleanup; + if (virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", + abs_srcdir, data->filename) < 0) + goto cleanup; + virFileWrapperAddPrefix("/sys/devices/system", dir); + virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl); caps = virCapabilitiesNew(data->arch, data->offlineMigrate, data->liveMigrate); if (!caps) @@ -84,6 +90,7 @@ test_virCapabilities(const void *opaque) cleanup: VIR_FREE(dir); + VIR_FREE(resctrl); VIR_FREE(path); VIR_FREE(capsXML); virObjectUnref(caps); @@ -112,6 +119,7 @@ mymain(void) DO_TEST("caches", VIR_ARCH_X86_64); DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true); + DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true); return ret; } -- 1.9.1

3 8