From patchwork Sun Oct 8 07:24:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9991757 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 02E2C60244 for ; Sun, 8 Oct 2017 07:48:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E900728689 for ; Sun, 8 Oct 2017 07:48:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDE5B28713; Sun, 8 Oct 2017 07:48:11 +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 4091E28689 for ; Sun, 8 Oct 2017 07:48:11 +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 1e16Gz-0002kn-Aj; Sun, 08 Oct 2017 07:45:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e16Gy-0002iP-4A for xen-devel@lists.xenproject.org; Sun, 08 Oct 2017 07:45:16 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id D7/F5-01894-B87D9D95; Sun, 08 Oct 2017 07:45:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCIsWRWlGSWpSXmKPExsXS1tYhr9t1/Wa kwf5n8hbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0bHvF0sBS1OFUv3rGZsYNxi2MXIySEkUCFx pf8FG4gtIcArcWTZDFYIO0Di2Z8DQHEuoJoGRolDc6exgCTYBNQlHn/tYQKxRQSUJO6tmgxmM wtcZ5TomRvbxcjBISyQItGzJxUkzCKgKtF87TrYfF4BD4n719cwQsyXkzh5bDLYLk6g+KzzG9 gh7nGXWL26nRGiXlDi5MwnLCAjmYHWrp8nBLFJXqJ562zmCYwCs5BUzUKomoWkagEj8ypG9eL UorLUIl1jvaSizPSMktzEzBxdQwNTvdzU4uLE9NScxKRiveT83E2MwLBkAIIdjHv/OR1ilORg UhLl/XPlZqQQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV77a0A5waLU9NSKtMwcYITApCU4eJREe CdfAkrzFhck5hZnpkOkTjEacxzbdPkPE0fHzbt/mIRY8vLzUqXEeWNBJgmAlGaU5sENgkXuJU ZZKWFeRqDThHgKUotyM0tQ5V8xinMwKgnzeoFM4cnMK4Hb9wroFCagUxiLb4CcUpKIkJJqYAz 9U7E+WeJ99nTHnyYmEt7amz9+n3lQfi3PmZQujeit3+Oivt6UDMv1YJteFRj9lOPmhSM75pat ldPd7yBYVJktYXzTzv6p/bZlCYneLsf+r6tlfp9afHvG9B32pxZwpPZFX1whlqv3hiNh6+b30 caCr6ax1osc8536eykD362dynd3+yt+U1diKc5INNRiLipOBADmlZPx1wIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1507448712!105841875!1 X-Originating-IP: [134.134.136.31] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8670 invoked from network); 8 Oct 2017 07:45:14 -0000 Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by server-8.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Oct 2017 07:45:14 -0000 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP; 08 Oct 2017 00:45:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.42,493,1500966000"; d="scan'208"; a="1022874926" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.75]) by orsmga003.jf.intel.com with ESMTP; 08 Oct 2017 00:45:01 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Sun, 8 Oct 2017 15:24:00 +0800 Message-Id: <1507447441-5422-16-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507447441-5422-1-git-send-email-yi.y.sun@linux.intel.com> References: <1507447441-5422-1-git-send-email-yi.y.sun@linux.intel.com> MIME-Version: 1.0 Cc: Wei Liu , Chao Peng , Yi Sun , Ian Jackson , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [Xen-devel] [PATCH v6 15/16] tools: implement new generic set value interface and MBA set value command 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch implements new generic set value interfaces in libxc and libxl. These interfaces are suitable for all allocation features. It also adds a new MBA set value command in xl. Signed-off-by: Yi Sun Reviewed-by: Roger Pau Monné Acked-by: Wei Liu --- CC: Wei Liu CC: Ian Jackson CC: Roger Pau Monné CC: Chao Peng v5: - move xc_type definition and value get out of the loop. (suggested by Roger Pau Monné) v4: - remove 'ALLOC_' from macro name. (suggested by Roger Pau Monné) - adjust place of argc check and return EXIT_FAILURE. (suggested by Roger Pau Monné) - fix indentation issue. (suggested by Roger Pau Monné) - move same type local variables declaration to a single line. (suggested by Roger Pau Monné) v3: - add 'const' for 'opts[]' in 'main_psr_mba_set'. (suggested by Roger Pau Monné) - replace 'libxl_psr_cbm_type' to 'libxl_psr_type' for newly defined interfaces. (suggested by Roger Pau Monné) --- tools/libxc/include/xenctrl.h | 6 ++--- tools/libxc/xc_psr.c | 9 ++++--- tools/libxl/libxl_psr.c | 52 ++++++++++++++++++++-------------------- tools/xl/xl.h | 1 + tools/xl/xl_cmdtable.c | 6 +++++ tools/xl/xl_psr.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 96 insertions(+), 33 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index dcea09e..f2463f9 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2512,9 +2512,9 @@ int xc_psr_cmt_get_data(xc_interface *xch, uint32_t rmid, uint32_t cpu, uint64_t *tsc); int xc_psr_cmt_enabled(xc_interface *xch); -int xc_psr_cat_set_domain_data(xc_interface *xch, uint32_t domid, - xc_psr_type type, uint32_t target, - uint64_t data); +int xc_psr_set_domain_data(xc_interface *xch, uint32_t domid, + xc_psr_type type, uint32_t target, + uint64_t data); int xc_psr_get_domain_data(xc_interface *xch, uint32_t domid, xc_psr_type type, uint32_t target, uint64_t *data); diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index 191de97..1609185 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -248,9 +248,9 @@ int xc_psr_cmt_enabled(xc_interface *xch) return 0; } -int xc_psr_cat_set_domain_data(xc_interface *xch, uint32_t domid, - xc_psr_type type, uint32_t target, - uint64_t data) +int xc_psr_set_domain_data(xc_interface *xch, uint32_t domid, + xc_psr_type type, uint32_t target, + uint64_t data) { DECLARE_DOMCTL; uint32_t cmd; @@ -269,6 +269,9 @@ int xc_psr_cat_set_domain_data(xc_interface *xch, uint32_t domid, case XC_PSR_CAT_L2_CBM: cmd = XEN_DOMCTL_PSR_SET_L2_CBM; break; + case XC_PSR_MBA_THRTL: + cmd = XEN_DOMCTL_PSR_SET_MBA_THRTL; + break; default: errno = EINVAL; return -1; diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index 7c560bc..9ced7d1 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -328,32 +328,7 @@ int libxl_psr_cat_set_cbm(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_type xc_type = libxl__psr_type_to_libxc_psr_type(type); - - if (socketid >= nr_sockets) - break; - - if (xc_psr_cat_set_domain_data(ctx->xch, domid, xc_type, - socketid, cbm)) { - libxl__psr_alloc_log_err_msg(gc, errno, type); - rc = ERROR_FAIL; - } - } - -out: - GC_FREE; - return rc; + return libxl_psr_set_val(ctx, domid, type, target_map, cbm); } int libxl_psr_cat_get_cbm(libxl_ctx *ctx, uint32_t domid, @@ -453,7 +428,30 @@ int libxl_psr_set_val(libxl_ctx *ctx, uint32_t domid, libxl_psr_type type, libxl_bitmap *target_map, uint64_t val) { - return ERROR_FAIL; + GC_INIT(ctx); + int rc, socketid, nr_sockets; + xc_psr_type xc_type = libxl__psr_type_to_libxc_psr_type(type); + + rc = libxl__count_physical_sockets(gc, &nr_sockets); + if (rc) { + LOG(ERROR, "failed to get system socket count"); + goto out; + } + + libxl_for_each_set_bit(socketid, *target_map) { + if (socketid >= nr_sockets) + break; + + if (xc_psr_set_domain_data(ctx->xch, domid, xc_type, + socketid, val)) { + libxl__psr_alloc_log_err_msg(gc, errno, type); + rc = ERROR_FAIL; + } + } + +out: + GC_FREE; + return rc; } int libxl_psr_get_val(libxl_ctx *ctx, uint32_t domid, diff --git a/tools/xl/xl.h b/tools/xl/xl.h index a72458b..4e784ff 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -208,6 +208,7 @@ int main_psr_cmt_detach(int argc, char **argv); int main_psr_cmt_show(int argc, char **argv); int main_psr_cat_cbm_set(int argc, char **argv); int main_psr_cat_show(int argc, char **argv); +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/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index cac2014..3339311 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -585,6 +585,12 @@ struct cmd_spec cmd_table[] = { "[options] ", "-l Specify the cache level to process, otherwise L3 cache is processed\n" }, + { "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", diff --git a/tools/xl/xl_psr.c b/tools/xl/xl_psr.c index 0eedbc7..181d300 100644 --- a/tools/xl/xl_psr.c +++ b/tools/xl/xl_psr.c @@ -552,6 +552,61 @@ int main_psr_mba_show(int argc, char **argv) return psr_val_show(domid, LIBXL_PSR_FEAT_TYPE_MBA, 0); } +int main_psr_mba_set(int argc, char **argv) +{ + uint32_t domid; + libxl_psr_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 const struct option opts[] = { + {"socket", 1, 0, 's'}, + COMMON_LONG_OPTS + }; + + if (argc != optind + 2) { + help("psr-mba-set"); + return EXIT_FAILURE; + } + + 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); + + 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; +} + static int psr_mba_hwinfo(void) { int rc;