From patchwork Wed Dec 14 04:07:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9474011 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 70A2B60823 for ; Wed, 14 Dec 2016 11:12:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 680852871A for ; Wed, 14 Dec 2016 11:12:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CE322871E; Wed, 14 Dec 2016 11:12:06 +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 F37D92871A for ; Wed, 14 Dec 2016 11:12:05 +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 1cH7Rm-0005Tz-QK; Wed, 14 Dec 2016 11:10:06 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cH7Rl-0005KG-0i for xen-devel@lists.xenproject.org; Wed, 14 Dec 2016 11:10:05 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 0F/B9-22326-C8821585; Wed, 14 Dec 2016 11:10:04 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRWlGSWpSXmKPExsXS1tYhodutERh hMHOyscX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmnHj6lPGggNqFT/e7mJqYFwu1cXIySEkUCGx ccdqJhBbQoBX4siyGawQtp/E519bWboYuYBqGhglGvd/YgFJsAmoSzz+2gPWICKgJHFv1WQmk CJmgW4miZUPt4IVCQsES8w//BysiEVAVeLY3OvsIDavgIfE+tY5LBAb5CROHpsMtI2DgxMo/m 9LIsRB7hIXe9+xT2DkXcDIsIpRozi1qCy1SNfIWC+pKDM9oyQ3MTNH19DATC83tbg4MT01JzG pWC85P3cTIzAcGIBgB+Of+YGHGCU5mJREebmuBkQI8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuCd pR4YISRYlJqeWpGWmQMMTJi0BAePkghvkApQmre4IDG3ODMdInWKUVFKnHclSJ8ASCKjNA+uD RYNlxhlpYR5GYEOEeIpSC3KzSxBlX/FKM7BqCTMuwFkCk9mXgnc9FdAi5mAFosu8QdZXJKIkJ JqYJwgN6F7WqX5Y7dna5dwmH35dnah3R+TrsKj2ctjP+YvnZp41caVi4E/67tR1799oYGLXva d4Pigd7eN+VlG98xc5VkW1zp8vBwrxTsFo8/qF588lSG8L102c7mwYeiE/3Inv3DFHyyZxNQl 8Mf0+/zPK7wDTn3OrzpnKFFq8EXM+PKh9FWxx5VYijMSDbWYi4oTAdTXXOiBAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1481713769!48240089!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.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20132 invoked from network); 14 Dec 2016 11:10:03 -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:03 -0000 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP; 14 Dec 2016 03:10:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,346,1477983600"; d="scan'208";a="39863248" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by orsmga004.jf.intel.com with ESMTP; 14 Dec 2016 03:10:00 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 14 Dec 2016 12:07:50 +0800 Message-Id: <1481688484-5093-11-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 10/24] x86: refactor psr: 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 with previous patch, 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 --- xen/arch/x86/psr.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 8fcaa76..6b2b1e0 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -150,6 +150,25 @@ struct feat_ops { unsigned int old_cos, enum cbm_type type, uint64_t m); + /* + * get_cos_max_from_type is used to get the cos_max value of the feature + * according to input type. + */ + unsigned int (*get_cos_max_from_type)(const struct feat_node *feat, + enum cbm_type type); + /* + * compare_val is used in set value process to compare if the + * input value array can match all the features' COS registers values + * according to input cos id. + * + * 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 (*compare_val)(const uint64_t val[], const struct feat_node *feat, + unsigned int cos, bool *found); }; @@ -346,6 +365,43 @@ static int l3_cat_set_new_val(uint64_t val[], return 1; } +static unsigned int l3_cat_get_cos_max_from_type(const struct feat_node *feat, + enum cbm_type type) +{ + if ( type != PSR_CBM_TYPE_L3 ) + return 0; + + return feat->info.l3_cat_info.cos_max; +} + +static int l3_cat_compare_val(const uint64_t val[], + const struct feat_node *feat, + unsigned int cos, bool *found) +{ + uint64_t l3_def_cbm; + + l3_def_cbm = (1ull << feat->info.l3_cat_info.cbm_len) - 1; + + /* + * Different features' cos_max are different. If cos id of the feature + * being set exceeds other feature's cos_max, the val of other feature + * must be default value. HW supports such case. + */ + if ( cos > feat->info.l3_cat_info.cos_max ) + { + if ( val[0] != l3_def_cbm ) + { + *found = false; + return -ENOENT; + } + *found = true; + } + else + *found = (val[0] == feat->cos_reg_val[cos]); + + /* 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, @@ -354,6 +410,8 @@ struct feat_ops l3_cat_ops = { .get_cos_num = l3_cat_get_cos_num, .get_old_val = l3_cat_get_old_val, .set_new_val = l3_cat_set_new_val, + .get_cos_max_from_type = l3_cat_get_cos_max_from_type, + .compare_val = l3_cat_compare_val, }; static void __init parse_psr_bool(char *s, char *value, char *feature, @@ -666,7 +724,58 @@ static int find_cos(const uint64_t *val, uint32_t array_len, enum cbm_type type, const struct psr_socket_info *info) { - return 0; + unsigned int cos; + const unsigned int *ref = info->cos_ref; + const struct feat_node *feat_tmp; + const uint64_t *val_tmp = val; + int ret; + bool found = false; + unsigned int cos_max = 0; + + /* cos_max is the one of the feature which is being set. */ + list_for_each_entry(feat_tmp, &info->feat_list, list) + { + cos_max = feat_tmp->ops.get_cos_max_from_type(feat_tmp, type); + if ( cos_max > 0 ) + break; + } + + for ( cos = 0; cos <= cos_max; cos++ ) + { + if ( cos && !ref[cos] ) + continue; + + /* Not found, need find again from beginning. */ + val_tmp = val; + list_for_each_entry(feat_tmp, &info->feat_list, list) + { + /* + * Compare value according to feature list order. + * We must follow this order because value array is assembled + * as this order in get_old_set_new(). + */ + ret = feat_tmp->ops.compare_val(val_tmp, feat_tmp, cos, &found); + if ( ret < 0 ) + return ret; + + /* If fail to match, go to next cos to compare. */ + if ( !found ) + break; + + val_tmp += ret; + if ( val_tmp - val > array_len ) + return -EINVAL; + } + + /* + * With this cos id, every entry of value array can match. This cos + * is what we find. + */ + if ( found ) + return cos; + } + + return -ENOENT; } static int alloc_new_cos(const struct psr_socket_info *info,