numa_conf.c 22.5 KB
Newer Older
1
/*
2
 * numa_conf.c
3
 *
4
 * Copyright (C) 2014-2015 Red Hat, Inc.
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library.  If not, see
 * <http://www.gnu.org/licenses/>.
 *
 * Author: Martin Kletzander <mkletzan@redhat.com>
 */

#include <config.h>

25
#include "numa_conf.h"
26

27 28
#include "domain_conf.h"
#include "viralloc.h"
29
#include "virnuma.h"
30 31 32 33
#include "virstring.h"

#define VIR_FROM_THIS VIR_FROM_DOMAIN

34 35 36 37 38 39
VIR_ENUM_IMPL(virDomainNumatuneMemMode,
              VIR_DOMAIN_NUMATUNE_MEM_LAST,
              "strict",
              "preferred",
              "interleave");

40 41
VIR_ENUM_IMPL(virDomainNumatunePlacement,
              VIR_DOMAIN_NUMATUNE_PLACEMENT_LAST,
42 43 44
              "default",
              "static",
              "auto");
45

46 47 48 49 50
VIR_ENUM_IMPL(virNumaMemAccess, VIR_NUMA_MEM_ACCESS_LAST,
              "default",
              "shared",
              "private");

51 52
typedef struct _virDomainNumaNode virDomainNumaNode;
typedef virDomainNumaNode *virDomainNumaNodePtr;
53

54
struct _virDomainNuma {
55
    struct {
56
        bool specified;
57 58 59 60 61
        virBitmapPtr nodeset;
        virDomainNumatuneMemMode mode;
        virDomainNumatunePlacement placement;
    } memory;               /* pinning for all the memory */

62
    struct _virDomainNumaNode {
63 64 65 66 67
        virBitmapPtr nodeset;
        virDomainNumatuneMemMode mode;
    } *mem_nodes;           /* fine tuning per guest node */
    size_t nmem_nodes;

68 69 70 71
    /* Future NUMA tuning related stuff should go here. */
};


72
inline bool
73
virDomainNumatuneNodeSpecified(virDomainNumaPtr numatune,
74 75 76 77 78 79 80 81 82 83
                               int cellid)
{
    if (numatune &&
        cellid >= 0 &&
        cellid < numatune->nmem_nodes)
        return numatune->mem_nodes[cellid].nodeset;

    return false;
}

84
static int
85
virDomainNumatuneNodeParseXML(virDomainNumaPtr *numatunePtr,
86
                              size_t ncells,
87 88 89
                              xmlXPathContextPtr ctxt)
{
    char *tmp = NULL;
E
Eric Blake 已提交
90
    int n = 0;
91 92
    int ret = -1;
    size_t i = 0;
93
    virDomainNumaPtr numatune = *numatunePtr;
94 95 96 97 98 99 100 101 102 103 104
    xmlNodePtr *nodes = NULL;

    if ((n = virXPathNodeSet("./numatune/memnode", ctxt, &nodes)) < 0) {
        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                       _("Cannot extract memnode nodes"));
        goto cleanup;
    }

    if (!n)
        return 0;

105 106
    if (numatune && numatune->memory.specified &&
        numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO) {
107 108 109 110 111 112
        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                       _("Per-node binding is not compatible with "
                         "automatic NUMA placement."));
        goto cleanup;
    }

113
    if (!ncells) {
114 115 116 117 118 119
        virReportError(VIR_ERR_XML_ERROR, "%s",
                       _("Element 'memnode' is invalid without "
                         "any guest NUMA cells"));
        goto cleanup;
    }

120
    if (!numatune && VIR_ALLOC(numatune) < 0)
121 122
        goto cleanup;

123 124 125 126
    *numatunePtr = numatune;

    VIR_FREE(numatune->mem_nodes);
    if (VIR_ALLOC_N(numatune->mem_nodes, ncells) < 0)
127 128
        goto cleanup;

129
    numatune->nmem_nodes = ncells;
130 131 132 133

    for (i = 0; i < n; i++) {
        int mode = 0;
        unsigned int cellid = 0;
134
        virDomainNumaNodePtr mem_node = NULL;
135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151
        xmlNodePtr cur_node = nodes[i];

        tmp = virXMLPropString(cur_node, "cellid");
        if (!tmp) {
            virReportError(VIR_ERR_XML_ERROR, "%s",
                           _("Missing required cellid attribute "
                             "in memnode element"));
            goto cleanup;
        }
        if (virStrToLong_uip(tmp, NULL, 10, &cellid) < 0) {
            virReportError(VIR_ERR_XML_ERROR,
                           _("Invalid cellid attribute in memnode element: %s"),
                           tmp);
            goto cleanup;
        }
        VIR_FREE(tmp);

152
        if (cellid >= numatune->nmem_nodes) {
153 154 155 156 157 158
            virReportError(VIR_ERR_XML_ERROR, "%s",
                           _("Argument 'cellid' in memnode element must "
                             "correspond to existing guest's NUMA cell"));
            goto cleanup;
        }

159
        mem_node = &numatune->mem_nodes[cellid];
160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200

        if (mem_node->nodeset) {
            virReportError(VIR_ERR_XML_ERROR,
                           _("Multiple memnode elements with cellid %u"),
                           cellid);
            goto cleanup;
        }

        tmp = virXMLPropString(cur_node, "mode");
        if (!tmp) {
            mem_node->mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT;
        } else {
            if ((mode = virDomainNumatuneMemModeTypeFromString(tmp)) < 0) {
                virReportError(VIR_ERR_XML_ERROR, "%s",
                               _("Invalid mode attribute in memnode element"));
                goto cleanup;
            }
            VIR_FREE(tmp);
            mem_node->mode = mode;
        }

        tmp = virXMLPropString(cur_node, "nodeset");
        if (!tmp) {
            virReportError(VIR_ERR_XML_ERROR, "%s",
                           _("Missing required nodeset attribute "
                             "in memnode element"));
            goto cleanup;
        }
        if (virBitmapParse(tmp, 0, &mem_node->nodeset,
                           VIR_DOMAIN_CPUMASK_LEN) < 0)
            goto cleanup;
        VIR_FREE(tmp);
    }

    ret = 0;
 cleanup:
    VIR_FREE(nodes);
    VIR_FREE(tmp);
    return ret;
}

201
int
202
virDomainNumatuneParseXML(virDomainNumaPtr *numatunePtr,
203 204
                          bool placement_static,
                          size_t ncells,
205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226
                          xmlXPathContextPtr ctxt)
{
    char *tmp = NULL;
    int mode = -1;
    int n = 0;
    int placement = -1;
    int ret = -1;
    virBitmapPtr nodeset = NULL;
    xmlNodePtr node = NULL;

    if (virXPathInt("count(./numatune)", ctxt, &n) < 0) {
        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                       _("cannot extract numatune nodes"));
        goto cleanup;
    } else if (n > 1) {
        virReportError(VIR_ERR_XML_ERROR, "%s",
                       _("only one numatune is supported"));
        goto cleanup;
    }

    node = virXPathNode("./numatune/memory[1]", ctxt);

227
    if (*numatunePtr) {
228
        virDomainNumaFree(*numatunePtr);
229
        *numatunePtr = NULL;
230 231
    }

232 233
    if (!node && placement_static) {
        if (virDomainNumatuneNodeParseXML(numatunePtr, ncells, ctxt) < 0)
234
            goto cleanup;
235
        return 0;
236
    }
237 238

    if (!node) {
239 240 241 242 243 244 245
        /* We know that placement_mode is "auto" if we're here */
        ret = virDomainNumatuneSet(numatunePtr,
                                   placement_static,
                                   VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO,
                                   -1,
                                   NULL);
        goto cleanup;
246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276
    }

    tmp = virXMLPropString(node, "mode");
    if (tmp) {
        mode = virDomainNumatuneMemModeTypeFromString(tmp);
        if (mode < 0) {
            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                           _("Unsupported NUMA memory tuning mode '%s'"),
                           tmp);
            goto cleanup;
        }
    }
    VIR_FREE(tmp);

    tmp = virXMLPropString(node, "placement");
    if (tmp) {
        placement = virDomainNumatunePlacementTypeFromString(tmp);
        if (placement < 0) {
            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                           _("Unsupported NUMA memory placement mode '%s'"),
                           tmp);
            goto cleanup;
        }
    }
    VIR_FREE(tmp);

    tmp = virXMLPropString(node, "nodeset");
    if (tmp && virBitmapParse(tmp, 0, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0)
        goto cleanup;
    VIR_FREE(tmp);

277 278 279 280 281
    if (virDomainNumatuneSet(numatunePtr,
                             placement_static,
                             placement,
                             mode,
                             nodeset) < 0)
282 283
        goto cleanup;

284
    if (virDomainNumatuneNodeParseXML(numatunePtr, ncells, ctxt) < 0)
285
        goto cleanup;
286

287 288 289 290 291 292 293 294 295
    ret = 0;
 cleanup:
    virBitmapFree(nodeset);
    VIR_FREE(tmp);
    return ret;
}

int
virDomainNumatuneFormatXML(virBufferPtr buf,
296
                           virDomainNumaPtr numatune)
297 298 299
{
    const char *tmp = NULL;
    char *nodeset = NULL;
300
    size_t i = 0;
301 302 303 304 305 306 307

    if (!numatune)
        return 0;

    virBufferAddLit(buf, "<numatune>\n");
    virBufferAdjustIndent(buf, 2);

308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323
    if (numatune->memory.specified) {
        tmp = virDomainNumatuneMemModeTypeToString(numatune->memory.mode);
        virBufferAsprintf(buf, "<memory mode='%s' ", tmp);

        if (numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC) {
            if (!(nodeset = virBitmapFormat(numatune->memory.nodeset)))
                return -1;
            virBufferAsprintf(buf, "nodeset='%s'/>\n", nodeset);
            VIR_FREE(nodeset);
        } else if (numatune->memory.placement) {
            tmp = virDomainNumatunePlacementTypeToString(numatune->memory.placement);
            virBufferAsprintf(buf, "placement='%s'/>\n", tmp);
        }
    }

    for (i = 0; i < numatune->nmem_nodes; i++) {
324
        virDomainNumaNodePtr mem_node = &numatune->mem_nodes[i];
325

326 327 328 329
        if (!mem_node->nodeset)
            continue;

        if (!(nodeset = virBitmapFormat(mem_node->nodeset)))
330
            return -1;
331 332 333 334 335 336

        virBufferAsprintf(buf,
                          "<memnode cellid='%zu' mode='%s' nodeset='%s'/>\n",
                          i,
                          virDomainNumatuneMemModeTypeToString(mem_node->mode),
                          nodeset);
337 338 339 340 341 342 343 344 345
        VIR_FREE(nodeset);
    }

    virBufferAdjustIndent(buf, -2);
    virBufferAddLit(buf, "</numatune>\n");
    return 0;
}

void
346
virDomainNumaFree(virDomainNumaPtr numa)
347
{
348 349
    size_t i = 0;

350
    if (!numa)
351 352
        return;

353 354 355 356
    virBitmapFree(numa->memory.nodeset);
    for (i = 0; i < numa->nmem_nodes; i++)
        virBitmapFree(numa->mem_nodes[i].nodeset);
    VIR_FREE(numa->mem_nodes);
357

358
    VIR_FREE(numa);
359 360 361
}

virDomainNumatuneMemMode
362
virDomainNumatuneGetMode(virDomainNumaPtr numatune,
363
                         int cellid)
364
{
365 366 367 368 369 370 371 372 373 374
    if (!numatune)
        return 0;

    if (virDomainNumatuneNodeSpecified(numatune, cellid))
        return numatune->mem_nodes[cellid].mode;

    if (numatune->memory.specified)
        return numatune->memory.mode;

    return 0;
375 376 377
}

virBitmapPtr
378
virDomainNumatuneGetNodeset(virDomainNumaPtr numatune,
379 380
                            virBitmapPtr auto_nodeset,
                            int cellid)
381 382 383 384
{
    if (!numatune)
        return NULL;

385 386
    if (numatune->memory.specified &&
        numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO)
387 388
        return auto_nodeset;

389 390 391 392
    if (virDomainNumatuneNodeSpecified(numatune, cellid))
        return numatune->mem_nodes[cellid].nodeset;

    if (!numatune->memory.specified)
393 394 395 396 397 398
        return NULL;

    return numatune->memory.nodeset;
}

char *
399
virDomainNumatuneFormatNodeset(virDomainNumaPtr numatune,
400 401
                               virBitmapPtr auto_nodeset,
                               int cellid)
402 403
{
    return virBitmapFormat(virDomainNumatuneGetNodeset(numatune,
404 405
                                                       auto_nodeset,
                                                       cellid));
406 407
}

408

409
int
410
virDomainNumatuneMaybeGetNodeset(virDomainNumaPtr numatune,
411 412 413
                                 virBitmapPtr auto_nodeset,
                                 virBitmapPtr *retNodeset,
                                 int cellid)
414
{
415
    *retNodeset = NULL;
416 417 418 419

    if (!numatune)
        return 0;

420 421 422 423 424 425
    if (!virDomainNumatuneNodeSpecified(numatune, cellid) &&
        !numatune->memory.specified)
        return 0;

    if (numatune->memory.specified &&
        numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO &&
426 427 428 429 430 431 432
        !auto_nodeset) {
        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                       _("Advice from numad is needed in case of "
                         "automatic numa placement"));
        return -1;
    }

433 434 435 436 437 438 439
    *retNodeset = virDomainNumatuneGetNodeset(numatune, auto_nodeset, cellid);

    return 0;
}


int
440
virDomainNumatuneMaybeFormatNodeset(virDomainNumaPtr numatune,
441 442 443 444 445 446 447 448 449 450 451 452
                                    virBitmapPtr auto_nodeset,
                                    char **mask,
                                    int cellid)
{
    virBitmapPtr nodeset;

    if (virDomainNumatuneMaybeGetNodeset(numatune, auto_nodeset, &nodeset,
                                         cellid) < 0)
        return -1;

    if (nodeset &&
        !(*mask = virBitmapFormat(nodeset)))
453 454 455 456 457 458
        return -1;

    return 0;
}

int
459
virDomainNumatuneSet(virDomainNumaPtr *numatunePtr,
460
                     bool placement_static,
461 462 463 464
                     int placement,
                     int mode,
                     virBitmapPtr nodeset)
{
465
    bool created = false;
466
    int ret = -1;
467
    virDomainNumaPtr numatune;
468 469 470 471 472

    /* No need to do anything in this case */
    if (mode == -1 && placement == -1 && !nodeset)
        return 0;

473 474 475 476 477 478 479 480 481 482 483 484 485
    if (!(*numatunePtr)) {
        if (VIR_ALLOC(*numatunePtr) < 0)
            goto cleanup;

        created = true;
        if (mode == -1)
            mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT;
        if (placement == -1)
            placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_DEFAULT;
    }

    numatune = *numatunePtr;

486 487 488 489 490 491 492 493
    /* Range checks */
    if (mode != -1 &&
        (mode < 0 || mode >= VIR_DOMAIN_NUMATUNE_MEM_LAST)) {
        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                       _("Unsupported numatune mode '%d'"),
                       mode);
        goto cleanup;
    }
494

495 496 497 498 499 500 501 502 503 504
    if (placement != -1 &&
        (placement < 0 || placement >= VIR_DOMAIN_NUMATUNE_PLACEMENT_LAST)) {
        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                       _("Unsupported numatune placement '%d'"),
                       mode);
        goto cleanup;
    }

    if (mode != -1)
        numatune->memory.mode = mode;
505

506 507 508 509 510 511 512 513 514 515
    if (nodeset) {
        virBitmapFree(numatune->memory.nodeset);
        numatune->memory.nodeset = virBitmapNewCopy(nodeset);
        if (!numatune->memory.nodeset)
            goto cleanup;
        if (placement == -1)
            placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC;
    }

    if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_DEFAULT) {
516
        if (numatune->memory.nodeset || placement_static)
517 518 519 520 521 522 523 524 525 526 527 528 529
            placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC;
        else
            placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO;
    }

    if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC &&
        !numatune->memory.nodeset) {
        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                       _("nodeset for NUMA memory tuning must be set "
                         "if 'placement' is 'static'"));
        goto cleanup;
    }

530 531 532 533 534 535 536
    /* setting nodeset when placement auto is invalid */
    if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO &&
        numatune->memory.nodeset) {
        virBitmapFree(numatune->memory.nodeset);
        numatune->memory.nodeset = NULL;
    }

537 538 539
    if (placement != -1)
        numatune->memory.placement = placement;

540 541
    numatune->memory.specified = true;

542
    ret = 0;
543

544
 cleanup:
545
    if (ret < 0 && created) {
546
        virDomainNumaFree(*numatunePtr);
547 548 549
        *numatunePtr = NULL;
    }

550 551 552
    return ret;
}

553
static bool
554 555
virDomainNumaNodesEqual(virDomainNumaPtr n1,
                        virDomainNumaPtr n2)
556 557 558 559 560 561 562
{
    size_t i = 0;

    if (n1->nmem_nodes != n2->nmem_nodes)
        return false;

    for (i = 0; i < n1->nmem_nodes; i++) {
563 564
        virDomainNumaNodePtr nd1 = &n1->mem_nodes[i];
        virDomainNumaNodePtr nd2 = &n2->mem_nodes[i];
565 566 567 568 569 570 571 572 573 574 575 576 577 578

        if (!nd1->nodeset && !nd2->nodeset)
            continue;

        if (nd1->mode != nd2->mode)
            return false;

        if (!virBitmapEqual(nd1->nodeset, nd2->nodeset))
            return false;
    }

    return true;
}

579
bool
580 581
virDomainNumaEquals(virDomainNumaPtr n1,
                    virDomainNumaPtr n2)
582 583 584 585 586 587 588
{
    if (!n1 && !n2)
        return true;

    if (!n1 || !n2)
        return false;

589
    if (!n1->memory.specified && !n2->memory.specified)
590
        return virDomainNumaNodesEqual(n1, n2);
591 592 593 594

    if (!n1->memory.specified || !n2->memory.specified)
        return false;

595 596 597 598 599 600
    if (n1->memory.mode != n2->memory.mode)
        return false;

    if (n1->memory.placement != n2->memory.placement)
        return false;

601 602 603
    if (!virBitmapEqual(n1->memory.nodeset, n2->memory.nodeset))
        return false;

604
    return virDomainNumaNodesEqual(n1, n2);
605 606 607
}

bool
608
virDomainNumatuneHasPlacementAuto(virDomainNumaPtr numatune)
609 610 611 612
{
    if (!numatune)
        return false;

613 614 615
    if (!numatune->memory.specified)
        return false;

616 617 618 619 620
    if (numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO)
        return true;

    return false;
}
621 622

bool
623
virDomainNumatuneHasPerNodeBinding(virDomainNumaPtr numatune)
624 625 626 627 628 629 630 631 632 633 634 635 636
{
    size_t i = 0;

    if (!numatune)
        return false;

    for (i = 0; i < numatune->nmem_nodes; i++) {
        if (numatune->mem_nodes[i].nodeset)
            return true;
    }

    return false;
}
637 638

int
639
virDomainNumatuneSpecifiedMaxNode(virDomainNumaPtr numatune)
640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664
{
    int ret = -1;
    virBitmapPtr nodemask = NULL;
    size_t i;
    int bit;

    if (!numatune)
        return ret;

    nodemask = virDomainNumatuneGetNodeset(numatune, NULL, -1);
    if (nodemask)
        ret = virBitmapLastSetBit(nodemask);

    for (i = 0; i < numatune->nmem_nodes; i++) {
        nodemask = numatune->mem_nodes[i].nodeset;
        if (!nodemask)
            continue;

        bit = virBitmapLastSetBit(nodemask);
        if (bit > ret)
            ret = bit;
    }

    return ret;
}
665 666

bool
667
virDomainNumatuneNodesetIsAvailable(virDomainNumaPtr numatune,
668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687
                                    virBitmapPtr auto_nodeset)
{
    size_t i = 0;
    virBitmapPtr b = NULL;

    if (!numatune)
        return true;

    b = virDomainNumatuneGetNodeset(numatune, auto_nodeset, -1);
    if (!virNumaNodesetIsAvailable(b))
        return false;

    for (i = 0; i < numatune->nmem_nodes; i++) {
        b = virDomainNumatuneGetNodeset(numatune, auto_nodeset, i);
        if (!virNumaNodesetIsAvailable(b))
            return false;
    }

    return true;
}
688 689 690 691 692 693 694 695


int
virDomainNumaDefCPUParseXML(virCPUDefPtr def,
                            xmlXPathContextPtr ctxt)
{
    xmlNodePtr *nodes = NULL;
    xmlNodePtr oldNode = ctxt->node;
696
    char *tmp = NULL;
697 698 699 700
    int n;
    size_t i;
    int ret = -1;

701 702 703
    /* check if NUMA definition is present */
    if (!virXPathNode("/domain/cpu/numa[1]", ctxt))
        return 0;
704

705 706 707 708 709 710 711 712 713
    if ((n = virXPathNodeSet("/domain/cpu/numa[1]/cell", ctxt, &nodes)) <= 0) {
        virReportError(VIR_ERR_XML_ERROR, "%s",
                       _("NUMA topology defined without NUMA cells"));
        goto cleanup;
    }

    if (VIR_ALLOC_N(def->cells, n) < 0)
        goto cleanup;
    def->ncells = n;
714

715
    for (i = 0; i < n; i++) {
716
        int rc;
717 718 719 720 721 722 723 724 725
        unsigned int cur_cell = i;

        /* cells are in order of parsing or explicitly numbered */
        if ((tmp = virXMLPropString(nodes[i], "id"))) {
            if (virStrToLong_uip(tmp, NULL, 10, &cur_cell) < 0) {
                virReportError(VIR_ERR_XML_ERROR,
                               _("Invalid 'id' attribute in NUMA cell: '%s'"),
                               tmp);
                goto cleanup;
726 727 728 729 730 731 732
            }

            if (cur_cell >= n) {
                virReportError(VIR_ERR_XML_ERROR, "%s",
                               _("Exactly one 'cell' element per guest "
                                 "NUMA cell allowed, non-contiguous ranges or "
                                 "ranges not starting from 0 are not allowed"));
733
                goto cleanup;
734
            }
735 736
        }
        VIR_FREE(tmp);
737

738 739 740 741 742 743
        if (def->cells[cur_cell].cpumask) {
            virReportError(VIR_ERR_XML_ERROR,
                           _("Duplicate NUMA cell info for cell id '%u'"),
                           cur_cell);
            goto cleanup;
        }
744

745 746 747 748 749
        if (!(tmp = virXMLPropString(nodes[i], "cpus"))) {
            virReportError(VIR_ERR_XML_ERROR, "%s",
                           _("Missing 'cpus' attribute in NUMA cell"));
            goto cleanup;
        }
750

751 752
        if (virBitmapParse(tmp, 0, &def->cells[cur_cell].cpumask,
                           VIR_DOMAIN_CPUMASK_LEN) <= 0)
753
            goto cleanup;
754

755
        VIR_FREE(tmp);
756

757 758 759 760
        ctxt->node = nodes[i];
        if (virDomainParseMemory("./@memory", "./@unit", ctxt,
                                 &def->cells[cur_cell].mem, true, false) < 0)
            goto cleanup;
761

762
        if ((tmp = virXMLPropString(nodes[i], "memAccess"))) {
763
            if ((rc = virNumaMemAccessTypeFromString(tmp)) <= 0) {
764 765 766 767
                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                               _("Invalid 'memAccess' attribute value '%s'"),
                               tmp);
                goto cleanup;
768
            }
769 770 771

            def->cells[cur_cell].memAccess = rc;
            VIR_FREE(tmp);
772 773 774 775 776 777 778 779
        }
    }

    ret = 0;

 cleanup:
    ctxt->node = oldNode;
    VIR_FREE(nodes);
780
    VIR_FREE(tmp);
781 782
    return ret;
}
783 784 785 786 787 788


int
virDomainNumaDefCPUFormat(virBufferPtr buf,
                          virCPUDefPtr def)
{
789
    virNumaMemAccess memAccess;
790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810
    char *cpustr;
    size_t i;

    if (def->ncells == 0)
        return 0;

    virBufferAddLit(buf, "<numa>\n");
    virBufferAdjustIndent(buf, 2);
    for (i = 0; i < def->ncells; i++) {
        memAccess = def->cells[i].memAccess;

        if (!(cpustr = virBitmapFormat(def->cells[i].cpumask)))
            return -1;

        virBufferAddLit(buf, "<cell");
        virBufferAsprintf(buf, " id='%zu'", i);
        virBufferAsprintf(buf, " cpus='%s'", cpustr);
        virBufferAsprintf(buf, " memory='%llu'", def->cells[i].mem);
        virBufferAddLit(buf, " unit='KiB'");
        if (memAccess)
            virBufferAsprintf(buf, " memAccess='%s'",
811
                              virNumaMemAccessTypeToString(memAccess));
812 813 814 815 816 817 818 819
        virBufferAddLit(buf, "/>\n");
        VIR_FREE(cpustr);
    }
    virBufferAdjustIndent(buf, -2);
    virBufferAddLit(buf, "</numa>\n");

    return 0;
}
820 821 822 823 824 825 826 827 828 829 830 831 832


unsigned int
virDomainNumaGetCPUCountTotal(virCPUDefPtr numa)
{
    size_t i;
    unsigned int ret = 0;

    for (i = 0; i < numa->ncells; i++)
        ret += virBitmapCountBits(numa->cells[i].cpumask);

    return ret;
}