From patchwork Thu Jul 6 01:53:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9827435 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 C182B603B5 for ; Thu, 6 Jul 2017 02:09:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B05B4285C7 for ; Thu, 6 Jul 2017 02:09:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A50D1285C9; Thu, 6 Jul 2017 02:09:12 +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 44D0F285CB for ; Thu, 6 Jul 2017 02:09:12 +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 1dSwCa-0001HN-W0; Thu, 06 Jul 2017 02:07:32 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSwCZ-0001Ef-AF for xen-devel@lists.xenproject.org; Thu, 06 Jul 2017 02:07:31 +0000 Received: from [193.109.254.147] by server-1.bemta-6.messagelabs.com id 20/FA-03577-26B9D595; Thu, 06 Jul 2017 02:07:30 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOLMWRWlGSWpSXmKPExsXS1tYhr5s0Ozb SYOUWTovvWyYzOTB6HP5whSWAMYo1My8pvyKBNePOR+uC1QoVW9+oNTD+l+hi5OAQEqiU2HBM touRk0NCgFfiyLIZrBB2gETr/a9ANhdQSQOjxKpLc5hAEmwC6hKPv/aA2SICShL3Vk1mAiliF pjPJPH6/ANmkISwgKPE/+nTWUEWsAioSnyYrg8S5hXwlLg/o50RYoGcxMljk8GWcQLFj1xtZg exhQQ8JDa2v2aawMi7gJFhFaNGcWpRWWqRrqGlXlJRZnpGSW5iZo6uoYGZXm5qcXFiempOYlK xXnJ+7iZGYCAwAMEOxh/LAg4xSnIwKYny/tGPjRTiS8pPqcxILM6ILyrNSS0+xCjDwaEkwasz CygnWJSanlqRlpkDDEmYtAQHj5II72phoDRvcUFibnFmOkTqFKMux6sJ/78xCbHk5eelSonz2 oPMEAApyijNgxsBi49LjLJSwryMQEcJ8RSkFuVmlqDKv2IU52BUEuYNBpnCk5lXArfpFdARTE BHKDbGgBxRkoiQkmpgXKDSJmO3dwfjxmKp13kdXGoNh70/8++8OJFPaVpIBuvPSEHes/ptG41 ipS6x/zom0dy7KqK181/Ok4X3Hsz6z3yT5VrmtvM2V5bkzd/jUzv3354yjVuV+m8XzZpzdXND ULiLgMOxRyzT3D3C3y1nc7YX3K1i2MTtm94m+Mr/Bdfkt0qz2Cz8lViKMxINtZiLihMBm7kVx IoCAAA= X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1499306837!105490986!6 X-Originating-IP: [134.134.136.31] 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 35062 invoked from network); 6 Jul 2017 02:07:29 -0000 Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by server-3.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 6 Jul 2017 02:07:29 -0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP; 05 Jul 2017 19:07:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.40,314,1496127600"; d="scan'208"; a="1191048188" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2017 19:07:26 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Thu, 6 Jul 2017 09:53:12 +0800 Message-Id: <1499305996-19029-20-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1499305996-19029-1-git-send-email-yi.y.sun@linux.intel.com> References: <1499305996-19029-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 v13 19/23] x86: L2 CAT: implement set value 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 This patch implements L2 CAT set value related callback function and domctl interface. Signed-off-by: Yi Sun Reviewed-by: Jan Beulich --- v11: - remove 'domctl->u.psr_cat_op.data' check because it has been moved into 'psr_set_val'. (suggested by Jan Beulich) - move 'feat->cos_reg_val' assignment and value comparison in 'write_msr' callback function out as generic codes. (suggested by Jan Beulich) v10: - check input data and remove cast in domctl. (suggested by Jan Beulich) - remove some hooks assignment due to previous patches changes. (suggested by Jan Beulich) - remove cast in 'l2_cat_write_msr'. (suggested by Jan Beulich) - remove 'return in 'l2_cat_write_msr'. (suggested by Jan Beulich) v9: - reuse some CAT common functions for L2 CAT to reduce redundant codes. (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. These things are done in patch "x86: refactor psr: set value: implement cos finding flow." (suggested by Roger Pau and Dario Faggioli) - remove 'get_cos_num' related codes. (suggested by Jan Beulich) - modify 'l2_cat_write_msr' according to previous patch change. - changes about 'uint64_t' to 'uint32_t'. (suggested by Jan Beulich) v8: - modify 'l2_cat_write_msr' 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 'l2_cat_get_cos_max_from_type'. (suggested by Jan Beulich) - rename 'l2_cat_exceeds_cos_max' to 'l2_cat_fits_cos_max'. (suggested by Jan Beulich) v4: - create this patch because of codes architecture change. (suggested by Jan Beulich) --- xen/arch/x86/domctl.c | 6 ++++++ xen/arch/x86/psr.c | 6 ++++++ xen/include/public/domctl.h | 1 + 3 files changed, 13 insertions(+) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index d637bca..a0892d6 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1439,6 +1439,12 @@ long arch_do_domctl( PSR_CBM_TYPE_L3_DATA); break; + case XEN_DOMCTL_PSR_CAT_OP_SET_L2_CBM: + ret = psr_set_val(d, domctl->u.psr_cat_op.target, + domctl->u.psr_cat_op.data, + PSR_CBM_TYPE_L2); + break; + case XEN_DOMCTL_PSR_CAT_OP_GET_L3_CBM: ret = psr_get_val(d, domctl->u.psr_cat_op.target, &val32, PSR_CBM_TYPE_L3); diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 610a55c..06f60f1 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -407,11 +407,17 @@ static const struct feat_props l3_cdp_props = { }; /* L2 CAT props */ +static void l2_cat_write_msr(unsigned int cos, uint32_t val, enum cbm_type type) +{ + wrmsrl(MSR_IA32_PSR_L2_MASK(cos), val); +} + static const struct feat_props l2_cat_props = { .cos_num = 1, .type[0] = PSR_CBM_TYPE_L2, .alt_type = PSR_CBM_TYPE_UNKNOWN, .get_feat_info = cat_get_feat_info, + .write_msr = l2_cat_write_msr, }; static void __init parse_psr_bool(char *s, char *value, char *feature, diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 61a9450..5197c34 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1134,6 +1134,7 @@ struct xen_domctl_psr_cat_op { #define XEN_DOMCTL_PSR_CAT_OP_SET_L3_DATA 3 #define XEN_DOMCTL_PSR_CAT_OP_GET_L3_CODE 4 #define XEN_DOMCTL_PSR_CAT_OP_GET_L3_DATA 5 +#define XEN_DOMCTL_PSR_CAT_OP_SET_L2_CBM 6 #define XEN_DOMCTL_PSR_CAT_OP_GET_L2_CBM 7 uint32_t cmd; /* IN: XEN_DOMCTL_PSR_CAT_OP_* */ uint32_t target; /* IN */