From patchwork Tue Jan 10 07:42:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9506627 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A2AEF606E1 for ; Tue, 10 Jan 2017 07:45:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9632528156 for ; Tue, 10 Jan 2017 07:45:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B08C28485; Tue, 10 Jan 2017 07:45:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2312928156 for ; Tue, 10 Jan 2017 07:45:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cQr67-0004HJ-4p; Tue, 10 Jan 2017 07:43:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cQr65-0004FN-Ui for xen-devel@lists.xenproject.org; Tue, 10 Jan 2017 07:43:58 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 51/37-25657-DB094785; Tue, 10 Jan 2017 07:43:57 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRWlGSWpSXmKPExsVywNykWHfPhJI Ig7ff1Sy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxL5z+wFlzXqVi5eQNLA+MypS5GTg4hgUqJ 9+fb2EBsCQFeiSPLZrBC2P4SVy+vZ+9i5AKqaWCUeNK3lhkkwSagLvH4aw8TiC0ioCRxb9VkJ pAiZoH9jBLzjx8HKxIWsJHY23MXbBKLgKrEpc2vweK8Ah4SB64/Y4bYICdx8thksBpOoHjL1X WMEBe5SzS/vc84gZF3ASPDKkaN4tSistQiXWMDvaSizPSMktzEzBxdQwNjvdzU4uLE9NScxKR iveT83E2MwICoZ2Bg3MHYecLvEKMkB5OSKG+KbkmEEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQne qn6gnGBRanpqRVpmDjA0YdISHDxKIrwsIGne4oLE3OLMdIjUKUZFKXHeQJCEAEgiozQPrg0WD 5cYZaWEeRkZGBiEeApSi3IzS1DlXzGKczAqCfM2g0zhycwrgZv+CmgxE9DiSLtikMUliQgpqQ bGLBaZxR9ELjy4futbiOMmIXOd4xZKHxKZH1zb/fZrLueimceneWk2JFZvF+Mqd9jh/9bDZpt a5uVXs+I+XUv73HhVc0/KqVPCn6QTZr+d0e/BlL/mg1pL+o/aVyHMEaFnfpYq39y/ePKEzSGP hCuz52jmPp7Tlbv4ttzO98K9q39wMaxl6WS2UmIpzkg01GIuKk4EACPltYGCAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1484034224!62972679!5 X-Originating-IP: [192.55.52.115] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 33828 invoked from network); 10 Jan 2017 07:43:56 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by server-12.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Jan 2017 07:43:56 -0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP; 09 Jan 2017 23:43:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,343,1477983600"; d="scan'208";a="211583298" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by fmsmga004.fm.intel.com with ESMTP; 09 Jan 2017 23:43:53 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Tue, 10 Jan 2017 15:42:34 +0800 Message-Id: <1484034155-4521-16-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484034155-4521-1-git-send-email-yi.y.sun@linux.intel.com> References: <1484034155-4521-1-git-send-email-yi.y.sun@linux.intel.com> Cc: wei.liu2@citrix.com, he.chen@linux.intel.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, Yi Sun , jbeulich@suse.com, chao.p.peng@linux.intel.com Subject: [Xen-devel] [RFC 15/16] tools: implemet set value flow for MBA. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch implements set value flow in tools for MBA. Signed-off-by: Yi Sun --- tools/libxc/xc_psr.c | 3 +++ tools/libxl/libxl.h | 3 +++ tools/libxl/libxl_psr.c | 33 ++++++++++++++++++++++++++++ tools/libxl/xl.h | 1 + tools/libxl/xl_cmdimpl.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ tools/libxl/xl_cmdtable.c | 6 ++++++ 6 files changed, 101 insertions(+) diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index 9348578..590700c 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -269,6 +269,9 @@ int xc_psr_set_domain_data(xc_interface *xch, uint32_t domid, case XC_PSR_CAT_L2_CBM: cmd = XEN_DOMCTL_PSR_CAT_OP_SET_L2_CBM; break; + case XC_PSR_MBA_THRTL: + cmd = XEN_DOMCTL_PSR_MBA_OP_SET_THRTL; + break; default: errno = EINVAL; return -1; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 4c42c00..a5ad730 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -2167,6 +2167,9 @@ int libxl_psr_cmt_get_sample(libxl_ctx *ctx, int libxl_psr_cat_set_cbm(libxl_ctx *ctx, uint32_t domid, libxl_psr_cbm_type type, libxl_bitmap *target_map, uint64_t cbm); +int libxl_psr_set_val(libxl_ctx *ctx, uint32_t domid, + libxl_psr_cbm_type type, libxl_bitmap *target_map, + uint64_t val); /* * Function to get a domain's cbm. It operates on a single 'target'. * The definition of 'target' is related to 'type': diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index fac2617..6ba4797 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -408,6 +408,39 @@ int libxl_psr_cat_get_cbm(libxl_ctx *ctx, uint32_t domid, return rc; } +int libxl_psr_set_val(libxl_ctx *ctx, uint32_t domid, + libxl_psr_cbm_type type, libxl_bitmap *target_map, + uint64_t cbm) +{ + GC_INIT(ctx); + int rc; + int socketid, nr_sockets; + + rc = libxl__count_physical_sockets(gc, &nr_sockets); + if (rc) { + LOGED(ERROR, domid, "failed to get system socket count"); + goto out; + } + + libxl_for_each_set_bit(socketid, *target_map) { + xc_psr_val_type xc_type; + + if (socketid >= nr_sockets) + break; + + xc_type = libxl__psr_cbm_type_to_libxc_psr_val_type(type); + if (xc_psr_set_domain_data(ctx->xch, domid, xc_type, + socketid, cbm)) { + libxl__psr_alloc_log_err_msg(gc, type, errno); + rc = ERROR_FAIL; + } + } + +out: + GC_FREE; + return rc; +} + int libxl_psr_get_val(libxl_ctx *ctx, uint32_t domid, libxl_psr_cbm_type type, uint32_t target, uint64_t *val) diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 2d0e676..c431348 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -134,6 +134,7 @@ int main_psr_cat_cbm_set(int argc, char **argv); int main_psr_cat_show(int argc, char **argv); #endif #ifdef LIBXL_HAVE_PSR_MBA +int main_psr_mba_set(int argc, char **argv); int main_psr_mba_show(int argc, char **argv); #endif int main_qemu_monitor_command(int argc, char **argv); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 2263635..e6c20b4 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -9652,6 +9652,61 @@ int main_psr_mba_show(int argc, char **argv) return psr_mba_show(domid); } + +int main_psr_mba_set(int argc, char **argv) +{ + uint32_t domid; + libxl_psr_cbm_type type; + uint64_t thrtl; + int ret, opt = 0; + libxl_bitmap target_map; + char *value; + libxl_string_list socket_list; + unsigned long start, end; + unsigned int i, j, len; + + static struct option opts[] = { + {"socket", 1, 0, 's'}, + COMMON_LONG_OPTS + }; + + libxl_socket_bitmap_alloc(ctx, &target_map, 0); + libxl_bitmap_set_none(&target_map); + + SWITCH_FOREACH_OPT(opt, "s", opts, "psr-mba-set", 0) { + case 's': + trim(isspace, optarg, &value); + split_string_into_string_list(value, ",", &socket_list); + len = libxl_string_list_length(&socket_list); + for (i = 0; i < len; i++) { + parse_range(socket_list[i], &start, &end); + for (j = start; j <= end; j++) + libxl_bitmap_set(&target_map, j); + } + + libxl_string_list_dispose(&socket_list); + free(value); + break; + } + + type = LIBXL_PSR_CBM_TYPE_MBA_THRTL; + + if (libxl_bitmap_is_empty(&target_map)) + libxl_bitmap_set_any(&target_map); + + if (argc != optind + 2) { + help("psr-mba-set"); + return 2; + } + + domid = find_domain(argv[optind]); + thrtl = strtoll(argv[optind + 1], NULL , 0); + + ret = libxl_psr_set_val(ctx, domid, type, &target_map, thrtl); + + libxl_bitmap_dispose(&target_map); + return ret; +} #endif int main_psr_cat_cbm_set(int argc, char **argv) diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index b7fc276..c8b83ab 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -566,6 +566,12 @@ struct cmd_spec cmd_table[] = { #endif #ifdef LIBXL_HAVE_PSR_MBA + { "psr-mba-set", + &main_psr_mba_set, 0, 1, + "Set throttling value (THRTL) for a domain", + "[options] ", + "-s Specify the socket to process, otherwise all sockets are processed\n" + }, { "psr-mba-show", &main_psr_mba_show, 0, 1, "Show Memory Bandwidth Allocation information",