From patchwork Thu Mar 16 11:08:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9627879 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 4AB176048C for ; Thu, 16 Mar 2017 11:16:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42D8D2857D for ; Thu, 16 Mar 2017 11:16:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37C0E285B5; Thu, 16 Mar 2017 11:16:14 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 712C22857D for ; Thu, 16 Mar 2017 11:16: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 1coTMm-0005IA-8P; Thu, 16 Mar 2017 11:14:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coTMk-0005Fi-L6 for xen-devel@lists.xenproject.org; Thu, 16 Mar 2017 11:14:46 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 59/74-23854-6A37AC85; Thu, 16 Mar 2017 11:14:46 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgkeJIrShJLcpLzFFi42I5YG4Sq7u0+FS EwYmLnBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bOqekFPywqvkyez9LA+F+9i5GLg0XgFpPE srPHmUEcIYFpjBITOj8zdjFyckgI8EocWTaDFcL2l5iwtp0RoqiBUWL2rEVsIAk2AXWJx197m EBsEQEliXurJjOBFDEL7GSSWHf6OzNIQljAReL9xYMsIDaLgKrE9a4vYA28Ah4SP5t6oDbISZ w8NhnM5gSKf2xvB7OFBNwl3m34yz6BkW8BI8MqRo3i1KKy1CJdQxO9pKLM9IyS3MTMHF1DA2O 93NTi4sT01JzEpGK95PzcTYzAUGEAgh2MK7Z7HmKU5GBSEuUt/3EiQogvKT+lMiOxOCO+qDQn tfgQowwHh5IE7xGlkxFCgkWp6akVaZk5wKCFSUtw8CiJ8OaCpHmLCxJzizPTIVKnGHU55sze/ YZJiCUvPy9VSpz3AkiRAEhRRmke3AhYBF1ilJUS5mUEOkqIpyC1KDezBFX+FaM4B6OSMO9mkC k8mXklcJteAR3BBHTE2w8nQI4oSURISTUwpjPsE3gTWRBkaul94GlI3lGWgLsqS/S3H776wLS ++samZT/v2zQsd5Ti+MkVPfX1wjk/b+f+vN0uJpDxd0L+sSXtgmcvPNVfckuk7ZFrXI+B9n/R sP8C+iI1D8tjV37S01/l9YsvpONtAdfBc0YtEq6nBeQLZ9435d6v8Wd3tNAxtiaT44LzlFiKM xINtZiLihMB0N2lZpsCAAA= X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1489662818!78881615!23 X-Originating-IP: [192.55.52.93] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjkzID0+IDMyNDY2NQ==\n X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15872 invoked from network); 16 Mar 2017 11:14:44 -0000 Received: from mga11.intel.com (HELO mga11.intel.com) (192.55.52.93) by server-2.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 16 Mar 2017 11:14:44 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1489662884; x=1521198884; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=GpoIPMj1FUDOX/tSPJ712rIfUd2bOkqTvV1tbPIfp8o=; b=ltrJOPio8KsSLWEL2FEsF2j9SPSa3nTBixGzoLg4iBWXOQEwQob0SIio bVhk6FiHpyyJTvExuRDlauCYAKoSxA==; Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Mar 2017 04:14:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,172,1486454400"; d="scan'208";a="944976875" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by orsmga003.jf.intel.com with ESMTP; 16 Mar 2017 04:14:41 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Thu, 16 Mar 2017 19:08:14 +0800 Message-Id: <1489662495-5375-25-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1489662495-5375-1-git-send-email-yi.y.sun@linux.intel.com> References: <1489662495-5375-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, he.chen@linux.intel.com, ian.jackson@eu.citrix.com, Yi Sun , mengxu@cis.upenn.edu, jbeulich@suse.com, chao.p.peng@linux.intel.com, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v9 24/25] tools: L2 CAT: support set cbm for L2 CAT. 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 the xl/xc changes to support set CBM for L2 CAT. The new level option is introduced to original CAT setting command in order to set CBM for specified level CAT. - 'xl psr-cat-set' is updated to set cache capacity bitmasks(CBM) for a domain according to input cache level. root@:~$ xl psr-cat-set -l2 1 0x7f root@:~$ xl psr-cat-show -l2 1 Socket ID : 0 Default CBM : 0xff ID NAME CBM 1 ubuntu14 0x7f Signed-off-by: He Chen Signed-off-by: Yi Sun Acked-by: Wei Liu --- v9: - handle the case to set both CODE and DATA for CDP at same time. For such case, user does not input '-c' or '-d' to set CDP cbm. - move xl_cmdimpl.c changes into xl/xl_psr.c. - move xl_cmdtable.c changes into xl/xl_cmdtable.c. v6: - rename 'psr-cat-cbm-set' to 'psr-cat-set'. (suggested by Kevin Tian) - return 'EXIT_FAILURE' for error case. (suggested by Dario Faggioli) - print error info when input level is wrong. v4: - create this patch because of codes architecture change. --- tools/libxc/xc_psr.c | 3 +++ tools/libxl/libxl_psr.c | 42 ++++++++++++++++++++++++++++++++++++++---- tools/xl/xl_cmdtable.c | 3 ++- tools/xl/xl_psr.c | 33 +++++++++++++++++++++++---------- 4 files changed, 66 insertions(+), 15 deletions(-) diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index 04f5927..039b920 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -266,6 +266,9 @@ int xc_psr_cat_set_domain_data(xc_interface *xch, uint32_t domid, case XC_PSR_CAT_L3_CBM_DATA: cmd = XEN_DOMCTL_PSR_CAT_OP_SET_L3_DATA; break; + case XC_PSR_CAT_L2_CBM: + cmd = XEN_DOMCTL_PSR_CAT_OP_SET_L2_CBM; + break; default: errno = EINVAL; return -1; diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index f55ba1e..15e7e59 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -317,6 +317,7 @@ int libxl_psr_cat_set_cbm(libxl_ctx *ctx, uint32_t domid, GC_INIT(ctx); int rc; int socketid, nr_sockets; + libxl_psr_cat_info cat_info; rc = libxl__count_physical_sockets(gc, &nr_sockets); if (rc) { @@ -331,10 +332,43 @@ int libxl_psr_cat_set_cbm(libxl_ctx *ctx, uint32_t domid, break; xc_type = libxl__psr_cbm_type_to_libxc_psr_cat_type(type); - if (xc_psr_cat_set_domain_data(ctx->xch, domid, xc_type, - socketid, cbm)) { - libxl__psr_cat_log_err_msg(gc, errno); - rc = ERROR_FAIL; + + if (xc_type == XC_PSR_CAT_L3_CBM) { + if (xc_psr_cat_get_info(ctx->xch, socketid, 3, &cat_info.cos_max, + &cat_info.cbm_len, &cat_info.cdp_enabled)) { + libxl__psr_cat_log_err_msg(gc, errno); + rc = ERROR_FAIL; + goto out; + } + } + + /* + * User can set both CDP CODE and DATA at same time when the '-c' or + * '-d' is not input. In such case, the input type is + * LIBXL_PSR_CBM_TYPE_L3_CBM. So, we need check if cdp_enabled is true. + * If it is true, we need set both CODE and DATA. + */ + if (xc_type == XC_PSR_CAT_L3_CBM && cat_info.cdp_enabled) { + xc_type = XC_PSR_CAT_L3_CBM_CODE; + if (xc_psr_cat_set_domain_data(ctx->xch, domid, xc_type, + socketid, cbm)) { + libxl__psr_cat_log_err_msg(gc, errno); + rc = ERROR_FAIL; + } + + xc_type = XC_PSR_CAT_L3_CBM_DATA; + if (rc != ERROR_FAIL && + xc_psr_cat_set_domain_data(ctx->xch, domid, xc_type, + socketid, cbm)) { + libxl__psr_cat_log_err_msg(gc, errno); + rc = ERROR_FAIL; + } + } else { + if (xc_psr_cat_set_domain_data(ctx->xch, domid, xc_type, + socketid, cbm)) { + libxl__psr_cat_log_err_msg(gc, errno); + rc = ERROR_FAIL; + } } } diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index ab7ad60..d332e1a 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -545,11 +545,12 @@ struct cmd_spec cmd_table[] = { }, #endif #ifdef LIBXL_HAVE_PSR_CAT - { "psr-cat-cbm-set", + { "psr-cat-set", &main_psr_cat_cbm_set, 0, 1, "Set cache capacity bitmasks(CBM) for a domain", "[options] ", "-s Specify the socket to process, otherwise all sockets are processed\n" + "-l Specify the cache level to process, otherwise L3 cache is processed\n" "-c Set code CBM if CDP is supported\n" "-d Set data CBM if CDP is supported\n" }, diff --git a/tools/xl/xl_psr.c b/tools/xl/xl_psr.c index 575f4a0..7309d4f 100644 --- a/tools/xl/xl_psr.c +++ b/tools/xl/xl_psr.c @@ -490,19 +490,21 @@ int main_psr_cat_cbm_set(int argc, char **argv) char *value; libxl_string_list socket_list; unsigned long start, end; - int i, j, len; + unsigned int i, j, len; + unsigned int lvl = 3; static struct option opts[] = { {"socket", 1, 0, 's'}, {"data", 0, 0, 'd'}, {"code", 0, 0, 'c'}, + {"level", 1, 0, 'l'}, COMMON_LONG_OPTS }; libxl_socket_bitmap_alloc(ctx, &target_map, 0); libxl_bitmap_set_none(&target_map); - SWITCH_FOREACH_OPT(opt, "s:cd", opts, "psr-cat-cbm-set", 2) { + SWITCH_FOREACH_OPT(opt, "s:l:cd", opts, "psr-cat-set", 2) { case 's': trim(isspace, optarg, &value); split_string_into_string_list(value, ",", &socket_list); @@ -522,24 +524,35 @@ int main_psr_cat_cbm_set(int argc, char **argv) case 'c': opt_code = 1; break; + case 'l': + lvl = atoi(optarg); + break; } - if (opt_data && opt_code) { - fprintf(stderr, "Cannot handle -c and -d at the same time\n"); - return -1; - } else if (opt_data) { - type = LIBXL_PSR_CBM_TYPE_L3_CBM_DATA; - } else if (opt_code) { - type = LIBXL_PSR_CBM_TYPE_L3_CBM_CODE; + if (lvl == 2) + type = LIBXL_PSR_CBM_TYPE_L2_CBM; + else if (lvl == 3) { + if (opt_data && opt_code) { + fprintf(stderr, "Cannot handle -c and -d at the same time\n"); + return EXIT_FAILURE; + } else if (opt_data) { + type = LIBXL_PSR_CBM_TYPE_L3_CBM_DATA; + } else if (opt_code) { + type = LIBXL_PSR_CBM_TYPE_L3_CBM_CODE; + } else { + type = LIBXL_PSR_CBM_TYPE_L3_CBM; + } } else { type = LIBXL_PSR_CBM_TYPE_L3_CBM; + fprintf(stderr, "Input lvl %d is wrong\n", lvl); + return EXIT_FAILURE; } if (libxl_bitmap_is_empty(&target_map)) libxl_bitmap_set_any(&target_map); if (argc != optind + 2) { - help("psr-cat-cbm-set"); + help("psr-cat-set"); return 2; }