From patchwork Wed Dec 14 04:07:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9474009 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 AAFCF60823 for ; Wed, 14 Dec 2016 11:12:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1A552871A for ; Wed, 14 Dec 2016 11:12:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 961442871E; Wed, 14 Dec 2016 11:12:04 +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=-2.7 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, 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 125A42871A for ; Wed, 14 Dec 2016 11:12:04 +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 1cH7Ri-0005AE-Er; Wed, 14 Dec 2016 11:10:02 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cH7Rh-00052m-K0 for xen-devel@lists.xenproject.org; Wed, 14 Dec 2016 11:10:01 +0000 Received: from [85.158.143.35] by server-5.bemta-6.messagelabs.com id F0/2E-11476-98821585; Wed, 14 Dec 2016 11:10:01 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRWlGSWpSXmKPExsXS1tYhoduhERh hsGSVjMX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmrHmzzr2gp9GFRdXNrE3MB5R6WLk5BASqJD4 d+QmE4gtIcArcWTZDFYI20/i5ZIPQHEuoJoGRonpi9vAEmwC6hKPv/aANYgIKEncWzUZrIhZo JtJYuXDrSwgCWGBMImmH3vAbBYBVYnG3m5mEJtXwEPi245fUNvkJE4emww0lIODEyj+b0sixE HuEhd737FPYORdwMiwilGjOLWoLLVI18hYL6koMz2jJDcxM0fX0MBMLze1uDgxPTUnMalYLzk /dxMjMBwYgGAH45/5gYcYJTmYlER5ua4GRAjxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4J2lHhgh JFiUmp5akZaZAwxMmLQEB4+SCG+QClCat7ggMbc4Mx0idYpRUUqcdyVInwBIIqM0D64NFg2XG GWlhHkZgQ4R4ilILcrNLEGVf8UozsGoJMy7AWQKT2ZeCdz0V0CLmYAWiy7xB1lckoiQkmpgrG RdHirEuHPTVuuas0+5nKKmJ/JLulf07LUw5AxmFrsoecrlmdacezuYhO+3HT8kseU1j9qKMx5 lp1bKHFp4S7TFrtxNTbRRRZhRZr7z/JwZx3hCO8t64x7Oczx+6CFvHXfRnWsBNk2PmYoKbuUl hp2S1Hs5hc/LMv7acYaYyecWL7ocGzNdiaU4I9FQi7moOBEA3/XMFYECAAA= X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1481713769!48240089!10 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzkwOTcx\n X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19214 invoked from network); 14 Dec 2016 11:10:00 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-12.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Dec 2016 11:10:00 -0000 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP; 14 Dec 2016 03:09:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,346,1477983600"; d="scan'208";a="39863235" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by orsmga004.jf.intel.com with ESMTP; 14 Dec 2016 03:09:57 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 14 Dec 2016 12:07:49 +0800 Message-Id: <1481688484-5093-10-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1481688484-5093-1-git-send-email-yi.y.sun@linux.intel.com> References: <1481688484-5093-1-git-send-email-yi.y.sun@linux.intel.com> Cc: 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 Subject: [Xen-devel] [PATCH v4 09/24] x86: refactor psr: set value: assemble features value array. 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 Only can one COS ID be used by one domain at one time. That means all enabled features' COS registers at this COS ID are valid for this domain at that time. When user updates a feature's value, we need make sure all other features' values are not affected. So, we firstly need assemble an array which contains all features current values and replace the setting feature's value in array to new value. Then, we can try to find if there is a COS ID on which all features' COS registers values are same as the array. If we can find, we just use this COS ID. If fail to find, we need allocate a new COS ID. This patch implements value array assembling flow. Signed-off-by: Yi Sun --- xen/arch/x86/psr.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 134 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 838f2d1..8fcaa76 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -121,6 +121,35 @@ struct feat_ops { /* get_val is used to get feature COS register value. */ bool (*get_val)(const struct feat_node *feat, unsigned int cos, enum cbm_type type, uint64_t *val); + /* + * get_cos_num is used to get the COS registers amount used by the + * feature for one setting, e.g. CDP uses 2 COSs but CAT uses 1. + */ + unsigned int (*get_cos_num)(const struct feat_node *feat); + /* + * get_old_val and set_new_val are a pair of functions called together. + * The caller will traverse all features in the list and call both + * functions for every feature to do below two things: + * 1. get old_cos register value of all supported features and + * 2. set the new value for the feature. + * + * All the values are set into value array according the traversal order, + * meaning the same order of feature list members. + * + * The return value is the amount of entries to skip in the value array + * or error. + * 1 - one entry in value array. + * 2 - two entries in value array, e.g. CDP uses two entries. + * negative - error. + */ + int (*get_old_val)(uint64_t val[], + const struct feat_node *feat, + unsigned int old_cos); + int (*set_new_val)(uint64_t val[], + const struct feat_node *feat, + unsigned int old_cos, + enum cbm_type type, + uint64_t m); }; @@ -186,6 +215,29 @@ static void free_feature(struct psr_socket_info *info) } } +static bool_t psr_check_cbm(unsigned int cbm_len, uint64_t cbm) +{ + unsigned int first_bit, zero_bit; + + /* Set bits should only in the range of [0, cbm_len). */ + if ( cbm & (~0ull << cbm_len) ) + return 0; + + /* At least one bit need to be set. */ + if ( cbm == 0 ) + return 0; + + first_bit = find_first_bit(&cbm, cbm_len); + zero_bit = find_next_zero_bit(&cbm, cbm_len, first_bit); + + /* Set bits should be contiguous. */ + if ( zero_bit < cbm_len && + find_next_bit(&cbm, cbm_len, zero_bit) < cbm_len ) + return 0; + + return 1; +} + /* L3 CAT callback functions implementation. */ static void l3_cat_init_feature(unsigned int eax, unsigned int ebx, unsigned int ecx, unsigned int edx, @@ -255,11 +307,53 @@ static bool l3_cat_get_val(const struct feat_node *feat, unsigned int cos, return true; } +static unsigned int l3_cat_get_cos_num(const struct feat_node *feat) +{ + return 1; +} + +static int l3_cat_get_old_val(uint64_t val[], + const struct feat_node *feat, + unsigned int old_cos) +{ + if ( old_cos > feat->info.l3_cat_info.cos_max ) + /* Use default value. */ + old_cos = 0; + + /* CAT */ + val[0] = feat->cos_reg_val[old_cos]; + + /* L3 CAT uses one COS. */ + return 1; +} + +static int l3_cat_set_new_val(uint64_t val[], + const struct feat_node *feat, + unsigned int old_cos, + enum cbm_type type, + uint64_t m) +{ + if ( type != PSR_CBM_TYPE_L3 ) + /* L3 CAT uses one COS. Skip it. */ + return 1; + + if ( !psr_check_cbm(feat->info.l3_cat_info.cbm_len, m) ) + return -EINVAL; + + val[0] = m; + + /* L3 CAT uses one COS. */ + return 1; +} + struct feat_ops l3_cat_ops = { .init_feature = l3_cat_init_feature, .get_max_cos_max = l3_cat_get_max_cos_max, .get_feat_info = l3_cat_get_feat_info, .get_val = l3_cat_get_val, + .get_cos_num = l3_cat_get_cos_num, + .get_old_val = l3_cat_get_old_val, + .set_new_val = l3_cat_set_new_val, }; static void __init parse_psr_bool(char *s, char *value, char *feature, @@ -516,7 +610,14 @@ int psr_get_val(struct domain *d, unsigned int socket, /* Set value functions */ static unsigned int get_cos_num(const struct psr_socket_info *info) { - return 0; + const struct feat_node *feat_tmp; + unsigned int num = 0; + + /* Get all features total amount. */ + list_for_each_entry(feat_tmp, &info->feat_list, list) + num += feat_tmp->ops.get_cos_num(feat_tmp); + + return num; } static int get_old_set_new(uint64_t *val, @@ -526,6 +627,38 @@ static int get_old_set_new(uint64_t *val, enum cbm_type type, uint64_t m) { + const struct feat_node *feat_tmp; + int ret; + uint64_t *val_tmp = val; + + if ( !val ) + return -EINVAL; + + /* Get all features current values according to old_cos. */ + list_for_each_entry(feat_tmp, &info->feat_list, list) + { + /* value getting order is same as feature list */ + ret = feat_tmp->ops.get_old_val(val_tmp, feat_tmp, old_cos); + + val_tmp += ret; + if ( val_tmp - val > array_len) + return -EINVAL; + } + + /* Set new value into array according to feature's position in array. */ + val_tmp = val; + list_for_each_entry(feat_tmp, &info->feat_list, list) + { + /* value setting order is same as feature list */ + ret = feat_tmp->ops.set_new_val(val_tmp, feat_tmp, old_cos, type, m); + if ( ret < 0 ) + return ret; + + val_tmp += ret; + if ( val_tmp - val > array_len) + return -EINVAL; + } + return 0; }