From patchwork Thu Jan 19 06:01:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9525201 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 C64E86045A for ; Thu, 19 Jan 2017 06:05:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2E882860C for ; Thu, 19 Jan 2017 06:05:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A7C692862A; Thu, 19 Jan 2017 06:05:16 +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 438D82860C for ; Thu, 19 Jan 2017 06:05:16 +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 1cU5on-0007Ig-LS; Thu, 19 Jan 2017 06:03: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 1cU5ol-0007Eg-Uc for xen-devel@lists.xenproject.org; Thu, 19 Jan 2017 06:03:28 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id FF/C5-15112-FA650885; Thu, 19 Jan 2017 06:03:27 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrALMWRWlGSWpSXmKPExsVywNykWHddWEO EwZ/LGhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8ae7VcYCzYpVvRNnsfewLhXsouRi0NIYDqj xJ1Z/5i6GDk5JAR4JY4sm8EKYftL3O2/xw5R1MAosb99MlgRm4C6xOOvPWC2iICSxL1VIHEuD maBbiaJlQ+3soAkhIG6d+1/wAZiswioSrx98xsszivgIbHvxRR2iA1yEiePTQbbxgkUvzL/Al hcSMBdYsuKS0wTGHkXMDKsYtQoTi0qSy3SNTTWSyrKTM8oyU3MzNE1NDDTy00tLk5MT81JTCr WS87P3cQIDAkGINjB+GVZwCFGSQ4mJVFee8uGCCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvHNC gXKCRanpqRVpmTnA4IRJS3DwKInwVoGkeYsLEnOLM9MhUqcYFaXEeaNAEgIgiYzSPLg2WERcY pSVEuZlBDpEiKcgtSg3swRV/hWjOAejkjDvbpApPJl5JXDTXwEtZgJabKVcD7K4JBEhJdXAmP p17a3Lk/VfsGTu2ugR/9k69naWwPZnuW/n78+d6Hlpy7qIh1YX+GbtXqq8oHe58l95442vckr /aRwPamPkuJG3Zt+vz5+zLvKr/ZtoIb1tz/vUStlIrmk/zjz50zmpxlFaorMjREixrql+c9UZ +x6NiMX71AteVzfuy3pXzLw146NQ9mShXCWW4oxEQy3mouJEAHYhyHeDAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1484805804!81831554!1 X-Originating-IP: [192.55.52.115] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46736 invoked from network); 19 Jan 2017 06:03:26 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by server-4.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 19 Jan 2017 06:03:26 -0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jan 2017 22:03:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,252,1477983600"; d="scan'208";a="215119592" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by fmsmga004.fm.intel.com with ESMTP; 18 Jan 2017 22:03:19 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Thu, 19 Jan 2017 14:01:19 +0800 Message-Id: <1484805686-7249-18-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484805686-7249-1-git-send-email-yi.y.sun@linux.intel.com> References: <1484805686-7249-1-git-send-email-yi.y.sun@linux.intel.com> Cc: wei.liu2@citrix.com, konrad.wilk@oracle.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 RESEND v5 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 --- v5: - remove 'feat_l2_cat' free in 'free_feature'. - Encapsulate cpuid registers into 'struct cpuid_leaf_regs'. - Print socket info when 'opt_cpu_info' is true. - rename 'l2_cat_get_max_cos_max' to 'l2_cat_get_cos_max'. - rename 'dat[]' to 'data[]' - move 'cpu_prepare_work' contents into 'psr_cpu_prepare'. --- xen/arch/x86/psr.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/psr.h | 1 + 2 files changed, 73 insertions(+) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 596e5b1..5320ae6 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -94,6 +94,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; }; }; @@ -236,6 +237,7 @@ static DEFINE_PER_CPU(struct psr_assoc, psr_assoc); */ 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) @@ -672,6 +674,51 @@ struct feat_ops l3_cdp_ops = { .write_msr = l3_cdp_write_msr, }; +/* L2 CAT callback functions implementation. */ +static void l2_cat_init_feature(struct cpuid_leaf_regs regs, + 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 ( !regs.eax || !regs.edx ) + return; + + l2_cat.cbm_len = (regs.eax & CAT_CBM_LEN_MASK) + 1; + l2_cat.cos_max = min(opt_cos_max, regs.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()); + if ( opt_cpu_info ) + 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_cos_max(const struct feat_node *feat) +{ + return feat->info.l2_cat_info.cos_max; +} + +struct feat_ops l2_cat_ops = { + .get_cos_max = l2_cat_get_cos_max, +}; + static void __init parse_psr_bool(char *s, char *value, char *feature, unsigned int mask) { @@ -1445,6 +1492,20 @@ static void cpu_init_work(void) l3_cat_init_feature(regs, feat, info); } } + + cpuid_count(PSR_CPUID_LEVEL_CAT, 0, + ®s.eax, ®s.ebx, ®s.ecx, ®s.edx); + if ( regs.ebx & PSR_RESOURCE_TYPE_L2 ) + { + /* Initialize L2 CAT according to CPUID. */ + cpuid_count(PSR_CPUID_LEVEL_CAT, 2, + ®s.eax, ®s.ebx, ®s.ecx, ®s.edx); + + feat = feat_l2_cat; + feat_l2_cat = NULL; + feat->ops = l2_cat_ops; + l2_cat_init_feature(regs, feat, info); + } } static void cpu_fini_work(unsigned int cpu) @@ -1503,6 +1564,17 @@ static int psr_cpu_prepare(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; } diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h index 97214fe..d2c7a13 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