From patchwork Wed Aug 9 07:41:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9889793 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 1E02B603F2 for ; Wed, 9 Aug 2017 08:01:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DA21285FC for ; Wed, 9 Aug 2017 08:01:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 023F028A28; Wed, 9 Aug 2017 08:01:27 +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 BF796285FC for ; Wed, 9 Aug 2017 08:01:21 +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 1dfLsv-00020r-Q4; Wed, 09 Aug 2017 07:58:33 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dfLsu-0001zl-Az for xen-devel@lists.xenproject.org; Wed, 09 Aug 2017 07:58:32 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id AB/47-03044-7A0CA895; Wed, 09 Aug 2017 07:58:31 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgkeJIrShJLcpLzFFi42Jpa+uQ0F12oCv S4M1tVYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNeP+pGVsBWcrK54uS2xgvBvSxcjJISQwjVHi /5NqEFtCgFfiyLIZrBC2v8Tk22+Yuxi5gGoaGCV2Tt/IBpJgE1CXePy1hwnEFhFQkri3ajITS BGzwDYmifeXX7CDJIQFsiRuTP0PZrMIqEqs+3wUrIFXwENiwbSDTBAb5CROHpsMto0TKL654w 8bxEXuEt92dbNPYORdwMiwilGjOLWoLLVI19hQL6koMz2jJDcxM0fX0MBMLze1uDgxPTUnMal YLzk/dxMjMBwYgGAHY9OiwEOMkhxMSqK8m7Q7I4X4kvJTKjMSizPii0pzUosPMcpwcChJ8F7a 3xUpJFiUmp5akZaZAwxMmLQEB4+SCO9GkDRvcUFibnFmOkTqFKMxx4bV678wcbya8P8bkxBLX n5eqpQ4736QUgGQ0ozSPLhBsIi5xCgrJczLCHSaEE9BalFuZgmq/CtGcQ5GJWHe0yBTeDLzSu D2vQI6hQnolAjfTpBTShIRUlINjLF7Ql+6vVHT2O97Olh5Uzn38bjPZaXGM1heBPV1xjt6Z39 zr9uzIovrg/ru7Lol9bIWk+Q0euu/daw8mfurYOkhhwTzRq75nAy1T05POxK/e2JYbrD+cpH3 1ckbZuVxMHibufrs6d4y69byuv13XPiuMe8XPp0r4GX6pc1QzsmisaGflUdNiaU4I9FQi7moO BEA2LJmOJMCAAA= X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1502265470!79168193!12 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 3073 invoked from network); 9 Aug 2017 07:58:29 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-11.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 9 Aug 2017 07:58:29 -0000 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Aug 2017 00:58:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,346,1498546800"; d="scan'208";a="117183119" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by orsmga004.jf.intel.com with ESMTP; 09 Aug 2017 00:58:26 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 9 Aug 2017 15:41:50 +0800 Message-Id: <1502264512-4648-12-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1502264512-4648-1-git-send-email-yi.y.sun@linux.intel.com> References: <1502264512-4648-1-git-send-email-yi.y.sun@linux.intel.com> 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, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v1 11/13] tools: implemet new get value interface suitable for all psr allocation features 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 a new get value interface in tools suitable for all psr allocation features and the whole flow. It also enables MBA support in tools to get MBA value. Signed-off-by: Yi Sun Acked-by: Wei Liu --- tools/libxc/include/xenctrl.h | 7 +- tools/libxc/xc_psr.c | 9 ++- tools/libxl/libxl_psr.c | 51 +++++++----- tools/xl/xl.h | 1 + tools/xl/xl_cmdtable.c | 5 ++ tools/xl/xl_psr.c | 179 +++++++++++++++++++++++++++++------------- 6 files changed, 173 insertions(+), 79 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index f1c629e..d7eabfb 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2455,6 +2455,7 @@ enum xc_psr_val_type { XC_PSR_CAT_L3_CBM_CODE = 2, XC_PSR_CAT_L3_CBM_DATA = 3, XC_PSR_CAT_L2_CBM = 4, + XC_PSR_MBA_THRTL = 5, }; typedef enum xc_psr_val_type xc_psr_val_type; @@ -2501,9 +2502,9 @@ int xc_psr_cmt_enabled(xc_interface *xch); int xc_psr_cat_set_domain_data(xc_interface *xch, uint32_t domid, xc_psr_val_type type, uint32_t target, uint64_t data); -int xc_psr_cat_get_domain_data(xc_interface *xch, uint32_t domid, - xc_psr_val_type type, uint32_t target, - uint64_t *data); +int xc_psr_get_domain_data(xc_interface *xch, uint32_t domid, + xc_psr_val_type type, uint32_t target, + uint64_t *data); int xc_psr_get_hw_info(xc_interface *xch, uint32_t socket, xc_psr_feat_type type, xc_psr_hw_info *hw_info); diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index c69e943..de501b0 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -283,9 +283,9 @@ int xc_psr_cat_set_domain_data(xc_interface *xch, uint32_t domid, return do_domctl(xch, &domctl); } -int xc_psr_cat_get_domain_data(xc_interface *xch, uint32_t domid, - xc_psr_val_type type, uint32_t target, - uint64_t *data) +int xc_psr_get_domain_data(xc_interface *xch, uint32_t domid, + xc_psr_val_type type, uint32_t target, + uint64_t *data) { int rc; DECLARE_DOMCTL; @@ -305,6 +305,9 @@ int xc_psr_cat_get_domain_data(xc_interface *xch, uint32_t domid, case XC_PSR_CAT_L2_CBM: cmd = XEN_DOMCTL_PSR_CAT_OP_GET_L2_CBM; break; + case XC_PSR_MBA_THRTL: + cmd = XEN_DOMCTL_PSR_MBA_OP_GET_THRTL; + break; default: errno = EINVAL; return -1; diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index 1d75f33..4b91e9b 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -71,16 +71,30 @@ static void libxl__psr_cmt_log_err_msg(libxl__gc *gc, int err) LOGE(ERROR, "%s", msg); } -static void libxl__psr_cat_log_err_msg(libxl__gc *gc, int err) +static void libxl__psr_alloc_log_err_msg(libxl__gc *gc, + int err, + libxl_psr_cbm_type type) { + /* + * Index is 'libxl_psr_cbm_type' so we set two 'CDP' to correspond to + * DATA and CODE. + */ + const char * const feat_name[6] = { + "UNKNOWN", + "L3 CAT", + "CDP", + "CDP", + "L2 CAT", + "MBA", + }; char *msg; switch (err) { case ENODEV: - msg = "CAT is not supported in this system"; + msg = "is not supported in this system"; break; case ENOENT: - msg = "CAT is not enabled on the socket"; + msg = "is not enabled on the socket"; break; case EOVERFLOW: msg = "no free COS available"; @@ -106,7 +120,7 @@ static void libxl__psr_cat_log_err_msg(libxl__gc *gc, int err) return; } - LOGE(ERROR, "%s", msg); + LOGE(ERROR, "%s: %s", feat_name[type], msg); } static int libxl__pick_socket_cpu(libxl__gc *gc, uint32_t socketid) @@ -333,7 +347,7 @@ int libxl_psr_cat_set_cbm(libxl_ctx *ctx, uint32_t domid, xc_type = libxl__psr_cbm_type_to_libxc_psr_val_type(type); if (xc_psr_cat_set_domain_data(ctx->xch, domid, xc_type, socketid, cbm)) { - libxl__psr_cat_log_err_msg(gc, errno); + libxl__psr_alloc_log_err_msg(gc, errno, type); rc = ERROR_FAIL; } } @@ -347,18 +361,7 @@ int libxl_psr_cat_get_cbm(libxl_ctx *ctx, uint32_t domid, libxl_psr_cbm_type type, uint32_t target, uint64_t *cbm_r) { - GC_INIT(ctx); - int rc = 0; - xc_psr_val_type xc_type = libxl__psr_cbm_type_to_libxc_psr_val_type(type); - - if (xc_psr_cat_get_domain_data(ctx->xch, domid, xc_type, - target, cbm_r)) { - libxl__psr_cat_log_err_msg(gc, errno); - rc = ERROR_FAIL; - } - - GC_FREE; - return rc; + return libxl_psr_get_val(ctx, domid, type, target, cbm_r); } static inline int libxl__psr_hw_info_to_libxl_psr_cat_info( @@ -438,7 +441,19 @@ int libxl_psr_get_val(libxl_ctx *ctx, uint32_t domid, libxl_psr_cbm_type type, unsigned int target, uint64_t *val) { - return ERROR_FAIL; + GC_INIT(ctx); + int rc = 0; + + xc_psr_val_type xc_type = libxl__psr_cbm_type_to_libxc_psr_val_type(type); + + if (xc_psr_get_domain_data(ctx->xch, domid, xc_type, + target, val)) { + libxl__psr_alloc_log_err_msg(gc, errno, type); + rc = ERROR_FAIL; + } + + GC_FREE; + return rc; } static inline xc_psr_feat_type libxl__psr_feat_type_to_libxc_psr_feat_type( diff --git a/tools/xl/xl.h b/tools/xl/xl.h index aa95b77..59065c4 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -206,6 +206,7 @@ int main_psr_cmt_show(int argc, char **argv); #ifdef LIBXL_HAVE_PSR_CAT int main_psr_cat_cbm_set(int argc, char **argv); int main_psr_cat_show(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 5ac8a7e..19e5004 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -562,6 +562,11 @@ struct cmd_spec cmd_table[] = { "[options] ", "-l Specify the cache level to process, otherwise L3 cache is processed\n" }, + { "psr-mba-show", + &main_psr_mba_show, 0, 1, + "Show Memory Bandwidth Allocation information", + "", + }, #endif { "usbctrl-attach", diff --git a/tools/xl/xl_psr.c b/tools/xl/xl_psr.c index bf41762..d7edab2 100644 --- a/tools/xl/xl_psr.c +++ b/tools/xl/xl_psr.c @@ -330,19 +330,21 @@ out: return rc; } -static void psr_cat_print_one_domain_cbm_type(uint32_t domid, uint32_t socketid, - libxl_psr_cbm_type type) +static void psr_print_one_domain_val_type(uint32_t domid, uint32_t socketid, + libxl_psr_cbm_type type) { - uint64_t cbm; + uint64_t val; - if (!libxl_psr_cat_get_cbm(ctx, domid, type, socketid, &cbm)) - printf("%#16"PRIx64, cbm); + if (!libxl_psr_get_val(ctx, domid, type, socketid, &val)) + printf("%#16"PRIx64, val); else printf("%16s", "error"); } -static void psr_cat_print_one_domain_cbm(uint32_t domid, uint32_t socketid, - bool cdp_enabled, unsigned int lvl) +static void psr_print_one_domain_val(uint32_t domid, + libxl_psr_hw_info *info, + libxl_psr_feat_type type, + unsigned int lvl) { char *domain_name; @@ -350,106 +352,152 @@ static void psr_cat_print_one_domain_cbm(uint32_t domid, uint32_t socketid, printf("%5d%25s", domid, domain_name); free(domain_name); - switch (lvl) { - case 3: - if (!cdp_enabled) { - psr_cat_print_one_domain_cbm_type(domid, socketid, + switch (type) { + case LIBXL_PSR_FEAT_TYPE_CAT_INFO: + switch (lvl) { + case 3: + if (!info->u.cat_info.cdp_enabled) { + psr_print_one_domain_val_type(domid, info->id, LIBXL_PSR_CBM_TYPE_L3_CBM); - } else { - psr_cat_print_one_domain_cbm_type(domid, socketid, + } else { + psr_print_one_domain_val_type(domid, info->id, LIBXL_PSR_CBM_TYPE_L3_CBM_CODE); - psr_cat_print_one_domain_cbm_type(domid, socketid, + psr_print_one_domain_val_type(domid, info->id, LIBXL_PSR_CBM_TYPE_L3_CBM_DATA); - } - break; - case 2: - psr_cat_print_one_domain_cbm_type(domid, socketid, + } + break; + case 2: + psr_print_one_domain_val_type(domid, info->id, LIBXL_PSR_CBM_TYPE_L2_CBM); + break; + default: + printf("Input lvl %d is wrong!", lvl); + } break; - default: - printf("Input lvl %d is wrong!", lvl); + + case LIBXL_PSR_FEAT_TYPE_MBA_INFO: + psr_print_one_domain_val_type(domid, info->id, + LIBXL_PSR_CBM_TYPE_MBA_THRTL); break; } printf("\n"); } -static int psr_cat_print_domain_cbm(uint32_t domid, uint32_t socketid, - bool cdp_enabled, unsigned int lvl) +static int psr_print_domain_val(uint32_t domid, + libxl_psr_hw_info *info, + libxl_psr_feat_type type, + unsigned int lvl) { int i, nr_domains; libxl_dominfo *list; if (domid != INVALID_DOMID) { - psr_cat_print_one_domain_cbm(domid, socketid, cdp_enabled, lvl); + psr_print_one_domain_val(domid, info, type, lvl); return 0; } if (!(list = libxl_list_domain(ctx, &nr_domains))) { - fprintf(stderr, "Failed to get domain list for cbm display\n"); - return -1; + fprintf(stderr, "Failed to get domain list for value display\n"); + return EXIT_FAILURE; } for (i = 0; i < nr_domains; i++) - psr_cat_print_one_domain_cbm(list[i].domid, socketid, cdp_enabled, lvl); + psr_print_one_domain_val(list[i].domid, info, type, lvl); libxl_dominfo_list_free(list, nr_domains); return 0; } -static int psr_cat_print_socket(uint32_t domid, libxl_psr_cat_info *info, - unsigned int lvl) +static int psr_print_socket(uint32_t domid, + libxl_psr_hw_info *info, + libxl_psr_feat_type type, + unsigned int lvl) { - int rc; - uint32_t l3_cache_size; - printf("%-16s: %u\n", "Socket ID", info->id); - /* So far, CMT only supports L3 cache. */ - if (lvl == 3) { - rc = libxl_psr_cmt_get_l3_cache_size(ctx, info->id, &l3_cache_size); - if (rc) { - fprintf(stderr, "Failed to get l3 cache size for socket:%d\n", - info->id); - return -1; + switch (type) { + case LIBXL_PSR_FEAT_TYPE_CAT_INFO: + { + int rc; + uint32_t l3_cache_size; + + /* So far, CMT only supports L3 cache. */ + if (lvl == 3) { + rc = libxl_psr_cmt_get_l3_cache_size(ctx, info->id, &l3_cache_size); + if (rc) { + fprintf(stderr, "Failed to get l3 cache size for socket:%d\n", + info->id); + return -1; + } + printf("%-16s: %uKB\n", "L3 Cache", l3_cache_size); } - printf("%-16s: %uKB\n", "L3 Cache", l3_cache_size); + + printf("%-16s: %#llx\n", "Default CBM", + (1ull << info->u.cat_info.cbm_len) - 1); + if (info->u.cat_info.cdp_enabled) + printf("%5s%25s%16s%16s\n", "ID", "NAME", "CBM (code)", "CBM (data)"); + else + printf("%5s%25s%16s\n", "ID", "NAME", "CBM"); + + break; } - printf("%-16s: %#llx\n", "Default CBM", (1ull << info->cbm_len) - 1); - if (info->cdp_enabled) - printf("%5s%25s%16s%16s\n", "ID", "NAME", "CBM (code)", "CBM (data)"); - else - printf("%5s%25s%16s\n", "ID", "NAME", "CBM"); + case LIBXL_PSR_FEAT_TYPE_MBA_INFO: + printf("%-16s: %u\n", "Default THRTL", 0); + printf("%5s%25s%16s\n", "ID", "NAME", "THRTL"); + break; - return psr_cat_print_domain_cbm(domid, info->id, info->cdp_enabled, lvl); + default: + fprintf(stderr, "Input feature type %d is wrong\n", type); + return EXIT_FAILURE; + } + + return psr_print_domain_val(domid, info, type, lvl); } -static int psr_cat_show(uint32_t domid, unsigned int lvl) +static int psr_val_show(uint32_t domid, + libxl_psr_feat_type type, + unsigned int lvl) { - int i, nr; + unsigned int i, nr; int rc; - libxl_psr_cat_info *info; + libxl_psr_hw_info *info; - if (lvl != 2 && lvl != 3) { - fprintf(stderr, "Input lvl %d is wrong\n", lvl); + switch (type) { + case LIBXL_PSR_FEAT_TYPE_CAT_INFO: + if (lvl != 2 && lvl != 3) { + fprintf(stderr, "Input lvl %d is wrong\n", lvl); + return EXIT_FAILURE; + } + break; + + case LIBXL_PSR_FEAT_TYPE_MBA_INFO: + if (lvl) { + fprintf(stderr, "Input lvl %d is wrong\n", lvl); + return EXIT_FAILURE; + } + break; + + default: + fprintf(stderr, "Input feature type %d is wrong\n", type); return EXIT_FAILURE; } - rc = libxl_psr_cat_get_info(ctx, &info, &nr, lvl); + rc = libxl_psr_get_hw_info(ctx, &info, &nr, type, lvl); if (rc) { - fprintf(stderr, "Failed to get %s cat info\n", (lvl == 3)?"L3":"L2"); + fprintf(stderr, "Failed to get info\n"); return rc; } for (i = 0; i < nr; i++) { - rc = psr_cat_print_socket(domid, info + i, lvl); + rc = psr_print_socket(domid, info + i, type, lvl); if (rc) goto out; } out: - libxl_psr_cat_info_list_free(info, nr); + libxl_psr_hw_info_list_free(info, nr); return rc; } @@ -479,6 +527,27 @@ static int psr_l2_cat_hwinfo(void) return rc; } +int main_psr_mba_show(int argc, char **argv) +{ + int opt; + uint32_t domid; + + SWITCH_FOREACH_OPT(opt, "", NULL, "psr-mba-show", 0) { + /* No options */ + } + + if (optind >= argc) + domid = INVALID_DOMID; + else if (optind == argc - 1) + domid = find_domain(argv[optind]); + else { + help("psr-mba-show"); + return 2; + } + + return psr_val_show(domid, LIBXL_PSR_FEAT_TYPE_MBA_INFO, 0); +} + static int psr_mba_hwinfo(void) { int rc; @@ -618,7 +687,7 @@ int main_psr_cat_show(int argc, char **argv) return 2; } - return psr_cat_show(domid, lvl); + return psr_val_show(domid, LIBXL_PSR_FEAT_TYPE_CAT_INFO, lvl); } int main_psr_hwinfo(int argc, char **argv)