[libvirt] [PATCH 5/6] qemu: Change qemuDomainGetVcpuPinInfo bitmap manipulation
Follow-up to the IOThread review on CPU affinity map manipulation:
http://www.redhat.com/archives/libvir-list/2015-March/msg00294.html
indicates that the GetVcpuPinInfo could use similar algorithm adjustments
which is what this patch does.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/qemu/qemu_driver.c | 59 ++++++++++++++++++++++++--------------------------
1 file changed, 28 insertions(+), 31 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c1f4e95..85387a8 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5100,12 +5100,8 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
virDomainObjPtr vm = NULL;
virDomainDefPtr targetDef = NULL;
int ret = -1;
- int maxcpu, hostcpus, vcpu, pcpu;
- int n;
- virDomainVcpuPinDefPtr *vcpupin_list;
- virBitmapPtr cpumask = NULL;
+ int hostcpus, vcpu;
unsigned char *cpumap;
- bool pinned;
virCapsPtr caps = NULL;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
@@ -5133,39 +5129,40 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
if ((hostcpus = nodeGetCPUCount()) < 0)
goto cleanup;
- maxcpu = maplen * 8;
- if (maxcpu > hostcpus)
- maxcpu = hostcpus;
-
- /* Clamp to actual number of vcpus */
- if (ncpumaps > targetDef->vcpus)
- ncpumaps = targetDef->vcpus;
-
if (ncpumaps < 1)
goto cleanup;
- /* initialize cpumaps */
- memset(cpumaps, 0xff, maplen * ncpumaps);
- if (maxcpu % 8) {
- for (vcpu = 0; vcpu < ncpumaps; vcpu++) {
- cpumap = VIR_GET_CPUMAP(cpumaps, maplen, vcpu);
- cpumap[maplen - 1] &= (1 << maxcpu % 8) - 1;
- }
- }
+ for (vcpu = 0; vcpu < ncpumaps; vcpu++) {
+ virDomainVcpuPinDefPtr pininfo;
+ virBitmapPtr bitmap = NULL;
+ unsigned char *tmpmap = NULL;
+ int tmpmaplen;
- /* if vcpupin setting exists, there are unused physical cpus */
- for (n = 0; n < targetDef->cputune.nvcpupin; n++) {
- vcpupin_list = targetDef->cputune.vcpupin;
- vcpu = vcpupin_list[n]->vcpuid;
- cpumask = vcpupin_list[n]->cpumask;
- cpumap = VIR_GET_CPUMAP(cpumaps, maplen, vcpu);
- for (pcpu = 0; pcpu < maxcpu; pcpu++) {
- if (virBitmapGetBit(cpumask, pcpu, &pinned) < 0)
+ pininfo = virDomainVcpuPinFindByVcpu(targetDef->cputune.vcpupin,
+ targetDef->cputune.nvcpupin,
+ vcpu);
+ if (!pininfo) {
+ if (!(bitmap = virBitmapNew(hostcpus)))
goto cleanup;
- if (!pinned)
- VIR_UNUSE_CPU(cpumap, pcpu);
+ virBitmapSetAll(bitmap);
+ } else {
+ bitmap = pininfo->cpumask;
+ }
+
+ if (virBitmapToData(bitmap, &tmpmap, &tmpmaplen) < 0) {
+ if (!pininfo)
+ virBitmapFree(bitmap);
+ goto cleanup;
}
+ if (tmpmaplen > maplen)
+ tmpmaplen = maplen;
+ cpumap = VIR_GET_CPUMAP(cpumaps, maplen, vcpu);
+ memcpy(cpumap, tmpmap, tmpmaplen);
+ if (!pininfo)
+ virBitmapFree(bitmap);
+ VIR_FREE(tmpmap);
}
+
ret = ncpumaps;
cleanup:
--
2.1.0