From patchwork Mon Feb 13 06:32:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9568903 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 51FBB6045D for ; Mon, 13 Feb 2017 06:38:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40E012819A for ; Mon, 13 Feb 2017 06:38:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35C7328210; Mon, 13 Feb 2017 06:38:45 +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 C8A632819A for ; Mon, 13 Feb 2017 06:38:44 +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 1cdAFL-0006ML-9K; Mon, 13 Feb 2017 06:36:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cdAFJ-0006Ic-74 for xen-devel@lists.xenproject.org; Mon, 13 Feb 2017 06:36:21 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 86/E9-01948-4E351A85; Mon, 13 Feb 2017 06:36:20 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRWlGSWpSXmKPExsXS1tbhqPs4eGG EwflbnBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aRx/OYCmapV7z6toe5gfGHTBcjF4eQwHRG idMz2ti6GDk5JAR4JY4sm8EKYftLHFp9CiwuJNDAKLH5tCWIzSagLvH4aw8TiC0ioCRxb9VkJ pBBzAKLmCRWTPoO1iAsECax+tgZsEEsAqoSrw7OZQGxeQU8JE5PPAa1QE7i5LHJYDYnUPzIof eMEMvcJfp3bWKZwMi7gJFhFaNGcWpRWWqRrpGlXlJRZnpGSW5iZo6uoYGpXm5qcXFiempOYlK xXnJ+7iZGYEDUMzAw7mC8vMXvEKMkB5OSKG+1/cIIIb6k/JTKjMTijPii0pzU4kOMMhwcShK8 a4OAcoJFqempFWmZOcDQhElLcPAoifCmgKR5iwsSc4sz0yFSpxh1Ob7sPPOSSYglLz8vVUqcd zFIkQBIUUZpHtwIWJxcYpSVEuZlZGBgEOIpSC3KzSxBlX/FKM7BqCTMuwlkCk9mXgncpldARz ABHeH6YC7IESWJCCmpBsaYf+7rpLKrmiInxP/gD/X6fNU3XyP3U7j1esUt9XXvNt8PUo/32SX +99GdzYLnWrT112dIFUl7OR/dwuG/9brm/9vX5rX3XrA/OnOXdq2Ckl1J8MU7Hxk3XK836fff K27MJXIvKtRVvJbPoDNZRvaRrUlkv0LZ3ucfc7Qqrtw90+s1M0e8X4mlOCPRUIu5qDgRAE3iN mWOAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1486967776!45712181!1 X-Originating-IP: [134.134.136.65] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5755 invoked from network); 13 Feb 2017 06:36:18 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by server-14.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 13 Feb 2017 06:36:18 -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:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,155,1484035200"; d="scan'208";a="224551712" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by fmsmga004.fm.intel.com with ESMTP; 12 Feb 2017 22:36:11 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Mon, 13 Feb 2017 14:32:25 +0800 Message-Id: <1486967556-3702-14-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 13/24] x86: refactor psr: implement CPU init and free flow for CDP. 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 CDP including L3 CDP initialization callback function. Signed-off-by: Yi Sun --- v7: - initialize 'l3_cdp'. --- xen/arch/x86/psr.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 98 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 172823a..2e061b5 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -97,6 +97,7 @@ struct psr_cat_hw_info { struct feat_hw_info { union { struct psr_cat_hw_info l3_cat_info; + struct psr_cat_hw_info l3_cdp_info; }; }; @@ -195,6 +196,22 @@ struct feat_node { struct list_head list; }; +/* + * get_data - get DATA COS register value from input COS ID. + * @feat: the feature list entry. + * @cos: the COS ID. + */ +#define get_cdp_data(feat, cos) \ + ( feat->cos_reg_val[cos * 2] ) + +/* + * get_cdp_code - get CODE COS register value from input COS ID. + * @feat: the feature list entry. + * @cos: the COS ID. + */ +#define get_cdp_code(feat, cos) \ + ( feat->cos_reg_val[cos * 2 + 1] ) + struct psr_assoc { uint64_t val; uint64_t cos_mask; @@ -217,6 +234,7 @@ static DEFINE_PER_CPU(struct psr_assoc, psr_assoc); * cpu_add_remove_lock spinlock. */ static struct feat_node *feat_l3_cat; +static struct feat_node *feat_l3_cdp; /* Common functions. */ static void free_feature(struct psr_socket_info *info) @@ -454,6 +472,63 @@ static const struct feat_ops l3_cat_ops = { .write_msr = l3_cat_write_msr, }; +/* L3 CDP functions implementation. */ +static void l3_cdp_init_feature(struct cpuid_leaf regs, + struct feat_node *feat, + struct psr_socket_info *info) +{ + struct psr_cat_hw_info l3_cdp = { }; + unsigned int socket; + uint64_t val; + + /* No valid value so do not enable feature. */ + if ( !regs.a || !regs.d ) + return; + + l3_cdp.cbm_len = (regs.a & CAT_CBM_LEN_MASK) + 1; + /* Cut half of cos_max when CDP is enabled. */ + l3_cdp.cos_max = min(opt_cos_max, regs.d & CAT_COS_MAX_MASK) >> 1; + + /* cos=0 is reserved as default cbm(all ones). */ + get_cdp_code(feat, 0) = + (1ull << l3_cdp.cbm_len) - 1; + get_cdp_data(feat, 0) = + (1ull << l3_cdp.cbm_len) - 1; + + /* We only write mask1 since mask0 is always all ones by default. */ + wrmsrl(MSR_IA32_PSR_L3_MASK(1), (1ull << l3_cdp.cbm_len) - 1); + rdmsrl(MSR_IA32_PSR_L3_QOS_CFG, val); + wrmsrl(MSR_IA32_PSR_L3_QOS_CFG, val | (1 << PSR_L3_QOS_CDP_ENABLE_BIT)); + + feat->feature = PSR_SOCKET_L3_CDP; + ASSERT(!test_bit(PSR_SOCKET_L3_CDP, &info->feat_mask)); + __set_bit(PSR_SOCKET_L3_CDP, &info->feat_mask); + + feat->info.l3_cdp_info = l3_cdp; + + 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 "L3 CDP: enabled on socket %u, cos_max:%u, cbm_len:%u\n", + socket, feat->info.l3_cdp_info.cos_max, + feat->info.l3_cdp_info.cbm_len); +} + +static unsigned int l3_cdp_get_cos_max(const struct feat_node *feat) +{ + return feat->info.l3_cdp_info.cos_max; +} + +struct feat_ops l3_cdp_ops = { + .get_cos_max = l3_cdp_get_cos_max, +}; + static void __init parse_psr_bool(char *s, char *value, char *feature, unsigned int mask) { @@ -1211,12 +1286,21 @@ static void cpu_init_work(void) { cpuid_count_leaf(PSR_CPUID_LEVEL_CAT, 1, ®s); - feat = feat_l3_cat; - /* psr_cpu_prepare will allocate it on subsequent CPU onlining. */ - feat_l3_cat = NULL; - feat->ops = l3_cat_ops; - - l3_cat_init_feature(regs, feat, info); + if ( (regs.c & PSR_CAT_CDP_CAPABILITY) && (opt_psr & PSR_CDP) && + !test_bit(PSR_SOCKET_L3_CDP, &info->feat_mask) ) + { + feat = feat_l3_cdp; + /* psr_cpu_prepare will allocate it on subsequent CPU onlining. */ + feat_l3_cdp = NULL; + feat->ops = l3_cdp_ops; + l3_cdp_init_feature(regs, feat, info); + } else { + feat = feat_l3_cat; + /* psr_cpu_prepare will allocate it on subsequent CPU onlining. */ + feat_l3_cat = NULL; + feat->ops = l3_cat_ops; + l3_cat_init_feature(regs, feat, info); + } } } @@ -1261,6 +1345,14 @@ static int psr_cpu_prepare(unsigned int cpu) (feat_l3_cat = xzalloc(struct feat_node)) == NULL ) return -ENOMEM; + if ( feat_l3_cdp == NULL && + (feat_l3_cdp = xzalloc(struct feat_node)) == NULL ) + { + xfree(feat_l3_cat); + feat_l3_cat = NULL; + return -ENOMEM; + } + return 0; }