External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Change/Fix IOThread CPU affinity bitmap manipulation

Browse Source 
Based on review:

http://www.redhat.com/archives/libvir-list/2015-March/msg00294.html

Adjust how the cpumap and cpumaplen to be returned are generated
This commit is contained in:
John Ferlan 2015-03-06 12:07:56 -05:00
parent 69e5f37c4a
commit daefe3f300
1 changed files with 31 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/qemu/qemu_driver.c
View File

@ -5566,7 +5566,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver,
qemuMonitorIOThreadsInfoPtr *iothreads = NULL; qemuMonitorIOThreadsInfoPtr *iothreads = NULL;
virDomainIOThreadInfoPtr *info_ret = NULL; virDomainIOThreadInfoPtr *info_ret = NULL;
int niothreads = 0; int niothreads = 0;
int maxcpu, hostcpus, maplen; int hostcpus;
size_t i; size_t i;
int ret = -1; int ret = -1;
@ -5602,18 +5602,11 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver,
if ((hostcpus = nodeGetCPUCount()) < 0) if ((hostcpus = nodeGetCPUCount()) < 0)
goto endjob; goto endjob;
maplen = VIR_CPU_MAPLEN(hostcpus);
maxcpu = maplen * 8;
if (maxcpu > hostcpus)
maxcpu = hostcpus;
if (VIR_ALLOC_N(info_ret, niothreads) < 0) if (VIR_ALLOC_N(info_ret, niothreads) < 0)
goto endjob; goto endjob;
for (i = 0; i < niothreads; i++) { for (i = 0; i < niothreads; i++) {
virBitmapPtr map = NULL; virBitmapPtr map = NULL;
unsigned char *tmpmap = NULL;
int tmpmaplen = 0;
if (VIR_ALLOC(info_ret[i]) < 0) if (VIR_ALLOC(info_ret[i]) < 0)
goto endjob; goto endjob;
@ -5622,19 +5615,14 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver,
&info_ret[i]->iothread_id) < 0) &info_ret[i]->iothread_id) < 0)
goto endjob; goto endjob;
if (VIR_ALLOC_N(info_ret[i]->cpumap, maplen) < 0) if (virProcessGetAffinity(iothreads[i]->thread_id, &map, hostcpus) < 0)
goto endjob; goto endjob;
if (virProcessGetAffinity(iothreads[i]->thread_id, &map, maxcpu) < 0) if (virBitmapToData(map, &info_ret[i]->cpumap,
&info_ret[i]->cpumaplen) < 0) {
virBitmapFree(map);
goto endjob; goto endjob;
}
virBitmapToData(map, &tmpmap, &tmpmaplen);
if (tmpmaplen > maplen)
tmpmaplen = maplen;
memcpy(info_ret[i]->cpumap, tmpmap, tmpmaplen);
info_ret[i]->cpumaplen = tmpmaplen;
VIR_FREE(tmpmap);
virBitmapFree(map); virBitmapFree(map);
} }
@ -5665,12 +5653,10 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef,
virDomainIOThreadInfoPtr **info) virDomainIOThreadInfoPtr **info)
{ {
virDomainIOThreadInfoPtr *info_ret = NULL; virDomainIOThreadInfoPtr *info_ret = NULL;
virDomainVcpuPinDefPtr *iothreadspin_list; virBitmapPtr bitmap = NULL;
virBitmapPtr cpumask = NULL; virBitmapPtr cpumask = NULL;
unsigned char *cpumap; int hostcpus;
int maxcpu, hostcpus, maplen; size_t i;
size_t i, pcpu;
bool pinned;
int ret = -1; int ret = -1;
if (targetDef->iothreads == 0) if (targetDef->iothreads == 0)
@ -5679,47 +5665,39 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef,
if ((hostcpus = nodeGetCPUCount()) < 0) if ((hostcpus = nodeGetCPUCount()) < 0)
goto cleanup; goto cleanup;
maplen = VIR_CPU_MAPLEN(hostcpus);
maxcpu = maplen * 8;
if (maxcpu > hostcpus)
maxcpu = hostcpus;
if (VIR_ALLOC_N(info_ret, targetDef->iothreads) < 0) if (VIR_ALLOC_N(info_ret, targetDef->iothreads) < 0)
goto cleanup; goto cleanup;
for (i = 0; i < targetDef->iothreads; i++) { for (i = 0; i < targetDef->iothreads; i++) {
virDomainVcpuPinDefPtr pininfo;
if (VIR_ALLOC(info_ret[i]) < 0) if (VIR_ALLOC(info_ret[i]) < 0)
goto cleanup; goto cleanup;
/* IOThreads being counting at 1 */ /* IOThreads being counting at 1 */
info_ret[i]->iothread_id = i + 1; info_ret[i]->iothread_id = i + 1;
if (VIR_ALLOC_N(info_ret[i]->cpumap, maplen) < 0)
goto cleanup;
/* Initialize the cpumap */ /* Initialize the cpumap */
info_ret[i]->cpumaplen = maplen; pininfo = virDomainVcpuPinFindByVcpu(targetDef->cputune.iothreadspin,
memset(info_ret[i]->cpumap, 0xff, maplen); targetDef->cputune.niothreadspin,
if (maxcpu % 8) i + 1);
info_ret[i]->cpumap[maplen - 1] &= (1 << maxcpu % 8) - 1; if (!pininfo) {
} if (targetDef->cpumask) {
cpumask = targetDef->cpumask;
/* If iothreadspin setting exists, there are unused physical cpus */ } else {
iothreadspin_list = targetDef->cputune.iothreadspin; if (!(bitmap = virBitmapNew(hostcpus)))
for (i = 0; i < targetDef->cputune.niothreadspin; i++) {
/* vcpuid is the iothread_id...
* iothread_id is the index into info_ret + 1, so we can
* assume that the info_ret index we want is vcpuid - 1
*/
cpumap = info_ret[iothreadspin_list[i]->vcpuid - 1]->cpumap;
cpumask = iothreadspin_list[i]->cpumask;
for (pcpu = 0; pcpu < maxcpu; pcpu++) {
if (virBitmapGetBit(cpumask, pcpu, &pinned) < 0)
goto cleanup; goto cleanup;
if (!pinned) virBitmapSetAll(bitmap);
VIR_UNUSE_CPU(cpumap, pcpu); cpumask = bitmap;
} }
} else {
cpumask = pininfo->cpumask;
}
if (virBitmapToData(cpumask, &info_ret[i]->cpumap,
&info_ret[i]->cpumaplen) < 0)
goto cleanup;
virBitmapFree(bitmap);
bitmap = NULL;
} }
*info = info_ret; *info = info_ret;
@ -5732,6 +5710,7 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef,
virDomainIOThreadsInfoFree(info_ret[i]); virDomainIOThreadsInfoFree(info_ret[i]);
VIR_FREE(info_ret); VIR_FREE(info_ret);
} }
virBitmapFree(bitmap);
return ret; return ret;
} }