From patchwork Tue Aug 1 08:48:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9873909 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 1950E60365 for ; Tue, 1 Aug 2017 09:07:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20D6B2582C for ; Tue, 1 Aug 2017 09:07:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1571328670; Tue, 1 Aug 2017 09:07:19 +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 5AB932582C for ; Tue, 1 Aug 2017 09:07:18 +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 1dcT6T-00058H-Sl; Tue, 01 Aug 2017 09:04:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcT6S-00056s-AD for xen-devel@lists.xenproject.org; Tue, 01 Aug 2017 09:04:36 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 09/EA-02175-32440895; Tue, 01 Aug 2017 09:04:35 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsXS1tYhoqvo0hB p8PSivsX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmnHy9D+mgicuFZ2LdjE3MH4w7GLk4hASmMYo seXbacYuRk4OCQFeiSPLZrBC2P4SPbtPMkMUNTBKvJv+HyzBJqAu8fhrDxOILSKgJHFv1WQmk CJmgflMEq/PP2AGSQgLxEscuX8LKMHBwSKgKjGtLw0kzCvgIdF4cAMzxAI5iZPHJoPN5ASK77 h5gxmkXEjAXWLnzMQJjLwLGBlWMaoXpxaVpRbpmuolFWWmZ5TkJmbm6BoamOrlphYXJ6an5iQ mFesl5+duYgQGAwMQ7GD80u98iFGSg0lJlFexpz5SiC8pP6UyI7E4I76oNCe1+BCjDAeHkgSv hHNDpJBgUWp6akVaZg4wLGHSEhw8SiK8F5yA0rzFBYm5xZnpEKlTjLocryb8/8YkxJKXn5cqJ c57EaRIAKQoozQPbgQsRi4xykoJ8zICHSXEU5BalJtZgir/ilGcg1FJmPc+yBSezLwSuE2vgI 5gAjpCsrQW5IiSRISUVANjn8H8mKPJr3g3rz/6vHHGqdr8o8XFXN3tN4SWz63UvWNxZ3ntKsf dXi2Fi7g1eH8u9Op6u8W/6KWNxvXXxgWKqw4v7lmQ98t57XoF2+/v0207D/y/N3HFFJMDe0u2 Sr31OxOU/UJP5ZLy7kWlbvfX+JXUv+GrMA0X6Fh87TTnidXz1jpJ2E31VGIpzkg01GIuKk4EA IYD81KMAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1501578248!89431283!10 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.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50118 invoked from network); 1 Aug 2017 09:04:33 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-16.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 1 Aug 2017 09:04:33 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2017 02:04:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,305,1498546800"; d="scan'208";a="118061576" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by orsmga002.jf.intel.com with ESMTP; 01 Aug 2017 02:04:30 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Tue, 1 Aug 2017 16:48:40 +0800 Message-Id: <1501577334-7431-10-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1501577334-7431-1-git-send-email-yi.y.sun@linux.intel.com> References: <1501577334-7431-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, 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 v15 09/23] x86: refactor psr: L3 CAT: 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 gather 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 pick a new COS ID. This patch implements value array assembling flow. Signed-off-by: Yi Sun Reviewed-by: Jan Beulich --- v15: - remove unnecessary 'else' in 'insert_val_into_array'. (suggested by Jan Beulich) v14: - remove parameter '**val' in skip_prior_features and return the length to skip value array in the caller. (suggested by Jan Beulich) - remove a stray blank. (suggested by Jan Beulich) v13: - remove an unnecessary blank line. (suggested by Jan Beulich) - add a new function 'skip_prior_features()' to skip value array according to feature type. This function will be used in later patches too. (suggested by Jan Beulich) v12: - use 'ARRAY_SIZE' to calculate array boundary. (suggested by Jan Beulich) - use 'ASSERT_UNREACHABLE()' to record bug and return error code if feat exist but props does not exist. (suggested by Jan Beulich) - return 0 only when value is set in 'insert_val_into_array'. (suggested by Jan Beulich) v11: - changes about 'feat_props'. (suggested by Jan Beulich) - changes about 'get_val'. It is replaced by generic codes. (suggested by Jan Beulich) v10: - remove 'get_old_val' to directly call 'get_val' to get needed val. (suggested by Jan Beulich) - move 'psr_check_cbm' into 'insert_val_to_array'. (suggested by Jan Beulich) - change type of 'cbm' in 'psr_check_cbm' to 'unsigned long'. (suggested by Jan Beulich) - remove 'set_new_val' as it can be handled in generic process. - changes related to 'feat_props'. (suggested by Jan Beulich) - adjust flow in 'gather_val_array' to avoid array cross. (suggested by Jan Beulich) - adjust flow in 'insert_val_to_array' to avoid array cross. (suggested by Jan Beulich) v9: - add comments about boundary checking. (suggested by Wei Liu) - rename 'assemble_val_array' to 'combine_val_array' in pervious patch. (suggested by Wei Liu) - rename 'l3_cat_get_cos_num' to 'cat_get_cos_num' to cover all L3/L2 CAT features. (suggested by Roger Pau) - rename 'l3_cat_get_old_val' to 'cat_get_old_val' to cover all L3/L2 CAT features and reuse cat_get_val in it. (suggested by Roger Pau) - replace feature list handling to feature array handling. (suggested by Roger Pau) - modify patch title to indicate 'L3 CAT'. (suggested by Jan Beulich) - replace 'm' to 'new_val'. (suggested by Jan Beulich) - move cos check outside callback function. (suggested by Jan Beulich) - remove 'get_cos_num' callback function. (suggested by Jan Beulich) - changes about 'uint64_t' to 'uint32_t'. (suggested by Jan Beulich) v6: - change 'assemble_val_array' to 'combine_val_array'. (suggested by Konrad Rzeszutek Wilk) - check return value of 'get_old_val'. (suggested by Konrad Rzeszutek Wilk) - replace some 'EINVAL' to 'ENOSPC'. (suggested by Konrad Rzeszutek Wilk) v5: - modify comments according to changes of codes. (suggested by Jan Beulich) - change 'bool_t' to 'bool'. (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) - modify variables names to make them better, e.g. 'feat_tmp' to 'feat'. (suggested by Jan Beulich) v4: - create this patch to make codes easier to understand. (suggested by Jan Beulich) --- xen/arch/x86/psr.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 133 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index f1b5837..f7ba892 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -210,6 +210,29 @@ static enum psr_feat_type psr_cbm_type_to_feat_type(enum cbm_type type) return feat_type; } +static bool psr_check_cbm(unsigned int cbm_len, unsigned long cbm) +{ + unsigned int first_bit, zero_bit; + + /* Set bits should only in the range of [0, cbm_len]. */ + if ( cbm & (~0ul << cbm_len) ) + return false; + + /* At least one bit need to be set. */ + if ( cbm == 0 ) + return false; + + 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 false; + + return true; +} + /* CAT common functions implementation. */ static int cat_init_feature(const struct cpuid_leaf *regs, struct feat_node *feat, @@ -601,7 +624,14 @@ int psr_get_val(struct domain *d, unsigned int socket, /* Set value functions */ static unsigned int get_cos_num(void) { - return 0; + unsigned int num = 0, i; + + /* Get all features total amount. */ + for ( i = 0; i < ARRAY_SIZE(feat_props); i++ ) + if ( feat_props[i] ) + num += feat_props[i]->cos_num; + + return num; } static int gather_val_array(uint32_t val[], @@ -609,7 +639,68 @@ static int gather_val_array(uint32_t val[], const struct psr_socket_info *info, unsigned int old_cos) { - return -EINVAL; + unsigned int i; + + if ( !val ) + return -EINVAL; + + /* Get all features current values according to old_cos. */ + for ( i = 0; i < ARRAY_SIZE(info->features); i++ ) + { + unsigned int cos = old_cos, j; + const struct feat_node *feat = info->features[i]; + const struct feat_props *props = feat_props[i]; + + if ( !feat ) + continue; + + if ( !props ) + { + ASSERT_UNREACHABLE(); + return -ENOENT; + } + + if ( array_len < props->cos_num ) + return -ENOSPC; + + /* + * If old_cos exceeds current feature's cos_max, we should get + * default value. So assign cos to 0 which stores default value. + */ + if ( cos > feat->cos_max ) + cos = 0; + + /* Value getting order is same as feature array. */ + for ( j = 0; j < props->cos_num; j++ ) + val[j] = feat->cos_reg_val[cos * props->cos_num + j]; + + array_len -= props->cos_num; + val += props->cos_num; + } + + return 0; +} + +static int skip_prior_features(unsigned int *array_len, + enum psr_feat_type feat_type) +{ + unsigned int i, skip_len = 0; + + for ( i = 0; i < feat_type; i++ ) + { + const struct feat_props *props = feat_props[i]; + + if ( !props ) + continue; + + if ( *array_len <= props->cos_num ) + return -ENOSPC; + + *array_len -= props->cos_num; + skip_len += props->cos_num; + } + + return skip_len; } static int insert_val_into_array(uint32_t val[], @@ -619,6 +710,46 @@ static int insert_val_into_array(uint32_t val[], enum cbm_type type, uint32_t new_val) { + const struct feat_node *feat; + const struct feat_props *props; + unsigned int i; + int ret; + + ASSERT(feat_type < FEAT_TYPE_NUM); + + ret = skip_prior_features(&array_len, feat_type); + if ( ret < 0 ) + return ret; + + val += ret; + + feat = info->features[feat_type]; + if ( !feat ) + return -ENOENT; + + props = feat_props[feat_type]; + if ( !props ) + { + ASSERT_UNREACHABLE(); + return -ENOENT; + } + + if ( array_len < props->cos_num ) + return -ENOSPC; + + if ( !psr_check_cbm(feat->cbm_len, new_val) ) + return -EINVAL; + + /* Value setting position is same as feature array. */ + for ( i = 0; i < props->cos_num; i++ ) + { + if ( type == props->type[i] ) + { + val[i] = new_val; + return 0; + } + } + return -EINVAL; }