From patchwork Tue Sep 5 09:32:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9938333 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 8BA1A601EB for ; Tue, 5 Sep 2017 09:53:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D98A28902 for ; Tue, 5 Sep 2017 09:53:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 727A028908; Tue, 5 Sep 2017 09:53:38 +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 8F2FD28912 for ; Tue, 5 Sep 2017 09:53:37 +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 1dpAVh-0006xu-2u; Tue, 05 Sep 2017 09:51:09 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpAVg-0006xJ-4e for xen-devel@lists.xenproject.org; Tue, 05 Sep 2017 09:51:08 +0000 Received: from [85.158.143.35] by server-5.bemta-6.messagelabs.com id 71/89-03454-B837EA95; Tue, 05 Sep 2017 09:51:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMIsWRWlGSWpSXmKPExsXS1tYhottVvC7 SYOtrTYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPt4+XsBctSKnZ9a2JqYFzt3sXIySEkMJ1R Yt68LBBbQoBX4siyGawQtr/EmwX3WCBqGhgl5i6sBrHZBNQlHn/tYQKxRQSUJO6tmgxkc3EwC 5xjktjzcQdYQlggUKJx3V5GEJtFQFVi1dm1bCA2r4C7xJVLbVAL5CROHpsMZHNwcAp4SCy9Vg exy13iz7a7rBDlghInZz5hASlhBtq7fp4QSJhZQF6ieets5gmMArOQVM1CqJqFpGoBI/MqRo3 i1KKy1CJdQ0O9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK95PzcTYzAwGQAgh2Mn5YFHGKU 5GBSEuUNTVwXKcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mC91YRUE6wKDU9tSItMwcYIzBpCQ4eJ RHecyBp3uKCxNzizHSI1ClGRSlx3uMgCQGQREZpHlwbLC4vMcpKCfMyAh0ixFOQWpSbWYIq/4 pRnINRSZh3CcgUnsy8Erjpr4AWMwEtrnq5BmRxSSJCSqqBkZ/JRqK/N9oqcH73FgWNE1OYuS5 /dUw+Hsp5YfNp9yPyQgcVe/alvz3XfPByi5H9GlvBFwFvFGIy72WeTT8gXHz98q3Ad+ofbit/ CzO6w52tdLpefYImv8e1DUbvxc/Gtcl2Fi7rX6KgweAZu0/G7P/hSqnU16/LrCQ+7wnMEtPy3 qvD+zpMiaU4I9FQi7moOBEAvsEBLcYCAAA= X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1504605051!81282253!4 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzU1MzU4\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3914 invoked from network); 5 Sep 2017 09:51:06 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-7.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 5 Sep 2017 09:51:06 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Sep 2017 02:51:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,479,1498546800"; d="scan'208";a="897185146" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by FMSMGA003.fm.intel.com with ESMTP; 05 Sep 2017 02:51:00 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Tue, 5 Sep 2017 17:32:25 +0800 Message-Id: <1504603957-5389-4-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504603957-5389-1-git-send-email-yi.y.sun@linux.intel.com> References: <1504603957-5389-1-git-send-email-yi.y.sun@linux.intel.com> MIME-Version: 1.0 Cc: kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, Yi Sun , julien.grall@arm.com, mengxu@cis.upenn.edu, jbeulich@suse.com, chao.p.peng@linux.intel.com, dgdegra@tycho.nsa.gov, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v3 03/15] x86: rename 'cbm_type' to 'psr_type' to make it general 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 renames 'cbm_type' to 'psr_type' to make it be general. Then, we can reuse this for all psr allocation features. Signed-off-by: Yi Sun Reviewed-by: Wei Liu Reviewed-by: Roger Pau Monné --- v3: - replace 'psr_val_type' to 'psr_type' and remove '_VAL' from the enum items. (suggested by Roger Pau Monné) v2: - replace 'PSR_VAL_TYPE_{L3, L2}' to 'PSR_VAL_TYPE_{L3, L2}_CBM'. (suggested by Chao Peng) --- xen/arch/x86/domctl.c | 16 ++++++------ xen/arch/x86/psr.c | 62 +++++++++++++++++++++++++---------------------- xen/arch/x86/sysctl.c | 4 +-- xen/include/asm-x86/psr.h | 18 +++++++------- 4 files changed, 52 insertions(+), 48 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 1424c90..696eff2 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1447,51 +1447,51 @@ long arch_do_domctl( case XEN_DOMCTL_PSR_ALLOC_SET_L3_CBM: ret = psr_set_val(d, domctl->u.psr_alloc.target, domctl->u.psr_alloc.data, - PSR_CBM_TYPE_L3); + PSR_TYPE_L3_CBM); break; case XEN_DOMCTL_PSR_ALLOC_SET_L3_CODE: ret = psr_set_val(d, domctl->u.psr_alloc.target, domctl->u.psr_alloc.data, - PSR_CBM_TYPE_L3_CODE); + PSR_TYPE_L3_CODE); break; case XEN_DOMCTL_PSR_ALLOC_SET_L3_DATA: ret = psr_set_val(d, domctl->u.psr_alloc.target, domctl->u.psr_alloc.data, - PSR_CBM_TYPE_L3_DATA); + PSR_TYPE_L3_DATA); break; case XEN_DOMCTL_PSR_ALLOC_SET_L2_CBM: ret = psr_set_val(d, domctl->u.psr_alloc.target, domctl->u.psr_alloc.data, - PSR_CBM_TYPE_L2); + PSR_TYPE_L2_CBM); break; case XEN_DOMCTL_PSR_ALLOC_GET_L3_CBM: ret = psr_get_val(d, domctl->u.psr_alloc.target, - &val32, PSR_CBM_TYPE_L3); + &val32, PSR_TYPE_L3_CBM); domctl->u.psr_alloc.data = val32; copyback = true; break; case XEN_DOMCTL_PSR_ALLOC_GET_L3_CODE: ret = psr_get_val(d, domctl->u.psr_alloc.target, - &val32, PSR_CBM_TYPE_L3_CODE); + &val32, PSR_TYPE_L3_CODE); domctl->u.psr_alloc.data = val32; copyback = true; break; case XEN_DOMCTL_PSR_ALLOC_GET_L3_DATA: ret = psr_get_val(d, domctl->u.psr_alloc.target, - &val32, PSR_CBM_TYPE_L3_DATA); + &val32, PSR_TYPE_L3_DATA); domctl->u.psr_alloc.data = val32; copyback = true; break; case XEN_DOMCTL_PSR_ALLOC_GET_L2_CBM: ret = psr_get_val(d, domctl->u.psr_alloc.target, - &val32, PSR_CBM_TYPE_L2); + &val32, PSR_TYPE_L2_CBM); domctl->u.psr_alloc.data = val32; copyback = true; break; diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index c0123d2..4166a1c 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -100,24 +100,24 @@ static const struct feat_props { unsigned int cos_num; /* - * An array to save all 'enum cbm_type' values of the feature. It is + * An array to save all 'enum psr_type' values of the feature. It is * used with cos_num together to get/write a feature's COS registers * values one by one. */ - enum cbm_type type[MAX_COS_NUM]; + enum psr_type type[MAX_COS_NUM]; /* * alt_type is 'alternative type'. When this 'alt_type' is input, the * feature does some special operations. */ - enum cbm_type alt_type; + enum psr_type alt_type; /* get_feat_info is used to return feature HW info through sysctl. */ bool (*get_feat_info)(const struct feat_node *feat, uint32_t data[], unsigned int array_len); /* write_msr is used to write out feature MSR register. */ - void (*write_msr)(unsigned int cos, uint32_t val, enum cbm_type type); + void (*write_msr)(unsigned int cos, uint32_t val, enum psr_type type); } *feat_props[FEAT_TYPE_NUM]; /* @@ -215,13 +215,13 @@ static void free_socket_resources(unsigned int socket) bitmap_zero(info->dom_set, DOMID_IDLE + 1); } -static enum psr_feat_type psr_cbm_type_to_feat_type(enum cbm_type type) +static enum psr_feat_type psr_type_to_feat_type(enum psr_type type) { enum psr_feat_type feat_type = FEAT_TYPE_UNKNOWN; switch ( type ) { - case PSR_CBM_TYPE_L3: + case PSR_TYPE_L3_CBM: feat_type = FEAT_TYPE_L3_CAT; /* @@ -233,12 +233,12 @@ static enum psr_feat_type psr_cbm_type_to_feat_type(enum cbm_type type) break; - case PSR_CBM_TYPE_L3_DATA: - case PSR_CBM_TYPE_L3_CODE: + case PSR_TYPE_L3_DATA: + case PSR_TYPE_L3_CODE: feat_type = FEAT_TYPE_L3_CDP; break; - case PSR_CBM_TYPE_L2: + case PSR_TYPE_L2_CBM: feat_type = FEAT_TYPE_L2_CAT; break; @@ -362,15 +362,16 @@ static bool cat_get_feat_info(const struct feat_node *feat, } /* L3 CAT props */ -static void l3_cat_write_msr(unsigned int cos, uint32_t val, enum cbm_type type) +static void l3_cat_write_msr(unsigned int cos, uint32_t val, + enum psr_type type) { wrmsrl(MSR_IA32_PSR_L3_MASK(cos), val); } static const struct feat_props l3_cat_props = { .cos_num = 1, - .type[0] = PSR_CBM_TYPE_L3, - .alt_type = PSR_CBM_TYPE_UNKNOWN, + .type[0] = PSR_TYPE_L3_CBM, + .alt_type = PSR_TYPE_UNKNOWN, .get_feat_info = cat_get_feat_info, .write_msr = l3_cat_write_msr, }; @@ -387,9 +388,10 @@ static bool l3_cdp_get_feat_info(const struct feat_node *feat, return true; } -static void l3_cdp_write_msr(unsigned int cos, uint32_t val, enum cbm_type type) +static void l3_cdp_write_msr(unsigned int cos, uint32_t val, + enum psr_type type) { - wrmsrl(((type == PSR_CBM_TYPE_L3_DATA) ? + wrmsrl(((type == PSR_TYPE_L3_DATA) ? MSR_IA32_PSR_L3_MASK_DATA(cos) : MSR_IA32_PSR_L3_MASK_CODE(cos)), val); @@ -397,23 +399,24 @@ static void l3_cdp_write_msr(unsigned int cos, uint32_t val, enum cbm_type type) static const struct feat_props l3_cdp_props = { .cos_num = 2, - .type[0] = PSR_CBM_TYPE_L3_DATA, - .type[1] = PSR_CBM_TYPE_L3_CODE, - .alt_type = PSR_CBM_TYPE_L3, + .type[0] = PSR_TYPE_L3_DATA, + .type[1] = PSR_TYPE_L3_CODE, + .alt_type = PSR_TYPE_L3_CBM, .get_feat_info = l3_cdp_get_feat_info, .write_msr = l3_cdp_write_msr, }; /* L2 CAT props */ -static void l2_cat_write_msr(unsigned int cos, uint32_t val, enum cbm_type type) +static void l2_cat_write_msr(unsigned int cos, uint32_t val, + enum psr_type type) { wrmsrl(MSR_IA32_PSR_L2_MASK(cos), val); } static const struct feat_props l2_cat_props = { .cos_num = 1, - .type[0] = PSR_CBM_TYPE_L2, - .alt_type = PSR_CBM_TYPE_UNKNOWN, + .type[0] = PSR_TYPE_L2_CBM, + .alt_type = PSR_TYPE_UNKNOWN, .get_feat_info = cat_get_feat_info, .write_msr = l2_cat_write_msr, }; @@ -654,7 +657,7 @@ static struct psr_socket_info *get_socket_info(unsigned int socket) return socket_info + socket; } -int psr_get_info(unsigned int socket, enum cbm_type type, +int psr_get_info(unsigned int socket, enum psr_type type, uint32_t data[], unsigned int array_len) { const struct psr_socket_info *info = get_socket_info(socket); @@ -666,7 +669,7 @@ int psr_get_info(unsigned int socket, enum cbm_type type, if ( IS_ERR(info) ) return PTR_ERR(info); - feat_type = psr_cbm_type_to_feat_type(type); + feat_type = psr_type_to_feat_type(type); if ( feat_type >= ARRAY_SIZE(info->features) ) return -ENOENT; @@ -687,7 +690,7 @@ int psr_get_info(unsigned int socket, enum cbm_type type, } int psr_get_val(struct domain *d, unsigned int socket, - uint32_t *val, enum cbm_type type) + uint32_t *val, enum psr_type type) { const struct psr_socket_info *info = get_socket_info(socket); const struct feat_node *feat; @@ -699,7 +702,7 @@ int psr_get_val(struct domain *d, unsigned int socket, if ( IS_ERR(info) ) return PTR_ERR(info); - feat_type = psr_cbm_type_to_feat_type(type); + feat_type = psr_type_to_feat_type(type); if ( feat_type >= ARRAY_SIZE(info->features) ) return -ENOENT; @@ -829,7 +832,7 @@ static int insert_val_into_array(uint32_t val[], unsigned int array_len, const struct psr_socket_info *info, enum psr_feat_type feat_type, - enum cbm_type type, + enum psr_type type, uint32_t new_val) { const struct feat_node *feat; @@ -865,8 +868,9 @@ static int insert_val_into_array(uint32_t val[], /* * Value setting position is same as feature array. * For CDP, user may set both DATA and CODE to same value. For such case, - * user input 'PSR_CBM_TYPE_L3' as type. The alternative type of CDP is same - * as it. So we should set new_val to both of DATA and CODE under such case. + * user input 'PSR_TYPE_L3_CBM' as type. The alternative type of CDP is + * same as it. So we should set new_val to both of DATA and CODE under such + * case. */ for ( i = 0; i < props->cos_num; i++ ) { @@ -1155,7 +1159,7 @@ static int write_psr_msrs(unsigned int socket, unsigned int cos, } int psr_set_val(struct domain *d, unsigned int socket, - uint64_t new_val, enum cbm_type type) + uint64_t new_val, enum psr_type type) { unsigned int old_cos, array_len; int cos, ret; @@ -1171,7 +1175,7 @@ int psr_set_val(struct domain *d, unsigned int socket, if ( new_val != val ) return -EINVAL; - feat_type = psr_cbm_type_to_feat_type(type); + feat_type = psr_type_to_feat_type(type); if ( feat_type >= ARRAY_SIZE(info->features) || !info->features[feat_type] ) return -ENOENT; diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 7dcbe74..1d3dbd0 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -179,7 +179,7 @@ long arch_do_sysctl( case XEN_SYSCTL_PSR_ALLOC_get_l3_info: { ret = psr_get_info(sysctl->u.psr_alloc.target, - PSR_CBM_TYPE_L3, data, ARRAY_SIZE(data)); + PSR_TYPE_L3_CBM, data, ARRAY_SIZE(data)); if ( ret ) break; @@ -198,7 +198,7 @@ long arch_do_sysctl( case XEN_SYSCTL_PSR_ALLOC_get_l2_info: { ret = psr_get_info(sysctl->u.psr_alloc.target, - PSR_CBM_TYPE_L2, data, ARRAY_SIZE(data)); + PSR_TYPE_L2_CBM, data, ARRAY_SIZE(data)); if ( ret ) break; diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h index 18a42f3..cb3f067 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -53,12 +53,12 @@ struct psr_cmt { struct psr_cmt_l3 l3; }; -enum cbm_type { - PSR_CBM_TYPE_L3, - PSR_CBM_TYPE_L3_CODE, - PSR_CBM_TYPE_L3_DATA, - PSR_CBM_TYPE_L2, - PSR_CBM_TYPE_UNKNOWN, +enum psr_type { + PSR_TYPE_L3_CBM, + PSR_TYPE_L3_CODE, + PSR_TYPE_L3_DATA, + PSR_TYPE_L2_CBM, + PSR_TYPE_UNKNOWN, }; extern struct psr_cmt *psr_cmt; @@ -72,12 +72,12 @@ int psr_alloc_rmid(struct domain *d); void psr_free_rmid(struct domain *d); void psr_ctxt_switch_to(struct domain *d); -int psr_get_info(unsigned int socket, enum cbm_type type, +int psr_get_info(unsigned int socket, enum psr_type type, uint32_t data[], unsigned int array_len); int psr_get_val(struct domain *d, unsigned int socket, - uint32_t *val, enum cbm_type type); + uint32_t *val, enum psr_type type); int psr_set_val(struct domain *d, unsigned int socket, - uint64_t val, enum cbm_type type); + uint64_t val, enum psr_type type); void psr_domain_init(struct domain *d); void psr_domain_free(struct domain *d);