The memory policy setting format is like: policy={default|membind|interleave|preferred}[,relative=true],host-nodes=N-N And we are adding this setting as a suboption of "-numa mem,", the memory policy then can be set like following: -numa node,nodeid=0,cpus=0 \ -numa node,nodeid=1,cpus=1 \ -numa mem,nodeid=0,size=1G,policy=membind,host-nodes=0-1 \ -numa mem,nodeid=1,size=1G,policy=interleave,relative=true,host-nodes=1
Signed-off-by: Wanlong Gao <gaowanl...@cn.fujitsu.com> --- include/sysemu/sysemu.h | 3 +++ numa.c | 18 ++++++++++++++++++ qapi-schema.json | 33 +++++++++++++++++++++++++++++++-- vl.c | 3 +++ 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 995cf3b..9707195 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -139,6 +139,9 @@ extern int nb_numa_mem_nodes; typedef struct node_info { uint64_t node_mem; DECLARE_BITMAP(node_cpu, MAX_CPUMASK_BITS); + DECLARE_BITMAP(host_mem, MAX_NODES); + NumaNodePolicy policy; + bool relative; } NodeInfo; extern NodeInfo numa_info[MAX_NODES]; void set_numa_nodes(void); diff --git a/numa.c b/numa.c index c676c5e..da4dbbd 100644 --- a/numa.c +++ b/numa.c @@ -78,6 +78,7 @@ static int numa_mem_parse(NumaMemOptions *opts) { uint16_t nodenr; uint64_t mem_size; + uint16List *nodes; if (opts->has_nodeid) { nodenr = opts->nodeid; @@ -96,6 +97,23 @@ static int numa_mem_parse(NumaMemOptions *opts) numa_info[nodenr].node_mem = mem_size; } + if (opts->has_policy) { + numa_info[nodenr].policy = opts->policy; + } + + if (opts->has_relative) { + numa_info[nodenr].relative = opts->relative; + } + + for (nodes = opts->host_nodes; nodes; nodes = nodes->next) { + if (nodes->value > MAX_NODES) { + fprintf(stderr, "qemu: node number %" PRIu16 " is bigger than %d\n", + nodes->value, MAX_NODES); + continue; + } + bitmap_set(numa_info[nodenr].host_mem, nodes->value, 1); + } + return 0; } diff --git a/qapi-schema.json b/qapi-schema.json index a19e453..804d44a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4221,6 +4221,26 @@ '*mem': 'str' }} ## +# @NumaNodePolicy +# +# NUMA node policy types +# +# @default: restore default policy, remove any nondefault policy +# +# @preferred: set the preferred node for allocation +# +# @membind: a strict policy that restricts memory allocation to the +# nodes specified +# +# @interleave: the page allocations is interleaved across the set +# of nodes specified +# +# Since 1.7 +## +{ 'enum': 'NumaNodePolicy', + 'data': [ 'default', 'preferred', 'membind', 'interleave' ] } + +## # @NumaMemOptions # # Set memory information of guest NUMA node. (for OptsVisitor) @@ -4229,9 +4249,18 @@ # # @size: #optional memory size of this node # +# @policy: #optional memory policy of this node +# +# @relative: #optional if the nodes specified are relative +# +# @host-nodes: #optional host nodes for its memory policy +# # Since 1.7 ## { 'type': 'NumaMemOptions', 'data': { - '*nodeid': 'uint16', - '*size': 'size' }} + '*nodeid': 'uint16', + '*size': 'size', + '*policy': 'NumaNodePolicy', + '*relative': 'bool', + '*host-nodes': ['uint16'] }} diff --git a/vl.c b/vl.c index 190d5d7..0d7a663 100644 --- a/vl.c +++ b/vl.c @@ -2814,6 +2814,9 @@ int main(int argc, char **argv, char **envp) for (i = 0; i < MAX_NODES; i++) { numa_info[i].node_mem = 0; bitmap_zero(numa_info[i].node_cpu, MAX_CPUMASK_BITS); + bitmap_zero(numa_info[i].host_mem, MAX_NODES); + numa_info[i].policy = NUMA_NODE_POLICY_DEFAULT; + numa_info[i].relative = false; } nb_numa_nodes = 0; -- 1.8.4.1.600.g3d092bf