From patchwork Mon Feb 13 06:32:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9568873 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 A26876045D for ; Mon, 13 Feb 2017 06:38:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 912F72818E for ; Mon, 13 Feb 2017 06:38:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85E05281DB; Mon, 13 Feb 2017 06:38: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 F2B672818E for ; Mon, 13 Feb 2017 06:38:15 +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 1cdAFT-0006WV-0c; Mon, 13 Feb 2017 06:36:31 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cdAFR-0006Tp-7a for xen-devel@lists.xenproject.org; Mon, 13 Feb 2017 06:36:29 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id 7B/83-21675-CE351A85; Mon, 13 Feb 2017 06:36:28 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRWlGSWpSXmKPExsXS1tbhqPs6eGG EQfN7U4vvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPz+4PsBQ/kKg6t/srcwHhZvIuRi0NIYDqj xKbfH5m7GDk5JAR4JY4sm8EKYftLvLl9hhGiqIFR4seTXjaQBJuAusTjrz1MILaIgJLEvVWTm UCKmAUWMUmsmPQdqIiDQ1jAQ+L+PXmQGhYBVYnWQzcYQWxeoPCJfR/ZIBbISZw8NhlsGSdQ/M ih92A1QgLuEv27NrFMYORdwMiwilG9OLWoLLVI11QvqSgzPaMkNzEzR9fQwEwvN7W4ODE9NSc xqVgvOT93EyMwHBiAYAfj9Mv+hxglOZiURHmr7RdGCPEl5adUZiQWZ8QXleakFh9ilOHgUJLg 1QCGl5BgUWp6akVaZg4wMGHSEhw8SiK8PSBp3uKCxNzizHSI1ClGRSlxXmOQhABIIqM0D64NF g2XGGWlhHkZgQ4R4ilILcrNLEGVf8UozsGoJMxbFQQ0hSczrwRu+iugxUxAi10fzAVZXJKIkJ JqYNwW9vB0ymHpV09TBKZxGx0M6V/onXutpm37L9YVZw3vLdt6brbzTe0JEx6tmtueu/fR/YP XDp2Uijr3NSonamn75Y82izasyXXaI3Qr5pjy/rN8ffGlM5+ainzcKppuJmKdpyas43qga9bv y5zRPk6sl7LmBbevtu64c3mrmYdSxfn8RTs8DqkosRRnJBpqMRcVJwIAvlfa4YECAAA= X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1486967780!52889311!3 X-Originating-IP: [134.134.136.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21434 invoked from network); 13 Feb 2017 06:36:27 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by server-16.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 13 Feb 2017 06:36:27 -0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Feb 2017 22:36:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,155,1484035200"; d="scan'208";a="224551787" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by fmsmga004.fm.intel.com with ESMTP; 12 Feb 2017 22:36:22 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Mon, 13 Feb 2017 14:32:29 +0800 Message-Id: <1486967556-3702-18-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1486967556-3702-1-git-send-email-yi.y.sun@linux.intel.com> References: <1486967556-3702-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 Subject: [Xen-devel] [PATCH v7 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 --- v7: - initialize 'l2_cat'. --- 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 8c6af69..60a4b93 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -98,6 +98,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; }; }; @@ -235,6 +236,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) @@ -681,6 +683,53 @@ 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, + 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.a || !regs.d ) + return; + + l2_cat.cbm_len = (regs.a & CAT_CBM_LEN_MASK) + 1; + l2_cat.cos_max = min(opt_cos_max, regs.d & 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; + ASSERT(!test_bit(PSR_SOCKET_L2_CAT, &info->feat_mask)); + __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 ) + return; + + 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) { @@ -1454,6 +1503,18 @@ static void cpu_init_work(void) l3_cat_init_feature(regs, feat, info); } } + + cpuid_count_leaf(PSR_CPUID_LEVEL_CAT, 0, ®s); + if ( regs.b & PSR_RESOURCE_TYPE_L2 ) + { + cpuid_count_leaf(PSR_CPUID_LEVEL_CAT, 2, ®s); + + feat = feat_l2_cat; + /* psr_cpu_prepare will allocate it on subsequent CPU onlining. */ + feat_l2_cat = NULL; + feat->ops = l2_cat_ops; + l2_cat_init_feature(regs, feat, info); + } } static void cpu_fini_work(unsigned int cpu) @@ -1505,6 +1566,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 fde7882..d7ed012 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