From patchwork Wed Dec 14 04:07:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9474019 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 8D8B160823 for ; Wed, 14 Dec 2016 11:12:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 851062871B for ; Wed, 14 Dec 2016 11:12:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 796112871E; Wed, 14 Dec 2016 11:12:17 +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=-2.7 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, 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 1DB2B2871A for ; Wed, 14 Dec 2016 11:12:17 +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 1cH7S9-0005wi-IQ; Wed, 14 Dec 2016 11:10:29 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cH7S8-0005tv-Ip for xen-devel@lists.xenproject.org; Wed, 14 Dec 2016 11:10:28 +0000 Received: from [85.158.143.35] by server-9.bemta-6.messagelabs.com id 71/09-27165-2A821585; Wed, 14 Dec 2016 11:10:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXS1tYhobtIIzD CoH+6hMX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmrFs+WymgquKFaumTGZqYLwi2cXIySEkUCFx 9d4xdhBbQoBX4siyGawQtp/Ets/XWSFqGhgl7hyKAbHZBNQlHn/tYQKxRQSUJO6tmgxkc3EwC 3QzSax8uJUFJCEs4CHRd/QUmM0ioCrx6sIBNhCbFyj+5el6qAVyEiePTQayOTg4geL/tiRC7H KXuNj7jn0CI+8CRoZVjBrFqUVlqUW6RsZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV6yfm 5mxiBwcAABDsY/8wPPMQoycGkJMrLdTUgQogvKT+lMiOxOCO+qDQntfgQowwHh5IE7yz1wAgh waLU9NSKtMwcYFjCpCU4eJREeINUgNK8xQWJucWZ6RCpU4yKUuK8K0H6BEASGaV5cG2wWLjEK CslzMsIdIgQT0FqUW5mCar8K0ZxDkYlYd4NIFN4MvNK4Ka/AlrMBLRYdIk/yOKSRISUVAMjt+ WPHiV7thdGGRer19V2vn3fVZfYUNGXHJ/77d6rm567O45k/0lT+bdZh1GxaLf/kc8pFy4HmXw 1PO8fskXj9v+cHtb8J+U7vLoNb5VWms0o/bdjit+cCyI+UxLNb9vfn/095abL5J7kSRy+XDE1 ++TDDiVbv93Vvlnv57E2vhnrJZInOfgosRRnJBpqMRcVJwIAal1jnYACAAA= X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1481713769!48240089!18 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.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25148 invoked from network); 14 Dec 2016 11:10:25 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-12.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Dec 2016 11:10:25 -0000 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP; 14 Dec 2016 03:10:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,346,1477983600"; d="scan'208";a="39863369" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by orsmga004.jf.intel.com with ESMTP; 14 Dec 2016 03:10:23 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 14 Dec 2016 12:07:57 +0800 Message-Id: <1481688484-5093-18-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1481688484-5093-1-git-send-email-yi.y.sun@linux.intel.com> References: <1481688484-5093-1-git-send-email-yi.y.sun@linux.intel.com> Cc: 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 Subject: [Xen-devel] [PATCH v4 17/24] x86: L2 CAT: implement CPU init and free flow. 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 CPU init and free flow for L2 CAT including L2 CAT initialization callback function. Signed-off-by: Yi Sun --- xen/arch/x86/psr.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/psr.h | 1 + 2 files changed, 77 insertions(+) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index eee1f24..b890b64 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -92,6 +92,7 @@ struct feat_hw_info { union { struct psr_cat_hw_info l3_cat_info; struct psr_cat_hw_info l3_cdp_info; + struct psr_cat_hw_info l2_cat_info; }; }; @@ -248,6 +249,7 @@ static DEFINE_PER_CPU(struct psr_assoc, psr_assoc); /* Declare feature list entry. */ static struct feat_node *feat_l3_cat; static struct feat_node *feat_l3_cdp; +static struct feat_node *feat_l2_cat; /* Common functions. */ static void free_feature(struct psr_socket_info *info) @@ -276,6 +278,12 @@ static void free_feature(struct psr_socket_info *info) xfree(feat_l3_cdp); feat_l3_cdp = NULL; } + + if ( feat_l2_cat ) + { + xfree(feat_l2_cat); + feat_l2_cat = NULL; + } } static bool_t psr_check_cbm(unsigned int cbm_len, uint64_t cbm) @@ -726,6 +734,51 @@ struct feat_ops l3_cdp_ops = { .write_msr = l3_cdp_write_msr, }; +/* L2 CAT callback functions implementation. */ +static void l2_cat_init_feature(unsigned int eax, unsigned int ebx, + unsigned int ecx, unsigned int edx, + struct feat_node *feat, + struct psr_socket_info *info) +{ + struct psr_cat_hw_info l2_cat; + unsigned int socket; + + /* No valid values so do not enable the feature. */ + if ( !eax || !edx ) + return; + + l2_cat.cbm_len = (eax & CAT_CBM_LEN_MASK) + 1; + l2_cat.cos_max = min(opt_cos_max, edx & CAT_COS_MAX_MASK); + + /* cos=0 is reserved as default cbm(all ones). */ + feat->cos_reg_val[0] = (1ull << l2_cat.cbm_len) - 1; + + feat->feature = PSR_SOCKET_L2_CAT; + __set_bit(PSR_SOCKET_L2_CAT, &info->feat_mask); + + feat->info.l2_cat_info = l2_cat; + + info->nr_feat++; + + /* Add this feature into list. */ + list_add_tail(&feat->list, &info->feat_list); + + socket = cpu_to_socket(smp_processor_id()); + printk(XENLOG_INFO "L2 CAT: enabled on socket %u, cos_max:%u, cbm_len:%u.\n", + socket, feat->info.l2_cat_info.cos_max, + feat->info.l2_cat_info.cbm_len); +} + +static unsigned int l2_cat_get_max_cos_max(const struct feat_node *feat) +{ + return feat->info.l2_cat_info.cos_max; +} + +struct feat_ops l2_cat_ops = { + .init_feature = l2_cat_init_feature, + .get_max_cos_max = l2_cat_get_max_cos_max, +}; + static void __init parse_psr_bool(char *s, char *value, char *feature, unsigned int mask) { @@ -1419,6 +1472,17 @@ static int cpu_prepare_work(unsigned int cpu) return -ENOMEM; } + if ( feat_l2_cat == NULL && + (feat_l2_cat = xzalloc(struct feat_node)) == NULL ) + { + xfree(feat_l3_cat); + feat_l3_cat = NULL; + + xfree(feat_l3_cdp); + feat_l3_cdp = NULL; + return -ENOMEM; + } + return 0; } @@ -1460,6 +1524,18 @@ static void cpu_init_work(void) feat_tmp->ops.init_feature(eax, ebx, ecx, edx, feat_tmp, info); } + + cpuid_count(PSR_CPUID_LEVEL_CAT, 0, &eax, &ebx, &ecx, &edx); + if ( ebx & PSR_RESOURCE_TYPE_L2 ) + { + feat_tmp = feat_l2_cat; + feat_l2_cat = NULL; + + /* Initialize L2 CAT according to CPUID. */ + cpuid_count(PSR_CPUID_LEVEL_CAT, 2, &eax, &ebx, &ecx, &edx); + feat_tmp->ops = l2_cat_ops; + feat_tmp->ops.init_feature(eax, ebx, ecx, edx, feat_tmp, info); + } } static void cpu_fini_work(unsigned int cpu) diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h index d245de3..a7fc13d 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -23,6 +23,7 @@ /* Resource Type Enumeration */ #define PSR_RESOURCE_TYPE_L3 0x2 +#define PSR_RESOURCE_TYPE_L2 0x4 /* L3 Monitoring Features */ #define PSR_CMT_L3_OCCUPANCY 0x1