From patchwork Tue Sep 5 09:32:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9938351 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 EEFB5601EB for ; Tue, 5 Sep 2017 09:54:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E137128902 for ; Tue, 5 Sep 2017 09:54:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D611A2890B; Tue, 5 Sep 2017 09:54:12 +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 4B86228902 for ; Tue, 5 Sep 2017 09:54:12 +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 1dpAWf-0007iE-0h; Tue, 05 Sep 2017 09:52:09 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpAWd-0007gH-J7 for xen-devel@lists.xenproject.org; Tue, 05 Sep 2017 09:52:07 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id E5/F7-09760-6C37EA95; Tue, 05 Sep 2017 09:52:06 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPIsWRWlGSWpSXmKPExsXS1tYhoXu4eF2 kwZ6tLBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8ap3dNYCj7aVCw/at7AOF23i5GLQ0hgOqNE 58bDbF2MnBwSArwSR5bNYIWw/SUe9RxkgShqYJRoWP6cBSTBJqAu8fhrDxOILSKgJHFv1WQmk CJmgXNMEns+7gBLCAukSNzduhzMZhFQlXj66BdQMwcHr4CHRMsLD4gFchInj01mBQlzAoWXXq sDCQsJuEv82XYX7AZeAUGJkzOfgHUyA61dP08IJMwsIC/RvHU28wRGgVlIqmYhVM1CUrWAkXk Vo0ZxalFZapGusaFeUlFmekZJbmJmjq6hgZlebmpxcWJ6ak5iUrFecn7uJkZgYDIAwQ7GpkWB hxglOZiURHlDE9dFCvEl5adUZiQWZ8QXleakFh9ilOHgUJLgrSsCygkWpaanVqRl5gBjBCYtw cGjJMI7BSTNW1yQmFucmQ6ROsWoy7Fh9fovTEIsefl5qVLivMdBigRAijJK8+BGwOL1EqOslD AvI9BRQjwFqUW5mSWo8q8YxTkYlYR5l4BM4cnMK4Hb9AroCCagI6pergE5oiQRISXVwBiQ8dt Kz1flRF/1F/uapiOeef+FlDsr/jYFrTr6d1vyzpWLlqVyZW24tOYPfwdD/OnjfCdv5k1KPuu/ 8klx4f6v4Sc19HVnP3u65K+xVNjreZf8VOYXPFDxY6y/MvNBSmckwwfj0H5Xb8OUbPWm/Jzk7 1f7SxQXb1ARNz72YHsei+COTsFYfSWW4oxEQy3mouJEAMm5q+vSAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1504605120!91943336!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzkwOTcx\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39327 invoked from network); 5 Sep 2017 09:52:02 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-10.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 5 Sep 2017 09:52:02 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Sep 2017 02:52:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,479,1498546800"; d="scan'208";a="897185485" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by FMSMGA003.fm.intel.com with ESMTP; 05 Sep 2017 02:51:54 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Tue, 5 Sep 2017 17:32:36 +0800 Message-Id: <1504603957-5389-15-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504603957-5389-1-git-send-email-yi.y.sun@linux.intel.com> References: <1504603957-5389-1-git-send-email-yi.y.sun@linux.intel.com> MIME-Version: 1.0 Cc: kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, Yi Sun , julien.grall@arm.com, mengxu@cis.upenn.edu, jbeulich@suse.com, chao.p.peng@linux.intel.com, dgdegra@tycho.nsa.gov, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v3 14/15] 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 --- 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 | 56 +++++++++++++++++++++---------------------- tools/xl/xl.h | 1 + tools/xl/xl_cmdtable.c | 6 +++++ tools/xl/xl_psr.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 99 insertions(+), 34 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index eef06be..21dac2f 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2499,9 +2499,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 2f0eed9..e53b5f5 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_ALLOC_SET_L2_CBM; break; + case XC_PSR_MBA_THRTL: + cmd = XEN_DOMCTL_PSR_ALLOC_SET_MBA_THRTL; + break; default: errno = EINVAL; return -1; diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index 78d5bc5..d3c3d42 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -328,33 +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; - - if (socketid >= nr_sockets) - break; - - xc_type = libxl__psr_type_to_libxc_psr_type(type); - 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, @@ -458,7 +432,33 @@ 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; + int socketid, nr_sockets; + + 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) { + xc_psr_type xc_type; + + if (socketid >= nr_sockets) + break; + + xc_type = libxl__psr_type_to_libxc_psr_type(type); + 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 3389df9..3f99b6b 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -204,6 +204,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 cdc2349..9d45d3b 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -560,6 +560,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 46b7788..a648b1a 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 + }; + + 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; +} + static int psr_mba_hwinfo(void) { int rc;