From patchwork Sun Oct 8 07:23:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9991741 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 8810560244 for ; Sun, 8 Oct 2017 07:47:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AA6E28689 for ; Sun, 8 Oct 2017 07:47:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F8A928713; Sun, 8 Oct 2017 07:47:48 +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 F361B28689 for ; Sun, 8 Oct 2017 07:47:47 +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 1e16Gv-0002gg-MX; Sun, 08 Oct 2017 07:45:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e16Gu-0002fr-HB for xen-devel@lists.xenproject.org; Sun, 08 Oct 2017 07:45:12 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 8A/CC-01767-787D9D95; Sun, 08 Oct 2017 07:45:11 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCIsWRWlGSWpSXmKPExsXS1taRott+/Wa kwdznYhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0bvNv+Cp8oVzVePsDcwvpDqYuTgEBKokLjU K9HFyMkhIcArcWTZDFYIO0Di3MNZQDYXUEkDo8SKxR1gCTYBdYnHX3uYQGwRASWJe6smM4EUM Qv8ZpQ4teUQWEJYwF5i/er7YDaLgKpE68rbbCA2r4C7xOTHb6E2yEmcPDYZzOYU8JCYdX4DO4 gtBFSzenU7I0S9oMTJmU9YQA5lBlq8fp4QSJhZQF6ieets5gmMArOQVM1CqJqFpGoBI/MqRvX i1KKy1CJdQ72kosz0jJLcxMwcXUMDU73c1OLixPTUnMSkYr3k/NxNjMCwrGdgYNzB2NTrfIhR koNJSZT3z5WbkUJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkeLdeA8oJFqWmp1akZeYAIwQmLcHBo yTCO/kSUJq3uCAxtzgzHSJ1itGY49imy3+YODpu3v3DJMSSl5+XKiXOewRkkgBIaUZpHtwgWO ReYpSVEuZlZGBgEOIpSC3KzSxBlX/FKM7BqCTM+w1kCk9mXgncvldApzABncJYfAPklJJEhJR UA6NyewwzT4veH+kz+TPOlmpld06pZFvUcsPBT8f64dHiVVMuzj/2odTzp88Tc/u5Ue08vAXr m843CMemXsrx2+0U96z+euTktwuM8peesAt4yeIb93VT9oxv9QYFZ1Zzf5g2T9KOc+uFvabnc ub1cdZP7Yo40aynKHGnOq13v8+6kn6WM9KqcUosxRmJhlrMRcWJAFrixTzXAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1507448706!86188759!4 X-Originating-IP: [134.134.136.100] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28044 invoked from network); 8 Oct 2017 07:45:11 -0000 Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by server-11.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Oct 2017 07:45:11 -0000 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP; 08 Oct 2017 00:45:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.42,493,1500966000"; d="scan'208"; a="1022874830" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.75]) by orsmga003.jf.intel.com with ESMTP; 08 Oct 2017 00:44:30 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Sun, 8 Oct 2017 15:23:49 +0800 Message-Id: <1507447441-5422-5-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507447441-5422-1-git-send-email-yi.y.sun@linux.intel.com> References: <1507447441-5422-1-git-send-email-yi.y.sun@linux.intel.com> MIME-Version: 1.0 Cc: Wei Liu , Yi Sun , Andrew Cooper , Jan Beulich , Chao Peng , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [Xen-devel] [PATCH v6 04/16] x86: a few optimizations to psr codes 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch refines psr codes: 1. Change type of 'cat_init_feature' to 'bool' to remove the pointless returning of error code. 2. Move printk in 'cat_init_feature' to reduce a return path. 3. Define a local variable 'feat_mask' in 'psr_cpu_init' to reduce calling of 'cpuid_count_leaf()'. Signed-off-by: Yi Sun Reviewed-by: Roger Pau Monné Acked-by: Jan Beulich --- CC: Jan Beulich CC: Andrew Cooper CC: Wei Liu CC: Roger Pau Monné CC: Chao Peng v6: - restore 'write_msr()' type to 'void'. (suggested by Jan Beulich and Roger Pau Monné) - change 'ebx' in 'psr_cpu_init' to 'feat_mask'. (suggested by Jan Beulich and Roger Pau Monné) v5: - create this patch to make codes clearer. (suggested by Jan Beulich and Roger Pau Monné) --- xen/arch/x86/psr.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 263ddbe..5945efa 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -273,10 +273,10 @@ static bool psr_check_cbm(unsigned int cbm_len, unsigned long cbm) } /* CAT common functions implementation. */ -static int cat_init_feature(const struct cpuid_leaf *regs, - struct feat_node *feat, - struct psr_socket_info *info, - enum psr_feat_type type) +static bool cat_init_feature(const struct cpuid_leaf *regs, + struct feat_node *feat, + struct psr_socket_info *info, + enum psr_feat_type type) { const char *const cat_feat_name[FEAT_TYPE_NUM] = { [FEAT_TYPE_L3_CAT] = "L3 CAT", @@ -286,7 +286,7 @@ static int cat_init_feature(const struct cpuid_leaf *regs, /* No valid value so do not enable feature. */ if ( !regs->a || !regs->d ) - return -ENOENT; + return false; feat->cbm_len = (regs->a & CAT_CBM_LEN_MASK) + 1; feat->cos_max = min(opt_cos_max, regs->d & CAT_COS_MAX_MASK); @@ -296,7 +296,7 @@ static int cat_init_feature(const struct cpuid_leaf *regs, case FEAT_TYPE_L3_CAT: case FEAT_TYPE_L2_CAT: if ( feat->cos_max < 1 ) - return -ENOENT; + return false; /* We reserve cos=0 as default cbm (all bits within cbm_len are 1). */ feat->cos_reg_val[0] = cat_default_val(feat->cbm_len); @@ -313,7 +313,7 @@ static int cat_init_feature(const struct cpuid_leaf *regs, uint64_t val; if ( feat->cos_max < 3 ) - return -ENOENT; + return false; /* Cut half of cos_max when CDP is enabled. */ feat->cos_max = (feat->cos_max - 1) >> 1; @@ -332,20 +332,18 @@ static int cat_init_feature(const struct cpuid_leaf *regs, } default: - return -ENOENT; + return false; } /* Add this feature into array. */ info->features[type] = feat; - if ( !opt_cpu_info ) - return 0; - - printk(XENLOG_INFO "%s: enabled on socket %u, cos_max:%u, cbm_len:%u\n", - cat_feat_name[type], cpu_to_socket(smp_processor_id()), - feat->cos_max, feat->cbm_len); + if ( opt_cpu_info ) + printk(XENLOG_INFO "%s: enabled on socket %u, cos_max:%u, cbm_len:%u\n", + cat_feat_name[type], cpu_to_socket(smp_processor_id()), + feat->cos_max, feat->cbm_len); - return 0; + return true; } static bool cat_get_feat_info(const struct feat_node *feat, @@ -1416,6 +1414,7 @@ static void psr_cpu_init(void) unsigned int socket, cpu = smp_processor_id(); struct feat_node *feat; struct cpuid_leaf regs; + uint32_t feat_mask; if ( !psr_alloc_feat_enabled() || !boot_cpu_has(X86_FEATURE_PQE) ) goto assoc_init; @@ -1434,7 +1433,8 @@ static void psr_cpu_init(void) spin_lock_init(&info->ref_lock); cpuid_count_leaf(PSR_CPUID_LEVEL_CAT, 0, ®s); - if ( regs.b & PSR_RESOURCE_TYPE_L3 ) + feat_mask = regs.b; + if ( feat_mask & PSR_RESOURCE_TYPE_L3 ) { cpuid_count_leaf(PSR_CPUID_LEVEL_CAT, 1, ®s); @@ -1455,8 +1455,7 @@ static void psr_cpu_init(void) } } - cpuid_count_leaf(PSR_CPUID_LEVEL_CAT, 0, ®s); - if ( regs.b & PSR_RESOURCE_TYPE_L2 ) + if ( feat_mask & PSR_RESOURCE_TYPE_L2 ) { cpuid_count_leaf(PSR_CPUID_LEVEL_CAT, 2, ®s);