There are several restrictions, for instance @initiator and @target have to refer to existing NUMA nodes (daa), @cache has to refer to a defined cache level and so on. Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- src/conf/domain_conf.c | 3 ++ src/conf/numa_conf.c | 99 ++++++++++++++++++++++++++++++++++++++++++ src/conf/numa_conf.h | 1 + 3 files changed, 103 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ce75831037..0d73968221 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7321,6 +7321,9 @@ virDomainDefValidateInternal(const virDomainDef *def, if (virDomainDefCputuneValidate(def) < 0) return -1; + if (virDomainNumaDefValidate(def->numa) < 0) + return -1; + return 0; } diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index f510dfebce..bf8442eada 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -1363,6 +1363,105 @@ virDomainNumaDefFormatXML(virBufferPtr buf, } +int +virDomainNumaDefValidate(const virDomainNuma *def) +{ + size_t i; + size_t j; + + if (!def) + return 0; + + for (i = 0; i < def->nmem_nodes; i++) { + const virDomainNumaNode *node = &def->mem_nodes[i]; + g_autoptr(virBitmap) levelsSeen = virBitmapNewEmpty(); + + for (j = 0; j < node->ncaches; j++) { + const virDomainNumaCache *cache = &node->caches[j]; + + /* Relax this if there's ever fourth layer of cache */ + if (cache->level > 3) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Ain't nobody heard of that much cache level")); + return -1; + } + + if (virBitmapIsBitSet(levelsSeen, cache->level)) { + virReportError(VIR_ERR_XML_ERROR, + _("Cache level '%u' already defined"), + cache->level); + return -1; + } + + if (virBitmapSetBitExpand(levelsSeen, cache->level)) + return -1; + } + } + + for (i = 0; i < def->nlatencies; i++) { + const virDomainNumaLatency *l = &def->latencies[i]; + + if (l->initiator >= def->nmem_nodes) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("'initiator' refers to a non-existent NUMA node")); + return -1; + } + + if (l->target >= def->nmem_nodes) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("'target' refers to a non-existent NUMA node")); + return -1; + } + + if (!def->mem_nodes[l->initiator].cpumask) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("NUMA nodes without CPUs can't be initiator")); + return -1; + } + + if (l->cache > 0) { + for (j = 0; j < def->mem_nodes[l->target].ncaches; j++) { + const virDomainNumaCache *cache = def->mem_nodes[l->target].caches; + + if (l->cache == cache->level) + break; + } + + if (j == def->mem_nodes[l->target].ncaches) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("'cache' refers to a non-existent NUMA node cache")); + return -1; + } + } + + for (j = 0; j < i; j++) { + virDomainNumaLatencyPtr ll = &def->latencies[j]; + + if (l->type == ll->type && + l->initiator == ll->initiator && + l->target == ll->target && + l->cache == ll->cache && + l->accessType == ll->accessType) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Duplicate info for NUMA latencies")); + return -1; + } + + + if (l->initiator != l->target && + l->initiator == ll->target && + l->target == ll->initiator) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Link already defined")); + return -1; + } + } + } + + return 0; +} + + unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa) { diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index a7dc3190d3..6d6e9de551 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -216,6 +216,7 @@ bool virDomainNumatuneNodeSpecified(virDomainNumaPtr numatune, int virDomainNumaDefParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt); int virDomainNumaDefFormatXML(virBufferPtr buf, virDomainNumaPtr def); +int virDomainNumaDefValidate(const virDomainNuma *def); unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa); -- 2.26.2