[libvirt] [RFCv2 PATCH 3/5] conf: rename cachetune to restune
John Ferlan
jferlan at redhat.com
Fri Jun 29 22:47:14 UTC 2018
On 06/15/2018 05:29 AM, bing.niu at intel.com wrote:
> From: Bing Niu <bing.niu at intel.com>
>
> resctrl not only supports cache tuning, but also memory bandwidth
> tuning. Rename cachetune to restune(resource tuning) to reflect
> that.
>
> Signed-off-by: Bing Niu <bing.niu at intel.com>
> ---
> src/conf/domain_conf.c | 44 ++++++++++++++++++++++----------------------
> src/conf/domain_conf.h | 10 +++++-----
> src/qemu/qemu_process.c | 18 +++++++++---------
> 3 files changed, 36 insertions(+), 36 deletions(-)
>
Not so sure I'm liking [R|r]estune[s]... Still @cachetunes is an array
of a structure that contains a vCPU bitmap and a virResctrlAllocPtr for
the /cputune/cachetunes data. The virResctrlAllocPtr was changed to add
a the bandwidth allocation, so does this really have to change?
I think the question is - if both cachetunes and memtunes exist in
domain XML, then for which does the @vcpus relate to. That is, from the
cover there's:
<memorytune vcpus='0-1'>
<node id='0' bandwidth='20'/>
</memorytune>
and then there's a
<cachetune vcpus='0-3'>
<cache id='0' level='3' type='both' size='3' unit='MiB'/>
<cache id='1' level='3' type='both' size='3' unit='MiB'/>
</cachetune>
Now what? I haven't looked at patch 4 yet to even know how this "works".
I think what you want to do is create a virDomainMemtuneDef that mimics
virDomainCachetuneDef, but I'm not 100% sure.
Of course that still leaves me wondering how much of virResctrlAllocPtr
then becomes wasted. You chose an integration point, but essentially
have separate technologies. I'm trying to make sense of it all and am
starting to get lost in the process of doing that.
If @bandwidth can not be > 100... Can we duplicate the @id somehow? So
how does that free buffer that got 100% and then gets subtracted from
really work in this model? I probably need to study the code some more,
but it's not clear it requires using the "same" sort of logic that
cachetune uses where there could be different types (instructs, data, or
both) that would be drawing from the size, right? I think that's how
that worked. So what's the corollary for memtunes? You set a range from
0 to 100, right and that's it. OK, too many questions and it's late so
I'll stop here... Hopefully I didn't leave any stray thoughts in the
review of patch 1 or 2.
John
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 62c412e..b3543f3 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -2950,14 +2950,14 @@ virDomainLoaderDefFree(virDomainLoaderDefPtr loader)
>
>
> static void
> -virDomainCachetuneDefFree(virDomainCachetuneDefPtr cachetune)
> +virDomainRestuneDefFree(virDomainRestuneDefPtr restune)
> {
> - if (!cachetune)
> + if (!restune)
> return;
>
> - virObjectUnref(cachetune->alloc);
> - virBitmapFree(cachetune->vcpus);
> - VIR_FREE(cachetune);
> + virObjectUnref(restune->alloc);
> + virBitmapFree(restune->vcpus);
> + VIR_FREE(restune);
> }
>
>
> @@ -3147,9 +3147,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->nrestunes; i++)
> + virDomainRestuneDefFree(def->restunes[i]);
> + VIR_FREE(def->restunes);
>
> VIR_FREE(def->keywrap);
>
> @@ -18971,7 +18971,7 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
> xmlNodePtr *nodes = NULL;
> virBitmapPtr vcpus = NULL;
> virResctrlAllocPtr alloc = virResctrlAllocNew();
> - virDomainCachetuneDefPtr tmp_cachetune = NULL;
> + virDomainRestuneDefPtr tmp_restune = NULL;
> char *tmp = NULL;
> char *vcpus_str = NULL;
> char *alloc_id = NULL;
> @@ -18984,7 +18984,7 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
> if (!alloc)
> goto cleanup;
>
> - if (VIR_ALLOC(tmp_cachetune) < 0)
> + if (VIR_ALLOC(tmp_restune) < 0)
> goto cleanup;
>
> vcpus_str = virXMLPropString(node, "vcpus");
> @@ -19025,8 +19025,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->nrestunes; i++) {
> + if (virBitmapOverlaps(def->restunes[i]->vcpus, vcpus)) {
> virReportError(VIR_ERR_XML_ERROR, "%s",
> _("Overlapping vcpus in cachetunes"));
> goto cleanup;
> @@ -19056,16 +19056,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_restune->vcpus, vcpus);
> + VIR_STEAL_PTR(tmp_restune->alloc, alloc);
>
> - if (VIR_APPEND_ELEMENT(def->cachetunes, def->ncachetunes, tmp_cachetune) < 0)
> + if (VIR_APPEND_ELEMENT(def->restunes, def->nrestunes, tmp_restune) < 0)
> goto cleanup;
>
> ret = 0;
> cleanup:
> ctxt->node = oldnode;
> - virDomainCachetuneDefFree(tmp_cachetune);
> + virDomainRestuneDefFree(tmp_restune);
> virObjectUnref(alloc);
> virBitmapFree(vcpus);
> VIR_FREE(alloc_id);
> @@ -26874,7 +26874,7 @@ virDomainCachetuneDefFormatHelper(unsigned int level,
>
> static int
> virDomainCachetuneDefFormat(virBufferPtr buf,
> - virDomainCachetuneDefPtr cachetune,
> + virDomainRestuneDefPtr restune,
> unsigned int flags)
> {
> virBuffer childrenBuf = VIR_BUFFER_INITIALIZER;
> @@ -26882,7 +26882,7 @@ virDomainCachetuneDefFormat(virBufferPtr buf,
> int ret = -1;
>
> virBufferSetChildIndent(&childrenBuf, buf);
> - virResctrlAllocForeachCache(cachetune->alloc,
> + virResctrlAllocForeachCache(restune->alloc,
> virDomainCachetuneDefFormatHelper,
> &childrenBuf);
>
> @@ -26895,14 +26895,14 @@ virDomainCachetuneDefFormat(virBufferPtr buf,
> goto cleanup;
> }
>
> - vcpus = virBitmapFormat(cachetune->vcpus);
> + vcpus = virBitmapFormat(restune->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(restune->alloc);
> if (!alloc_id)
> goto cleanup;
>
> @@ -27023,8 +27023,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->nrestunes; i++)
> + virDomainCachetuneDefFormat(&childrenBuf, def->restunes[i], flags);
>
> if (virBufferCheckError(&childrenBuf) < 0)
> return -1;
> diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
> index 6344c02..9e71a0b 100644
> --- a/src/conf/domain_conf.h
> +++ b/src/conf/domain_conf.h
> @@ -2228,10 +2228,10 @@ struct _virDomainCputune {
> };
>
>
> -typedef struct _virDomainCachetuneDef virDomainCachetuneDef;
> -typedef virDomainCachetuneDef *virDomainCachetuneDefPtr;
> +typedef struct _virDomainRestuneDef virDomainRestuneDef;
> +typedef virDomainRestuneDef *virDomainRestuneDefPtr;
>
> -struct _virDomainCachetuneDef {
> +struct _virDomainRestuneDef {
> virBitmapPtr vcpus;
> virResctrlAllocPtr alloc;
> };
> @@ -2409,8 +2409,8 @@ struct _virDomainDef {
>
> virDomainCputune cputune;
>
> - virDomainCachetuneDefPtr *cachetunes;
> - size_t ncachetunes;
> + virDomainRestuneDefPtr *restunes;
> + size_t nrestunes;
>
> virDomainNumaPtr numa;
> virDomainResourceDefPtr resource;
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index 93fd6ba..0659c06 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c
> @@ -2447,7 +2447,7 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver,
> virCapsPtr caps = NULL;
> qemuDomainObjPrivatePtr priv = vm->privateData;
>
> - if (!vm->def->ncachetunes)
> + if (!vm->def->nrestunes)
> return 0;
>
> /* Force capability refresh since resctrl info can change
> @@ -2456,9 +2456,9 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver,
> if (!caps)
> return -1;
>
> - for (i = 0; i < vm->def->ncachetunes; i++) {
> + for (i = 0; i < vm->def->nrestunes; i++) {
> if (virResctrlAllocCreate(caps->host.resctrl,
> - vm->def->cachetunes[i]->alloc,
> + vm->def->restunes[i]->alloc,
> priv->machineName) < 0)
> goto cleanup;
> }
> @@ -5259,8 +5259,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->nrestunes; i++) {
> + virDomainRestuneDefPtr ct = vm->def->restunes[i];
>
> if (virBitmapIsBitSet(ct->vcpus, vcpuid)) {
> if (virResctrlAllocAddPID(ct->alloc, vcpupid) < 0)
> @@ -6955,8 +6955,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->nrestunes; i++)
> + virResctrlAllocRemove(vm->def->restunes[i]->alloc);
>
> qemuProcessRemoveDomainStatus(driver, vm);
>
> @@ -7676,8 +7676,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->nrestunes; i++) {
> + if (virResctrlAllocDeterminePath(obj->def->restunes[i]->alloc,
> priv->machineName) < 0)
> goto error;
> }
>
More information about the libvir-list
mailing list