From patchwork Wed Feb 8 08:16:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9561929 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 EC37360236 for ; Wed, 8 Feb 2017 08:21:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF53728441 for ; Wed, 8 Feb 2017 08:21:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D434B2849C; Wed, 8 Feb 2017 08:21:56 +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 4B49228441 for ; Wed, 8 Feb 2017 08:21:56 +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 1cbNTU-00060x-42; Wed, 08 Feb 2017 08:19:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cbNTS-0005zB-L9 for xen-devel@lists.xenproject.org; Wed, 08 Feb 2017 08:19:34 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id D1/C8-01711-694DA985; Wed, 08 Feb 2017 08:19:34 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRWlGSWpSXmKPExsXS1tbhqDv1yqw Ig13feC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxL1+ULvipXnJsr0sD4RKKLkZNDSKBS4vHU OWwgtoQAr8SRZTNYIWw/iSdbHrB3MXIB1TQwSiw80c4IkmATUJd4/LWHCcQWEVCSuLdqMhNIE bPAIiaJFZO+g00SFgiTmHisBWwSi4CqxKtdHSwgNq+Ah8S29uvsEBvkJE4emwxUw8HBCRRfs0 AO4iB3iesnZ7BMYORdwMiwilGjOLWoLLVI19BQL6koMz2jJDcxM0fX0MBULze1uDgxPTUnMal YLzk/dxMjMBQYgGAH48p250OMkhxMSqK8jKdmRQjxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4GUD hpaQYFFqempFWmYOMChh0hIcPEoivIcvA6V5iwsSc4sz0yFSpxgVpcQhEgIgiYzSPLg2WCRcY pSVEuZlBDpEiKcgtSg3swRV/hWjOAejkjBvOMgUnsy8Erjpr4AWMwEtvn4abHFJIkJKqoEx8H TizNv3mPzfps+esU3js0BU8fl/dY8/Fz++s7Z8e8vcK693vX86S4k1Ys/5x9P3WJaoPJj+X8Y 8ICtdzuPkjGv982/p3GPmWXfSPGPDA+VZcSYVRl+afqWsPb31o+Tcx2feWR5V2F7WvDbsxZZ1 As+bvErOJT57r/u/sY8tb/6bXtcbh2PtTZRYijMSDbWYi4oTATolkBJ/AgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1486541945!83610550!12 X-Originating-IP: [134.134.136.65] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 63731 invoked from network); 8 Feb 2017 08:19:32 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by server-6.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Feb 2017 08:19:32 -0000 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP; 08 Feb 2017 00:19:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,346,1477983600"; d="scan'208";a="63203500" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by fmsmga006.fm.intel.com with ESMTP; 08 Feb 2017 00:19:29 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 8 Feb 2017 16:16:03 +0800 Message-Id: <1486541776-8406-12-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1486541776-8406-1-git-send-email-yi.y.sun@linux.intel.com> References: <1486541776-8406-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 v6 11/24] x86: refactor psr: set value: implement cos id picking 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: 'x86: refactor psr: set value: implement cos finding flow.' If fail to find a COS ID, we need pick a new COS ID for domain. Only COS ID that ref[COS_ID] is 1 or 0 can be picked to input a new set feature values. Signed-off-by: Yi Sun --- xen/arch/x86/psr.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 3d29d33..8f06d60 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -158,6 +158,17 @@ struct feat_ops { */ int (*compare_val)(const uint64_t val[], const struct feat_node *feat, unsigned int cos, bool *found); + /* + * fits_cos_max is used to check if the input cos id exceeds the + * feature's cos_max and if the input value is not the default one. + * Even if the associated cos exceeds the cos_max, HW can work with default + * value. That is the reason we need check if input value is default one. + * If both criteria are fulfilled, that means the input exceeds the range. + * If not, that means the input fits the requirements. + */ + bool (*fits_cos_max)(const uint64_t val[], + const struct feat_node *feat, + unsigned int cos); }; /* @@ -394,6 +405,25 @@ static int l3_cat_compare_val(const uint64_t val[], return 0; } +static bool l3_cat_fits_cos_max(const uint64_t val[], + const struct feat_node *feat, + unsigned int cos) +{ + uint64_t l3_def_cbm; + + l3_def_cbm = (1ull << feat->info.l3_cat_info.cbm_len) - 1; + + if ( cos > feat->info.l3_cat_info.cos_max && + val[0] != l3_def_cbm ) + /* + * Exceed cos_max and value to set is not default, + * return error. + */ + return false; + + return true; +} + static const struct feat_ops l3_cat_ops = { .get_cos_max = l3_cat_get_cos_max, .get_feat_info = l3_cat_get_feat_info, @@ -402,6 +432,7 @@ static const struct feat_ops l3_cat_ops = { .get_old_val = l3_cat_get_old_val, .set_new_val = l3_cat_set_new_val, .compare_val = l3_cat_compare_val, + .fits_cos_max = l3_cat_fits_cos_max, }; static void __init parse_psr_bool(char *s, char *value, char *feature, @@ -808,11 +839,79 @@ static int find_cos(const uint64_t *val, uint32_t array_len, return -ENOENT; } +static bool fits_cos_max(const uint64_t *val, + uint32_t array_len, + const struct psr_socket_info *info, + unsigned int cos) +{ + unsigned int ret; + const uint64_t *val_tmp = val; + const struct feat_node *feat; + + list_for_each_entry(feat, &info->feat_list, list) + { + ret = feat->ops.fits_cos_max(val_tmp, feat, cos); + if ( !ret ) + return false; + + val_tmp += feat->ops.get_cos_num(feat); + if ( val_tmp - val > array_len ) + return false; + } + + return true; +} + static int pick_avail_cos(const struct psr_socket_info *info, const uint64_t *val, uint32_t array_len, unsigned int old_cos, enum psr_feat_type feat_type) { + unsigned int cos; + unsigned int cos_max = 0; + const struct feat_node *feat; + const unsigned int *ref = info->cos_ref; + + /* + * cos_max is the one of the feature which is being set. + */ + list_for_each_entry(feat, &info->feat_list, list) + { + if ( feat->feature != feat_type ) + continue; + + cos_max = feat->ops.get_cos_max(feat); + if ( cos_max > 0 ) + break; + } + + if ( !cos_max ) + return -ENOENT; + + /* + * If old cos is referred only by the domain, then use it. And, we cannot + * use id 0 because it stores the default values. + */ + if ( old_cos && ref[old_cos] == 1 && + fits_cos_max(val, array_len, info, old_cos) ) + return old_cos; + + /* Find an unused one other than cos0. */ + for ( cos = 1; cos <= cos_max; cos++ ) + { + /* + * ref is 0 means this COS is not used by other domain and + * can be used for current setting. + */ + if ( !ref[cos] ) + { + if ( !fits_cos_max(val, array_len, info, cos) ) + return -ENOENT; + + return cos; + } + } + return -ENOENT; }