From nobody Sun Feb 8 17:46:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593006588; cv=none; d=zohomail.com; s=zohoarc; b=UBOoHKmYjQ8znEhq+XymlTjz421VkbyoNjbiamPL8jdUIAnuZfX7gb3OvcL54F1sdOh7mc9Mpmxgt4/heIWDBeLt+tsS4EaH0mHFwrGDoT8h9ajBKIW6Oh50VQjHhAMR3kytD+rzsv3nimgEqzcVm9HJDaD63CCIungRi+VmO+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593006588; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6uy63+z+Wc87TyEwSBzADSd76RV/DwibGXJFuhiAdcs=; b=eg+nTzAMBP8ghtO8SlYZ14EpYA4Z+WPQc3dMcCYVyicSEoc5pjsse22gqR2dgS5EF1XHEFPjsRiuKQNFpTCoAHxyY8wZ5f2hW1ny4maMNB5hCWbtJlfDKC4YkIJVVw8mwKU4mxek/DMsp1MP7oD6wwrx0OUa9iSs4nOXtc82oo4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 159300658807782.79356183972129; Wed, 24 Jun 2020 06:49:48 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-13-3yoVvSxgMg6CSkoKGKmdEw-1; Wed, 24 Jun 2020 09:49:43 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 78C671005512; Wed, 24 Jun 2020 13:49:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 58D725C240; Wed, 24 Jun 2020 13:49:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2D3351CA6; Wed, 24 Jun 2020 13:49:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05ODnNuT015690 for ; Wed, 24 Jun 2020 09:49:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id C46375DA27; Wed, 24 Jun 2020 13:49:23 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.195.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 447E45D9DC for ; Wed, 24 Jun 2020 13:49:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593006586; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6uy63+z+Wc87TyEwSBzADSd76RV/DwibGXJFuhiAdcs=; b=a5ext/Y9lHckJmNOa8ANxuWqYqvavR7XMfBb/phT8h8NCkb4KRNsbuoN6RGCISChxJLV6R /cVzTIehrO2JEf2hS2lTTnoyBYSlS033wnG8nOIZiX7/1eH1bYc/db+Zu/986Eezgnu6G/ JCJo47lOgDcouN5eVhRupMj/lBZE91I= X-MC-Unique: 3yoVvSxgMg6CSkoKGKmdEw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 08/13] conf: Parse and format HMAT Date: Wed, 24 Jun 2020 15:49:06 +0200 Message-Id: <98bea11bf69a7736b3e5ca9ac7444570a8381da8.1593006346.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" To cite ACPI specification: Heterogeneous Memory Attribute Table describes the memory attributes, such as memory side cache attributes and bandwidth and latency details, related to the System Physical Address (SPA) Memory Ranges. The software is expected to use this information as hint for optimization. According to our upstream discussion [1] this is exposed under as under NUMA and or under numa/latencies. 1: https://www.redhat.com/archives/libvir-list/2020-January/msg00422.html Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- docs/formatdomain.html.in | 88 ++++++ docs/schemas/cputypes.rng | 110 ++++++- src/conf/numa_conf.c | 350 ++++++++++++++++++++- src/conf/numa_conf.h | 33 ++ src/libvirt_private.syms | 6 + tests/qemuxml2argvdata/numatune-hmat.xml | 52 +++ tests/qemuxml2xmloutdata/numatune-hmat.xml | 1 + tests/qemuxml2xmltest.c | 1 + 8 files changed, 625 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/numatune-hmat.xml create mode 120000 tests/qemuxml2xmloutdata/numatune-hmat.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 07dcca57f5..78b2d2828d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1931,6 +1931,94 @@ using 10 for local and 20 for remote distances.

=20 +

Heterogeneous Memory Attribute Table

+ +
+...
+<cpu>
+  ...
+  <numa>
+    <cell id=3D'0' cpus=3D'0-3' memory=3D'512000' unit=3D'KiB' discard=
=3D'yes'/>
+    <cell id=3D'1' cpus=3D'4-7' memory=3D'512000' unit=3D'KiB' memAcces=
s=3D'shared'/>
+    <cell id=3D'3' cpus=3D'0-3' memory=3D'2097152' unit=3D'KiB'>
+      <cache level=3D'1' associativity=3D'direct' policy=3D'writeback'&=
gt;
+        <size value=3D'10' unit=3D'KiB'/>
+        <line value=3D'8' unit=3D'B'/>
+      </cache>
+    </cell>
+    <latencies>
+      <latency initiator=3D'0' target=3D'0' type=3D'access' value=3D'5'=
/>
+      <latency initiator=3D'0' target=3D'0' cache=3D'1' type=3D'access'=
 value=3D'10'/>
+      <bandwidth initiator=3D'0' target=3D'0' type=3D'access' value=3D'=
204800' unit=3D'KiB'/>
+    </latencies>
+  </numa>
+  ...
+</cpu>
+...
+ +

+ Since 6.5.0 the cell eleme= nt can + have cache child element which describes memory side ca= che + for memory proximity domains. The cache element has + level attribute describing the cache level and thus the + element can be repeated multiple times to describe different levels = of + the cache. +

+ +

+ The cache element then has associativity + attribute (accepted values are none, direct and + full) describing the cache associativity, and + policy attribute (accepted values are none, + writeback and writethrough) describing cac= he + write associativity. The element has two mandatory child elements th= en: + size and line which describe cache size and + cache line size. Both elements accept two attributes: value + and unit which set the value of corresponding cache + attribute. +

+ +

+ The NUMA description has optional latencies element that + describes the normalized memory read/write latency, read/write bandw= idth + between Initiator Proximity Domains (Processor or I/O) and Target + Proximity Domains (Memory). +

+ +

+ The latencies element can have zero or more + latency child elements to describe latency between two + memory nodes and zero or more bandwidth child elements = to + describe bandwidth between two memory nodes. Both these have the + following mandatory attributes: +

+ +
+
initiator
+
Refers to the source NUMA node
+ +
target
+
Refers to the target NUMA node
+ +
type
+
The type of the access. Accepted values: access, + read, write
+ +
value
+
The actual value. For latency this is delay in nanoseconds, for + bandwidth this value is in kibibytes per second. Use additional + unit attribute to change the units.
+
+ +

+ To describe latency from one NUMA node to a cache of another NUMA no= de + the latency element has optional cache + attribute which in combination with target attribute cr= eates + full reference to distant NUMA node's cache level. For instance, + target=3D'0' cache=3D'1' refers to the first level cach= e of NUMA + node 0. +

+

Events configuration

=20

diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng index a1682a1003..70c455cfa9 100644 --- a/docs/schemas/cputypes.rng +++ b/docs/schemas/cputypes.rng @@ -102,9 +102,14 @@ =20 - - - + + + + + + + + =20 @@ -148,6 +153,9 @@ + + + =20 @@ -162,6 +170,102 @@ =20 + + + + + + + + none + direct + full + + + + + none + writeback + writethrough + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + access + read + write + + + + + + + + + + + + + + + + + + + access + read + write + + + + + + + + + + + + + + diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 7cf62ce7da..f510dfebce 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -59,9 +59,37 @@ VIR_ENUM_IMPL(virDomainMemoryAccess, "private", ); =20 +VIR_ENUM_IMPL(virDomainCacheAssociativity, + VIR_DOMAIN_CACHE_ASSOCIATIVITY_LAST, + "none", + "direct", + "full", +); + +VIR_ENUM_IMPL(virDomainCachePolicy, + VIR_DOMAIN_CACHE_POLICY_LAST, + "none", + "writeback", + "writethrough", +); + +VIR_ENUM_IMPL(virDomainMemoryLatency, + VIR_DOMAIN_MEMORY_LATENCY_LAST, + "none", + "access", + "read", + "write" +); + typedef struct _virDomainNumaDistance virDomainNumaDistance; typedef virDomainNumaDistance *virDomainNumaDistancePtr; =20 +typedef struct _virDomainNumaCache virDomainNumaCache; +typedef virDomainNumaCache *virDomainNumaCachePtr; + +typedef struct _virDomainNumaLatency virDomainNumaLatency; +typedef virDomainNumaLatency *virDomainNumaLatencyPtr; + typedef struct _virDomainNumaNode virDomainNumaNode; typedef virDomainNumaNode *virDomainNumaNodePtr; =20 @@ -86,9 +114,30 @@ struct _virDomainNuma { unsigned int cellid; } *distances; /* remote node distances */ size_t ndistances; + + struct _virDomainNumaCache { + unsigned int level; /* cache level */ + unsigned int size; /* cache size */ + unsigned int line; /* line size, !!! in bytes !!! */ + virDomainCacheAssociativity associativity; /* cache associativ= ity */ + virDomainCachePolicy policy; /* cache policy */ + } *caches; + size_t ncaches; } *mem_nodes; /* guest node configuration */ size_t nmem_nodes; =20 + struct _virDomainNumaLatency { + virDomainNumaLatencyType type; /* whether structure describes lat= ency + or bandwidth */ + unsigned int initiator; /* the initiator NUMA node */ + unsigned int target; /* the target NUMA node */ + unsigned int cache; /* the target cache on @target; if 0 then = the + memory on @target */ + virDomainMemoryLatency accessType; /* what type of access is defi= ned */ + unsigned long value; /* value itself */ + } *latencies; + size_t nlatencies; + /* Future NUMA tuning related stuff should go here. */ }; =20 @@ -368,9 +417,13 @@ virDomainNumaFree(virDomainNumaPtr numa) =20 if (numa->mem_nodes[i].ndistances > 0) VIR_FREE(numa->mem_nodes[i].distances); + + VIR_FREE(numa->mem_nodes[i].caches); } VIR_FREE(numa->mem_nodes); =20 + VIR_FREE(numa->latencies); + VIR_FREE(numa); } =20 @@ -841,12 +894,102 @@ virDomainNumaDefNodeDistanceParseXML(virDomainNumaPt= r def, return ret; } =20 + +static int +virDomainNumaDefNodeCacheParseXML(virDomainNumaPtr def, + xmlXPathContextPtr ctxt, + unsigned int cur_cell) +{ + g_autofree xmlNodePtr *nodes =3D NULL; + int n; + size_t i; + + if ((n =3D virXPathNodeSet("./cache", ctxt, &nodes)) < 0) + return -1; + + def->mem_nodes[cur_cell].caches =3D g_new0(virDomainNumaCache, n); + + for (i =3D 0; i < n; i++) { + VIR_XPATH_NODE_AUTORESTORE(ctxt); + virDomainNumaCachePtr cache =3D &def->mem_nodes[cur_cell].caches[i= ]; + g_autofree char *tmp =3D NULL; + unsigned int level; + int associativity; + int policy; + unsigned long long size; + unsigned long long line; + + if (!(tmp =3D virXMLPropString(nodes[i], "level"))) { + virReportError(VIR_ERR_XML_ERROR, + _("Missing 'level' attribute in cache " + "element for NUMA node %d"), + cur_cell); + return -1; + } + + if (virStrToLong_uip(tmp, NULL, 10, &level) < 0 || + level =3D=3D 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid 'level' attribute in cache " + "element for NUMA node %d"), + cur_cell); + return -1; + } + VIR_FREE(tmp); + + if (!(tmp =3D virXMLPropString(nodes[i], "associativity"))) { + virReportError(VIR_ERR_XML_ERROR, + _("Missing 'associativity' attribute in cache " + "element for NUMA node %d"), + cur_cell); + return -1; + } + + if ((associativity =3D virDomainCacheAssociativityTypeFromString(t= mp)) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid cache associativity '%s'"), + tmp); + return -1; + } + VIR_FREE(tmp); + + if (!(tmp =3D virXMLPropString(nodes[i], "policy"))) { + virReportError(VIR_ERR_XML_ERROR, + _("Missing 'policy' attribute in cache " + "element for NUMA node %d"), + cur_cell); + } + + if ((policy =3D virDomainCachePolicyTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid cache policy '%s'"), + tmp); + return -1; + } + VIR_FREE(tmp); + + ctxt->node =3D nodes[i]; + if (virDomainParseMemory("./size/@value", "./size/unit", + ctxt, &size, true, false) < 0) + return -1; + + if (virParseScaledValue("./line/@value", "./line/unit", + ctxt, &line, 1, ULLONG_MAX, true) < 0) + return -1; + + *cache =3D (virDomainNumaCache){level, size, line, associativity, = policy}; + def->mem_nodes[cur_cell].ncaches++; + } + + return 0; +} + + int virDomainNumaDefParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt) { xmlNodePtr *nodes =3D NULL; - VIR_XPATH_NODE_AUTORESTORE(ctxt); char *tmp =3D NULL; int n; size_t i, j; @@ -867,6 +1010,7 @@ virDomainNumaDefParseXML(virDomainNumaPtr def, def->nmem_nodes =3D n; =20 for (i =3D 0; i < n; i++) { + VIR_XPATH_NODE_AUTORESTORE(ctxt); int rc; unsigned int cur_cell =3D i; =20 @@ -953,7 +1097,109 @@ virDomainNumaDefParseXML(virDomainNumaPtr def, =20 /* Parse NUMA distances info */ if (virDomainNumaDefNodeDistanceParseXML(def, ctxt, cur_cell) < 0) + goto cleanup; + + /* Parse cache info */ + if (virDomainNumaDefNodeCacheParseXML(def, ctxt, cur_cell) < 0) + goto cleanup; + } + + VIR_FREE(nodes); + if ((n =3D virXPathNodeSet("./cpu/numa[1]/latencies[1]/latency|" + "./cpu/numa[1]/latencies[1]/bandwidth", ctxt,= &nodes)) < 0) + goto cleanup; + + def->latencies =3D g_new0(virDomainNumaLatency, n); + for (i =3D 0; i < n; i++) { + virDomainNumaLatencyType type; + unsigned int initiator; + unsigned int target; + unsigned int cache =3D 0; + int accessType; + unsigned long long value; + + if (virXMLNodeNameEqual(nodes[i], "latency")) { + type =3D VIR_DOMAIN_NUMA_LATENCY_TYPE_LATENCY; + + if (!(tmp =3D virXMLPropString(nodes[i], "value"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Missing 'value' attribute in NUMA latenc= ies")); goto cleanup; + } + + if (virStrToLong_ullp(tmp, NULL, 10, &value) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid 'value' attribute in NUMA latenc= ies")); + goto cleanup; + } + VIR_FREE(tmp); + } else if (virXMLNodeNameEqual(nodes[i], "bandwidth")) { + VIR_XPATH_NODE_AUTORESTORE(ctxt); + type =3D VIR_DOMAIN_NUMA_LATENCY_TYPE_BANDWIDTH; + + ctxt->node =3D nodes[i]; + + if (virDomainParseMemory("./@value", "./@unit", ctxt, &value, = true, false) < 0) + goto cleanup; + } else { + /* Ignore yet unknown child elements. */ + continue; + } + + if (!(tmp =3D virXMLPropString(nodes[i], "initiator"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Missing 'initiator' attribute in NUMA latenc= ies")); + goto cleanup; + } + + if (virStrToLong_uip(tmp, NULL, 10, &initiator) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid 'initiator' attribute in NUMA latenc= ies")); + goto cleanup; + } + VIR_FREE(tmp); + + if (!(tmp =3D virXMLPropString(nodes[i], "target"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Missing 'target' attribute in NUMA latencies= ")); + goto cleanup; + } + + if (virStrToLong_uip(tmp, NULL, 10, &target) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid 'target' attribute in NUMA latencies= ")); + goto cleanup; + } + VIR_FREE(tmp); + + + /* cache attribute is optional */ + if ((tmp =3D virXMLPropString(nodes[i], "cache"))) { + if (virStrToLong_uip(tmp, NULL, 10, &cache) < 0 || + cache =3D=3D 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid 'cache' attribute in NUMA latenc= ies")); + goto cleanup; + } + } + VIR_FREE(tmp); + + if (!(tmp =3D virXMLPropString(nodes[i], "type"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Missing 'type' attribute in NUMA latencies")= ); + goto cleanup; + } + + if ((accessType =3D virDomainMemoryLatencyTypeFromString(tmp)) <= =3D 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid 'type' attribute in NUMA latencies")= ); + goto cleanup; + } + VIR_FREE(tmp); + + def->latencies[i] =3D (virDomainNumaLatency) {type, initiator, tar= get, + cache, accessType, val= ue}; + def->nlatencies++; } =20 ret =3D 0; @@ -982,6 +1228,7 @@ virDomainNumaDefFormatXML(virBufferPtr buf, for (i =3D 0; i < ncells; i++) { virBitmapPtr cpumask =3D virDomainNumaGetNodeCpumask(def, i); int ndistances; + size_t ncaches; =20 memAccess =3D virDomainNumaGetNodeMemoryAccessMode(def, i); discard =3D virDomainNumaGetNodeDiscard(def, i); @@ -1008,30 +1255,107 @@ virDomainNumaDefFormatXML(virBufferPtr buf, virTristateBoolTypeToString(discard)); =20 ndistances =3D def->mem_nodes[i].ndistances; - if (ndistances =3D=3D 0) { + ncaches =3D def->mem_nodes[i].ncaches; + if (ndistances =3D=3D 0 && ncaches =3D=3D 0) { virBufferAddLit(buf, "/>\n"); } else { size_t j; - virDomainNumaDistancePtr distances =3D def->mem_nodes[i].dista= nces; =20 virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); - virBufferAddLit(buf, "\n"); - virBufferAdjustIndent(buf, 2); - for (j =3D 0; j < ndistances; j++) { - if (distances[j].value) { - virBufferAddLit(buf, "\n"); + + if (ndistances) { + virDomainNumaDistancePtr distances =3D def->mem_nodes[i].d= istances; + + virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(buf, 2); + for (j =3D 0; j < ndistances; j++) { + if (distances[j].value) { + virBufferAddLit(buf, "\n"); + } } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); + } + + for (j =3D 0; j < ncaches; j++) { + virDomainNumaCachePtr cache =3D &def->mem_nodes[i].caches[= j]; + + virBufferAsprintf(buf, "level= ); + if (cache->associativity) { + virBufferAsprintf(buf, " associativity=3D'%s'", + virDomainCacheAssociativityTypeToStr= ing(cache->associativity)); + } + + if (cache->policy) { + virBufferAsprintf(buf, " policy=3D'%s'", + virDomainCachePolicyTypeToString(cac= he->policy)); + } + virBufferAddLit(buf, ">\n"); + + virBufferAdjustIndent(buf, 2); + virBufferAsprintf(buf, + "\n", + cache->size); + + if (cache->line) { + virBufferAsprintf(buf, + "\n", + cache->line); + } + + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); } - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); } } + + if (def->nlatencies) { + virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(buf, 2); + } + + for (i =3D 0; i < def->nlatencies; i++) { + virDomainNumaLatencyPtr l =3D &def->latencies[i]; + + switch (l->type) { + case VIR_DOMAIN_NUMA_LATENCY_TYPE_LATENCY: + virBufferAddLit(buf, "initiator, l->target); + + if (l->cache > 0) { + virBufferAsprintf(buf, + " cache=3D'%u'", + l->cache); + } + + virBufferAsprintf(buf, + " type=3D'%s' value=3D'%lu'", + virDomainMemoryLatencyTypeToString(l->accessType= ), + l->value); + + if (l->type =3D=3D VIR_DOMAIN_NUMA_LATENCY_TYPE_BANDWIDTH) + virBufferAddLit(buf, " unit=3D'KiB'"); + virBufferAddLit(buf, "/>\n"); + } + + if (def->nlatencies) { + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); + } + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); =20 diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index 25e896826b..a7dc3190d3 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -51,6 +51,39 @@ typedef enum { } virDomainMemoryAccess; VIR_ENUM_DECL(virDomainMemoryAccess); =20 +typedef enum { + VIR_DOMAIN_CACHE_ASSOCIATIVITY_NONE, /* No associativity */ + VIR_DOMAIN_CACHE_ASSOCIATIVITY_DIRECT, /* Direct mapped cache */ + VIR_DOMAIN_CACHE_ASSOCIATIVITY_FULL, /* Fully associative cache */ + + VIR_DOMAIN_CACHE_ASSOCIATIVITY_LAST +} virDomainCacheAssociativity; +VIR_ENUM_DECL(virDomainCacheAssociativity); + +typedef enum { + VIR_DOMAIN_CACHE_POLICY_NONE, /* No policy */ + VIR_DOMAIN_CACHE_POLICY_WRITEBACK, /* Write-back policy */ + VIR_DOMAIN_CACHE_POLICY_WRITETHROUGH, /* Write-through policy */ + + VIR_DOMAIN_CACHE_POLICY_LAST +} virDomainCachePolicy; +VIR_ENUM_DECL(virDomainCachePolicy); + +typedef enum { + VIR_DOMAIN_NUMA_LATENCY_TYPE_LATENCY, + VIR_DOMAIN_NUMA_LATENCY_TYPE_BANDWIDTH, +} virDomainNumaLatencyType; + +typedef enum { + VIR_DOMAIN_MEMORY_LATENCY_NONE =3D 0, /* No memory latency defined */ + VIR_DOMAIN_MEMORY_LATENCY_ACCESS, /* Access latency */ + VIR_DOMAIN_MEMORY_LATENCY_READ, /* Read latency */ + VIR_DOMAIN_MEMORY_LATENCY_WRITE, /* Write latency */ + + VIR_DOMAIN_MEMORY_LATENCY_LAST +} virDomainMemoryLatency; +VIR_ENUM_DECL(virDomainMemoryLatency); + =20 virDomainNumaPtr virDomainNumaNew(void); void virDomainNumaFree(virDomainNumaPtr numa); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9f2abc1d8d..65fe1c7f47 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -830,8 +830,14 @@ virNodeDeviceDeleteVport; virNodeDeviceGetParentName; =20 # conf/numa_conf.h +virDomainCacheAssociativityTypeFromString; +virDomainCacheAssociativityTypeToString; +virDomainCachePolicyTypeFromString; +virDomainCachePolicyTypeToString; virDomainMemoryAccessTypeFromString; virDomainMemoryAccessTypeToString; +virDomainMemoryLatencyTypeFromString; +virDomainMemoryLatencyTypeToString; virDomainNumaCheckABIStability; virDomainNumaEquals; virDomainNumaFillCPUsInNode; diff --git a/tests/qemuxml2argvdata/numatune-hmat.xml b/tests/qemuxml2argvd= ata/numatune-hmat.xml new file mode 100644 index 0000000000..b20ca0e439 --- /dev/null +++ b/tests/qemuxml2argvdata/numatune-hmat.xml @@ -0,0 +1,52 @@ + + QEMUGuest + c7a5fdb2-cdaf-9455-926a-d65c16db1809 + 8388608 + 8388608 + 12 + + hvm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + destroy + restart + restart + + /usr/bin/qemu-system-x86_64 + +

+ + + + + +
+ + + diff --git a/tests/qemuxml2xmloutdata/numatune-hmat.xml b/tests/qemuxml2xml= outdata/numatune-hmat.xml new file mode 120000 index 0000000000..6903a80ab1 --- /dev/null +++ b/tests/qemuxml2xmloutdata/numatune-hmat.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/numatune-hmat.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 376c427415..103ce155a4 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1106,6 +1106,7 @@ mymain(void) DO_TEST("numatune-memnode-no-memory", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("numatune-distances", QEMU_CAPS_NUMA, QEMU_CAPS_NUMA_DIST); DO_TEST("numatune-no-vcpu", QEMU_CAPS_NUMA); + DO_TEST("numatune-hmat", NONE); =20 DO_TEST("bios-nvram", NONE); DO_TEST("bios-nvram-os-interleave", NONE); --=20 2.26.2