From patchwork Wed Jul 31 06:42:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanlong Gao X-Patchwork-Id: 263599 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 614762C009F for ; Wed, 31 Jul 2013 16:46:19 +1000 (EST) Received: from localhost ([::1]:35254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4QAp-0007Wu-CO for incoming@patchwork.ozlabs.org; Wed, 31 Jul 2013 02:46:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4Q74-0002Yv-CN for qemu-devel@nongnu.org; Wed, 31 Jul 2013 02:42:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4Q6y-0002Nb-7l for qemu-devel@nongnu.org; Wed, 31 Jul 2013 02:42:22 -0400 Received: from [222.73.24.84] (port=43861 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4Q6x-0002M7-Ra for qemu-devel@nongnu.org; Wed, 31 Jul 2013 02:42:16 -0400 X-IronPort-AV: E=Sophos;i="4.89,785,1367942400"; d="scan'208";a="8074957" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 31 Jul 2013 14:39:04 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r6V6g2wl009393; Wed, 31 Jul 2013 14:42:04 +0800 Received: from G08FNSTD121251.fnst.cn.fujitsu.com ([10.167.226.75]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013073114395008-281721 ; Wed, 31 Jul 2013 14:39:50 +0800 From: Wanlong Gao To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2013 14:42:14 +0800 Message-Id: <1375252936-28496-10-git-send-email-gaowanlong@cn.fujitsu.com> X-Mailer: git-send-email 1.8.4.rc0.11.g35f5eaa In-Reply-To: <1375252936-28496-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1375252936-28496-1-git-send-email-gaowanlong@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/07/31 14:39:50, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/07/31 14:39:52, Serialize complete at 2013/07/31 14:39:52 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: aliguori@us.ibm.com, ehabkost@redhat.com, lersek@redhat.com, peter.huangpeng@huawei.com, lcapitulino@redhat.com, bsd@redhat.com, hutao@cn.fujitsu.com, y-goto@jp.fujitsu.com, pbonzini@redhat.com, afaerber@suse.de, gaowanlong@cn.fujitsu.com Subject: [Qemu-devel] [PATCH V7 09/11] NUMA: add hmp command set-mem-policy X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add hmp command set-mem-policy 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-mem-policy 0 policy=membind,relative=false,host-nodes=0-1 Signed-off-by: Wanlong Gao --- hmp-commands.hx | 16 ++++++++++++++ hmp.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ hmp.h | 1 + 3 files changed, 82 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 8c6b91a..fe3a26f 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1587,6 +1587,22 @@ Executes a qemu-io command on the given block device. ETEXI { + .name = "set-mem-policy", + .args_type = "nodeid:i,args:s?", + .params = "nodeid [args]", + .help = "set host memory policy for a guest NUMA node", + .mhandler.cmd = hmp_set_mem_policy, + }, + +STEXI +@item set-mem-policy @var{nodeid} @var{args} +@findex set-mem-policy + +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 c45514b..98d2a76 100644 --- a/hmp.c +++ b/hmp.c @@ -24,6 +24,9 @@ #include "ui/console.h" #include "block/qapi.h" #include "qemu-io.h" +#include "qapi-visit.h" +#include "qapi/opts-visitor.h" +#include "qapi/dealloc-visitor.h" static void hmp_handle_error(Monitor *mon, Error **errp) { @@ -1514,3 +1517,65 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &err); } + +void hmp_set_mem_policy(Monitor *mon, const QDict *qdict) +{ + Error *local_err = NULL; + bool has_policy = true; + bool has_relative = true; + bool has_host_nodes = true; + QemuOpts *opts; + NumaMemOptions *object = NULL; + NumaNodePolicy policy = NUMA_NODE_POLICY_DEFAULT; + bool relative = false; + uint16List *host_nodes = NULL; + + uint64_t nodeid = qdict_get_int(qdict, "nodeid"); + const char *args = qdict_get_try_str(qdict, "args"); + + if (args == NULL) { + has_policy = false; + has_relative = false; + has_host_nodes = false; + } else { + opts = qemu_opts_parse(qemu_find_opts("numa"), args, 1); + if (opts == NULL) { + monitor_printf(mon, "Parsing memory policy args failed\n"); + return; + } else { + OptsVisitor *ov = opts_visitor_new(opts); + visit_type_NumaMemOptions(opts_get_visitor(ov), &object, NULL, + &local_err); + opts_visitor_cleanup(ov); + + if (error_is_set(&local_err)) { + goto error; + } + + has_policy = object->has_policy; + if (has_policy) { + policy = object->policy; + } + has_relative = object->has_relative; + if (has_relative) { + relative = object->relative; + } + has_host_nodes = object->has_host_nodes; + if (has_host_nodes) { + host_nodes = object->host_nodes; + } + } + } + + qmp_set_mem_policy(nodeid, has_policy, policy, has_relative, relative, + has_host_nodes, host_nodes, &local_err); +error: + if (object) { + QapiDeallocVisitor *dv = qapi_dealloc_visitor_new(); + visit_type_NumaMemOptions(qapi_dealloc_get_visitor(dv), + &object, NULL, NULL); + qapi_dealloc_visitor_cleanup(dv); + } + + hmp_handle_error(mon, &local_err); +} diff --git a/hmp.h b/hmp.h index 6c3bdcd..ae09525 100644 --- a/hmp.h +++ b/hmp.h @@ -87,5 +87,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_mem_policy(Monitor *mon, const QDict *qdict); #endif