mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-08 22:39:56 +00:00
02129b7c0e
There are two places where you'll find info on page sizes. The first one is under <cpu/> element, where all supported pages sizes are listed. Then the second one is under each <cell/> element which refers to concrete NUMA node. At this place, the size of page's pool is reported. So the capabilities XML looks something like this: <capabilities> <host> <uuid>01281cda-f352-cb11-a9db-e905fe22010c</uuid> <cpu> <arch>x86_64</arch> <model>Westmere</model> <vendor>Intel</vendor> <topology sockets='1' cores='1' threads='1'/> ... <pages unit='KiB' size='4'/> <pages unit='KiB' size='2048'/> <pages unit='KiB' size='1048576'/> </cpu> ... <topology> <cells num='4'> <cell id='0'> <memory unit='KiB'>4054408</memory> <pages unit='KiB' size='4'>1013602</pages> <pages unit='KiB' size='2048'>3</pages> <pages unit='KiB' size='1048576'>1</pages> <distances/> <cpus num='1'> <cpu id='0' socket_id='0' core_id='0' siblings='0'/> </cpus> </cell> <cell id='1'> <memory unit='KiB'>4071072</memory> <pages unit='KiB' size='4'>1017768</pages> <pages unit='KiB' size='2048'>3</pages> <pages unit='KiB' size='1048576'>1</pages> <distances/> <cpus num='1'> <cpu id='1' socket_id='0' core_id='0' siblings='1'/> </cpus> </cell> ... </cells> </topology> ... </host> <guest/> </capabilities> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
166 lines
4.8 KiB
C
166 lines
4.8 KiB
C
/*
|
|
* Copyright (C) Red Hat, Inc. 2014
|
|
*
|
|
* 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/>.
|
|
*
|
|
* Authors:
|
|
* Michal Privoznik <mprivozn@redhat.com>
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "testutils.h"
|
|
#include "capabilities.h"
|
|
#include "virbitmap.h"
|
|
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
static virCapsPtr
|
|
buildVirCapabilities(int max_cells,
|
|
int max_cpus_in_cell,
|
|
int max_mem_in_cell)
|
|
{
|
|
virCapsPtr caps;
|
|
virCapsHostNUMACellCPUPtr cell_cpus = NULL;
|
|
virCapsHostNUMACellSiblingInfoPtr siblings = NULL;
|
|
int core_id, cell_id, nsiblings;
|
|
int id;
|
|
size_t i;
|
|
|
|
if ((caps = virCapabilitiesNew(VIR_ARCH_X86_64, 0, 0)) == NULL)
|
|
goto error;
|
|
|
|
id = 0;
|
|
for (cell_id = 0; cell_id < max_cells; cell_id++) {
|
|
if (VIR_ALLOC_N(cell_cpus, max_cpus_in_cell) < 0)
|
|
goto error;
|
|
|
|
for (core_id = 0; core_id < max_cpus_in_cell; core_id++) {
|
|
cell_cpus[core_id].id = id;
|
|
cell_cpus[core_id].socket_id = cell_id;
|
|
cell_cpus[core_id].core_id = id + core_id;
|
|
if (!(cell_cpus[core_id].siblings =
|
|
virBitmapNew(max_cpus_in_cell)))
|
|
goto error;
|
|
ignore_value(virBitmapSetBit(cell_cpus[core_id].siblings, id));
|
|
}
|
|
id++;
|
|
|
|
if (VIR_ALLOC_N(siblings, max_cells) < 0)
|
|
goto error;
|
|
nsiblings = max_cells;
|
|
|
|
for (i = 0; i < nsiblings; i++) {
|
|
siblings[i].node = i;
|
|
/* Some magical constants, see virNumaGetDistances()
|
|
* for their description. */
|
|
siblings[i].distance = cell_id == i ? 10 : 20;
|
|
}
|
|
|
|
if (virCapabilitiesAddHostNUMACell(caps, cell_id,
|
|
max_mem_in_cell,
|
|
max_cpus_in_cell, cell_cpus,
|
|
nsiblings, siblings,
|
|
0, NULL) < 0)
|
|
goto error;
|
|
|
|
cell_cpus = NULL;
|
|
siblings = NULL;
|
|
}
|
|
|
|
return caps;
|
|
|
|
error:
|
|
virCapabilitiesClearHostNUMACellCPUTopology(cell_cpus, max_cpus_in_cell);
|
|
VIR_FREE(cell_cpus);
|
|
VIR_FREE(siblings);
|
|
virObjectUnref(caps);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
struct virCapabilitiesFormatData {
|
|
const char *filename;
|
|
int max_cells;
|
|
int max_cpus_in_cell;
|
|
int max_mem_in_cell;
|
|
};
|
|
|
|
static int
|
|
test_virCapabilitiesFormat(const void *opaque)
|
|
{
|
|
struct virCapabilitiesFormatData *data = (struct virCapabilitiesFormatData *) opaque;
|
|
virCapsPtr caps = NULL;
|
|
char *capsXML = NULL;
|
|
char *capsFromFile = NULL;
|
|
char *path = NULL;
|
|
int ret = -1;
|
|
|
|
if (!(caps = buildVirCapabilities(data->max_cells, data->max_cpus_in_cell,
|
|
data->max_mem_in_cell)))
|
|
goto cleanup;
|
|
|
|
if (!(capsXML = virCapabilitiesFormatXML(caps))) {
|
|
fprintf(stderr, "Unable to format capabilities XML");
|
|
goto cleanup;
|
|
}
|
|
|
|
if (virAsprintf(&path, "%s/vircaps2xmldata/vircaps-%s.xml",
|
|
abs_srcdir, data->filename) < 0)
|
|
goto cleanup;
|
|
|
|
if (virFileReadAll(path, 8192, &capsFromFile) < 0)
|
|
goto cleanup;
|
|
|
|
|
|
if (STRNEQ(capsXML, capsFromFile)) {
|
|
virtTestDifference(stderr, capsFromFile, capsXML);
|
|
goto cleanup;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
cleanup:
|
|
VIR_FREE(path);
|
|
VIR_FREE(capsFromFile);
|
|
VIR_FREE(capsXML);
|
|
virObjectUnref(caps);
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = 0;
|
|
|
|
#define DO_TEST(filename, max_cells, \
|
|
max_cpus_in_cell, max_mem_in_cell) \
|
|
do { \
|
|
struct virCapabilitiesFormatData data = {filename, max_cells, \
|
|
max_cpus_in_cell, \
|
|
max_mem_in_cell}; \
|
|
if (virtTestRun(filename, test_virCapabilitiesFormat, &data) < 0) \
|
|
ret = -1; \
|
|
} while (0)
|
|
|
|
DO_TEST("basic-4-4-2G", 4, 4, 2*1024*1024);
|
|
|
|
return ret;
|
|
}
|
|
|
|
VIRT_TEST_MAIN(mymain)
|