2014-05-14 11:43:05 +02:00
|
|
|
/*
|
|
|
|
* NUMA parameter parsing routines
|
|
|
|
*
|
|
|
|
* Copyright (c) 2014 Fujitsu Ltd.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2016-01-29 18:50:05 +01:00
|
|
|
#include "qemu/osdep.h"
|
2015-02-08 19:51:16 +01:00
|
|
|
#include "sysemu/numa.h"
|
2014-05-14 11:43:05 +02:00
|
|
|
#include "exec/cpu-common.h"
|
2016-12-20 17:31:36 +01:00
|
|
|
#include "exec/ramlist.h"
|
2014-05-14 11:43:05 +02:00
|
|
|
#include "qemu/bitmap.h"
|
|
|
|
#include "qom/cpu.h"
|
2014-05-14 11:43:06 +02:00
|
|
|
#include "qemu/error-report.h"
|
2018-02-01 12:18:31 +01:00
|
|
|
#include "qapi/error.h"
|
2014-05-14 11:43:08 +02:00
|
|
|
#include "qapi/opts-visitor.h"
|
2018-02-27 00:13:27 +01:00
|
|
|
#include "qapi/qapi-commands-misc.h"
|
|
|
|
#include "qapi/qapi-visit-misc.h"
|
2014-05-14 11:43:15 +02:00
|
|
|
#include "hw/boards.h"
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
#include "sysemu/hostmem.h"
|
2014-11-04 12:49:30 +01:00
|
|
|
#include "hw/mem/pc-dimm.h"
|
2018-04-23 18:51:16 +02:00
|
|
|
#include "hw/mem/memory-device.h"
|
2015-02-08 19:51:20 +01:00
|
|
|
#include "qemu/option.h"
|
|
|
|
#include "qemu/config-file.h"
|
2017-10-12 11:39:58 +02:00
|
|
|
#include "qemu/cutils.h"
|
2014-05-14 11:43:08 +02:00
|
|
|
|
|
|
|
QemuOptsList qemu_numa_opts = {
|
|
|
|
.name = "numa",
|
|
|
|
.implied_opt_name = "type",
|
|
|
|
.head = QTAILQ_HEAD_INITIALIZER(qemu_numa_opts.head),
|
|
|
|
.desc = { { 0 } } /* validated with OptsVisitor */
|
|
|
|
};
|
|
|
|
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
static int have_memdevs = -1;
|
2015-02-08 19:51:19 +01:00
|
|
|
static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one.
|
|
|
|
* For all nodes, nodeid < max_numa_nodeid
|
|
|
|
*/
|
2015-02-08 19:51:18 +01:00
|
|
|
int nb_numa_nodes;
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
bool have_numa_distance;
|
2015-02-08 19:51:18 +01:00
|
|
|
NodeInfo numa_info[MAX_NODES];
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
|
2015-06-29 10:20:27 +02:00
|
|
|
|
2017-05-10 13:29:49 +02:00
|
|
|
static void parse_numa_node(MachineState *ms, NumaNodeOptions *node,
|
2017-10-12 11:39:58 +02:00
|
|
|
Error **errp)
|
2014-05-14 11:43:05 +02:00
|
|
|
{
|
2014-05-14 11:43:08 +02:00
|
|
|
uint16_t nodenr;
|
|
|
|
uint16List *cpus = NULL;
|
2017-05-10 13:29:49 +02:00
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(ms);
|
2014-05-14 11:43:05 +02:00
|
|
|
|
2014-05-14 11:43:08 +02:00
|
|
|
if (node->has_nodeid) {
|
|
|
|
nodenr = node->nodeid;
|
2014-05-14 11:43:05 +02:00
|
|
|
} else {
|
2014-05-14 11:43:08 +02:00
|
|
|
nodenr = nb_numa_nodes;
|
2014-05-14 11:43:05 +02:00
|
|
|
}
|
|
|
|
|
2014-05-14 11:43:08 +02:00
|
|
|
if (nodenr >= MAX_NODES) {
|
|
|
|
error_setg(errp, "Max number of NUMA nodes reached: %"
|
2015-02-25 05:22:30 +01:00
|
|
|
PRIu16 "", nodenr);
|
2014-05-14 11:43:08 +02:00
|
|
|
return;
|
2014-05-14 11:43:05 +02:00
|
|
|
}
|
|
|
|
|
2014-06-26 23:33:19 +02:00
|
|
|
if (numa_info[nodenr].present) {
|
|
|
|
error_setg(errp, "Duplicate NUMA nodeid: %" PRIu16, nodenr);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-02-27 12:02:55 +01:00
|
|
|
if (!mc->cpu_index_to_instance_props || !mc->get_default_cpu_node_id) {
|
2017-05-10 13:29:49 +02:00
|
|
|
error_report("NUMA is not supported by this machine-type");
|
|
|
|
exit(1);
|
|
|
|
}
|
2014-05-14 11:43:08 +02:00
|
|
|
for (cpus = node->cpus; cpus; cpus = cpus->next) {
|
2017-05-10 13:29:50 +02:00
|
|
|
CpuInstanceProperties props;
|
2015-02-09 20:28:52 +01:00
|
|
|
if (cpus->value >= max_cpus) {
|
|
|
|
error_setg(errp,
|
|
|
|
"CPU index (%" PRIu16 ")"
|
|
|
|
" should be smaller than maxcpus (%d)",
|
|
|
|
cpus->value, max_cpus);
|
2014-05-14 11:43:08 +02:00
|
|
|
return;
|
|
|
|
}
|
2017-05-10 13:29:50 +02:00
|
|
|
props = mc->cpu_index_to_instance_props(ms, cpus->value);
|
|
|
|
props.node_id = nodenr;
|
|
|
|
props.has_node_id = true;
|
|
|
|
machine_set_cpu_numa_node(ms, &props, &error_fatal);
|
2014-05-14 11:43:05 +02:00
|
|
|
}
|
|
|
|
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
if (node->has_mem && node->has_memdev) {
|
2017-04-13 18:14:39 +02:00
|
|
|
error_setg(errp, "cannot specify both mem= and memdev=");
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (have_memdevs == -1) {
|
|
|
|
have_memdevs = node->has_memdev;
|
|
|
|
}
|
|
|
|
if (node->has_memdev != have_memdevs) {
|
2017-04-13 18:14:39 +02:00
|
|
|
error_setg(errp, "memdev option must be specified for either "
|
2015-02-25 05:22:30 +01:00
|
|
|
"all or no nodes");
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-05-14 11:43:08 +02:00
|
|
|
if (node->has_mem) {
|
2017-10-12 11:39:58 +02:00
|
|
|
numa_info[nodenr].node_mem = node->mem;
|
2014-05-14 11:43:08 +02:00
|
|
|
}
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
if (node->has_memdev) {
|
|
|
|
Object *o;
|
|
|
|
o = object_resolve_path_type(node->memdev, TYPE_MEMORY_BACKEND, NULL);
|
|
|
|
if (!o) {
|
|
|
|
error_setg(errp, "memdev=%s is ambiguous", node->memdev);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
object_ref(o);
|
2017-06-07 18:36:30 +02:00
|
|
|
numa_info[nodenr].node_mem = object_property_get_uint(o, "size", NULL);
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
numa_info[nodenr].node_memdev = MEMORY_BACKEND(o);
|
|
|
|
}
|
2014-06-26 23:33:18 +02:00
|
|
|
numa_info[nodenr].present = true;
|
|
|
|
max_numa_nodeid = MAX(max_numa_nodeid, nodenr + 1);
|
2017-11-14 03:34:01 +01:00
|
|
|
nb_numa_nodes++;
|
2014-05-14 11:43:05 +02:00
|
|
|
}
|
|
|
|
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
static void parse_numa_distance(NumaDistOptions *dist, Error **errp)
|
|
|
|
{
|
|
|
|
uint16_t src = dist->src;
|
|
|
|
uint16_t dst = dist->dst;
|
|
|
|
uint8_t val = dist->val;
|
|
|
|
|
|
|
|
if (src >= MAX_NODES || dst >= MAX_NODES) {
|
|
|
|
error_setg(errp,
|
numa: Fix format string for "Invalid node" message
Some compilers complain about the PRIu16 format string with the
MAX(src, dst) and MAX_NODES arguments. Example output from Apple LLVM
version 7.3.0 (clang-703.0.31):
numa.c:236:20: warning: format specifies type 'unsigned short' but the argument has type 'int' [-Wformat]
MAX(src, dst), MAX_NODES);
~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
include/qapi/error.h:163:35: note: expanded from macro 'error_setg'
(fmt), ## __VA_ARGS__)
^~~~~~~~~~~
glib/2.52.2/include/glib-2.0/glib/gmacros.h:288:20: note: expanded from macro 'MAX'
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
^~~~~~~~~~~~~~~~~~~~~~~~~
numa.c:236:35: warning: format specifies type 'unsigned short' but the argument has type 'int' [-Wformat]
MAX(src, dst), MAX_NODES);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~
include/qapi/error.h:163:35: note: expanded from macro 'error_setg'
(fmt), ## __VA_ARGS__)
^~~~~~~~~~~
include/sysemu/sysemu.h:165:19: note: expanded from macro 'MAX_NODES'
#define MAX_NODES 128
^~~
MAX(src, dst) promotes the src and dst arguments to int, and MAX_NODES
is an int. Use %d to silence those warnings.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170530184013.31044-1-ehabkost@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-05-30 20:40:13 +02:00
|
|
|
"Invalid node %d, max possible could be %d",
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
MAX(src, dst), MAX_NODES);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!numa_info[src].present || !numa_info[dst].present) {
|
|
|
|
error_setg(errp, "Source/Destination NUMA node is missing. "
|
|
|
|
"Please use '-numa node' option to declare it first.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (val < NUMA_DISTANCE_MIN) {
|
|
|
|
error_setg(errp, "NUMA distance (%" PRIu8 ") is invalid, "
|
|
|
|
"it shouldn't be less than %d.",
|
|
|
|
val, NUMA_DISTANCE_MIN);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (src == dst && val != NUMA_DISTANCE_MIN) {
|
|
|
|
error_setg(errp, "Local distance of node %d should be %d.",
|
|
|
|
src, NUMA_DISTANCE_MIN);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
numa_info[src].distance[dst] = val;
|
|
|
|
have_numa_distance = true;
|
|
|
|
}
|
|
|
|
|
2015-03-13 13:35:14 +01:00
|
|
|
static int parse_numa(void *opaque, QemuOpts *opts, Error **errp)
|
2014-05-14 11:43:05 +02:00
|
|
|
{
|
2014-05-14 11:43:08 +02:00
|
|
|
NumaOptions *object = NULL;
|
2017-05-10 13:29:49 +02:00
|
|
|
MachineState *ms = opaque;
|
2014-05-14 11:43:08 +02:00
|
|
|
Error *err = NULL;
|
2014-05-14 11:43:05 +02:00
|
|
|
|
2014-05-14 11:43:08 +02:00
|
|
|
{
|
2016-06-09 18:48:36 +02:00
|
|
|
Visitor *v = opts_visitor_new(opts);
|
|
|
|
visit_type_NumaOptions(v, NULL, &object, &err);
|
|
|
|
visit_free(v);
|
2014-05-14 11:43:05 +02:00
|
|
|
}
|
|
|
|
|
2014-05-14 11:43:08 +02:00
|
|
|
if (err) {
|
2016-07-13 02:39:13 +02:00
|
|
|
goto end;
|
2014-05-14 11:43:08 +02:00
|
|
|
}
|
2014-05-14 11:43:05 +02:00
|
|
|
|
2017-10-12 11:39:58 +02:00
|
|
|
/* Fix up legacy suffix-less format */
|
|
|
|
if ((object->type == NUMA_OPTIONS_TYPE_NODE) && object->u.node.has_mem) {
|
|
|
|
const char *mem_str = qemu_opt_get(opts, "mem");
|
|
|
|
qemu_strtosz_MiB(mem_str, NULL, &object->u.node.mem);
|
|
|
|
}
|
|
|
|
|
2015-10-26 23:34:59 +01:00
|
|
|
switch (object->type) {
|
2017-02-21 21:46:26 +01:00
|
|
|
case NUMA_OPTIONS_TYPE_NODE:
|
2017-10-12 11:39:58 +02:00
|
|
|
parse_numa_node(ms, &object->u.node, &err);
|
2014-05-14 11:43:08 +02:00
|
|
|
if (err) {
|
2016-07-13 02:39:13 +02:00
|
|
|
goto end;
|
2014-05-14 11:43:05 +02:00
|
|
|
}
|
2014-05-14 11:43:08 +02:00
|
|
|
break;
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
case NUMA_OPTIONS_TYPE_DIST:
|
|
|
|
parse_numa_distance(&object->u.dist, &err);
|
|
|
|
if (err) {
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
break;
|
numa: add '-numa cpu,...' option for property based node mapping
legacy cpu to node mapping is using cpu index values to map
VCPU to node with help of '-numa node,nodeid=node,cpus=x[-y]'
option. However cpu index is internal concept and QEMU users
have to guess /reimplement qemu's logic/ to map it to
a concrete cpu socket/core/thread to make sane CPUs
placement across numa nodes.
This patch allows to map cpu objects to numa nodes using
the same properties as used for cpus with -device/device_add
(socket-id/core-id/thread-id/node-id).
At present valid properties/values to address CPUs could be
fetched using hotpluggable-cpus monitor/qmp command, it will
require user to start qemu twice when creating domain to fetch
possible CPUs for a machine type/-smp layout first and
then the second time with numa explicit mapping for actual
usage. The first step results could be saved and reused to
set/change mapping later as far as machine type/-smp stays
the same.
Proposed impl. supports exact and wildcard matching to
simplify CLI and allow to set mapping for a specific cpu
or group of cpu objects specified by matched properties.
For example:
# exact mapping x86
-numa cpu,node-id=x,socket-id=y,core-id=z,thread-id=n
# exact mapping SPAPR
-numa cpu,node-id=x,core-id=y
# wildcard mapping, all cpu objects that match socket-id=y
# are mapped to node-id=x
-numa cpu,node-id=x,socket-id=y
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <1494415802-227633-18-git-send-email-imammedo@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-05-10 13:30:01 +02:00
|
|
|
case NUMA_OPTIONS_TYPE_CPU:
|
|
|
|
if (!object->u.cpu.has_node_id) {
|
|
|
|
error_setg(&err, "Missing mandatory node-id property");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (!numa_info[object->u.cpu.node_id].present) {
|
|
|
|
error_setg(&err, "Invalid node-id=%" PRId64 ", NUMA node must be "
|
|
|
|
"defined with -numa node,nodeid=ID before it's used with "
|
|
|
|
"-numa cpu,node-id=ID", object->u.cpu.node_id);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
machine_set_cpu_numa_node(ms, qapi_NumaCpuOptions_base(&object->u.cpu),
|
|
|
|
&err);
|
|
|
|
break;
|
2014-05-14 11:43:08 +02:00
|
|
|
default:
|
|
|
|
abort();
|
|
|
|
}
|
2014-05-14 11:43:05 +02:00
|
|
|
|
2016-07-13 02:39:13 +02:00
|
|
|
end:
|
2016-02-23 22:14:33 +01:00
|
|
|
qapi_free_NumaOptions(object);
|
2016-07-13 02:39:13 +02:00
|
|
|
if (err) {
|
|
|
|
error_report_err(err);
|
|
|
|
return -1;
|
|
|
|
}
|
2014-05-14 11:43:08 +02:00
|
|
|
|
2016-07-13 02:39:13 +02:00
|
|
|
return 0;
|
2014-05-14 11:43:05 +02:00
|
|
|
}
|
|
|
|
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
/* If all node pair distances are symmetric, then only distances
|
|
|
|
* in one direction are enough. If there is even one asymmetric
|
|
|
|
* pair, though, then all distances must be provided. The
|
|
|
|
* distance from a node to itself is always NUMA_DISTANCE_MIN,
|
|
|
|
* so providing it is never necessary.
|
|
|
|
*/
|
|
|
|
static void validate_numa_distance(void)
|
2015-02-09 20:32:04 +01:00
|
|
|
{
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
int src, dst;
|
|
|
|
bool is_asymmetrical = false;
|
|
|
|
|
|
|
|
for (src = 0; src < nb_numa_nodes; src++) {
|
|
|
|
for (dst = src; dst < nb_numa_nodes; dst++) {
|
|
|
|
if (numa_info[src].distance[dst] == 0 &&
|
|
|
|
numa_info[dst].distance[src] == 0) {
|
|
|
|
if (src != dst) {
|
|
|
|
error_report("The distance between node %d and %d is "
|
|
|
|
"missing, at least one distance value "
|
|
|
|
"between each nodes should be provided.",
|
|
|
|
src, dst);
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
}
|
2015-02-09 20:32:04 +01:00
|
|
|
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
if (numa_info[src].distance[dst] != 0 &&
|
|
|
|
numa_info[dst].distance[src] != 0 &&
|
|
|
|
numa_info[src].distance[dst] !=
|
|
|
|
numa_info[dst].distance[src]) {
|
|
|
|
is_asymmetrical = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (is_asymmetrical) {
|
|
|
|
for (src = 0; src < nb_numa_nodes; src++) {
|
|
|
|
for (dst = 0; dst < nb_numa_nodes; dst++) {
|
|
|
|
if (src != dst && numa_info[src].distance[dst] == 0) {
|
|
|
|
error_report("At least one asymmetrical pair of "
|
|
|
|
"distances is given, please provide distances "
|
|
|
|
"for both directions of all node pairs.");
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-02-09 20:32:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
static void complete_init_numa_distance(void)
|
2015-02-09 20:32:04 +01:00
|
|
|
{
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
int src, dst;
|
2015-02-09 20:32:04 +01:00
|
|
|
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
/* Fixup NUMA distance by symmetric policy because if it is an
|
|
|
|
* asymmetric distance table, it should be a complete table and
|
|
|
|
* there would not be any missing distance except local node, which
|
|
|
|
* is verified by validate_numa_distance above.
|
|
|
|
*/
|
|
|
|
for (src = 0; src < nb_numa_nodes; src++) {
|
|
|
|
for (dst = 0; dst < nb_numa_nodes; dst++) {
|
|
|
|
if (numa_info[src].distance[dst] == 0) {
|
|
|
|
if (src == dst) {
|
|
|
|
numa_info[src].distance[dst] = NUMA_DISTANCE_MIN;
|
|
|
|
} else {
|
|
|
|
numa_info[src].distance[dst] = numa_info[dst].distance[src];
|
|
|
|
}
|
|
|
|
}
|
2015-02-09 20:32:04 +01:00
|
|
|
}
|
|
|
|
}
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
}
|
numa: Print warning if no node is assigned to a CPU
We need all possible CPUs (including hotplug ones) to be present in the
SRAT when QEMU starts. QEMU already does that correctly today, the only
problem is that when a CPU is omitted from the NUMA configuration, it is
silently assigned to node 0.
Check if all CPUs up to max_cpus are present in the NUMA configuration
and warn about missing CPUs.
Make it just a warning, to allow management software to be updated if
necessary. In the future we may make it a fatal error instead.
Command-line examples:
* Correct, no warning:
$ qemu-system-x86_64 -smp 2,maxcpus=4
$ qemu-system-x86_64 -smp 2,maxcpus=4 -numa node,cpus=0-3
* Incomplete, with warnings:
$ qemu-system-x86_64 -smp 2,maxcpus=4 -numa node,cpus=0
qemu-system-x86_64: warning: CPU(s) not present in any NUMA nodes: 1 2 3
qemu-system-x86_64: warning: All CPU(s) up to maxcpus should be described in NUMA config
$ qemu-system-x86_64 -smp 2,maxcpus=4 -numa node,cpus=0-2
qemu-system-x86_64: warning: CPU(s) not present in any NUMA nodes: 3
qemu-system-x86_64: warning: All CPU(s) up to maxcpus should be described in NUMA config
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
v1 -> v2: (no changes)
v2 -> v3:
* Use enumerate_cpus() and error_report() for error message
* Simplify logic using bitmap_full()
v3 -> v4:
* Clarify error message, mention that all CPUs up to
maxcpus need to be described in NUMA config
v4 -> v5:
* Commit log update, to make problem description clearer
2015-02-09 20:35:04 +01:00
|
|
|
|
2017-05-02 18:29:55 +02:00
|
|
|
void numa_legacy_auto_assign_ram(MachineClass *mc, NodeInfo *nodes,
|
|
|
|
int nb_nodes, ram_addr_t size)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
uint64_t usedmem = 0;
|
|
|
|
|
|
|
|
/* Align each node according to the alignment
|
|
|
|
* requirements of the machine class
|
|
|
|
*/
|
|
|
|
|
|
|
|
for (i = 0; i < nb_nodes - 1; i++) {
|
|
|
|
nodes[i].node_mem = (size / nb_nodes) &
|
|
|
|
~((1 << mc->numa_mem_align_shift) - 1);
|
|
|
|
usedmem += nodes[i].node_mem;
|
numa: Print warning if no node is assigned to a CPU
We need all possible CPUs (including hotplug ones) to be present in the
SRAT when QEMU starts. QEMU already does that correctly today, the only
problem is that when a CPU is omitted from the NUMA configuration, it is
silently assigned to node 0.
Check if all CPUs up to max_cpus are present in the NUMA configuration
and warn about missing CPUs.
Make it just a warning, to allow management software to be updated if
necessary. In the future we may make it a fatal error instead.
Command-line examples:
* Correct, no warning:
$ qemu-system-x86_64 -smp 2,maxcpus=4
$ qemu-system-x86_64 -smp 2,maxcpus=4 -numa node,cpus=0-3
* Incomplete, with warnings:
$ qemu-system-x86_64 -smp 2,maxcpus=4 -numa node,cpus=0
qemu-system-x86_64: warning: CPU(s) not present in any NUMA nodes: 1 2 3
qemu-system-x86_64: warning: All CPU(s) up to maxcpus should be described in NUMA config
$ qemu-system-x86_64 -smp 2,maxcpus=4 -numa node,cpus=0-2
qemu-system-x86_64: warning: CPU(s) not present in any NUMA nodes: 3
qemu-system-x86_64: warning: All CPU(s) up to maxcpus should be described in NUMA config
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
v1 -> v2: (no changes)
v2 -> v3:
* Use enumerate_cpus() and error_report() for error message
* Simplify logic using bitmap_full()
v3 -> v4:
* Clarify error message, mention that all CPUs up to
maxcpus need to be described in NUMA config
v4 -> v5:
* Commit log update, to make problem description clearer
2015-02-09 20:35:04 +01:00
|
|
|
}
|
2017-05-02 18:29:55 +02:00
|
|
|
nodes[i].node_mem = size - usedmem;
|
2015-02-09 20:32:04 +01:00
|
|
|
}
|
|
|
|
|
2017-05-02 18:29:55 +02:00
|
|
|
void numa_default_auto_assign_ram(MachineClass *mc, NodeInfo *nodes,
|
|
|
|
int nb_nodes, ram_addr_t size)
|
2014-05-14 11:43:05 +02:00
|
|
|
{
|
2014-06-26 23:33:20 +02:00
|
|
|
int i;
|
2017-05-02 18:29:55 +02:00
|
|
|
uint64_t usedmem = 0, node_mem;
|
|
|
|
uint64_t granularity = size / nb_nodes;
|
|
|
|
uint64_t propagate = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < nb_nodes - 1; i++) {
|
|
|
|
node_mem = (granularity + propagate) &
|
|
|
|
~((1 << mc->numa_mem_align_shift) - 1);
|
|
|
|
propagate = granularity + propagate - node_mem;
|
|
|
|
nodes[i].node_mem = node_mem;
|
|
|
|
usedmem += node_mem;
|
|
|
|
}
|
|
|
|
nodes[i].node_mem = size - usedmem;
|
|
|
|
}
|
2014-06-26 23:33:20 +02:00
|
|
|
|
2017-05-10 13:29:45 +02:00
|
|
|
void parse_numa_opts(MachineState *ms)
|
2014-05-14 11:43:05 +02:00
|
|
|
{
|
2014-06-26 23:33:20 +02:00
|
|
|
int i;
|
2017-05-10 13:29:45 +02:00
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(ms);
|
2016-11-18 12:02:54 +01:00
|
|
|
|
2017-05-10 13:29:49 +02:00
|
|
|
if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) {
|
2015-02-08 19:51:20 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2017-11-14 03:34:01 +01:00
|
|
|
/*
|
|
|
|
* If memory hotplug is enabled (slots > 0) but without '-numa'
|
|
|
|
* options explicitly on CLI, guestes will break.
|
|
|
|
*
|
|
|
|
* Windows: won't enable memory hotplug without SRAT table at all
|
|
|
|
*
|
|
|
|
* Linux: if QEMU is started with initial memory all below 4Gb
|
|
|
|
* and no SRAT table present, guest kernel will use nommu DMA ops,
|
|
|
|
* which breaks 32bit hw drivers when memory is hotplugged and
|
|
|
|
* guest tries to use it with that drivers.
|
|
|
|
*
|
|
|
|
* Enable NUMA implicitly by adding a new NUMA node automatically.
|
|
|
|
*/
|
|
|
|
if (ms->ram_slots > 0 && nb_numa_nodes == 0 &&
|
|
|
|
mc->auto_enable_numa_with_memhp) {
|
|
|
|
NumaNodeOptions node = { };
|
|
|
|
parse_numa_node(ms, &node, NULL);
|
|
|
|
}
|
|
|
|
|
2014-06-26 23:33:20 +02:00
|
|
|
assert(max_numa_nodeid <= MAX_NODES);
|
|
|
|
|
|
|
|
/* No support for sparse NUMA node IDs yet: */
|
|
|
|
for (i = max_numa_nodeid - 1; i >= 0; i--) {
|
|
|
|
/* Report large node IDs first, to make mistakes easier to spot */
|
|
|
|
if (!numa_info[i].present) {
|
|
|
|
error_report("numa: Node ID missing: %d", i);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This must be always true if all nodes are present: */
|
|
|
|
assert(nb_numa_nodes == max_numa_nodeid);
|
|
|
|
|
2014-05-14 11:43:05 +02:00
|
|
|
if (nb_numa_nodes > 0) {
|
2014-05-14 11:43:06 +02:00
|
|
|
uint64_t numa_total;
|
2014-05-14 11:43:05 +02:00
|
|
|
|
|
|
|
if (nb_numa_nodes > MAX_NODES) {
|
|
|
|
nb_numa_nodes = MAX_NODES;
|
|
|
|
}
|
|
|
|
|
2014-06-24 07:50:30 +02:00
|
|
|
/* If no memory size is given for any node, assume the default case
|
2014-05-14 11:43:05 +02:00
|
|
|
* and distribute the available memory equally across all nodes
|
|
|
|
*/
|
|
|
|
for (i = 0; i < nb_numa_nodes; i++) {
|
2014-05-14 11:43:07 +02:00
|
|
|
if (numa_info[i].node_mem != 0) {
|
2014-05-14 11:43:05 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (i == nb_numa_nodes) {
|
2017-05-02 18:29:55 +02:00
|
|
|
assert(mc->numa_auto_assign_ram);
|
|
|
|
mc->numa_auto_assign_ram(mc, numa_info, nb_numa_nodes, ram_size);
|
2014-05-14 11:43:05 +02:00
|
|
|
}
|
|
|
|
|
2014-05-14 11:43:06 +02:00
|
|
|
numa_total = 0;
|
|
|
|
for (i = 0; i < nb_numa_nodes; i++) {
|
2014-05-14 11:43:07 +02:00
|
|
|
numa_total += numa_info[i].node_mem;
|
2014-05-14 11:43:06 +02:00
|
|
|
}
|
|
|
|
if (numa_total != ram_size) {
|
2014-08-04 10:16:09 +02:00
|
|
|
error_report("total memory for NUMA nodes (0x%" PRIx64 ")"
|
|
|
|
" should equal RAM size (0x" RAM_ADDR_FMT ")",
|
2014-05-14 11:43:06 +02:00
|
|
|
numa_total, ram_size);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
/* QEMU needs at least all unique node pair distances to build
|
|
|
|
* the whole NUMA distance table. QEMU treats the distance table
|
|
|
|
* as symmetric by default, i.e. distance A->B == distance B->A.
|
|
|
|
* Thus, QEMU is able to complete the distance table
|
|
|
|
* initialization even though only distance A->B is provided and
|
|
|
|
* distance B->A is not. QEMU knows the distance of a node to
|
|
|
|
* itself is always 10, so A->A distances may be omitted. When
|
|
|
|
* the distances of two nodes of a pair differ, i.e. distance
|
|
|
|
* A->B != distance B->A, then that means the distance table is
|
|
|
|
* asymmetric. In this case, the distances for both directions
|
|
|
|
* of all node pairs are required.
|
|
|
|
*/
|
|
|
|
if (have_numa_distance) {
|
|
|
|
/* Validate enough NUMA distance information was provided. */
|
|
|
|
validate_numa_distance();
|
2014-05-14 11:43:05 +02:00
|
|
|
|
numa: Allow setting NUMA distance for different NUMA nodes
This patch is going to add SLIT table support in QEMU, and provides
additional option `dist` for command `-numa` to allow user set vNUMA
distance by QEMU command.
With this patch, when a user wants to create a guest that contains
several vNUMA nodes and also wants to set distance among those nodes,
the QEMU command would like:
```
-numa node,nodeid=0,cpus=0 \
-numa node,nodeid=1,cpus=1 \
-numa node,nodeid=2,cpus=2 \
-numa node,nodeid=3,cpus=3 \
-numa dist,src=0,dst=1,val=21 \
-numa dist,src=0,dst=2,val=31 \
-numa dist,src=0,dst=3,val=41 \
-numa dist,src=1,dst=2,val=21 \
-numa dist,src=1,dst=3,val=31 \
-numa dist,src=2,dst=3,val=21 \
```
Signed-off-by: He Chen <he.chen@linux.intel.com>
Message-Id: <1493260558-20728-1-git-send-email-he.chen@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-04-27 04:35:58 +02:00
|
|
|
/* Validation succeeded, now fill in any missing distances. */
|
|
|
|
complete_init_numa_distance();
|
2014-05-14 11:43:05 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-05-14 11:43:15 +02:00
|
|
|
|
2017-05-30 18:23:56 +02:00
|
|
|
void numa_cpu_pre_plug(const CPUArchId *slot, DeviceState *dev, Error **errp)
|
|
|
|
{
|
|
|
|
int node_id = object_property_get_int(OBJECT(dev), "node-id", &error_abort);
|
|
|
|
|
|
|
|
if (node_id == CPU_UNSET_NUMA_NODE_ID) {
|
|
|
|
/* due to bug in libvirt, it doesn't pass node-id from props on
|
|
|
|
* device_add as expected, so we have to fix it up here */
|
2017-05-30 18:23:58 +02:00
|
|
|
if (slot->props.has_node_id) {
|
|
|
|
object_property_set_int(OBJECT(dev), slot->props.node_id,
|
|
|
|
"node-id", errp);
|
|
|
|
}
|
|
|
|
} else if (node_id != slot->props.node_id) {
|
2017-05-30 18:23:56 +02:00
|
|
|
error_setg(errp, "node-id=%d must match numa node specified "
|
|
|
|
"with -numa option", node_id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner,
|
|
|
|
const char *name,
|
|
|
|
uint64_t ram_size)
|
|
|
|
{
|
2014-05-14 11:43:19 +02:00
|
|
|
if (mem_path) {
|
|
|
|
#ifdef __linux__
|
2014-05-14 11:43:20 +02:00
|
|
|
Error *err = NULL;
|
hostmem-file: add "align" option
When mmap(2) the backend files, QEMU uses the host page size
(getpagesize(2)) by default as the alignment of mapping address.
However, some backends may require alignments different than the page
size. For example, mmap a device DAX (e.g., /dev/dax0.0) on Linux
kernel 4.13 to an address, which is 4K-aligned but not 2M-aligned,
fails with a kernel message like
[617494.969768] dax dax0.0: qemu-system-x86: dax_mmap: fail, unaligned vma (0x7fa37c579000 - 0x7fa43c579000, 0x1fffff)
Because there is no common approach to get such alignment requirement,
we add the 'align' option to 'memory-backend-file', so that users or
management utils, which have enough knowledge about the backend, can
specify a proper alignment via this option.
Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
Message-Id: <20171211072806.2812-2-haozhong.zhang@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[ehabkost: fixed typo, fixed error_setg() format string]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2017-12-11 08:28:04 +01:00
|
|
|
memory_region_init_ram_from_file(mr, owner, name, ram_size, 0, false,
|
2014-05-14 11:43:20 +02:00
|
|
|
mem_path, &err);
|
2014-06-17 12:17:05 +02:00
|
|
|
if (err) {
|
2015-02-10 15:06:23 +01:00
|
|
|
error_report_err(err);
|
2016-01-22 15:15:01 +01:00
|
|
|
if (mem_prealloc) {
|
|
|
|
exit(1);
|
|
|
|
}
|
2018-01-15 21:17:01 +01:00
|
|
|
error_report("falling back to regular RAM allocation.");
|
2016-01-22 15:15:01 +01:00
|
|
|
|
|
|
|
/* Legacy behavior: if allocation failed, fall back to
|
|
|
|
* regular RAM allocation.
|
|
|
|
*/
|
2018-04-19 09:19:11 +02:00
|
|
|
mem_path = NULL;
|
2017-07-07 16:42:49 +02:00
|
|
|
memory_region_init_ram_nomigrate(mr, owner, name, ram_size, &error_fatal);
|
2014-05-14 11:43:20 +02:00
|
|
|
}
|
2014-05-14 11:43:19 +02:00
|
|
|
#else
|
|
|
|
fprintf(stderr, "-mem-path not supported on this host\n");
|
|
|
|
exit(1);
|
|
|
|
#endif
|
|
|
|
} else {
|
2017-07-07 16:42:49 +02:00
|
|
|
memory_region_init_ram_nomigrate(mr, owner, name, ram_size, &error_fatal);
|
2014-05-14 11:43:19 +02:00
|
|
|
}
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
vmstate_register_ram_global(mr);
|
|
|
|
}
|
|
|
|
|
2014-05-14 11:43:15 +02:00
|
|
|
void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner,
|
|
|
|
const char *name,
|
|
|
|
uint64_t ram_size)
|
|
|
|
{
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
uint64_t addr = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (nb_numa_nodes == 0 || !have_memdevs) {
|
|
|
|
allocate_system_memory_nonnuma(mr, owner, name, ram_size);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
memory_region_init(mr, owner, name, ram_size);
|
2017-08-22 09:45:36 +02:00
|
|
|
for (i = 0; i < nb_numa_nodes; i++) {
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
uint64_t size = numa_info[i].node_mem;
|
|
|
|
HostMemoryBackend *backend = numa_info[i].node_memdev;
|
|
|
|
if (!backend) {
|
|
|
|
continue;
|
|
|
|
}
|
2015-09-11 15:04:45 +02:00
|
|
|
MemoryRegion *seg = host_memory_backend_get_memory(backend,
|
|
|
|
&error_fatal);
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
|
2014-06-30 12:28:15 +02:00
|
|
|
if (memory_region_is_mapped(seg)) {
|
|
|
|
char *path = object_get_canonical_path_component(OBJECT(backend));
|
|
|
|
error_report("memory backend %s is used multiple times. Each "
|
|
|
|
"-numa option must use a different memdev value.",
|
|
|
|
path);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
numa: set the memory backend "is_mapped" field
Commit 2aece63 "hostmem: detect host backend memory is being used properly"
added a way to know if a memory backend is busy or available for use. It
caused a slight regression if we pass the same backend to a NUMA node and
to a pc-dimm device:
-m 1G,slots=2,maxmem=2G \
-object memory-backend-ram,size=1G,id=mem-mem1 \
-device pc-dimm,id=dimm-mem1,memdev=mem-mem1 \
-numa node,nodeid=0,memdev=mem-mem1
Before commit 2aece63, this would cause QEMU to print an error message and
to exit gracefully:
qemu-system-ppc64: -device pc-dimm,id=dimm-mem1,memdev=mem-mem1:
can't use already busy memdev: mem-mem1
Since commit 2aece63, QEMU hits an assertion in the memory code:
qemu-system-ppc64: memory.c:1934: memory_region_add_subregion_common:
Assertion `!subregion->container' failed.
Aborted
This happens because pc-dimm devices don't use memory_region_is_mapped()
anymore and cannot guess the backend is already used by a NUMA node.
Let's revert to the previous behavior by turning the NUMA code to also
call host_memory_backend_set_mapped() when it uses a backend.
Fixes: 2aece63c8a9d2c3a8ff41d2febc4cdeff2633331
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <146891691503.15642.9817215371777203794.stgit@bahia.lan>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-07-19 10:28:35 +02:00
|
|
|
host_memory_backend_set_mapped(backend, true);
|
numa: add -numa node,memdev= option
This option provides the infrastructure for binding guest NUMA nodes
to host NUMA nodes. For example:
-object memory-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-ram,size=1024M,policy=interleave,host-nodes=1-3,id=ram-node1 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1
The option replaces "-numa node,mem=".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
MST: conflict resolution
2014-05-14 11:43:17 +02:00
|
|
|
memory_region_add_subregion(mr, addr, seg);
|
|
|
|
vmstate_register_ram_global(seg);
|
|
|
|
addr += size;
|
|
|
|
}
|
2014-05-14 11:43:15 +02:00
|
|
|
}
|
2014-06-16 12:05:41 +02:00
|
|
|
|
2017-08-29 17:30:20 +02:00
|
|
|
static void numa_stat_memory_devices(NumaNodeMem node_mem[])
|
2014-11-04 12:49:30 +01:00
|
|
|
{
|
2018-04-23 18:51:16 +02:00
|
|
|
MemoryDeviceInfoList *info_list = qmp_memory_device_list();
|
2014-11-04 12:49:30 +01:00
|
|
|
MemoryDeviceInfoList *info;
|
2017-08-29 17:30:20 +02:00
|
|
|
PCDIMMDeviceInfo *pcdimm_info;
|
2014-11-04 12:49:30 +01:00
|
|
|
|
|
|
|
for (info = info_list; info; info = info->next) {
|
|
|
|
MemoryDeviceInfo *value = info->value;
|
|
|
|
|
|
|
|
if (value) {
|
2015-10-26 23:34:59 +01:00
|
|
|
switch (value->type) {
|
2018-03-11 04:02:12 +01:00
|
|
|
case MEMORY_DEVICE_INFO_KIND_DIMM:
|
2017-08-29 17:30:20 +02:00
|
|
|
pcdimm_info = value->u.dimm.data;
|
2018-03-11 04:02:12 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case MEMORY_DEVICE_INFO_KIND_NVDIMM:
|
|
|
|
pcdimm_info = value->u.nvdimm.data;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
pcdimm_info = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pcdimm_info) {
|
2017-08-29 17:30:20 +02:00
|
|
|
node_mem[pcdimm_info->node].node_mem += pcdimm_info->size;
|
|
|
|
if (pcdimm_info->hotpluggable && pcdimm_info->hotplugged) {
|
|
|
|
node_mem[pcdimm_info->node].node_plugged_mem +=
|
|
|
|
pcdimm_info->size;
|
|
|
|
}
|
2014-11-04 12:49:30 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
qapi_free_MemoryDeviceInfoList(info_list);
|
|
|
|
}
|
|
|
|
|
2017-08-29 17:30:20 +02:00
|
|
|
void query_numa_node_mem(NumaNodeMem node_mem[])
|
2014-11-04 12:49:30 +01:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (nb_numa_nodes <= 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
numa_stat_memory_devices(node_mem);
|
|
|
|
for (i = 0; i < nb_numa_nodes; i++) {
|
2017-08-29 17:30:20 +02:00
|
|
|
node_mem[i].node_mem += numa_info[i].node_mem;
|
2014-11-04 12:49:30 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-16 12:05:41 +02:00
|
|
|
static int query_memdev(Object *obj, void *opaque)
|
|
|
|
{
|
|
|
|
MemdevList **list = opaque;
|
2014-08-18 08:46:33 +02:00
|
|
|
MemdevList *m = NULL;
|
2014-06-16 12:05:41 +02:00
|
|
|
|
|
|
|
if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)) {
|
2014-08-18 08:46:33 +02:00
|
|
|
m = g_malloc0(sizeof(*m));
|
2014-06-16 12:05:41 +02:00
|
|
|
|
|
|
|
m->value = g_malloc0(sizeof(*m->value));
|
|
|
|
|
2018-04-30 11:48:18 +02:00
|
|
|
m->value->id = object_get_canonical_path_component(obj);
|
2017-01-10 13:53:15 +01:00
|
|
|
m->value->has_id = !!m->value->id;
|
|
|
|
|
2017-06-07 18:36:30 +02:00
|
|
|
m->value->size = object_property_get_uint(obj, "size",
|
|
|
|
&error_abort);
|
2014-06-16 12:05:41 +02:00
|
|
|
m->value->merge = object_property_get_bool(obj, "merge",
|
2015-11-23 09:35:31 +01:00
|
|
|
&error_abort);
|
2014-06-16 12:05:41 +02:00
|
|
|
m->value->dump = object_property_get_bool(obj, "dump",
|
2015-11-23 09:35:31 +01:00
|
|
|
&error_abort);
|
2014-06-16 12:05:41 +02:00
|
|
|
m->value->prealloc = object_property_get_bool(obj,
|
2015-11-23 09:35:31 +01:00
|
|
|
"prealloc",
|
|
|
|
&error_abort);
|
2014-06-16 12:05:41 +02:00
|
|
|
m->value->policy = object_property_get_enum(obj,
|
|
|
|
"policy",
|
2015-05-27 17:07:56 +02:00
|
|
|
"HostMemPolicy",
|
2015-11-23 09:35:31 +01:00
|
|
|
&error_abort);
|
2014-06-16 12:05:41 +02:00
|
|
|
object_property_get_uint16List(obj, "host-nodes",
|
2015-11-23 09:35:31 +01:00
|
|
|
&m->value->host_nodes,
|
|
|
|
&error_abort);
|
2014-06-16 12:05:41 +02:00
|
|
|
|
|
|
|
m->next = *list;
|
|
|
|
*list = m;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
MemdevList *qmp_query_memdev(Error **errp)
|
|
|
|
{
|
2015-11-23 09:35:31 +01:00
|
|
|
Object *obj = object_get_objects_root();
|
2014-08-18 08:46:35 +02:00
|
|
|
MemdevList *list = NULL;
|
2014-06-16 12:05:41 +02:00
|
|
|
|
2015-11-23 09:35:31 +01:00
|
|
|
object_child_foreach(obj, query_memdev, &list);
|
2014-06-16 12:05:41 +02:00
|
|
|
return list;
|
|
|
|
}
|
2016-10-05 17:51:23 +02:00
|
|
|
|
2016-12-20 17:31:36 +01:00
|
|
|
void ram_block_notifier_add(RAMBlockNotifier *n)
|
|
|
|
{
|
|
|
|
QLIST_INSERT_HEAD(&ram_list.ramblock_notifiers, n, next);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ram_block_notifier_remove(RAMBlockNotifier *n)
|
|
|
|
{
|
|
|
|
QLIST_REMOVE(n, next);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ram_block_notify_add(void *host, size_t size)
|
|
|
|
{
|
|
|
|
RAMBlockNotifier *notifier;
|
|
|
|
|
|
|
|
QLIST_FOREACH(notifier, &ram_list.ramblock_notifiers, next) {
|
|
|
|
notifier->ram_block_added(notifier, host, size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void ram_block_notify_remove(void *host, size_t size)
|
|
|
|
{
|
|
|
|
RAMBlockNotifier *notifier;
|
|
|
|
|
|
|
|
QLIST_FOREACH(notifier, &ram_list.ramblock_notifiers, next) {
|
|
|
|
notifier->ram_block_removed(notifier, host, size);
|
|
|
|
}
|
|
|
|
}
|