From patchwork Thu Jan 19 06:01:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9525199 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 8D5F160437 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 7A36028610 for ; Thu, 19 Jan 2017 06:05:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F22C2863A; 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 8307828610 for ; Thu, 19 Jan 2017 06:05:14 +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 1cU5ok-0007Do-Q3; Thu, 19 Jan 2017 06:03:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cU5oj-0007BL-74 for xen-devel@lists.xenproject.org; Thu, 19 Jan 2017 06:03:25 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 33/B3-16730-CA650885; Thu, 19 Jan 2017 06:03:24 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRWlGSWpSXmKPExsVywNykWHd1WEO EwfT5lhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8b+A2/YCx6oV6y/08jcwLhFtouRi0NIYDqj xKq5N9i6GDk5JAR4JY4sm8EKYftLHDy6hR2iqIFR4vamvSwgCTYBdYnHX3uYQGwRASWJe6smM 4EUMQt0M0msfLgVrEhYIFbi4/zD7CA2i4CqxPGzm8E28Ap4SPxZMxlqg5zEyWMQNidQ/Mr8C2 D1QgLuEltWXGKawMi7gJFhFaNGcWpRWWqRrrGBXlJRZnpGSW5iZo6uoYGxXm5qcXFiempOYlK xXnJ+7iZGYEjUMzAw7mDsPOF3iFGSg0lJlNfesiFCiC8pP6UyI7E4I76oNCe1+BCjDAeHkgTv nFCgnGBRanpqRVpmDjA4YdISHDxKIrxVIGne4oLE3OLMdIjUKUZdji87z7xkEmLJy89LlRLnj QIpEgApyijNgxsBi5RLjLJSwryMDAwMQjwFqUW5mSWo8q8YxTkYlYR5v4NM4cnMK4Hb9AroCC agI6yU60GOKElESEk1MPZbRHd0GMaqh6nIP1qvoTbh9cn4ZL/rH8XKpmqEvzQ2PuxS9P/KToF H5Ty6/3lO5M1KicnO3F2+hCnH918l1832he9vP9uzs/v3G5YVGoaTSg03bzALjVsb+2vn6QOH 84sfWInvkGmfuXTjxWU21wRbp/s6NkUZchgveOscM72yY93UMps/bUosxRmJhlrMRcWJAM8Ma N2PAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1484805800!80652688!2 X-Originating-IP: [192.55.52.115] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3518 invoked from network); 19 Jan 2017 06:03:23 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by server-13.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 19 Jan 2017 06:03:23 -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:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,252,1477983600"; d="scan'208";a="215119538" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by fmsmga004.fm.intel.com with ESMTP; 18 Jan 2017 22:03:09 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Thu, 19 Jan 2017 14:01:15 +0800 Message-Id: <1484805686-7249-14-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 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 --- v5: - remove 'feat_l3_cdp' free in 'free_feature'. - Encapsulate cpuid registers into 'struct cpuid_leaf_regs'. - Print socket info when 'opt_cpu_info' is true. - rename 'l3_cdp_get_max_cos_max' to 'l3_cdp_get_cos_max'. - rename 'dat[]' to 'data[]' - move 'cpu_prepare_work' contents into 'psr_cpu_prepare'. --- xen/arch/x86/psr.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 93 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index b8d3c82..a979128 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -93,6 +93,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; }; }; @@ -197,6 +198,21 @@ struct cpuid_leaf_regs { unsigned int ecx; unsigned int edx; }; +/* + * 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; @@ -219,6 +235,7 @@ static DEFINE_PER_CPU(struct psr_assoc, psr_assoc); * inserted into feature list in cpu_init_work(). */ 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) @@ -448,6 +465,61 @@ 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 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.eax || !regs.edx ) + return; + + l3_cdp.cbm_len = (regs.eax & CAT_CBM_LEN_MASK) + 1; + /* Cut half of cos_max when CDP is enabled. */ + l3_cdp.cos_max = min(opt_cos_max, regs.edx & 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; + __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 ) + 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) { @@ -1207,11 +1279,19 @@ static void cpu_init_work(void) cpuid_count(PSR_CPUID_LEVEL_CAT, 1, ®s.eax, ®s.ebx, ®s.ecx, ®s.edx); - feat = feat_l3_cat; - feat_l3_cat = NULL; - feat->ops = l3_cat_ops; - - l3_cat_init_feature(regs, feat, info); + if ( (regs.ecx & PSR_CAT_CDP_CAPABILITY) && (opt_psr & PSR_CDP) && + !test_bit(PSR_SOCKET_L3_CDP, &info->feat_mask) ) + { + feat = feat_l3_cdp; + feat_l3_cdp = NULL; + feat->ops = l3_cdp_ops; + l3_cdp_init_feature(regs, feat, info); + } else { + feat = feat_l3_cat; + feat_l3_cat = NULL; + feat->ops = l3_cat_ops; + l3_cat_init_feature(regs, feat, info); + } } } @@ -1263,6 +1343,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; }