From patchwork Sat Apr 1 13:53:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9657957 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 6231A60349 for ; Sat, 1 Apr 2017 13:56:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 594CC285C2 for ; Sat, 1 Apr 2017 13:56:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E29328610; Sat, 1 Apr 2017 13:56:18 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 C94C8285C2 for ; Sat, 1 Apr 2017 13:56:17 +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 1cuJTh-0005kh-92; Sat, 01 Apr 2017 13:54:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuJTg-0005jO-AG for xen-devel@lists.xenproject.org; Sat, 01 Apr 2017 13:54:04 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id E1/90-08534-BF0BFD85; Sat, 01 Apr 2017 13:54:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRWlGSWpSXmKPExsXS1tYhovt7w/0 Ig/vXGS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozuNStYCrosKpY2LmVtYOzX7GLk4mARuMUk 8fbwXxYQR0hgGqPE9flT2LoYOTkkBHgljiybwdrFyAFk+0s0PokCCQsJ1Es8nvmJEcRmE1CXe Py1hwnEFhFQkri3ajITyBxmgZ1MEutOf2cGSQgLxEusvvoArIhFQFXiXONlVhCbV8BT4m3rfy aIXXISJ49NBotzAsWvvNjHArHMQ2LVpEvMExj5FjAyrGLUKE4tKkst0jW00EsqykzPKMlNzMz RNTQw1stNLS5OTE/NSUwq1kvOz93ECAyUegYGxh2Mv097HmKU5GBSEuX9XnwvQogvKT+lMiOx OCO+qDQntfgQowwHh5IErwIw8IQEi1LTUyvSMnOAIQuTluDgURLhPbYeKM1bXJCYW5yZDpE6x agoJc77DCQhAJLIKM2Da4PFySVGWSlhXkYGBgYhnoLUotzMElT5V4ziHIxKwrzyIFN4MvNK4K a/AlrMBLTY4utdkMUliQgpqQZGX4G0+zd89oguXLaJx7331YFP1kmt1SxlcsV3Wo1lDz/cssS hTW9pwMFDMZunf/3LmXef/Q+fWhJLuAjLPpNTBayhcycdTFqW86rmCc8dn+l3Eh/Ee13IDHT8 ujrPMCOgYu+P1TfYfrw4fVem98aG6EYdMea+s1d0orZ8zOPPk3WMPDon1VtciaU4I9FQi7moO BEASSYVpo4CAAA= X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1491054811!37933881!11 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.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52284 invoked from network); 1 Apr 2017 13:54:02 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-9.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 1 Apr 2017 13:54:02 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491054842; x=1522590842; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=MqNR6vZ03nucmGMsMOxSXyiiucmwyvP+9/msWujOCJg=; b=xysQMLMESiZzpDmoiRghUfteZbITUsH7pZChB8K9KWhQSNxng6IZbZoS qiHgpdrxaJ8QXEQPttc2nBxM4SGAZg==; Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Apr 2017 06:54:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,258,1486454400"; d="scan'208";a="950544799" Received: from yisun1-ubuntu.bj.intel.com ([10.238.156.112]) by orsmga003.jf.intel.com with ESMTP; 01 Apr 2017 06:53:59 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Sat, 1 Apr 2017 21:53:41 +0800 Message-Id: <1491054836-30488-11-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491054836-30488-1-git-send-email-yi.y.sun@linux.intel.com> References: <1491054836-30488-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 v10 10/25] 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 --- 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 | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 104 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 9d805d6..c912478 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -224,6 +224,29 @@ static enum psr_feat_type psr_cbm_type_to_feat_type(enum cbm_type type) } /* CAT common functions implementation. */ +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; +} + static void cat_init_feature(const struct cpuid_leaf *regs, struct feat_node *feat, struct psr_socket_info *info, @@ -593,7 +616,21 @@ 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; + unsigned int num = 0, i; + + /* Get all features total amount. */ + for ( i = 0; i < PSR_SOCKET_MAX_FEAT; i++ ) + { + const struct feat_node *feat = info->features[i]; + if ( !feat ) + continue; + + feat = info->features[i]; + + num += feat->props->cos_num; + } + + return num; } static int gather_val_array(uint32_t val[], @@ -601,7 +638,38 @@ 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 < PSR_SOCKET_MAX_FEAT; i++ ) + { + unsigned int cos = old_cos; + const struct feat_node *feat = info->features[i]; + if ( !feat ) + continue; + + if ( array_len < feat->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->props->cos_max ) + cos = 0; + + /* Value getting order is same as feature array. */ + feat->props->get_val(feat, cos, &val[0]); + + array_len -= feat->props->cos_num; + + val += feat->props->cos_num; + } + + return 0; } static int insert_val_to_array(uint32_t val[], @@ -611,7 +679,40 @@ static int insert_val_to_array(uint32_t val[], enum cbm_type type, uint32_t new_val) { - return -EINVAL; + const struct feat_node *feat; + unsigned int i; + + ASSERT(feat_type < PSR_SOCKET_MAX_FEAT); + + /* Insert new value into array according to feature's position in array. */ + for ( i = 0; i < feat_type; i++ ) + { + feat = info->features[i]; + if ( !feat ) + continue; + + if ( array_len <= feat->props->cos_num ) + return -ENOSPC; + + array_len -= feat->props->cos_num; + + val += feat->props->cos_num; + } + + feat = info->features[feat_type]; + if ( !feat ) + return -ENOENT; + + if ( array_len < feat->props->cos_num ) + return -ENOSPC; + + if ( !psr_check_cbm(feat->props->cbm_len, new_val) ) + return -EINVAL; + + /* Value setting position is same as feature array. */ + val[0] = new_val; + + return 0; } static int find_cos(const uint32_t val[], unsigned int array_len,