Patchwork [V7,08/11] NUMA: add qmp command set-mem-policy to set memory policy for NUMA node

login
register
mail settings
Submitter Wanlong Gao
Date July 31, 2013, 6:42 a.m.
Message ID <1375252936-28496-9-git-send-email-gaowanlong@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/263600/
State New
Headers show

Comments

Wanlong Gao - July 31, 2013, 6:42 a.m.
This QMP command allows user set guest node's memory policy
through the QMP protocol. The qmp-shell command is like:
    set-mem-policy nodeid=0 policy=membind relative=true host-nodes=0-1

Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
---
 numa.c           | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 qapi-schema.json | 21 +++++++++++++++++++
 qmp-commands.hx  | 41 +++++++++++++++++++++++++++++++++++++
 3 files changed, 124 insertions(+)

Patch

diff --git a/numa.c b/numa.c
index b2c0048..c260d73 100644
--- a/numa.c
+++ b/numa.c
@@ -29,6 +29,7 @@ 
 #include "qapi/opts-visitor.h"
 #include "qapi/dealloc-visitor.h"
 #include "exec/memory.h"
+#include "qmp-commands.h"
 
 #ifdef CONFIG_NUMA
 #include <numa.h>
@@ -311,3 +312,64 @@  void set_numa_modes(void)
         }
     }
 }
+
+void qmp_set_mem_policy(uint16_t nodeid, bool has_policy, NumaNodePolicy policy,
+                        bool has_relative, bool relative,
+                        bool has_host_nodes, uint16List *host_nodes,
+                        Error **errp)
+{
+    NumaNodePolicy old_policy;
+    bool old_relative;
+    DECLARE_BITMAP(host_mem, MAX_CPUMASK_BITS);
+    uint16List *nodes;
+
+    if (nodeid >= nb_numa_nodes) {
+        error_setg(errp, "Only has '%d' NUMA nodes", nb_numa_nodes);
+        return;
+    }
+
+    bitmap_copy(host_mem, numa_info[nodeid].host_mem, MAX_CPUMASK_BITS);
+    old_policy = numa_info[nodeid].policy;
+    old_relative = numa_info[nodeid].relative;
+
+    numa_info[nodeid].policy = NUMA_NODE_POLICY_DEFAULT;
+    numa_info[nodeid].relative = false;
+    bitmap_zero(numa_info[nodeid].host_mem, MAX_CPUMASK_BITS);
+
+    if (!has_policy) {
+        if (set_node_mem_policy(nodeid) == -1) {
+            error_setg(errp, "Failed to set memory policy for node%" PRIu16,
+                       nodeid);
+            goto error;
+        }
+        return;
+    }
+
+    numa_info[nodeid].policy = policy;
+
+    if (has_relative) {
+        numa_info[nodeid].relative = relative;
+    }
+
+    if (!has_host_nodes) {
+        bitmap_fill(numa_info[nodeid].host_mem, MAX_CPUMASK_BITS);
+    }
+
+    for (nodes = host_nodes; nodes; nodes = nodes->next) {
+        bitmap_set(numa_info[nodeid].host_mem, nodes->value, 1);
+    }
+
+    if (set_node_mem_policy(nodeid) == -1) {
+        error_setg(errp, "Failed to set memory policy for node%" PRIu16,
+                   nodeid);
+        goto error;
+    }
+
+    return;
+
+error:
+    bitmap_copy(numa_info[nodeid].host_mem, host_mem, MAX_CPUMASK_BITS);
+    numa_info[nodeid].policy = old_policy;
+    numa_info[nodeid].relative = old_relative;
+    return;
+}
diff --git a/qapi-schema.json b/qapi-schema.json
index a34350c..a1e0d36 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3847,3 +3847,24 @@ 
    '*policy':     'NumaNodePolicy',
    '*relative':   'bool',
    '*host-nodes': ['uint16'] }}
+
+##
+# @set-mem-policy:
+#
+# Set the host memory binding policy for guest NUMA node.
+#
+# @nodeid: The node ID of guest NUMA node to set memory policy to.
+#
+# @policy: #optional The memory policy to be set (default 'default').
+#
+# @relative: #optional If the specified nodes are relative (default 'false')
+#
+# @host-nodes: #optional The host nodes range for memory policy.
+#
+# Returns: Nothing on success
+#
+# Since: 1.7
+##
+{ 'command': 'set-mem-policy',
+  'data': {'nodeid': 'uint16', '*policy': 'NumaNodePolicy',
+           '*relative': 'bool', '*host-nodes': ['uint16'] } }
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 2e59b0d..c8356c5 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -3051,6 +3051,7 @@  Example:
 <- { "return": {} }
 
 EQMP
+
     {
         .name       = "query-rx-filter",
         .args_type  = "name:s?",
@@ -3114,3 +3115,43 @@  Example:
    }
 
 EQMP
+
+    {
+        .name      = "set-mem-policy",
+        .args_type = "nodeid:i,policy:s?,relative:b?,host-nodes:q?",
+        .help      = "Set the host memory binding policy for guest NUMA node",
+        .mhandler.cmd_new = qmp_marshal_input_set_mem_policy,
+    },
+
+SQMP
+set-mem-policy
+------
+
+Set the host memory binding policy for guest NUMA node
+
+Arguments:
+
+- "nodeid": The nodeid of guest NUMA node to set memory policy to.
+            (json-int)
+- "policy": The memory policy to set.
+            (json-string, optional)
+- "relative": If the specified nodes are relative.
+              (json-bool, optional)
+- "host-nodes": The host nodes contained to this memory policy.
+                (a json-array of int, optional)
+
+Example:
+
+-> { "execute": "set-mem-policy", "arguments": { "nodeid": 0,
+                                                 "policy": "membind",
+                                                 "relative": true,
+                                                 "host-nodes": [0, 1] } }
+<- { "return": {} }
+
+Notes:
+    1. If "policy" is not set, the memory policy of this "nodeid" will be set
+       to "default".
+    2. If "host-nodes" is not set, the node mask of this "policy" will be set
+       to all available host nodes.
+
+EQMP