From patchwork Sat Jul 15 00:31:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9841843 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 F1E2C60212 for ; Sat, 15 Jul 2017 00:48:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E07C628798 for ; Sat, 15 Jul 2017 00:48:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5661287B3; Sat, 15 Jul 2017 00:48:43 +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 546EC28798 for ; Sat, 15 Jul 2017 00:48:43 +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 1dWBEZ-0007bz-DT; Sat, 15 Jul 2017 00:46:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dWBEX-0007WG-PY for xen-devel@lists.xenproject.org; Sat, 15 Jul 2017 00:46:58 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 60/06-02176-9E569695; Sat, 15 Jul 2017 00:46:33 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRWlGSWpSXmKPExsVywNxEW/dFama kwb5Jehbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8ay70EFW/QrVsydwdTAeEu5i5GTQ0igQuLi po2sILaEAK/EkWUzoGx/id6VG5khahoYJRqeVYDYbALqEo+/9jCB2CICShL3Vk0Gsrk4mAXmM 0m8Pv8ArEFYIFLi+YQNYINYBFQlWnb+BrN5BTwkFv+6wAyxQE7i5LHJYHFOoPjUfW3sXYwcQM vcJVpml09g5F3AyLCKUaM4tagstUjX2EAvqSgzPaMkNzEzR9fQwFgvN7W4ODE9NScxqVgvOT9 3EyMwFOoZGBh3MHae8DvEKMnBpCTK++52RqQQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV5+YGgJ CRalpqdWpGXmAIMSJi3BwaMkwjsrBSjNW1yQmFucmQ6ROsWoy/Fqwv9vTEIsefl5qVLivKdAi gRAijJK8+BGwCLkEqOslDAvIwMDgxBPQWpRbmYJqvwrRnEORiVh3vkgU3gy80rgNr0COoIJ6I i2rAyQI0oSEVJSDYwGfTsbBO9qccT+sKjlFV34rM7ouF75CmHlS9F+Ai9zJ3zpF3ePO/d489R 8kbO2gn7Hrs7W2a9v+J6L59yzZcb/uU3j5mdUvF9r82faQfb3h3un5TRZRfdzZulL7TsVyxm2 +9YBQd5OJU0L21qz3cZKr27cEVO31pXSspq3zNRK4sn7O9tMKpVYijMSDbWYi4oTARk2rtqLA gAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1500079549!66978060!16 X-Originating-IP: [192.55.52.43] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37809 invoked from network); 15 Jul 2017 00:46:32 -0000 Received: from mga05.intel.com (HELO mga05.intel.com) (192.55.52.43) by server-6.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 15 Jul 2017 00:46:32 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP; 14 Jul 2017 17:46:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,360,1496127600"; d="scan'208";a="111534903" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by orsmga002.jf.intel.com with ESMTP; 14 Jul 2017 17:46:29 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Sat, 15 Jul 2017 08:31:48 +0800 Message-Id: <1500078716-5928-16-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500078716-5928-1-git-send-email-yi.y.sun@linux.intel.com> References: <1500078716-5928-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, 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 v14 15/23] x86: refactor psr: CDP: implement set value callback function. 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 function. With this patch, 'psr-cat-cbm-set' command can work for L3 CDP. Signed-off-by: Yi Sun Reviewed-by: Jan Beulich --- v13: - remove 'strict' from 'psr_cbm_type_to_feat_type' because we use 'alt_type' to check if we need set both DATA and CODE now. (suggested by Jan Beulich) - adjust the implementation in circle in 'insert_val_into_array' to make codes clearer to show how to decide the return value. (suggested by Jan Beulich) v12: - add comment to explain how to deal with the case that user set new val for both DATA and CODE at same time. - add parameter for 'psr_cbm_type_to_feat_type' to return the feature type according to it. - use the feature type returned by 'psr_cbm_type_to_feat_type' to check if we need insert the new value into all items of the feature value array. - use conditional expression for wrmsrl. (suggested by Jan Beulich) v11: - move 'feat->cos_reg_val' assignment and value comparison in 'write_msr' callback function out as generic codes. (suggested by Jan Beulich) - changes about setting both CDP DATA and CODE at same time. - move 'type[]' declaration into previous patch which introduced 'cos_num'. (suggested by Jan Beulich) - changes about 'type[]'. (suggested by Jan Beulich) - move 'compare_val' to previous patch. (suggested by Jan Beulich) - changes about 'get_val' which has been replace by generic codes. (suggested by Jan Beulich) - remove 'restore_default_val' which is unnecessary now. (suggested by Jan Beulich) v10: - remove 'l3_cdp_get_old_val' and use 'l3_cdp_get_val' to replace it. (suggested by Jan Beulich) - remove 'l3_cdp_set_new_val'. - modify 'insert_val_to_array' flow to handle multiple COSs case. (suggested by Jan Beulich) - remove 'l3_cdp_compare_val' and implement a generic function 'comapre_val'. (suggested by Jan Beulich) - remove 'l3_cdp_fits_cos_max'. (suggested by Jan Beulich) - introduce macro 'PSR_MAX_COS_NUM'. - introduce a new member in 'feat_props', 'type[PSR_MAX_COS_NUM]' to record all 'cbm_type' the feature has. (suggested by Jan Beulich) - modify 'gather_val_array' flow to handle multiple COSs case. (suggested by Jan Beulich) - modify 'find_cos' flow and implement 'compare_val' to handle multiple COSs case. (suggested by Jan Beulich) - modify 'fits_cos_max' flow to handle multiple COSs case. (suggested by Jan Beulich) - changes about 'props'. (suggested by Jan Beulich) - remove cast in 'l3_cdp_write_msr'. (suggested by Jan Beulich) - implement 'compare_val' function to compare if feature values are what we expect in finding flow. - implement 'restore_default_val' function to restore feature's COS values to default if the feature has multiple COSs. It is called when the COS ID is reduced to 0. v9: - add comment to explain why CDP uses 2 COSs. (suggested by Wei Liu) - use 'cat_default_val'. (suggested by Wei Liu) - remove 'l3_cdp_get_cos_num' because we can directly get cos_num from feat_node now. (suggested by Jan Beulich) - remove cos checking because it has been moved to common function. (suggested by Jan Beulich) - l3_cdp_set_new_val parameter 'm' is changed to 'new_val'. (suggested by Jan Beulich) - directly use get_cdp_data(feat, 0) and get_cdp_code(feat, 0) to get default value. (suggested by Jan Beulich) - modify 'l3_cdp_write_msr' flow to write value into register according to input type. - changes about 'uint64_t' to 'uint32_t'. (suggested by Jan Beulich) v8: - modify 'l3_cdp_write_msr' type to 'void'. v5: - remove type check in callback function. (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) - remove 'l3_cdp_get_cos_max_from_type'. - rename 'l3_cdp_exceeds_cos_max' to 'l3_cdp_fits_cos_max'. (suggested by Jan Beulich) v4: - create this patch to make codes easier to understand. (suggested by Jan Beulich) --- xen/arch/x86/psr.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index a9e1b56..c211c77 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -374,6 +374,10 @@ static bool l3_cdp_get_feat_info(const struct feat_node *feat, static void l3_cdp_write_msr(unsigned int cos, uint32_t val, enum cbm_type type) { + wrmsrl(((type == PSR_CBM_TYPE_L3_DATA) ? + MSR_IA32_PSR_L3_MASK_DATA(cos) : + MSR_IA32_PSR_L3_MASK_CODE(cos)), + val); } static const struct feat_props l3_cdp_props = { @@ -829,17 +833,27 @@ static int insert_val_into_array(uint32_t val[], if ( !psr_check_cbm(feat->cbm_len, new_val) ) return -EINVAL; - /* Value setting position is same as feature array. */ + /* + * Value setting position is same as feature array. + * For CDP, user may set both DATA and CODE to same value. For such case, + * user input 'PSR_CBM_TYPE_L3' as type. The alternative type of CDP is same + * as it. So we should set new_val to both of DATA and CODE under such case. + */ for ( i = 0; i < props->cos_num; i++ ) { if ( type == props->type[i] ) { val[i] = new_val; - return 0; + ret = 0; + break; } + else if ( type == props->alt_type ) + val[i] = new_val; + else + ret = -EINVAL; } - return -EINVAL; + return ret; } static int compare_val(const uint32_t val[],