From patchwork Thu Jan 19 06:01:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9525203 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 A001860437 for ; Thu, 19 Jan 2017 06:05:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D0662860C for ; Thu, 19 Jan 2017 06:05:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81BAE2862A; Thu, 19 Jan 2017 06:05:17 +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 223472860C for ; Thu, 19 Jan 2017 06:05: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 1cU5om-0007Gl-Dc; Thu, 19 Jan 2017 06:03:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cU5ol-0007EB-Fo for xen-devel@lists.xenproject.org; Thu, 19 Jan 2017 06:03:27 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 58/DC-12625-EA650885; Thu, 19 Jan 2017 06:03:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRWlGSWpSXmKPExsVywNykWHddWEO Ewc5edovvWyYzOTB6HP5whSWAMYo1My8pvyKBNePlyXesBY+VKh5Of8fewHhEoouRi0NIYDqj xJuHK5m7GDk5JAR4JY4sm8EKYftLrJpynAWiqIFR4tvXZSwgCTYBdYnHX3uYQGwRASWJe6smM 4EUMQt0M0msfLgVrEhYIFli7aVt7F2MHBwsAqoSy07Wgpi8Ah4SC+6FQMyXkzh5bDLYLk6g8J X5F9hBbCEBd4ktKy4xTWDkXcDIsIpRozi1qCy1SNfYQC+pKDM9oyQ3MTNH19DAWC83tbg4MT0 1JzGpWC85P3cTIzAc6hkYGHcwdp7wO8QoycGkJMprb9kQIcSXlJ9SmZFYnBFfVJqTWnyIUYaD Q0mCd04oUE6wKDU9tSItMwcYmDBpCQ4eJRHeKpA0b3FBYm5xZjpE6hSjopQ4bxRIQgAkkVGaB 9cGi4ZLjLJSwryMDAwMQjwFqUW5mSWo8q8YxTkYlYR5v4NM4cnMK4Gb/gpoMRPQYivlepDFJY kIKakGRm+/Bp9F0xabvPJdLRx3IPfwB7fFtSZb5m9RWscsU2t76XS0U9H6p9OTOT9sa7t5X12 COXCu42sBkbeRkS0uLUf261dqvPmqZrG9um+t8hv3uXouurx/lu+dN62wINaB59ik7NT1T8+x Xbqvva1ltUeYdlTqwheHZy65ZnpBWDXg2T/zd88n7VJiKc5INNRiLipOBAComvPvgQIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1484805800!80652688!4 X-Originating-IP: [192.55.52.115] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3731 invoked from network); 19 Jan 2017 06:03:25 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by server-13.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 19 Jan 2017 06:03:25 -0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jan 2017 22:03:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,252,1477983600"; d="scan'208";a="215119580" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by fmsmga004.fm.intel.com with ESMTP; 18 Jan 2017 22:03:16 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Thu, 19 Jan 2017 14:01:18 +0800 Message-Id: <1484805686-7249-17-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484805686-7249-1-git-send-email-yi.y.sun@linux.intel.com> References: <1484805686-7249-1-git-send-email-yi.y.sun@linux.intel.com> Cc: wei.liu2@citrix.com, konrad.wilk@oracle.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 RESEND v5 16/24] x86: refactor psr: implement set value callback functions for CDP. 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 This patch implements L3 CDP set value related callback functions. With this patch, 'psr-cat-cbm-set' command can work for L3 CDP. Signed-off-by: Yi Sun --- v5: - remove type check in callback function. - 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. - remove 'l3_cdp_get_cos_max_from_type'. - rename 'l3_cdp_exceeds_cos_max' to 'l3_cdp_fits_cos_max'. --- xen/arch/x86/psr.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index dc062ff..596e5b1 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -548,10 +548,128 @@ static bool l3_cdp_get_val(const struct feat_node *feat, unsigned int cos, return true; } +static unsigned int l3_cdp_get_cos_num(const struct feat_node *feat) +{ + return 2; +} + +static int l3_cdp_get_old_val(uint64_t val[], + const struct feat_node *feat, + unsigned int old_cos) +{ + if ( old_cos > feat->info.l3_cdp_info.cos_max ) + /* Use default value. */ + old_cos = 0; + + /* Data */ + val[0] = get_cdp_data(feat, old_cos); + /* Code */ + val[1] = get_cdp_code(feat, old_cos); + + return 0; +} + +static int l3_cdp_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_cdp_info.cbm_len, m) ) + return -EINVAL; + + if ( type == PSR_CBM_TYPE_L3_DATA ) + val[0] = m; + else + val[1] = m; + + return 0; +} + +static int l3_cdp_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_cdp_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_cdp_info.cos_max ) + { + if ( val[0] != l3_def_cbm || + val[1] != l3_def_cbm ) + { + *found = false; + return -ENOENT; + } + *found = true; + } + else + *found = (val[0] == get_cdp_data(feat, cos) && + val[1] == get_cdp_code(feat, cos)); + + return 0; +} + +static bool l3_cdp_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_cdp_info.cbm_len) - 1; + + if ( cos > feat->info.l3_cdp_info.cos_max && + (val[0] != l3_def_cbm || val[1] != l3_def_cbm) ) + /* + * Exceed cos_max and value to set is not default, + * return error. + */ + return false; + + return true; +} + +static int l3_cdp_write_msr(unsigned int cos, const uint64_t val[], + struct feat_node *feat) +{ + /* + * If input cos is more than the cos_max of the feature, we should + * not set the value. + */ + if ( cos > feat->info.l3_cdp_info.cos_max ) + return -EINVAL; + + /* Data */ + if ( get_cdp_data(feat, cos) != val[0] ) + { + get_cdp_data(feat, cos) = val[0]; + wrmsrl(MSR_IA32_PSR_L3_MASK_DATA(cos), val[0]); + } + /* Code */ + if ( get_cdp_code(feat, cos) != val[1] ) + { + get_cdp_code(feat, cos) = val[1]; + wrmsrl(MSR_IA32_PSR_L3_MASK_CODE(cos), val[1]); + } + + return 0; +} + struct feat_ops l3_cdp_ops = { .get_cos_max = l3_cdp_get_cos_max, .get_feat_info = l3_cdp_get_feat_info, .get_val = l3_cdp_get_val, + .get_cos_num = l3_cdp_get_cos_num, + .get_old_val = l3_cdp_get_old_val, + .set_new_val = l3_cdp_set_new_val, + .compare_val = l3_cdp_compare_val, + .fits_cos_max = l3_cdp_fits_cos_max, + .write_msr = l3_cdp_write_msr, }; static void __init parse_psr_bool(char *s, char *value, char *feature,