From patchwork Wed Jun 14 01:12:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9785125 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 D97B66038E for ; Wed, 14 Jun 2017 01:27:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBD7426E75 for ; Wed, 14 Jun 2017 01:27:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C05B628569; Wed, 14 Jun 2017 01:27:51 +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 2DEC728520 for ; Wed, 14 Jun 2017 01:27:51 +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 1dKx4L-0007mc-8o; Wed, 14 Jun 2017 01:26:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dKx4K-0007lT-D3 for xen-devel@lists.xenproject.org; Wed, 14 Jun 2017 01:26:00 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 63/87-01752-7A090495; Wed, 14 Jun 2017 01:25:59 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRWlGSWpSXmKPExsVywNykWHf5BId Ig6u3mS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozzP2oLJttVPN2xmbWBsVG/i5GLQ0hgGqPE tUdL2LoYOTkkBHgljiybwQph+0l8abjNBFHUwCixfPZWZpAEm4C6xOOvPUwgtoiAksS9VZPBi pgFdjJJrDv9HaxIWCBSYlrbVvYuRg4OFgFVibXrVUDCvAKeEq/X3YJaJidx8thksGWcQPHu18 /AZgoJeEj8vDKVaQIj7wJGhlWMGsWpRWWpRbpGhnpJRZnpGSW5iZk5uoYGpnq5qcXFiempOYl JxXrJ+bmbGIHhUM/AwLiD8e5kv0OMkhxMSqK8S+wcIoX4kvJTKjMSizPii0pzUosPMcpwcChJ 8L7pA8oJFqWmp1akZeYAAxMmLcHBoyTCW9sGlOYtLkjMLc5Mh0idYlSUEuc9BdInAJLIKM2Da 4NFwyVGWSlhXkYGBgYhnoLUotzMElT5V4ziHIxKwrzH+4Gm8GTmlcBNfwW0mAlo8fUrNiCLSx IRUlINjIvWN9S77xK5/cvwrNu370+smX3VW059fbhv8uWsvatXi/hEvtn/Ib7GsEnoT8y1vQw TJkzoCf38Val85vv9twP37ZC/xiAsrZga9mkRU69t+13nLWmZMwSqvdgs55pesZht99zN63Vq zCSf+ye37Lxr+/XGCbFXwf/1s8+H3DiRscnN0di7e6sSS3FGoqEWc1FxIgBreLCWgQIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1497403511!87398197!16 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.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49993 invoked from network); 14 Jun 2017 01:25:58 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by server-16.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Jun 2017 01:25:58 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jun 2017 18:25:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,340,1493708400"; d="scan'208";a="99173981" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.64]) by orsmga002.jf.intel.com with ESMTP; 13 Jun 2017 18:25:54 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 14 Jun 2017 09:12:48 +0800 Message-Id: <1497402776-22348-16-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1497402776-22348-1-git-send-email-yi.y.sun@linux.intel.com> References: <1497402776-22348-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, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v12 15/23] x86: refactor psr: CDP: implement set value callback function. 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 L3 CDP set value related callback function. With this patch, 'psr-cat-cbm-set' command can work for L3 CDP. Signed-off-by: Yi Sun --- v12: - add comment to explain how to deal with the case that user set new val for both DATA and CODE at same time. - add parameter for 'psr_cbm_type_to_feat_type' to return the feature type according to it. - use the feature type returned by 'psr_cbm_type_to_feat_type' to check if we need insert the new value into all items of the feature value array. - use conditional expression for wrmsrl. (suggested by Jan Beulich) v11: - move 'feat->cos_reg_val' assignment and value comparison in 'write_msr' callback function out as generic codes. (suggested by Jan Beulich) - changes about setting both CDP DATA and CODE at same time. - move 'type[]' declaration into previous patch which introduced 'cos_num'. (suggested by Jan Beulich) - changes about 'type[]'. (suggested by Jan Beulich) - move 'compare_val' to previous patch. (suggested by Jan Beulich) - changes about 'get_val' which has been replace by generic codes. (suggested by Jan Beulich) - remove 'restore_default_val' which is unnecessary now. (suggested by Jan Beulich) v10: - remove 'l3_cdp_get_old_val' and use 'l3_cdp_get_val' to replace it. (suggested by Jan Beulich) - remove 'l3_cdp_set_new_val'. - modify 'insert_val_to_array' flow to handle multiple COSs case. (suggested by Jan Beulich) - remove 'l3_cdp_compare_val' and implement a generic function 'comapre_val'. (suggested by Jan Beulich) - remove 'l3_cdp_fits_cos_max'. (suggested by Jan Beulich) - introduce macro 'PSR_MAX_COS_NUM'. - introduce a new member in 'feat_props', 'type[PSR_MAX_COS_NUM]' to record all 'cbm_type' the feature has. (suggested by Jan Beulich) - modify 'gather_val_array' flow to handle multiple COSs case. (suggested by Jan Beulich) - modify 'find_cos' flow and implement 'compare_val' to handle multiple COSs case. (suggested by Jan Beulich) - modify 'fits_cos_max' flow to handle multiple COSs case. (suggested by Jan Beulich) - changes about 'props'. (suggested by Jan Beulich) - remove cast in 'l3_cdp_write_msr'. (suggested by Jan Beulich) - implement 'compare_val' function to compare if feature values are what we expect in finding flow. - implement 'restore_default_val' function to restore feature's COS values to default if the feature has multiple COSs. It is called when the COS ID is reduced to 0. v9: - add comment to explain why CDP uses 2 COSs. (suggested by Wei Liu) - use 'cat_default_val'. (suggested by Wei Liu) - remove 'l3_cdp_get_cos_num' because we can directly get cos_num from feat_node now. (suggested by Jan Beulich) - remove cos checking because it has been moved to common function. (suggested by Jan Beulich) - l3_cdp_set_new_val parameter 'm' is changed to 'new_val'. (suggested by Jan Beulich) - directly use get_cdp_data(feat, 0) and get_cdp_code(feat, 0) to get default value. (suggested by Jan Beulich) - modify 'l3_cdp_write_msr' flow to write value into register according to input type. - changes about 'uint64_t' to 'uint32_t'. (suggested by Jan Beulich) v8: - modify 'l3_cdp_write_msr' type to 'void'. v5: - remove type check in callback function. (suggested by Jan Beulich) - modify return value of callback functions because we do not need them to return number of entries the feature uses. In caller, we call 'get_cos_num' to get the number of entries the feature uses. (suggested by Jan Beulich) - remove 'l3_cdp_get_cos_max_from_type'. - rename 'l3_cdp_exceeds_cos_max' to 'l3_cdp_fits_cos_max'. (suggested by Jan Beulich) v4: - create this patch to make codes easier to understand. (suggested by Jan Beulich) --- --- xen/arch/x86/psr.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index aee6e3e..91b2122 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -209,7 +209,8 @@ 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_cbm_type_to_feat_type(enum cbm_type type, + bool strict) { enum psr_feat_type feat_type = PSR_SOCKET_FEAT_UNKNOWN; @@ -222,7 +223,7 @@ static enum psr_feat_type psr_cbm_type_to_feat_type(enum cbm_type type) * If type is L3 CAT but we cannot find it in feat_props array, * try CDP. */ - if ( !feat_props[feat_type] ) + if ( !feat_props[feat_type] && !strict ) feat_type = PSR_SOCKET_L3_CDP; break; @@ -358,11 +359,20 @@ 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) +{ + wrmsrl(((type == PSR_CBM_TYPE_L3_DATA) ? + MSR_IA32_PSR_L3_MASK_DATA(cos) : + MSR_IA32_PSR_L3_MASK_CODE(cos)), + val); +} + 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, .get_feat_info = l3_cdp_get_feat_info, + .write_msr = l3_cdp_write_msr, }; static void __init parse_psr_bool(char *s, char *value, char *feature, @@ -613,7 +623,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_cbm_type_to_feat_type(type, false); if ( feat_type >= ARRAY_SIZE(info->features) ) return -ENOENT; @@ -646,7 +656,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_cbm_type_to_feat_type(type, false); if ( feat_type >= ARRAY_SIZE(info->features) ) return -ENOENT; @@ -764,6 +774,7 @@ static int insert_val_into_array(uint32_t val[], const struct feat_node *feat; const struct feat_props *props; unsigned int i; + int ret = -EINVAL; ASSERT(feat_type < PSR_SOCKET_FEAT_NUM); @@ -805,17 +816,24 @@ static int insert_val_into_array(uint32_t val[], if ( !psr_check_cbm(feat->cbm_len, new_val) ) return -EINVAL; - /* Value setting position is same as feature array. */ + /* + * 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 strict feature type of + * 'PSR_CBM_TYPE_L3' is L3 CAT. So, we should set new_val to both of DATA + * and CODE under such case. + */ for ( i = 0; i < props->cos_num; i++ ) { - if ( type == props->type[i] ) + if ( type == props->type[i] || + feat_type != psr_cbm_type_to_feat_type(type, true) ) { val[i] = new_val; - return 0; + ret = 0; } } - return -EINVAL; + return ret; } static int compare_val(const uint32_t val[], @@ -1124,7 +1142,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_cbm_type_to_feat_type(type, false); if ( feat_type >= ARRAY_SIZE(info->features) || !info->features[feat_type] ) return -ENOENT;