From patchwork Fri Oct 20 08:28:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 10019253 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 A2BB0602CB for ; Fri, 20 Oct 2017 08:52:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 920B428EC0 for ; Fri, 20 Oct 2017 08:52:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85A5C28ECB; Fri, 20 Oct 2017 08:52:25 +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 E678928EC6 for ; Fri, 20 Oct 2017 08:52:24 +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 1e5T0D-0006BK-O7; Fri, 20 Oct 2017 08:50:01 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e5T0C-00066a-1Z for xen-devel@lists.xenproject.org; Fri, 20 Oct 2017 08:50:00 +0000 Received: from [85.158.143.35] by server-6.bemta-6.messagelabs.com id 84/FE-08608-7B8B9E95; Fri, 20 Oct 2017 08:49:59 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrKIsWRWlGSWpSXmKPExsXS1tYhr7t5x8t Ig2UbzS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozumR4F3fYV1//uY2xgXKbXxcjJISRQITFx 8nI2EFtCgFfiyLIZrBC2v8SPN70sXYxcQDUNjBKnn6xhBkmwCahLPP7awwRiiwgoSdxbNZkJp IhZ4DejxKkth8ASwgL2Ege/NANN5eBgEVCVmLk0CyTMK+AucezgSyaIBXISJ49NBlvGKeAhsb f1NiPEQe4SU8/MZIeoF5Q4OfMJC8gYZqC96+cJgYSZBeQlmrfOZp7AKDALSdUshKpZSKoWMDK vYtQoTi0qSy3SNTTSSyrKTM8oyU3MzNE1NDDTy00tLk5MT81JTCrWS87P3cQIDEwGINjBeHlj wCFGSQ4mJVHewMqXkUJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkeNm2A+UEi1LTUyvSMnOAMQKTl uDgURLhfQSS5i0uSMwtzkyHSJ1iNOY4tunyHyaOjpt3/zAJseTl56VKifP2gZQKgJRmlObBDY LF7iVGWSlhXkag04R4ClKLcjNLUOVfMYpzMCoJ81qATOHJzCuB2/cK6BQmoFPY7V+AnFKSiJC SamBcU8ff6j3PSLFtmq1mwsEvBSFnD5X++93wj2HlLBdzuYJJErPPnpg7db9x1vU3ce7GUx+Y dU1fFKzam6pmwNFZ3RU4T+pcizznjDeMN/zM/p88Z75E53XGDs7tap3yMlt9AiLyW/5mNKhM5 JhWH/NfaM27tfn8Nx/y+9/wft6o8f18cHbP8WIlluKMREMt5qLiRABFf7id2AIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1508489386!74969590!5 X-Originating-IP: [134.134.136.31] 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 18289 invoked from network); 20 Oct 2017 08:49:55 -0000 Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by server-11.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 20 Oct 2017 08:49:55 -0000 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP; 20 Oct 2017 01:49:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,405,1503385200"; d="scan'208";a="162752619" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.75]) by orsmga005.jf.intel.com with ESMTP; 20 Oct 2017 01:49:52 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Fri, 20 Oct 2017 16:28:16 +0800 Message-Id: <1508488108-7071-5-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508488108-7071-1-git-send-email-yi.y.sun@linux.intel.com> References: <1508488108-7071-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 v9 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()'. 4. Change 'PSR_INFO_IDX_CAT_FLAG' to 'PSR_INFO_IDX_CAT_FLAGS'. 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 v7: - adjust the check to 'cat_init_feature' in 'psr_cpu_init'. (suggested by Jan Beulich) - change 'PSR_INFO_IDX_CAT_FLAG' to 'PSR_INFO_IDX_CAT_FLAGS'. (suggested by Jan Beulich) 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 | 45 ++++++++++++++++++++++----------------------- xen/arch/x86/sysctl.c | 4 ++-- xen/include/asm-x86/psr.h | 2 +- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 7d8295e..58d203f 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, @@ -356,7 +354,7 @@ static bool cat_get_feat_info(const struct feat_node *feat, data[PSR_INFO_IDX_COS_MAX] = feat->cos_max; data[PSR_INFO_IDX_CAT_CBM_LEN] = feat->cbm_len; - data[PSR_INFO_IDX_CAT_FLAG] = 0; + data[PSR_INFO_IDX_CAT_FLAGS] = 0; return true; } @@ -383,7 +381,7 @@ static bool l3_cdp_get_feat_info(const struct feat_node *feat, if ( !cat_get_feat_info(feat, data, array_len) ) return false; - data[PSR_INFO_IDX_CAT_FLAG] |= XEN_SYSCTL_PSR_CAT_L3_CDP; + data[PSR_INFO_IDX_CAT_FLAGS] |= XEN_SYSCTL_PSR_CAT_L3_CDP; return true; } @@ -1413,6 +1411,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; @@ -1431,7 +1430,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); @@ -1439,27 +1439,26 @@ static void psr_cpu_init(void) feat_l3 = NULL; if ( (regs.c & PSR_CAT_CDP_CAPABILITY) && (opt_psr & PSR_CDP) && - !cat_init_feature(®s, feat, info, FEAT_TYPE_L3_CDP) ) + cat_init_feature(®s, feat, info, FEAT_TYPE_L3_CDP) ) feat_props[FEAT_TYPE_L3_CDP] = &l3_cdp_props; /* If CDP init fails, try to work as L3 CAT. */ if ( !feat_props[FEAT_TYPE_L3_CDP] ) { - if ( !cat_init_feature(®s, feat, info, FEAT_TYPE_L3_CAT) ) + if ( cat_init_feature(®s, feat, info, FEAT_TYPE_L3_CAT) ) feat_props[FEAT_TYPE_L3_CAT] = &l3_cat_props; else feat_l3 = feat; } } - 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); feat = feat_l2_cat; feat_l2_cat = NULL; - if ( !cat_init_feature(®s, feat, info, FEAT_TYPE_L2_CAT) ) + if ( cat_init_feature(®s, feat, info, FEAT_TYPE_L2_CAT) ) feat_props[FEAT_TYPE_L2_CAT] = &l2_cat_props; else feat_l2_cat = feat; diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 6867ee1..6d48cac 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -188,7 +188,7 @@ long arch_do_sysctl( sysctl->u.psr_alloc.u.cat_info.cbm_len = data[PSR_INFO_IDX_CAT_CBM_LEN]; sysctl->u.psr_alloc.u.cat_info.flags = - data[PSR_INFO_IDX_CAT_FLAG]; + data[PSR_INFO_IDX_CAT_FLAGS]; if ( __copy_field_to_guest(u_sysctl, sysctl, u.psr_alloc) ) ret = -EFAULT; @@ -207,7 +207,7 @@ long arch_do_sysctl( sysctl->u.psr_alloc.u.cat_info.cbm_len = data[PSR_INFO_IDX_CAT_CBM_LEN]; sysctl->u.psr_alloc.u.cat_info.flags = - data[PSR_INFO_IDX_CAT_FLAG]; + data[PSR_INFO_IDX_CAT_FLAGS]; if ( __copy_field_to_guest(u_sysctl, sysctl, u.psr_alloc) ) ret = -EFAULT; diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h index cb3f067..f151fa7 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -37,7 +37,7 @@ /* Used by psr_get_info() */ #define PSR_INFO_IDX_COS_MAX 0 #define PSR_INFO_IDX_CAT_CBM_LEN 1 -#define PSR_INFO_IDX_CAT_FLAG 2 +#define PSR_INFO_IDX_CAT_FLAGS 2 #define PSR_INFO_ARRAY_SIZE 3 struct psr_cmt_l3 {