From patchwork Wed May 3 08:44:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9709009 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 D4DEA60385 for ; Wed, 3 May 2017 08:56:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B49EE28604 for ; Wed, 3 May 2017 08:56:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A94FF28608; Wed, 3 May 2017 08:56:24 +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 0DF0028606 for ; Wed, 3 May 2017 08:56:23 +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 1d5q2z-0000iy-Vh; Wed, 03 May 2017 08:54:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5q2y-0000gx-03 for xen-devel@lists.xenproject.org; Wed, 03 May 2017 08:54:08 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 5C/49-01709-FAA99095; Wed, 03 May 2017 08:54:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRWlGSWpSXmKPExsXS1tYhobtuFme kwcTXGhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aLCRuYCm7qV7zv6GNsYNyr0MXIxSEkMJ1R oqNjHnMXIyeHhACvxJFlM1ghbH+JT4u7WCCKGhgleq8vYwdJsAmoSzz+2sMEYosIKEncWzWZC aSIWWAnk8S609+BJnFwCAvESOzoiAepYRFQlbjfMYcRxOYV8JTYtnAT1AI5iZPHJoPZnEDx51 82gs0XEvCQOPTsPdMERt4FjAyrGNWLU4vKUot0jfWSijLTM0pyEzNzdA0NTPVyU4uLE9NTcxK TivWS83M3MQLDgQEIdjDu/ed0iFGSg0lJlFf9FXukEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQne hzM5I4UEi1LTUyvSMnOAgQmTluDgURLh7QJJ8xYXJOYWZ6ZDpE4xKkqJ804HSQiAJDJK8+DaY NFwiVFWSpiXEegQIZ6C1KLczBJU+VeM4hyMSsK8ySBTeDLzSuCmvwJazAS0uFmWA2RxSSJCSq qBUdXzO/OUs4wtBrW9rxfLc5t9OhYVvJgtTZ/nuK7tj2/PZ2lURps8jD/34t0l/+43DsJSjdU HF4pFeQsXvr6xpkaxJeG+0bv3WxbprhBQmuqf+0dl5buJ2/ODT1w8eSnLMjmq5uftoq9MnfNt 9H725tVO2u2YuvHrgaw3lw55WUYk+Nsv+hTIr8RSnJFoqMVcVJwIALy8EPGBAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1493801620!75519330!11 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.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9889 invoked from network); 3 May 2017 08:54:06 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-2.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 3 May 2017 08:54:06 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 May 2017 01:54:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,283,1491289200"; d="scan'208";a="852347613" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.39]) by FMSMGA003.fm.intel.com with ESMTP; 03 May 2017 01:54:03 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 3 May 2017 16:44:10 +0800 Message-Id: <1493801063-38513-11-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1493801063-38513-1-git-send-email-yi.y.sun@linux.intel.com> References: <1493801063-38513-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 v11 10/23] x86: refactor psr: L3 CAT: set value: implement cos finding flow. 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 Continue from patch: 'x86: refactor psr: L3 CAT: set value: assemble features value array' We can try to find if there is a COS ID on which all features' COS registers values are same as the array assembled before. Signed-off-by: Yi Sun --- v11: - move 'compare_val' implementation from CDP patch to this. (suggested by Jan Beulich) - remove 'rc' in 'compare_val' to make codes clearer. (suggested by Jan Beulich) - changes about 'feat_props'. (suggested by Jan Beulich) - fix bug. (suggested by Jan Beulich) - remove unnecessary variable initialization. (suggested by Jan Beulich) - remove unnecessary comment. (suggested by Jan Beulich) - adjust array check place prior to using the array. (suggested by Jan Beulich) - add comment. v10: - remove 'compare_val' hook and its CAT implementation. Make its functionality be generic in 'find_cos' flow. (suggested by Jan Beulich) - changes related to 'props'. (suggested by Jan Beulich) - rename 'val_array' to 'val_ptr'. (suggested by Jan Beulich) - rename 'find' to 'found'. (suggested by Jan Beulich) - move some variables declaration and initialization into loop. (suggested by Jan Beulich) - adjust codes positions. (suggested by Jan Beulich) v9: - modify comments of 'compare_val' to be same as current implementation. (suggested by Wei Liu) - fix indentation issue. (suggested by Wei Liu) - rename 'l3_cat_compare_val' to 'cat_compare_val' to cover all L3/L2 CAT features. (suggested by Roger Pau) - remove parameter 'found' from 'cat_compare_val' and modify the return values to let caller know if the id is found or not. (suggested by Roger Pau) - replace feature list handling to feature array handling. (suggested by Roger Pau) - replace 'get_cos_num' to 'feat->cos_num'. (suggested by Jan Beulich) - directly use 'cos_reg_val[0]' as default value. (suggested by Jan Beulich) - modify patch title to indicate 'L3 CAT'. (suggested by Jan Beulich) - changes about 'uint64_t' to 'uint32_t'. (suggested by Jan Beulich) v5: - modify commit message to provide exact patch name to continue from. (suggested by Jan Beulich) - remove 'get_cos_max_from_type' because it can be replaced by 'get_cos_max'. - move type check out from callback functions to caller. (suggested by Jan Beulich) - modify variables names to make them better, e.g. 'feat_tmp' to 'feat'. (suggested by Jan Beulich) - modify comments according to changes of codes. (suggested by Jan Beulich) v4: - create this patch to make codes easier to understand. (suggested by Jan Beulich) --- xen/arch/x86/psr.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index b15924e..c81ccc2 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -694,10 +694,106 @@ static int insert_val_into_array(uint32_t val[], return 0; } +static int compare_val(const uint32_t val[], + const struct feat_node *feat, + const struct feat_props *props, + unsigned int cos) +{ + unsigned int i; + + for ( i = 0; i < props->cos_num; i++ ) + { + uint32_t feat_val; + + /* If cos is bigger than cos_max, we need compare default value. */ + if ( cos > feat->cos_max ) + { + /* + * COS ID 0 always stores the default value. + * For CDP: + * - DATA default value stored in cos_reg_val[0]; + * - CODE default value stored in cos_reg_val[1]. + */ + feat_val = feat->cos_reg_val[i]; + + /* + * If cos is bigger than feature's cos_max, the val should be + * default value. Otherwise, it fails to find a COS ID. So we + * have to exit find flow. + */ + if ( val[i] != feat_val ) + return -EINVAL; + } + else + { + feat_val = feat->cos_reg_val[cos * props->cos_num + i]; + if ( val[i] != feat_val ) + return 0; + } + } + + return 1; +} + static int find_cos(const uint32_t val[], unsigned int array_len, enum psr_feat_type feat_type, const struct psr_socket_info *info) { + unsigned int cos, i; + const unsigned int *ref = info->cos_ref; + const struct feat_node *feat; + unsigned int cos_max; + + /* cos_max is the one of the feature which is being set. */ + feat = info->features[feat_type]; + if ( !feat ) + return -ENOENT; + + cos_max = feat->cos_max; + + for ( cos = 0; cos <= cos_max; cos++ ) + { + const uint32_t *val_ptr = val; + unsigned int len = array_len; + int rc = 0; + + if ( cos && !ref[cos] ) + continue; + + for ( i = 0; i < PSR_SOCKET_FEAT_NUM; i++ ) + { + const struct feat_props *props = feat_props[i]; + + feat = info->features[i]; + if ( !feat || !props ) + continue; + + if ( len < props->cos_num ) + return -ENOSPC; + + /* + * Compare value according to feature array order. + * We must follow this order because value array is assembled + * as this order. + */ + rc = compare_val(val_ptr, feat, props, cos); + if ( rc < 0 ) + return rc; + + /* If fail to match, go to next cos to compare. */ + if ( !rc ) + break; + + len -= props->cos_num; + + val_ptr += props->cos_num; + } + + /* For this COS ID all entries in the values array do match. Use it. */ + if ( rc ) + return cos; + } + return -ENOENT; }