From patchwork Wed Jun 14 01:12:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9785141 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 DF3A760384 for ; Wed, 14 Jun 2017 01:28:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1BC728419 for ; Wed, 14 Jun 2017 01:28:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C661028520; Wed, 14 Jun 2017 01:28:09 +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 49F9328419 for ; Wed, 14 Jun 2017 01:28:09 +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 1dKx4m-0008KL-4J; Wed, 14 Jun 2017 01:26:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dKx4k-0008II-IH for xen-devel@lists.xenproject.org; Wed, 14 Jun 2017 01:26:26 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id F9/FD-01735-1C090495; Wed, 14 Jun 2017 01:26:25 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRWlGSWpSXmKPExsVywNykWHfPBId Ig/0fbCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oy2b/vYCuaqV3zc7drAeEumi5GLQ0hgGqPE uan7mLsYOTkkBHgljiybwQph+0mcXHGGEaKogVHi54ZLYAk2AXWJx197mEBsEQEliXurJjOBF DEL7GSSWHf6O9gkYQFXieVrX7OA2CwCqhInOp+wg9i8Ap4Sa49/YYLYICdx8thksKGcQPHu18 /A4kICHhI/r0xlmsDIu4CRYRWjRnFqUVlqka6RoV5SUWZ6RkluYmaOrqGBqV5uanFxYnpqTmJ SsV5yfu4mRmBA1DMwMO5gvDvZ7xCjJAeTkijvEjuHSCG+pPyUyozE4oz4otKc1OJDjDIcHEoS vOH9QDnBotT01Iq0zBxgaMKkJTh4lER4a9uA0rzFBYm5xZnpEKlTjLocG1av/8IkxJKXn5cqJ c4bCTJDAKQoozQPbgQsTi4xykoJ8zIyMDAI8RSkFuVmlqDKv2IU52BUEuY9DjKFJzOvBG7TK6 AjmICOuH7FBuSIkkSElFQDI2Pz7B3Jxi4yk2v187+6Pdwoc1RUxbbJqCDrR/3lTT5HbF7qnL1 ttX4G88uye5dzfV+1MLlnLToatD3dKFOqrvzIhf3+P/bMLXabtP9V9iu9a+wTpFv11nGXb+CZ ULT07f7bHAaKyZNKj+1dcKjuuIXFwY7oquM7LfV0/t+38Jf5N9fq2+JXnEosxRmJhlrMRcWJA HJmTJSOAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1497403511!87398197!23 X-Originating-IP: [192.55.52.115] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64657 invoked from network); 14 Jun 2017 01:26:20 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by server-16.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Jun 2017 01:26:20 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jun 2017 18:26:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,340,1493708400"; d="scan'208";a="99174090" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.64]) by orsmga002.jf.intel.com with ESMTP; 13 Jun 2017 18:26:17 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 14 Jun 2017 09:12:55 +0800 Message-Id: <1497402776-22348-23-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1497402776-22348-1-git-send-email-yi.y.sun@linux.intel.com> References: <1497402776-22348-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 v12 22/23] 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 --- v11: - revert change in v9 to handle the case to set both CODE and DATA for CDP at same time. This must be handled in hypervisor. v10: - fix comments. (suggested 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/xl/xl_cmdtable.c | 3 ++- tools/xl/xl_psr.c | 33 +++++++++++++++++++++++---------- 3 files changed, 28 insertions(+), 11 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/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 539cb64..2c71a9f 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -546,11 +546,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; }