From patchwork Thu Jul 20 08:49:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9854309 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 979C360388 for ; Thu, 20 Jul 2017 09:06:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B8B728782 for ; Thu, 20 Jul 2017 09:06:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 803BD28785; Thu, 20 Jul 2017 09:06:19 +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 A072828782 for ; Thu, 20 Jul 2017 09:06:18 +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 1dY7NA-0007IZ-Mg; Thu, 20 Jul 2017 09:03:52 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dY7N9-0007HT-Nn for xen-devel@lists.xenproject.org; Thu, 20 Jul 2017 09:03:51 +0000 Received: from [193.109.254.147] by server-10.bemta-6.messagelabs.com id 76/19-03582-7F170795; Thu, 20 Jul 2017 09:03:51 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgkeJIrShJLcpLzFFi42Jpa+uQ1/1WWBB pMG+fpMX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmvHj72+mgt7aisU3nrA0MG6M6mLk5BASqJDo eN/BCmJLCPBKHFk2A8oOkOhrX8XUxcgFVNPAKPFh5ndGkASbgLrE4689TCC2iICSxL1Vk8GKm AW2MUm8v/yCHSQhLJAsMX/2bRYQm0VAVeLDqmVAcQ4OXgEPibvngyEWyEmcPDYZbBmngKfE8+ 7N7BAHeUjcW/mXeQIj7wJGhlWMGsWpRWWpRbqGxnpJRZnpGSW5iZk5uoYGZnq5qcXFiempOYl JxXrJ+bmbGIHhwAAEOxi/LAs4xCjJwaQkyssSWBApxJeUn1KZkVicEV9UmpNafIhRhoNDSYL3 YQFQTrAoNT21Ii0zBxiYMGkJDh4lEYg0b3FBYm5xZjpE6hSjMceG1eu/MHG8mvD/G5MQS15+X qqUOO9SkFIBkNKM0jy4QbCIucQoKyXMywh0mhBPQWpRbmYJqvwrRnEORiVh3ucgU3gy80rg9r 0COoUJ6JRHbmCnlCQipKQaGDds2XQpqMh57bn+N6vUrHg2/ErOXlYcb8MhlLVnPcu6hwdUf97 j3XSg5m2SX/uEprvKhy5+dTdrc64/PuV0kU2M4O2SOfEpJyZIC65oMme6YcZjyuEevLb/0v1v L/t39G/J3DlbqM3hikVLbOENo4p/Eoza7FxRKi1tvzWdjEzKOub3GpiUKrEUZyQaajEXFScCA L+71LyTAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1500541426!108131258!2 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 59113 invoked from network); 20 Jul 2017 09:03:50 -0000 Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by server-9.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 20 Jul 2017 09:03:50 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP; 20 Jul 2017 02:03:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.40,383,1496127600"; d="scan'208"; a="1153386976" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by orsmga001.jf.intel.com with ESMTP; 20 Jul 2017 02:03:46 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Thu, 20 Jul 2017 16:49:03 +0800 Message-Id: <1500540553-29199-3-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500540553-29199-1-git-send-email-yi.y.sun@linux.intel.com> References: <1500540553-29199-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 , julien.grall@arm.com, mengxu@cis.upenn.edu, jbeulich@suse.com, chao.p.peng@linux.intel.com, roger.pau@citrix.com Subject: [Xen-devel] [RFC v2 02/12] Rename PSR sysctl/domctl interfaces and xsm policy to make them be general. 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 renames PSR sysctl/domctl interfaces and related xsm policy to make them be general for all resource allocation features but not only for CAT. Then, we can resuse the interfaces for all allocation features. Signed-off-by: Yi Sun --- tools/flask/policy/modules/dom0.te | 4 ++-- tools/libxc/xc_psr.c | 34 +++++++++++++++++----------------- xen/arch/x86/domctl.c | 36 ++++++++++++++++++------------------ xen/arch/x86/sysctl.c | 24 ++++++++++++------------ xen/include/public/domctl.h | 10 +++++----- xen/include/public/sysctl.h | 10 +++++----- xen/xsm/flask/hooks.c | 8 ++++---- xen/xsm/flask/policy/access_vectors | 8 ++++---- 8 files changed, 67 insertions(+), 67 deletions(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index d0a4d91..1a376ac 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -14,7 +14,7 @@ allow dom0_t xen_t:xen { tmem_control getscheduler setscheduler }; allow dom0_t xen_t:xen2 { - resource_op psr_cmt_op psr_cat_op pmu_ctrl get_symbol + resource_op psr_cmt_op psr_alloc_op pmu_ctrl get_symbol get_cpu_levelling_caps get_cpu_featureset livepatch_op gcov_op }; @@ -39,7 +39,7 @@ allow dom0_t dom0_t:domain { }; allow dom0_t dom0_t:domain2 { set_cpuid gettsc settsc setscheduler set_max_evtchn set_vnumainfo - get_vnumainfo psr_cmt_op psr_cat_op + get_vnumainfo psr_cmt_op psr_alloc_op }; allow dom0_t dom0_t:resource { add remove }; diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index 039b920..73d05f2 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -274,11 +274,11 @@ int xc_psr_cat_set_domain_data(xc_interface *xch, uint32_t domid, return -1; } - domctl.cmd = XEN_DOMCTL_psr_cat_op; + domctl.cmd = XEN_DOMCTL_psr_alloc_op; domctl.domain = (domid_t)domid; - domctl.u.psr_cat_op.cmd = cmd; - domctl.u.psr_cat_op.target = target; - domctl.u.psr_cat_op.data = data; + domctl.u.psr_alloc_op.cmd = cmd; + domctl.u.psr_alloc_op.target = target; + domctl.u.psr_alloc_op.data = data; return do_domctl(xch, &domctl); } @@ -310,15 +310,15 @@ int xc_psr_cat_get_domain_data(xc_interface *xch, uint32_t domid, return -1; } - domctl.cmd = XEN_DOMCTL_psr_cat_op; + domctl.cmd = XEN_DOMCTL_psr_alloc_op; domctl.domain = (domid_t)domid; - domctl.u.psr_cat_op.cmd = cmd; - domctl.u.psr_cat_op.target = target; + domctl.u.psr_alloc_op.cmd = cmd; + domctl.u.psr_alloc_op.target = target; rc = do_domctl(xch, &domctl); if ( !rc ) - *data = domctl.u.psr_cat_op.data; + *data = domctl.u.psr_alloc_op.data; return rc; } @@ -329,29 +329,29 @@ int xc_psr_cat_get_info(xc_interface *xch, uint32_t socket, unsigned int lvl, int rc = -1; DECLARE_SYSCTL; - sysctl.cmd = XEN_SYSCTL_psr_cat_op; - sysctl.u.psr_cat_op.target = socket; + sysctl.cmd = XEN_SYSCTL_psr_alloc_op; + sysctl.u.psr_alloc_op.target = socket; switch ( lvl ) { case 2: - sysctl.u.psr_cat_op.cmd = XEN_SYSCTL_PSR_CAT_get_l2_info; + sysctl.u.psr_alloc_op.cmd = XEN_SYSCTL_PSR_CAT_get_l2_info; rc = xc_sysctl(xch, &sysctl); if ( !rc ) { - *cos_max = sysctl.u.psr_cat_op.u.cat_info.cos_max; - *cbm_len = sysctl.u.psr_cat_op.u.cat_info.cbm_len; + *cos_max = sysctl.u.psr_alloc_op.u.cat_info.cos_max; + *cbm_len = sysctl.u.psr_alloc_op.u.cat_info.cbm_len; *cdp_enabled = false; } break; case 3: - sysctl.u.psr_cat_op.cmd = XEN_SYSCTL_PSR_CAT_get_l3_info; + sysctl.u.psr_alloc_op.cmd = XEN_SYSCTL_PSR_CAT_get_l3_info; rc = xc_sysctl(xch, &sysctl); if ( !rc ) { - *cos_max = sysctl.u.psr_cat_op.u.cat_info.cos_max; - *cbm_len = sysctl.u.psr_cat_op.u.cat_info.cbm_len; - *cdp_enabled = sysctl.u.psr_cat_op.u.cat_info.flags & + *cos_max = sysctl.u.psr_alloc_op.u.cat_info.cos_max; + *cbm_len = sysctl.u.psr_alloc_op.u.cat_info.cbm_len; + *cdp_enabled = sysctl.u.psr_alloc_op.u.cat_info.flags & XEN_SYSCTL_PSR_CAT_L3_CDP; } break; diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 127c84e..24b998b 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1439,60 +1439,60 @@ long arch_do_domctl( } break; - case XEN_DOMCTL_psr_cat_op: - switch ( domctl->u.psr_cat_op.cmd ) + case XEN_DOMCTL_psr_alloc_op: + switch ( domctl->u.psr_alloc_op.cmd ) { uint32_t val32; case XEN_DOMCTL_PSR_CAT_OP_SET_L3_CBM: - ret = psr_set_val(d, domctl->u.psr_cat_op.target, - domctl->u.psr_cat_op.data, + ret = psr_set_val(d, domctl->u.psr_alloc_op.target, + domctl->u.psr_alloc_op.data, PSR_CBM_TYPE_L3); break; case XEN_DOMCTL_PSR_CAT_OP_SET_L3_CODE: - ret = psr_set_val(d, domctl->u.psr_cat_op.target, - domctl->u.psr_cat_op.data, + ret = psr_set_val(d, domctl->u.psr_alloc_op.target, + domctl->u.psr_alloc_op.data, PSR_CBM_TYPE_L3_CODE); break; case XEN_DOMCTL_PSR_CAT_OP_SET_L3_DATA: - ret = psr_set_val(d, domctl->u.psr_cat_op.target, - domctl->u.psr_cat_op.data, + ret = psr_set_val(d, domctl->u.psr_alloc_op.target, + domctl->u.psr_alloc_op.data, 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, + ret = psr_set_val(d, domctl->u.psr_alloc_op.target, + domctl->u.psr_alloc_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, + ret = psr_get_val(d, domctl->u.psr_alloc_op.target, &val32, PSR_CBM_TYPE_L3); - domctl->u.psr_cat_op.data = val32; + domctl->u.psr_alloc_op.data = val32; copyback = true; break; case XEN_DOMCTL_PSR_CAT_OP_GET_L3_CODE: - ret = psr_get_val(d, domctl->u.psr_cat_op.target, + ret = psr_get_val(d, domctl->u.psr_alloc_op.target, &val32, PSR_CBM_TYPE_L3_CODE); - domctl->u.psr_cat_op.data = val32; + domctl->u.psr_alloc_op.data = val32; copyback = true; break; case XEN_DOMCTL_PSR_CAT_OP_GET_L3_DATA: - ret = psr_get_val(d, domctl->u.psr_cat_op.target, + ret = psr_get_val(d, domctl->u.psr_alloc_op.target, &val32, PSR_CBM_TYPE_L3_DATA); - domctl->u.psr_cat_op.data = val32; + domctl->u.psr_alloc_op.data = val32; copyback = true; break; case XEN_DOMCTL_PSR_CAT_OP_GET_L2_CBM: - ret = psr_get_val(d, domctl->u.psr_cat_op.target, + ret = psr_get_val(d, domctl->u.psr_alloc_op.target, &val32, PSR_CBM_TYPE_L2); - domctl->u.psr_cat_op.data = val32; + domctl->u.psr_alloc_op.data = val32; copyback = true; break; diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 14c12b7..3051843 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -171,45 +171,45 @@ long arch_do_sysctl( break; - case XEN_SYSCTL_psr_cat_op: - switch ( sysctl->u.psr_cat_op.cmd ) + case XEN_SYSCTL_psr_alloc_op: + switch ( sysctl->u.psr_alloc_op.cmd ) { uint32_t data[PSR_INFO_ARRAY_SIZE]; case XEN_SYSCTL_PSR_CAT_get_l3_info: { - ret = psr_get_info(sysctl->u.psr_cat_op.target, + ret = psr_get_info(sysctl->u.psr_alloc_op.target, PSR_CBM_TYPE_L3, data, ARRAY_SIZE(data)); if ( ret ) break; - sysctl->u.psr_cat_op.u.cat_info.cos_max = + sysctl->u.psr_alloc_op.u.cat_info.cos_max = data[PSR_INFO_IDX_COS_MAX]; - sysctl->u.psr_cat_op.u.cat_info.cbm_len = + sysctl->u.psr_alloc_op.u.cat_info.cbm_len = data[PSR_INFO_IDX_CAT_CBM_LEN]; - sysctl->u.psr_cat_op.u.cat_info.flags = + sysctl->u.psr_alloc_op.u.cat_info.flags = data[PSR_INFO_IDX_CAT_FLAG]; - if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) ) + if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_alloc_op) ) ret = -EFAULT; break; } case XEN_SYSCTL_PSR_CAT_get_l2_info: { - ret = psr_get_info(sysctl->u.psr_cat_op.target, + ret = psr_get_info(sysctl->u.psr_alloc_op.target, PSR_CBM_TYPE_L2, data, ARRAY_SIZE(data)); if ( ret ) break; - sysctl->u.psr_cat_op.u.cat_info.cos_max = + sysctl->u.psr_alloc_op.u.cat_info.cos_max = data[PSR_INFO_IDX_COS_MAX]; - sysctl->u.psr_cat_op.u.cat_info.cbm_len = + sysctl->u.psr_alloc_op.u.cat_info.cbm_len = data[PSR_INFO_IDX_CAT_CBM_LEN]; - sysctl->u.psr_cat_op.u.cat_info.flags = + sysctl->u.psr_alloc_op.u.cat_info.flags = data[PSR_INFO_IDX_CAT_FLAG]; - if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) ) + if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_alloc_op) ) ret = -EFAULT; break; } diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 0669c31..94dcd58 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1135,7 +1135,7 @@ struct xen_domctl_monitor_op { typedef struct xen_domctl_monitor_op xen_domctl_monitor_op_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_monitor_op_t); -struct xen_domctl_psr_cat_op { +struct xen_domctl_psr_alloc_op { #define XEN_DOMCTL_PSR_CAT_OP_SET_L3_CBM 0 #define XEN_DOMCTL_PSR_CAT_OP_GET_L3_CBM 1 #define XEN_DOMCTL_PSR_CAT_OP_SET_L3_CODE 2 @@ -1148,8 +1148,8 @@ struct xen_domctl_psr_cat_op { uint32_t target; /* IN */ uint64_t data; /* IN/OUT */ }; -typedef struct xen_domctl_psr_cat_op xen_domctl_psr_cat_op_t; -DEFINE_XEN_GUEST_HANDLE(xen_domctl_psr_cat_op_t); +typedef struct xen_domctl_psr_alloc_op xen_domctl_psr_alloc_op_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_psr_alloc_op_t); struct xen_domctl { uint32_t cmd; @@ -1226,7 +1226,7 @@ struct xen_domctl { #define XEN_DOMCTL_setvnumainfo 74 #define XEN_DOMCTL_psr_cmt_op 75 #define XEN_DOMCTL_monitor_op 77 -#define XEN_DOMCTL_psr_cat_op 78 +#define XEN_DOMCTL_psr_alloc_op 78 #define XEN_DOMCTL_soft_reset 79 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 @@ -1289,7 +1289,7 @@ struct xen_domctl { struct xen_domctl_vnuma vnuma; struct xen_domctl_psr_cmt_op psr_cmt_op; struct xen_domctl_monitor_op monitor_op; - struct xen_domctl_psr_cat_op psr_cat_op; + struct xen_domctl_psr_alloc_op psr_alloc_op; uint8_t pad[128]; } u; }; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 9e51af6..44d64f5 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -745,7 +745,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_pcitopoinfo_t); #define XEN_SYSCTL_PSR_CAT_get_l3_info 0 #define XEN_SYSCTL_PSR_CAT_get_l2_info 1 -struct xen_sysctl_psr_cat_op { +struct xen_sysctl_psr_alloc_op { uint32_t cmd; /* IN: XEN_SYSCTL_PSR_CAT_* */ uint32_t target; /* IN */ union { @@ -757,8 +757,8 @@ struct xen_sysctl_psr_cat_op { } cat_info; } u; }; -typedef struct xen_sysctl_psr_cat_op xen_sysctl_psr_cat_op_t; -DEFINE_XEN_GUEST_HANDLE(xen_sysctl_psr_cat_op_t); +typedef struct xen_sysctl_psr_alloc_op xen_sysctl_psr_alloc_op_t; +DEFINE_XEN_GUEST_HANDLE(xen_sysctl_psr_alloc_op_t); #define XEN_SYSCTL_TMEM_OP_ALL_CLIENTS 0xFFFFU @@ -1119,7 +1119,7 @@ struct xen_sysctl { #define XEN_SYSCTL_gcov_op 20 #define XEN_SYSCTL_psr_cmt_op 21 #define XEN_SYSCTL_pcitopoinfo 22 -#define XEN_SYSCTL_psr_cat_op 23 +#define XEN_SYSCTL_psr_alloc_op 23 #define XEN_SYSCTL_tmem_op 24 #define XEN_SYSCTL_get_cpu_levelling_caps 25 #define XEN_SYSCTL_get_cpu_featureset 26 @@ -1147,7 +1147,7 @@ struct xen_sysctl { struct xen_sysctl_scheduler_op scheduler_op; struct xen_sysctl_gcov_op gcov_op; struct xen_sysctl_psr_cmt_op psr_cmt_op; - struct xen_sysctl_psr_cat_op psr_cat_op; + struct xen_sysctl_psr_alloc_op psr_alloc_op; struct xen_sysctl_tmem_op tmem_op; struct xen_sysctl_cpu_levelling_caps cpu_levelling_caps; struct xen_sysctl_cpu_featureset cpu_featureset; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index fd84ac0..95aff21 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -742,8 +742,8 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_psr_cmt_op: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_CMT_OP); - case XEN_DOMCTL_psr_cat_op: - return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_CAT_OP); + case XEN_DOMCTL_psr_alloc_op: + return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_ALLOC_OP); case XEN_DOMCTL_soft_reset: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__SOFT_RESET); @@ -806,9 +806,9 @@ static int flask_sysctl(int cmd) case XEN_SYSCTL_psr_cmt_op: return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2, XEN2__PSR_CMT_OP, NULL); - case XEN_SYSCTL_psr_cat_op: + case XEN_SYSCTL_psr_alloc_op: return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2, - XEN2__PSR_CAT_OP, NULL); + XEN2__PSR_ALLOC_OP, NULL); case XEN_SYSCTL_tmem_op: return domain_has_xen(current->domain, XEN__TMEM_CONTROL); diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 1f7eb35..9d81e41 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -85,8 +85,8 @@ class xen2 resource_op # XEN_SYSCTL_psr_cmt_op psr_cmt_op -# XEN_SYSCTL_psr_cat_op - psr_cat_op +# XEN_SYSCTL_psr_alloc_op + psr_alloc_op # XENPF_get_symbol get_symbol # PMU control @@ -244,8 +244,8 @@ class domain2 mem_paging # XENMEM_sharing_op mem_sharing -# XEN_DOMCTL_psr_cat_op - psr_cat_op +# XEN_DOMCTL_psr_alloc_op + psr_alloc_op } # Similar to class domain, but primarily contains domctls related to HVM domains