From patchwork Wed Feb 15 08:49:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9573595 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 9878060493 for ; Wed, 15 Feb 2017 08:55:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A2EB28448 for ; Wed, 15 Feb 2017 08:55:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F00D2844C; Wed, 15 Feb 2017 08:55:46 +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 0A05428448 for ; Wed, 15 Feb 2017 08:55:46 +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 1cdvKy-0007PP-GW; Wed, 15 Feb 2017 08:53:20 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cdvKw-0007Mv-MP for xen-devel@lists.xenproject.org; Wed, 15 Feb 2017 08:53:18 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 0C/70-25093-EF614A85; Wed, 15 Feb 2017 08:53:18 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXS1tYhoftXbEm EwaNmeYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNWP9yqXMBfcsKzYtKGxg7NTsYuTiEBKYxihx YFszSxcjJ4eEAK/EkWUzWCHsAImnt5sYIYoaGCUmv93KBJJgE1CXePy1B8wWEVCSuLdqMhNIE bPAIiaJFZO+s3UxcnAIC4RJPJyuC1LDIqAq8frYVLB6XgEPiWXHHzBDLJCTOHlsMtgyTqD4sQ tzwGwhAXeJoz3TmCYw8i5gZFjFqF6cWlSWWqRrppdUlJmeUZKbmJmja2hgppebWlycmJ6ak5h UrJecn7uJERgMDECwg3HeCf9DjJIcTEqivGzHFkcI8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuBl AgaXkGBRanpqRVpmDjAsYdISHDxKIrw/RYHSvMUFibnFmekQqVOMilLivB9BEgIgiYzSPLg2W CxcYpSVEuZlBDpEiKcgtSg3swRV/hWjOAejkjDvf5ApPJl5JXDTXwEtZgJazBq3EGRxSSJCSq qBMfeI9byMLmYR3/TXwRpfDm3qU7jBeu6YyakmEfU/180jA1YYeLvpvVgszLJj8VHmCvZ/sj8 urVvT5dOcEPEr5MQxuW3v6pa57zvc+f2V4jf3jbMWrn/+7WUnjyuf04d7Fy90KphfENyq1r9K 7vTlzXyL2aulyr7fb3n/T/eAlPohlsC4qnX2JkosxRmJhlrMRcWJAHmtM2yAAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1487148772!76852937!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.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26728 invoked from network); 15 Feb 2017 08:53:16 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-8.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 15 Feb 2017 08:53:16 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Feb 2017 00:53:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.35,165,1484035200"; d="scan'208"; a="1094969700" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by orsmga001.jf.intel.com with ESMTP; 15 Feb 2017 00:53:14 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 15 Feb 2017 16:49:24 +0800 Message-Id: <1487148579-7243-10-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1487148579-7243-1-git-send-email-yi.y.sun@linux.intel.com> References: <1487148579-7243-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 Subject: [Xen-devel] [PATCH v8 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 | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 146 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index d414b5e..ae108b9 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -119,6 +119,32 @@ 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 in order. + * 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 meaning: + * 0 - success. + * 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, + enum cbm_type type, + uint64_t m); }; /* @@ -207,6 +233,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, 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 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; +} + /* L3 CAT functions implementation. */ static void l3_cat_init_feature(struct cpuid_leaf regs, struct feat_node *feat, @@ -275,10 +324,45 @@ 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]; + + return 0; +} + +static int l3_cat_set_new_val(uint64_t val[], + const struct feat_node *feat, + enum cbm_type type, + uint64_t m) +{ + if ( !psr_check_cbm(feat->info.l3_cat_info.cbm_len, m) ) + return -EINVAL; + + val[0] = m; + + return 0; +} + static const struct feat_ops l3_cat_ops = { .get_cos_max = l3_cat_get_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, @@ -549,15 +633,42 @@ 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 assemble_val_array(uint64_t *val, +static int combine_val_array(uint64_t *val, uint32_t array_len, const struct psr_socket_info *info, unsigned int old_cos) { - return -EINVAL; + const struct feat_node *feat; + 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, &info->feat_list, list) + { + /* value getting order is same as feature list */ + ret = feat->ops.get_old_val(val_tmp, feat, old_cos); + if ( ret ) + return ret; + + val_tmp += feat->ops.get_cos_num(feat); + if ( val_tmp - val > array_len) + return -ENOSPC; + } + + return 0; } static int set_new_val_to_array(uint64_t *val, @@ -567,7 +678,37 @@ static int set_new_val_to_array(uint64_t *val, enum cbm_type type, uint64_t m) { - return -EINVAL; + const struct feat_node *feat; + int ret; + uint64_t *val_tmp = val; + + /* Set new value into array according to feature's position in array. */ + list_for_each_entry(feat, &info->feat_list, list) + { + if ( feat->feature != feat_type ) + { + val_tmp += feat->ops.get_cos_num(feat); + if ( val_tmp - val > array_len) + return -ENOSPC; + + continue; + } + + /* + * Value setting position is same as feature list. + * Different features may have different setting behaviors, e.g. CDP + * has two values (DATA/CODE) which need us to save input value to + * different position in the array according to type, so we have to + * maintain a callback function. + */ + ret = feat->ops.set_new_val(val_tmp, feat, type, m); + if ( ret ) + return ret; + else + break; + } + + return 0; } static int find_cos(const uint64_t *val, uint32_t array_len, @@ -638,7 +779,7 @@ int psr_set_val(struct domain *d, unsigned int socket, if ( !val_array ) return -ENOMEM; - if ( (ret = assemble_val_array(val_array, array_len, info, old_cos)) != 0 ) + if ( (ret = combine_val_array(val_array, array_len, info, old_cos)) != 0 ) { xfree(val_array); return ret;