From patchwork Sat Apr 1 13:53:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9657961 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 4F56F6035D for ; Sat, 1 Apr 2017 13:56:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4604D285C2 for ; Sat, 1 Apr 2017 13:56:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3ABF228610; Sat, 1 Apr 2017 13:56:20 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 B3C5E285F8 for ; Sat, 1 Apr 2017 13:56:19 +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 1cuJUG-0006Pb-AH; Sat, 01 Apr 2017 13:54:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuJUE-0006Mg-FW for xen-devel@lists.xenproject.org; Sat, 01 Apr 2017 13:54:38 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 34/D7-12861-D11BFD85; Sat, 01 Apr 2017 13:54:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRWlGSWpSXmKPExsXS1tYhoiu78X6 EwYodghbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aXSY/ZCv7KVdw7sp25gfGgeBcjFweLwC0m iYX9E1lAHCGBaYwSD1ctYu1i5OSQEOCVOLJsBpTtL3Fh82VGEFtIoF6iofM+M4jNJqAu8fhrD xOILSKgJHFv1WQmkEHMAjuZJNad/g5WJCzgKHHmy1MWEJtFQFXi9PJP7CA2r4CnxKoLLYwQC+ QkTh6bDLaMEyh+5cU+FohlHhKrJl1insDIt4CRYRWjRnFqUVlqka6hhV5SUWZ6RkluYmaOrqG BsV5uanFxYnpqTmJSsV5yfu4mRmCo1DMwMO5g/H3a8xCjJAeTkijv9+J7EUJ8SfkplRmJxRnx RaU5qcWHGGU4OJQkeBU23I8QEixKTU+tSMvMAQYtTFqCg0dJhPfYeqA0b3FBYm5xZjpE6hSjo pQ4bypInwBIIqM0D64NFimXGGWlhHkZGRgYhHgKUotyM0tQ5V8xinMwKgnzyoOM58nMK4Gb/g poMRPQYouvd0EWlyQipKQaGDksHmg+E7C9vK7P91rGdi/zyx4TGfa1e5QZHw7+xHl51trCnap VnR/Z6p+m2jbzqgXscmVuvT+p4KGWyErP7ZYH9wS0l7u+nrP5XPWlDZZLfX5xdZfnblGZ++SR 1KPSA0eNZnjVS67Wyd5vs6vvQ67BqY9aJbMNn9/Kna9tXsGwMf7XKzEfJiWW4oxEQy3mouJEA KExCZWPAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1491054811!37933881!22 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.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57088 invoked from network); 1 Apr 2017 13:54:36 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-9.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 1 Apr 2017 13:54:36 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491054876; x=1522590876; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=cd3kVEjVjULgi4O0E0JkVaIteiF1SohsZmyuOhXL0+o=; b=tozYPtVG52ZMupKYa/pPiKeRjJ/W3COsJ3s2SnJF2QFVUY0WdeksZjZl qhjaEAhloQcZjt6HdfJzfJFWqiYheQ==; Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Apr 2017 06:54:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,258,1486454400"; d="scan'208";a="950545500" Received: from yisun1-ubuntu.bj.intel.com ([10.238.156.112]) by orsmga003.jf.intel.com with ESMTP; 01 Apr 2017 06:54:33 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Sat, 1 Apr 2017 21:53:52 +0800 Message-Id: <1491054836-30488-22-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491054836-30488-1-git-send-email-yi.y.sun@linux.intel.com> References: <1491054836-30488-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, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v10 21/25] 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 functions and domctl interface. Signed-off-by: Yi Sun --- 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 | 10 ++++++++++ xen/arch/x86/psr.c | 11 +++++++++++ xen/include/public/domctl.h | 1 + 3 files changed, 22 insertions(+) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 59d472c..7eb5983 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1466,6 +1466,16 @@ long arch_do_domctl( PSR_CBM_TYPE_L3_DATA); break; + case XEN_DOMCTL_PSR_CAT_OP_SET_L2_CBM: + if ( domctl->u.psr_cat_op.data != + (uint32_t)domctl->u.psr_cat_op.data ) + return -EINVAL; + + 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: { uint32_t val; diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 426d725..a85ea99 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -467,10 +467,21 @@ static struct feat_props l3_cdp_props = { }; /* L2 CAT ops */ +static void l2_cat_write_msr(unsigned int cos, uint32_t val, + enum cbm_type type, struct feat_node *feat) +{ + if ( feat->cos_reg_val[cos] != val ) + { + feat->cos_reg_val[cos] = val; + wrmsrl(MSR_IA32_PSR_L2_MASK(cos), val); + } +} + static struct feat_props l2_cat_props = { .cos_num = 1, .get_feat_info = cat_get_feat_info, .get_val = cat_get_val, + .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 8c183ba..523a2cd 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1138,6 +1138,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 */