Patchwork [6/7] NUMA: add hmp command set-mpol

login
register
mail settings
Submitter Wanlong Gao
Date June 18, 2013, 8:09 a.m.
Message ID <1371542991-15911-7-git-send-email-gaowanlong@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/252129/
State New
Headers show

Comments

Wanlong Gao - June 18, 2013, 8:09 a.m.
Add hmp command set-mpol to set host memory policy for a guest
NUMA node. Then we can also set node's memory policy using
the monitor command like:
    (qemu) set-mpol 0 membind 0-1

Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
---
 hmp-commands.hx | 16 ++++++++++++++++
 hmp.c           | 22 ++++++++++++++++++++++
 hmp.h           |  1 +
 3 files changed, 39 insertions(+)
Paolo Bonzini - June 18, 2013, 9:23 a.m.
Il 18/06/2013 10:09, Wanlong Gao ha scritto:
> Add hmp command set-mpol to set host memory policy for a guest
> NUMA node. Then we can also set node's memory policy using
> the monitor command like:
>     (qemu) set-mpol 0 membind 0-1

I suggest something similar to what chardev-add does: Just make it
"set-mpol <nodeid> <qemuopts>", for example

 (qemu) set-mpol 0 mem-policy=membind,mem-hostnode=0-1

Similar to the command-line syntax.

Paolo

> Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
> ---
>  hmp-commands.hx | 16 ++++++++++++++++
>  hmp.c           | 22 ++++++++++++++++++++++
>  hmp.h           |  1 +
>  3 files changed, 39 insertions(+)
> 
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index 915b0d1..fd3505e 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -1567,6 +1567,22 @@ Executes a qemu-io command on the given block device.
>  ETEXI
>  
>      {
> +        .name       = "set-mpol",
> +        .args_type  = "nodeid:i,mpol:s?,nodemask:s?",
> +        .params     = "nodeid [mpol] [nodemask]",
> +        .help       = "set host memory policy for a guest NUMA node",
> +        .mhandler.cmd = hmp_set_mpol,
> +    },
> +
> +STEXI
> +@item set-mpol @var{nodeid} @var{mpol} @var{nodemask}
> +@findex set-mpol
> +
> +Set host memory policy for a guest NUMA node
> +
> +ETEXI
> +
> +    {
>          .name       = "info",
>          .args_type  = "item:s?",
>          .params     = "[subcommand]",
> diff --git a/hmp.c b/hmp.c
> index 494a9aa..2e5315e 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -1464,3 +1464,25 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict)
>  
>      hmp_handle_error(mon, &err);
>  }
> +
> +void hmp_set_mpol(Monitor *mon, const QDict *qdict)
> +{
> +    Error *local_err = NULL;
> +    bool has_mpol = true;
> +    bool has_nodemask = true;
> +
> +    uint64_t nodeid = qdict_get_int(qdict, "nodeid");
> +    const char *mpol = qdict_get_try_str(qdict, "mpol");
> +    const char *nodemask = qdict_get_try_str(qdict, "nodemask");
> +
> +    if (mpol == NULL) {
> +        has_mpol = false;
> +    }
> +
> +    if (nodemask == NULL) {
> +        has_nodemask = false;
> +    }
> +
> +    qmp_set_mpol(nodeid, has_mpol, mpol, has_nodemask, nodemask, &local_err);
> +    hmp_handle_error(mon, &local_err);
> +}
> diff --git a/hmp.h b/hmp.h
> index 56d2e92..81f631b 100644
> --- a/hmp.h
> +++ b/hmp.h
> @@ -86,5 +86,6 @@ void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict);
>  void hmp_chardev_add(Monitor *mon, const QDict *qdict);
>  void hmp_chardev_remove(Monitor *mon, const QDict *qdict);
>  void hmp_qemu_io(Monitor *mon, const QDict *qdict);
> +void hmp_set_mpol(Monitor *mon, const QDict *qdict);
>  
>  #endif
>
Wanlong Gao - June 18, 2013, 9:49 a.m.
On 06/18/2013 05:23 PM, Paolo Bonzini wrote:
> Il 18/06/2013 10:09, Wanlong Gao ha scritto:
>> Add hmp command set-mpol to set host memory policy for a guest
>> NUMA node. Then we can also set node's memory policy using
>> the monitor command like:
>>     (qemu) set-mpol 0 membind 0-1
> 
> I suggest something similar to what chardev-add does: Just make it
> "set-mpol <nodeid> <qemuopts>", for example
> 
>  (qemu) set-mpol 0 mem-policy=membind,mem-hostnode=0-1
> 
> Similar to the command-line syntax.

That's better, I'll try to change like this, thank you very much. ;)

Regards,
Wanlong Gao

> 
> Paolo
> 
>> Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
>> ---
>>  hmp-commands.hx | 16 ++++++++++++++++
>>  hmp.c           | 22 ++++++++++++++++++++++
>>  hmp.h           |  1 +
>>  3 files changed, 39 insertions(+)
>>
>> diff --git a/hmp-commands.hx b/hmp-commands.hx
>> index 915b0d1..fd3505e 100644
>> --- a/hmp-commands.hx
>> +++ b/hmp-commands.hx
>> @@ -1567,6 +1567,22 @@ Executes a qemu-io command on the given block device.
>>  ETEXI
>>  
>>      {
>> +        .name       = "set-mpol",
>> +        .args_type  = "nodeid:i,mpol:s?,nodemask:s?",
>> +        .params     = "nodeid [mpol] [nodemask]",
>> +        .help       = "set host memory policy for a guest NUMA node",
>> +        .mhandler.cmd = hmp_set_mpol,
>> +    },
>> +
>> +STEXI
>> +@item set-mpol @var{nodeid} @var{mpol} @var{nodemask}
>> +@findex set-mpol
>> +
>> +Set host memory policy for a guest NUMA node
>> +
>> +ETEXI
>> +
>> +    {
>>          .name       = "info",
>>          .args_type  = "item:s?",
>>          .params     = "[subcommand]",
>> diff --git a/hmp.c b/hmp.c
>> index 494a9aa..2e5315e 100644
>> --- a/hmp.c
>> +++ b/hmp.c
>> @@ -1464,3 +1464,25 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict)
>>  
>>      hmp_handle_error(mon, &err);
>>  }
>> +
>> +void hmp_set_mpol(Monitor *mon, const QDict *qdict)
>> +{
>> +    Error *local_err = NULL;
>> +    bool has_mpol = true;
>> +    bool has_nodemask = true;
>> +
>> +    uint64_t nodeid = qdict_get_int(qdict, "nodeid");
>> +    const char *mpol = qdict_get_try_str(qdict, "mpol");
>> +    const char *nodemask = qdict_get_try_str(qdict, "nodemask");
>> +
>> +    if (mpol == NULL) {
>> +        has_mpol = false;
>> +    }
>> +
>> +    if (nodemask == NULL) {
>> +        has_nodemask = false;
>> +    }
>> +
>> +    qmp_set_mpol(nodeid, has_mpol, mpol, has_nodemask, nodemask, &local_err);
>> +    hmp_handle_error(mon, &local_err);
>> +}
>> diff --git a/hmp.h b/hmp.h
>> index 56d2e92..81f631b 100644
>> --- a/hmp.h
>> +++ b/hmp.h
>> @@ -86,5 +86,6 @@ void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict);
>>  void hmp_chardev_add(Monitor *mon, const QDict *qdict);
>>  void hmp_chardev_remove(Monitor *mon, const QDict *qdict);
>>  void hmp_qemu_io(Monitor *mon, const QDict *qdict);
>> +void hmp_set_mpol(Monitor *mon, const QDict *qdict);
>>  
>>  #endif
>>
> 
>

Patch

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 915b0d1..fd3505e 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1567,6 +1567,22 @@  Executes a qemu-io command on the given block device.
 ETEXI
 
     {
+        .name       = "set-mpol",
+        .args_type  = "nodeid:i,mpol:s?,nodemask:s?",
+        .params     = "nodeid [mpol] [nodemask]",
+        .help       = "set host memory policy for a guest NUMA node",
+        .mhandler.cmd = hmp_set_mpol,
+    },
+
+STEXI
+@item set-mpol @var{nodeid} @var{mpol} @var{nodemask}
+@findex set-mpol
+
+Set host memory policy for a guest NUMA node
+
+ETEXI
+
+    {
         .name       = "info",
         .args_type  = "item:s?",
         .params     = "[subcommand]",
diff --git a/hmp.c b/hmp.c
index 494a9aa..2e5315e 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1464,3 +1464,25 @@  void hmp_qemu_io(Monitor *mon, const QDict *qdict)
 
     hmp_handle_error(mon, &err);
 }
+
+void hmp_set_mpol(Monitor *mon, const QDict *qdict)
+{
+    Error *local_err = NULL;
+    bool has_mpol = true;
+    bool has_nodemask = true;
+
+    uint64_t nodeid = qdict_get_int(qdict, "nodeid");
+    const char *mpol = qdict_get_try_str(qdict, "mpol");
+    const char *nodemask = qdict_get_try_str(qdict, "nodemask");
+
+    if (mpol == NULL) {
+        has_mpol = false;
+    }
+
+    if (nodemask == NULL) {
+        has_nodemask = false;
+    }
+
+    qmp_set_mpol(nodeid, has_mpol, mpol, has_nodemask, nodemask, &local_err);
+    hmp_handle_error(mon, &local_err);
+}
diff --git a/hmp.h b/hmp.h
index 56d2e92..81f631b 100644
--- a/hmp.h
+++ b/hmp.h
@@ -86,5 +86,6 @@  void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict);
 void hmp_chardev_add(Monitor *mon, const QDict *qdict);
 void hmp_chardev_remove(Monitor *mon, const QDict *qdict);
 void hmp_qemu_io(Monitor *mon, const QDict *qdict);
+void hmp_set_mpol(Monitor *mon, const QDict *qdict);
 
 #endif