From patchwork Tue Aug 1 08:48:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9873893 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 D292660365 for ; Tue, 1 Aug 2017 09:07:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA1E02582C for ; Tue, 1 Aug 2017 09:07:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF0DD28670; Tue, 1 Aug 2017 09:07:01 +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 71FA12582C for ; Tue, 1 Aug 2017 09:07:01 +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 1dcT6v-0005gF-Lk; Tue, 01 Aug 2017 09:05:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcT6u-0005eC-Oa for xen-devel@lists.xenproject.org; Tue, 01 Aug 2017 09:05:04 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id EC/17-01993-F3440895; Tue, 01 Aug 2017 09:05:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsXS1tYhomvv0hB pML1T3OL7lslMDowehz9cYQlgjGLNzEvKr0hgzVj7/DNTwXK5invXOhgbGDeIdzFycQgJTGOU eDRvBmMXIyeHhACvxJFlM1ghbH+JzxtOsEEUNTBKtLw6xA6SYBNQl3j8tYcJxBYRUJK4t2oyE 0gRs8B8JonX5x8wgySEBRwlth5fCTaVRUBVYu+cS0BTOTh4BTwkHk3zgFggJ3Hy2GSwZZxA4R 03bzCDlAgJuEvsnJk4gZF3ASPDKkb14tSistQiXVO9pKLM9IyS3MTMHF1DA1O93NTi4sT01Jz EpGK95PzcTYzAYGAAgh2MX/qdDzFKcjApifIq9tRHCvEl5adUZiQWZ8QXleakFh9ilOHgUJLg lXBuiBQSLEpNT61Iy8wBhiVMWoKDR0mE94ITUJq3uCAxtzgzHSJ1ilGX49WE/9+YhFjy8vNSp cR5L4IUCYAUZZTmwY2AxcglRlkpYV5GoKOEeApSi3IzS1DlXzGKczAqCfPKglzCk5lXArfpFd ARTEBHSJbWghxRkoiQkmpgNHE/tNhErc+/+NqsS1tWnlx1U3ujkyfT+zNBe2ZNWHn50uMtXgI lbH6lM232LOJTebp/w2zflk2f/l4sOOYR4bvNO/S5r2DUvezIo1zypfNWXAlTXfyzLUmr7l/7 lptGEotjj4gca58471PA7au+NS22rZblcrNXJjxZZzSdS6pb1/GyguglZyWW4oxEQy3mouJEA GVHvfOMAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1501578248!89431283!20 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzU1MzU4\n X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56052 invoked from network); 1 Aug 2017 09:05:02 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-16.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 1 Aug 2017 09:05:02 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2017 02:05:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,305,1498546800"; d="scan'208";a="118061724" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by orsmga002.jf.intel.com with ESMTP; 01 Aug 2017 02:04:59 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Tue, 1 Aug 2017 16:48:50 +0800 Message-Id: <1501577334-7431-20-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1501577334-7431-1-git-send-email-yi.y.sun@linux.intel.com> References: <1501577334-7431-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 v15 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 | 1 + xen/include/public/domctl.h | 1 + 3 files changed, 8 insertions(+) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index b4847b6..127c84e 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1462,6 +1462,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 4a8b01b..c355f1e 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -408,6 +408,7 @@ 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 = { diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 61d44cd..0669c31 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1142,6 +1142,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 */