External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-04 21:35:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Rename cachetune to resctrl

Browse Source 
Resctrl not only supports cache tuning, but also memory bandwidth
tuning. Renaming cachetune to resctrl to reflect that. With resctrl,
all allocation for different resources (cache, memory bandwidth) are
aggregated and represented by a virResctrlAllocPtr inside
virDomainResctrlDef.

Signed-off-by: Bing Niu <bing.niu@intel.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Bing Niu 2018-07-30 11:12:35 +08:00 committed by John Ferlan
parent 5b66c6cc85
commit acc288d655
4 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/conf/domain_conf.c
View File

@ -2966,14 +2966,14 @@ virDomainLoaderDefFree(virDomainLoaderDefPtr loader)
static void
virDomainCachetuneDefFree(virDomainCachetuneDefPtr cachetune)
virDomainResctrlDefFree(virDomainResctrlDefPtr resctrl)
{
if (!cachetune)
if (!resctrl)
return;
virObjectUnref(cachetune->alloc);
virBitmapFree(cachetune->vcpus);
VIR_FREE(cachetune);
virObjectUnref(resctrl->alloc);
virBitmapFree(resctrl->vcpus);
VIR_FREE(resctrl);
}
@ -3163,9 +3163,9 @@ void virDomainDefFree(virDomainDefPtr def)
virDomainShmemDefFree(def->shmems[i]);
VIR_FREE(def->shmems);
for (i = 0; i < def->ncachetunes; i++)
virDomainCachetuneDefFree(def->cachetunes[i]);
VIR_FREE(def->cachetunes);
for (i = 0; i < def->nresctrls; i++)
virDomainResctrlDefFree(def->resctrls[i]);
VIR_FREE(def->resctrls);
VIR_FREE(def->keywrap);
@ -19162,7 +19162,7 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
xmlNodePtr *nodes = NULL;
virBitmapPtr vcpus = NULL;
virResctrlAllocPtr alloc = virResctrlAllocNew();
virDomainCachetuneDefPtr tmp_cachetune = NULL;
virDomainResctrlDefPtr tmp_resctrl = NULL;
char *tmp = NULL;
char *vcpus_str = NULL;
char *alloc_id = NULL;
@ -19175,7 +19175,7 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
if (!alloc)
goto cleanup;
if (VIR_ALLOC(tmp_cachetune) < 0)
if (VIR_ALLOC(tmp_resctrl) < 0)
goto cleanup;
vcpus_str = virXMLPropString(node, "vcpus");
@ -19216,8 +19216,8 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
goto cleanup;
}
for (i = 0; i < def->ncachetunes; i++) {
if (virBitmapOverlaps(def->cachetunes[i]->vcpus, vcpus)) {
for (i = 0; i < def->nresctrls; i++) {
if (virBitmapOverlaps(def->resctrls[i]->vcpus, vcpus)) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Overlapping vcpus in cachetunes"));
goto cleanup;
@ -19247,16 +19247,16 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
if (virResctrlAllocSetID(alloc, alloc_id) < 0)
goto cleanup;
VIR_STEAL_PTR(tmp_cachetune->vcpus, vcpus);
VIR_STEAL_PTR(tmp_cachetune->alloc, alloc);
VIR_STEAL_PTR(tmp_resctrl->vcpus, vcpus);
VIR_STEAL_PTR(tmp_resctrl->alloc, alloc);
if (VIR_APPEND_ELEMENT(def->cachetunes, def->ncachetunes, tmp_cachetune) < 0)
if (VIR_APPEND_ELEMENT(def->resctrls, def->nresctrls, tmp_resctrl) < 0)
goto cleanup;
ret = 0;
cleanup:
ctxt->node = oldnode;
virDomainCachetuneDefFree(tmp_cachetune);
virDomainResctrlDefFree(tmp_resctrl);
virObjectUnref(alloc);
virBitmapFree(vcpus);
VIR_FREE(alloc_id);
@ -27089,7 +27089,7 @@ virDomainCachetuneDefFormatHelper(unsigned int level,
static int
virDomainCachetuneDefFormat(virBufferPtr buf,
virDomainCachetuneDefPtr cachetune,
virDomainResctrlDefPtr resctrl,
unsigned int flags)
{
virBuffer childrenBuf = VIR_BUFFER_INITIALIZER;
@ -27097,7 +27097,7 @@ virDomainCachetuneDefFormat(virBufferPtr buf,
int ret = -1;
virBufferSetChildIndent(&childrenBuf, buf);
virResctrlAllocForeachCache(cachetune->alloc,
virResctrlAllocForeachCache(resctrl->alloc,
virDomainCachetuneDefFormatHelper,
&childrenBuf);
@ -27110,14 +27110,14 @@ virDomainCachetuneDefFormat(virBufferPtr buf,
goto cleanup;
}
vcpus = virBitmapFormat(cachetune->vcpus);
vcpus = virBitmapFormat(resctrl->vcpus);
if (!vcpus)
goto cleanup;
virBufferAsprintf(buf, "<cachetune vcpus='%s'", vcpus);
if (!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE)) {
const char *alloc_id = virResctrlAllocGetID(cachetune->alloc);
const char *alloc_id = virResctrlAllocGetID(resctrl->alloc);
if (!alloc_id)
goto cleanup;
@ -27238,8 +27238,8 @@ virDomainCputuneDefFormat(virBufferPtr buf,
def->iothreadids[i]->iothread_id);
}
for (i = 0; i < def->ncachetunes; i++)
virDomainCachetuneDefFormat(&childrenBuf, def->cachetunes[i], flags);
for (i = 0; i < def->nresctrls; i++)
virDomainCachetuneDefFormat(&childrenBuf, def->resctrls[i], flags);
if (virBufferCheckError(&childrenBuf) < 0)
return -1;

10
src/conf/domain_conf.h
View File

@ -2232,10 +2232,10 @@ struct _virDomainCputune {
};
typedef struct _virDomainCachetuneDef virDomainCachetuneDef;
typedef virDomainCachetuneDef *virDomainCachetuneDefPtr;
typedef struct _virDomainResctrlDef virDomainResctrlDef;
typedef virDomainResctrlDef *virDomainResctrlDefPtr;
struct _virDomainCachetuneDef {
struct _virDomainResctrlDef {
virBitmapPtr vcpus;
virResctrlAllocPtr alloc;
};
@ -2413,8 +2413,8 @@ struct _virDomainDef {
virDomainCputune cputune;
virDomainCachetuneDefPtr *cachetunes;
size_t ncachetunes;
virDomainResctrlDefPtr *resctrls;
size_t nresctrls;
virDomainNumaPtr numa;
virDomainResourceDefPtr resource;

2
src/qemu/qemu_domain.c
View File

@ -3999,7 +3999,7 @@ qemuDomainDefValidate(const virDomainDef *def,
}
}
if (def->ncachetunes &&
if (def->nresctrls &&
def->virtType != VIR_DOMAIN_VIRT_KVM) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("cachetune is only supported for KVM domains"));

18
src/qemu/qemu_process.c
View File

@ -2559,7 +2559,7 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver,
virCapsPtr caps = NULL;
qemuDomainObjPrivatePtr priv = vm->privateData;
if (!vm->def->ncachetunes)
if (!vm->def->nresctrls)
return 0;
/* Force capability refresh since resctrl info can change
@ -2568,9 +2568,9 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver,
if (!caps)
return -1;
for (i = 0; i < vm->def->ncachetunes; i++) {
for (i = 0; i < vm->def->nresctrls; i++) {
if (virResctrlAllocCreate(caps->host.resctrl,
vm->def->cachetunes[i]->alloc,
vm->def->resctrls[i]->alloc,
priv->machineName) < 0)
goto cleanup;
}
@ -5388,8 +5388,8 @@ qemuProcessSetupVcpu(virDomainObjPtr vm,
&vcpu->sched) < 0)
return -1;
for (i = 0; i < vm->def->ncachetunes; i++) {
virDomainCachetuneDefPtr ct = vm->def->cachetunes[i];
for (i = 0; i < vm->def->nresctrls; i++) {
virDomainResctrlDefPtr ct = vm->def->resctrls[i];
if (virBitmapIsBitSet(ct->vcpus, vcpuid)) {
if (virResctrlAllocAddPID(ct->alloc, vcpupid) < 0)
@ -7091,8 +7091,8 @@ void qemuProcessStop(virQEMUDriverPtr driver,
/* Remove resctrl allocation after cgroups are cleaned up which makes it
* kind of safer (although removing the allocation should work even with
* pids in tasks file */
for (i = 0; i < vm->def->ncachetunes; i++)
virResctrlAllocRemove(vm->def->cachetunes[i]->alloc);
for (i = 0; i < vm->def->nresctrls; i++)
virResctrlAllocRemove(vm->def->resctrls[i]->alloc);
qemuProcessRemoveDomainStatus(driver, vm);
@ -7818,8 +7818,8 @@ qemuProcessReconnect(void *opaque)
if (qemuConnectAgent(driver, obj) < 0)
goto error;
for (i = 0; i < obj->def->ncachetunes; i++) {
if (virResctrlAllocDeterminePath(obj->def->cachetunes[i]->alloc,
for (i = 0; i < obj->def->nresctrls; i++) {
if (virResctrlAllocDeterminePath(obj->def->resctrls[i]->alloc,
priv->machineName) < 0)
goto error;
}