numa_conf.c 22.3 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 numa,
86
                              size_t ncells,
87 88 89
                              xmlXPathContextPtr ctxt)
{
    char *tmp = NULL;
E
Eric Blake 已提交
90
    int n = 0;
91 92 93 94 95 96 97 98 99 100 101 102 103
    int ret = -1;
    size_t i = 0;
    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;

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

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

119 120
    VIR_FREE(numa->mem_nodes);
    if (VIR_ALLOC_N(numa->mem_nodes, ncells) < 0)
121 122
        goto cleanup;

123
    numa->nmem_nodes = ncells;
124 125 126 127

    for (i = 0; i < n; i++) {
        int mode = 0;
        unsigned int cellid = 0;
128
        virDomainNumaNodePtr mem_node = NULL;
129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145
        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);

146
        if (cellid >= numa->nmem_nodes) {
147 148 149 150 151 152
            virReportError(VIR_ERR_XML_ERROR, "%s",
                           _("Argument 'cellid' in memnode element must "
                             "correspond to existing guest's NUMA cell"));
            goto cleanup;
        }

153
        mem_node = &numa->mem_nodes[cellid];
154 155 156 157 158 159 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

        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;
}

195
int
196
virDomainNumatuneParseXML(virDomainNumaPtr numa,
197 198
                          bool placement_static,
                          size_t ncells,
199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220
                          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);

221 222 223 224 225 226 227 228
    if (!placement_static && !node)
        placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO;

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

233 234 235 236 237 238 239
        if ((tmp = virXMLPropString(node, "placement")) &&
            (placement = virDomainNumatunePlacementTypeFromString(tmp)) < 0) {
            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                           _("Unsupported NUMA memory placement mode '%s'"), tmp);
            goto cleanup;
        }
        VIR_FREE(tmp);
240

241 242 243 244
        if ((tmp = virXMLPropString(node, "nodeset")) &&
            virBitmapParse(tmp, 0, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0)
            goto cleanup;
        VIR_FREE(tmp);
245 246
    }

247
    if (virDomainNumatuneSet(numa,
248 249 250 251
                             placement_static,
                             placement,
                             mode,
                             nodeset) < 0)
252 253
        goto cleanup;

254
    if (virDomainNumatuneNodeParseXML(numa, ncells, ctxt) < 0)
255
        goto cleanup;
256

257 258 259 260 261 262 263 264 265
    ret = 0;
 cleanup:
    virBitmapFree(nodeset);
    VIR_FREE(tmp);
    return ret;
}

int
virDomainNumatuneFormatXML(virBufferPtr buf,
266
                           virDomainNumaPtr numatune)
267 268 269
{
    const char *tmp = NULL;
    char *nodeset = NULL;
270
    bool nodesetSpecified = false;
271
    size_t i = 0;
272 273 274 275

    if (!numatune)
        return 0;

276 277 278 279 280 281 282 283 284 285
    for (i = 0; i < numatune->nmem_nodes; i++) {
        if (numatune->mem_nodes[i].nodeset) {
            nodesetSpecified = true;
            break;
        }
    }

    if (!nodesetSpecified && !numatune->memory.specified)
        return 0;

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

289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304
    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++) {
305
        virDomainNumaNodePtr mem_node = &numatune->mem_nodes[i];
306

307 308 309 310
        if (!mem_node->nodeset)
            continue;

        if (!(nodeset = virBitmapFormat(mem_node->nodeset)))
311
            return -1;
312 313 314 315 316 317

        virBufferAsprintf(buf,
                          "<memnode cellid='%zu' mode='%s' nodeset='%s'/>\n",
                          i,
                          virDomainNumatuneMemModeTypeToString(mem_node->mode),
                          nodeset);
318 319 320 321 322 323 324 325 326
        VIR_FREE(nodeset);
    }

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

void
327
virDomainNumaFree(virDomainNumaPtr numa)
328
{
329 330
    size_t i = 0;

331
    if (!numa)
332 333
        return;

334 335 336 337
    virBitmapFree(numa->memory.nodeset);
    for (i = 0; i < numa->nmem_nodes; i++)
        virBitmapFree(numa->mem_nodes[i].nodeset);
    VIR_FREE(numa->mem_nodes);
338

339
    VIR_FREE(numa);
340 341 342
}

virDomainNumatuneMemMode
343
virDomainNumatuneGetMode(virDomainNumaPtr numatune,
344
                         int cellid)
345
{
346 347 348 349 350 351 352 353 354 355
    if (!numatune)
        return 0;

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

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

    return 0;
356 357 358
}

virBitmapPtr
359
virDomainNumatuneGetNodeset(virDomainNumaPtr numatune,
360 361
                            virBitmapPtr auto_nodeset,
                            int cellid)
362 363 364 365
{
    if (!numatune)
        return NULL;

366 367
    if (numatune->memory.specified &&
        numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO)
368 369
        return auto_nodeset;

370 371 372 373
    if (virDomainNumatuneNodeSpecified(numatune, cellid))
        return numatune->mem_nodes[cellid].nodeset;

    if (!numatune->memory.specified)
374 375 376 377 378 379
        return NULL;

    return numatune->memory.nodeset;
}

char *
380
virDomainNumatuneFormatNodeset(virDomainNumaPtr numatune,
381 382
                               virBitmapPtr auto_nodeset,
                               int cellid)
383 384
{
    return virBitmapFormat(virDomainNumatuneGetNodeset(numatune,
385 386
                                                       auto_nodeset,
                                                       cellid));
387 388
}

389

390
int
391
virDomainNumatuneMaybeGetNodeset(virDomainNumaPtr numatune,
392 393 394
                                 virBitmapPtr auto_nodeset,
                                 virBitmapPtr *retNodeset,
                                 int cellid)
395
{
396
    *retNodeset = NULL;
397 398 399 400

    if (!numatune)
        return 0;

401 402 403 404 405 406
    if (!virDomainNumatuneNodeSpecified(numatune, cellid) &&
        !numatune->memory.specified)
        return 0;

    if (numatune->memory.specified &&
        numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO &&
407 408 409 410 411 412 413
        !auto_nodeset) {
        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                       _("Advice from numad is needed in case of "
                         "automatic numa placement"));
        return -1;
    }

414 415 416 417 418 419 420
    *retNodeset = virDomainNumatuneGetNodeset(numatune, auto_nodeset, cellid);

    return 0;
}


int
421
virDomainNumatuneMaybeFormatNodeset(virDomainNumaPtr numatune,
422 423 424 425 426 427 428 429 430 431 432 433
                                    virBitmapPtr auto_nodeset,
                                    char **mask,
                                    int cellid)
{
    virBitmapPtr nodeset;

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

    if (nodeset &&
        !(*mask = virBitmapFormat(nodeset)))
434 435 436 437 438 439
        return -1;

    return 0;
}

int
440
virDomainNumatuneSet(virDomainNumaPtr numa,
441
                     bool placement_static,
442 443 444 445 446 447 448 449 450 451
                     int placement,
                     int mode,
                     virBitmapPtr nodeset)
{
    int ret = -1;

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

452
    if (!numa->memory.specified) {
453 454 455 456 457 458
        if (mode == -1)
            mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT;
        if (placement == -1)
            placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_DEFAULT;
    }

459 460 461 462 463 464 465 466
    /* 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;
    }
467

468 469 470 471 472 473 474 475 476
    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)
477
        numa->memory.mode = mode;
478

479
    if (nodeset) {
480 481
        virBitmapFree(numa->memory.nodeset);
        if (!(numa->memory.nodeset = virBitmapNewCopy(nodeset)))
482 483 484 485 486 487
            goto cleanup;
        if (placement == -1)
            placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC;
    }

    if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_DEFAULT) {
488
        if (numa->memory.nodeset || placement_static)
489 490 491 492 493 494
            placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC;
        else
            placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO;
    }

    if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC &&
495
        !numa->memory.nodeset) {
496 497 498 499 500 501
        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                       _("nodeset for NUMA memory tuning must be set "
                         "if 'placement' is 'static'"));
        goto cleanup;
    }

502 503
    /* setting nodeset when placement auto is invalid */
    if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO &&
504 505 506
        numa->memory.nodeset) {
        virBitmapFree(numa->memory.nodeset);
        numa->memory.nodeset = NULL;
507 508
    }

509
    if (placement != -1)
510
        numa->memory.placement = placement;
511

512
    numa->memory.specified = true;
513

514
    ret = 0;
515

516 517 518 519
 cleanup:
    return ret;
}

520
static bool
521 522
virDomainNumaNodesEqual(virDomainNumaPtr n1,
                        virDomainNumaPtr n2)
523 524 525 526 527 528 529
{
    size_t i = 0;

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

    for (i = 0; i < n1->nmem_nodes; i++) {
530 531
        virDomainNumaNodePtr nd1 = &n1->mem_nodes[i];
        virDomainNumaNodePtr nd2 = &n2->mem_nodes[i];
532 533 534 535 536 537 538 539 540 541 542 543 544 545

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

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

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

    return true;
}

546
bool
547 548
virDomainNumaEquals(virDomainNumaPtr n1,
                    virDomainNumaPtr n2)
549 550 551 552 553 554 555
{
    if (!n1 && !n2)
        return true;

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

556
    if (!n1->memory.specified && !n2->memory.specified)
557
        return virDomainNumaNodesEqual(n1, n2);
558 559 560 561

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

562 563 564 565 566 567
    if (n1->memory.mode != n2->memory.mode)
        return false;

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

568 569 570
    if (!virBitmapEqual(n1->memory.nodeset, n2->memory.nodeset))
        return false;

571
    return virDomainNumaNodesEqual(n1, n2);
572 573 574
}

bool
575
virDomainNumatuneHasPlacementAuto(virDomainNumaPtr numatune)
576 577 578 579
{
    if (!numatune)
        return false;

580 581 582
    if (!numatune->memory.specified)
        return false;

583 584 585 586 587
    if (numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO)
        return true;

    return false;
}
588 589

bool
590
virDomainNumatuneHasPerNodeBinding(virDomainNumaPtr numatune)
591 592 593 594 595 596 597 598 599 600 601 602 603
{
    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;
}
604 605

int
606
virDomainNumatuneSpecifiedMaxNode(virDomainNumaPtr numatune)
607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631
{
    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;
}
632 633

bool
634
virDomainNumatuneNodesetIsAvailable(virDomainNumaPtr numatune,
635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654
                                    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;
}
655 656 657 658 659 660 661 662


int
virDomainNumaDefCPUParseXML(virCPUDefPtr def,
                            xmlXPathContextPtr ctxt)
{
    xmlNodePtr *nodes = NULL;
    xmlNodePtr oldNode = ctxt->node;
663
    char *tmp = NULL;
664 665 666 667
    int n;
    size_t i;
    int ret = -1;

668 669 670
    /* check if NUMA definition is present */
    if (!virXPathNode("/domain/cpu/numa[1]", ctxt))
        return 0;
671

672 673 674 675 676 677 678 679 680
    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;
681

682
    for (i = 0; i < n; i++) {
683
        int rc;
684 685 686 687 688 689 690 691 692
        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;
693 694 695 696 697 698 699
            }

            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"));
700
                goto cleanup;
701
            }
702 703
        }
        VIR_FREE(tmp);
704

705 706 707 708 709 710
        if (def->cells[cur_cell].cpumask) {
            virReportError(VIR_ERR_XML_ERROR,
                           _("Duplicate NUMA cell info for cell id '%u'"),
                           cur_cell);
            goto cleanup;
        }
711

712 713 714 715 716
        if (!(tmp = virXMLPropString(nodes[i], "cpus"))) {
            virReportError(VIR_ERR_XML_ERROR, "%s",
                           _("Missing 'cpus' attribute in NUMA cell"));
            goto cleanup;
        }
717

718
        if (virBitmapParse(tmp, 0, &def->cells[cur_cell].cpumask,
719
                           VIR_DOMAIN_CPUMASK_LEN) < 0)
720
            goto cleanup;
721

722 723 724 725 726
        if (virBitmapIsAllClear(def->cells[cur_cell].cpumask)) {
            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                          _("NUMA cell %d has no vCPUs assigned"), cur_cell);
            goto cleanup;
        }
727
        VIR_FREE(tmp);
728

729 730 731 732
        ctxt->node = nodes[i];
        if (virDomainParseMemory("./@memory", "./@unit", ctxt,
                                 &def->cells[cur_cell].mem, true, false) < 0)
            goto cleanup;
733

734
        if ((tmp = virXMLPropString(nodes[i], "memAccess"))) {
735
            if ((rc = virNumaMemAccessTypeFromString(tmp)) <= 0) {
736 737 738 739
                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                               _("Invalid 'memAccess' attribute value '%s'"),
                               tmp);
                goto cleanup;
740
            }
741 742 743

            def->cells[cur_cell].memAccess = rc;
            VIR_FREE(tmp);
744 745 746 747 748 749 750 751
        }
    }

    ret = 0;

 cleanup:
    ctxt->node = oldNode;
    VIR_FREE(nodes);
752
    VIR_FREE(tmp);
753 754
    return ret;
}
755 756 757 758 759 760


int
virDomainNumaDefCPUFormat(virBufferPtr buf,
                          virCPUDefPtr def)
{
761
    virNumaMemAccess memAccess;
762
    char *cpustr;
763
    size_t ncells = virDomainNumaGetNodeCount(def);
764 765
    size_t i;

766
    if (ncells == 0)
767 768 769 770
        return 0;

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

774
        if (!(cpustr = virBitmapFormat(virDomainNumaGetNodeCpumask(def, i))))
775 776 777 778 779 780 781 782 783
            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'",
784
                              virNumaMemAccessTypeToString(memAccess));
785 786 787 788 789 790 791 792
        virBufferAddLit(buf, "/>\n");
        VIR_FREE(cpustr);
    }
    virBufferAdjustIndent(buf, -2);
    virBufferAddLit(buf, "</numa>\n");

    return 0;
}
793 794 795 796 797 798 799 800 801


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

    for (i = 0; i < numa->ncells; i++)
802
        ret += virBitmapCountBits(virDomainNumaGetNodeCpumask(numa, i));
803 804 805

    return ret;
}
806 807 808 809 810 811 812 813 814 815 816


virDomainNumaPtr
virDomainNumaNew(void)
{
    virDomainNumaPtr ret = NULL;

    ignore_value(VIR_ALLOC(ret));

    return ret;
}
817 818 819 820 821 822 823 824 825 826


size_t
virDomainNumaGetNodeCount(virCPUDefPtr numa)
{
    if (!numa)
        return 0;

    return numa->ncells;
}
827 828 829 830 831 832 833 834


virBitmapPtr
virDomainNumaGetNodeCpumask(virCPUDefPtr numa,
                            size_t node)
{
    return numa->cells[node].cpumask;
}