| Message ID | 1372931597-28115-10-git-send-email-gaowanlong@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On Thu, 4 Jul 2013 17:53:16 +0800 Wanlong Gao <gaowanlong@cn.fujitsu.com> wrote: > 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 mem-policy=membind,mem-hostnode=0-1 > > Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> > --- > hmp-commands.hx | 16 ++++++++++++++++ > hmp.c | 35 +++++++++++++++++++++++++++++++++++ > hmp.h | 1 + > 3 files changed, 52 insertions(+) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 915b0d1..417b69f 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,args:s?", > + .params = "nodeid [args]", > + .help = "set host memory policy for a guest NUMA node", > + .mhandler.cmd = hmp_set_mpol, > + }, > + > +STEXI > +@item set-mpol @var{nodeid} @var{args} > +@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 2daed43..57a5730 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -1482,3 +1482,38 @@ 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_hostnode = true; > + const char *mpol = NULL; > + const char *hostnode = NULL; > + QemuOpts *opts; > + > + uint64_t nodeid = qdict_get_int(qdict, "nodeid"); > + const char *args = qdict_get_try_str(qdict, "args"); > + > + if (args == NULL) { > + has_mpol = false; > + has_hostnode = false; > + } else { > + opts = qemu_opts_parse(qemu_find_opts("numa"), args, 1); > + if (opts == NULL) { > + error_setg(&local_err, "Parsing memory policy args failed"); You're still going to call qmp_set_mpol() if this fails. You can replace error_setg() to a monitor_printf() call and return. > + } else { > + mpol = qemu_opt_get(opts, "mem-policy"); > + if (mpol == NULL) { > + has_mpol = false; > + } > + hostnode = qemu_opt_get(opts, "mem-hostnode"); > + if (hostnode == NULL) { > + has_hostnode = false; > + } > + } > + } > + > + qmp_set_mpol(nodeid, has_mpol, mpol, has_hostnode, hostnode, &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
diff --git a/hmp-commands.hx b/hmp-commands.hx index 915b0d1..417b69f 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,args:s?", + .params = "nodeid [args]", + .help = "set host memory policy for a guest NUMA node", + .mhandler.cmd = hmp_set_mpol, + }, + +STEXI +@item set-mpol @var{nodeid} @var{args} +@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 2daed43..57a5730 100644 --- a/hmp.c +++ b/hmp.c @@ -1482,3 +1482,38 @@ 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_hostnode = true; + const char *mpol = NULL; + const char *hostnode = NULL; + QemuOpts *opts; + + uint64_t nodeid = qdict_get_int(qdict, "nodeid"); + const char *args = qdict_get_try_str(qdict, "args"); + + if (args == NULL) { + has_mpol = false; + has_hostnode = false; + } else { + opts = qemu_opts_parse(qemu_find_opts("numa"), args, 1); + if (opts == NULL) { + error_setg(&local_err, "Parsing memory policy args failed"); + } else { + mpol = qemu_opt_get(opts, "mem-policy"); + if (mpol == NULL) { + has_mpol = false; + } + hostnode = qemu_opt_get(opts, "mem-hostnode"); + if (hostnode == NULL) { + has_hostnode = false; + } + } + } + + qmp_set_mpol(nodeid, has_mpol, mpol, has_hostnode, hostnode, &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
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 mem-policy=membind,mem-hostnode=0-1 Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- hmp-commands.hx | 16 ++++++++++++++++ hmp.c | 35 +++++++++++++++++++++++++++++++++++ hmp.h | 1 + 3 files changed, 52 insertions(+)