From patchwork Fri Apr 8 20:31:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8786301 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 06DF2C0553 for ; Fri, 8 Apr 2016 21:01:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AC15F20222 for ; Fri, 8 Apr 2016 21:01:57 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 5E0C0201CD for ; Fri, 8 Apr 2016 21:01:56 +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 1aodUN-0002LU-Ow; Fri, 08 Apr 2016 20:58:47 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aodUM-0002KQ-AA for xen-devel@lists.xen.org; Fri, 08 Apr 2016 20:58:46 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 57/3E-09532-58B18075; Fri, 08 Apr 2016 20:58:45 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJIsWRWlGSWpSXmKPExsXitHRDpG6rNEe 4Qd8dFoslHxezODB6HN39mymAMYo1My8pvyKBNePP/9/sBTdjKz7vbWZtYFzo2cXIySEh4C/R 232UDcRmE9CX2P3iExOILSKgLnG64yJrFyMHB7OArsSqnxogprBArMTpN3kgFSwCKhJLG6eDV fMKeEksaXzJCjFRTuL88Z/MIDYnUPzMtjNgcSEBT4nLM+ezQNhqEtf6L7FD9ApKnJz5BCzOLC AhcfDFC2aQVRIC3BJ/u+0nMPLNQlI1C0nVAkamVYzqxalFZalFusZ6SUWZ6RkluYmZObqGBmZ 6uanFxYnpqTmJScV6yfm5mxiBwcQABDsYO/45HWKU5GBSEuXd9pA9XIgvKT+lMiOxOCO+qDQn tfgQowwHh5IE71QpjnAhwaLU9NSKtMwcYFjDpCU4eJREeMtB0rzFBYm5xZnpEKlTjLocWxbcW MskxJKXn5cqJc5bDVIkAFKUUZoHNwIWY5cYZaWEeRmBjhLiKUgtys0sQZV/xSjOwagkzFsIMo UnM68EbtMroCOYgI64wM8GckRJIkJKqoHxUOWuaIa4K12aa39WL/ts91z+sovEmQd7DjROrX8 1wyL5xDQFP6k/GhMyw2p2NMpOs2B8E3nkxpNI5l2cDVLaK3L/u87c+ffbz1VCiuXszNtE0upc NbdpMXm3K7xc6MV987DrrfxdiiYaPTnOms6WVgHX1u33VU1aIvf68vdv8akcBzfnip9VYinOS DTUYi4qTgQAJcbslawCAAA= X-Env-Sender: prvs=8997c7931=Andrew.Cooper3@citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1460149123!8343370!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60739 invoked from network); 8 Apr 2016 20:58:44 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Apr 2016 20:58:44 -0000 X-IronPort-AV: E=Sophos;i="5.24,454,1454976000"; d="scan'208";a="345898926" From: Andrew Cooper To: Xen-devel Date: Fri, 8 Apr 2016 21:31:50 +0100 Message-ID: <1460147517-11706-15-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1460147517-11706-1-git-send-email-andrew.cooper3@citrix.com> References: <1460147517-11706-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Andrew Cooper Subject: [Xen-devel] [PATCH v6 14/21] xen+tools: Export maximum host and guest cpu featuresets via SYSCTL 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP And provide stubs for toolstack use. Signed-off-by: Andrew Cooper Acked-by: Wei Liu Acked-by: David Scott Acked-by: Jan Beulich Acked-by: Daniel De Graaf Reviewed-by: Konrad Rzeszutek Wilk --- v2: * Rebased to use libxencall * Improve hypercall documentation v3: * Provide libxc implementation for XEN_SYSCTL_get_cpu_levelling_caps as well. v4: * More const. v5: * XSM bits. --- tools/flask/policy/policy/modules/xen/xen.te | 1 + tools/libxc/include/xenctrl.h | 4 +++ tools/libxc/xc_cpuid_x86.c | 41 ++++++++++++++++++++++ tools/ocaml/libs/xc/xenctrl.ml | 3 ++ tools/ocaml/libs/xc/xenctrl.mli | 4 +++ tools/ocaml/libs/xc/xenctrl_stubs.c | 35 +++++++++++++++++++ xen/arch/x86/sysctl.c | 51 ++++++++++++++++++++++++++++ xen/include/public/sysctl.h | 27 +++++++++++++++ xen/xsm/flask/hooks.c | 3 ++ xen/xsm/flask/policy/access_vectors | 2 ++ 10 files changed, 171 insertions(+) diff --git a/tools/flask/policy/policy/modules/xen/xen.te b/tools/flask/policy/policy/modules/xen/xen.te index c29b067..a551756 100644 --- a/tools/flask/policy/policy/modules/xen/xen.te +++ b/tools/flask/policy/policy/modules/xen/xen.te @@ -73,6 +73,7 @@ allow dom0_t xen_t:xen2 { pmu_ctrl get_symbol get_cpu_levelling_caps + get_cpu_featureset }; # Allow dom0 to use all XENVER_ subops and VERSION subops that have checks. diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index e8cb1ec..1c865a3 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2618,6 +2618,10 @@ int xc_psr_cat_get_domain_data(xc_interface *xch, uint32_t domid, int xc_psr_cat_get_l3_info(xc_interface *xch, uint32_t socket, uint32_t *cos_max, uint32_t *cbm_len, bool *cdp_enabled); + +int xc_get_cpu_levelling_caps(xc_interface *xch, uint32_t *caps); +int xc_get_cpu_featureset(xc_interface *xch, uint32_t index, + uint32_t *nr_features, uint32_t *featureset); #endif /* Compat shims */ diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 733add4..5780397 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -33,6 +33,47 @@ #define DEF_MAX_INTELEXT 0x80000008u #define DEF_MAX_AMDEXT 0x8000001cu +int xc_get_cpu_levelling_caps(xc_interface *xch, uint32_t *caps) +{ + DECLARE_SYSCTL; + int ret; + + sysctl.cmd = XEN_SYSCTL_get_cpu_levelling_caps; + ret = do_sysctl(xch, &sysctl); + + if ( !ret ) + *caps = sysctl.u.cpu_levelling_caps.caps; + + return ret; +} + +int xc_get_cpu_featureset(xc_interface *xch, uint32_t index, + uint32_t *nr_features, uint32_t *featureset) +{ + DECLARE_SYSCTL; + DECLARE_HYPERCALL_BOUNCE(featureset, + *nr_features * sizeof(*featureset), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + int ret; + + if ( xc_hypercall_bounce_pre(xch, featureset) ) + return -1; + + sysctl.cmd = XEN_SYSCTL_get_cpu_featureset; + sysctl.u.cpu_featureset.index = index; + sysctl.u.cpu_featureset.nr_features = *nr_features; + set_xen_guest_handle(sysctl.u.cpu_featureset.features, featureset); + + ret = do_sysctl(xch, &sysctl); + + xc_hypercall_bounce_post(xch, featureset); + + if ( !ret ) + *nr_features = sysctl.u.cpu_featureset.nr_features; + + return ret; +} + struct cpuid_domain_info { enum diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 58a53a1..75006e7 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -242,6 +242,9 @@ external version_changeset: handle -> string = "stub_xc_version_changeset" external version_capabilities: handle -> string = "stub_xc_version_capabilities" +type featureset_index = Featureset_raw | Featureset_host | Featureset_pv | Featureset_hvm +external get_cpu_featureset : handle -> featureset_index -> int64 array = "stub_xc_get_cpu_featureset" + external watchdog : handle -> int -> int32 -> int = "stub_xc_watchdog" diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 16443df..720e4b2 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -147,6 +147,10 @@ external version_compile_info : handle -> compile_info external version_changeset : handle -> string = "stub_xc_version_changeset" external version_capabilities : handle -> string = "stub_xc_version_capabilities" + +type featureset_index = Featureset_raw | Featureset_host | Featureset_pv | Featureset_hvm +external get_cpu_featureset : handle -> featureset_index -> int64 array = "stub_xc_get_cpu_featureset" + type core_magic = Magic_hvm | Magic_pv type core_header = { xch_magic : core_magic; diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 4ac5dce..e87f14f 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -1207,6 +1207,41 @@ CAMLprim value stub_xc_domain_deassign_device(value xch, value domid, value desc CAMLreturn(Val_unit); } +CAMLprim value stub_xc_get_cpu_featureset(value xch, value idx) +{ + CAMLparam2(xch, idx); + CAMLlocal1(bitmap_val); + + /* Safe, because of the global ocaml lock. */ + static uint32_t fs_len; + + if (fs_len == 0) + { + int ret = xc_get_cpu_featureset(_H(xch), 0, &fs_len, NULL); + + if (ret || (fs_len == 0)) + failwith_xc(_H(xch)); + } + + { + /* To/from hypervisor to retrieve actual featureset */ + uint32_t fs[fs_len], len = fs_len; + unsigned int i; + + int ret = xc_get_cpu_featureset(_H(xch), Int_val(idx), &len, fs); + + if (ret) + failwith_xc(_H(xch)); + + bitmap_val = caml_alloc(len, 0); + + for (i = 0; i < len; ++i) + Store_field(bitmap_val, i, caml_copy_int64(fs[i])); + } + + CAMLreturn(bitmap_val); +} + CAMLprim value stub_xc_watchdog(value xch, value domid, value timeout) { CAMLparam3(xch, domid, timeout); diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index f68cbec..9c75de6 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -30,6 +30,7 @@ #include #include #include +#include struct l3_cache_info { int ret; @@ -196,6 +197,56 @@ long arch_do_sysctl( ret = -EFAULT; break; + case XEN_SYSCTL_get_cpu_featureset: + { + static const uint32_t *const featureset_table[] = { + [XEN_SYSCTL_cpu_featureset_raw] = raw_featureset, + [XEN_SYSCTL_cpu_featureset_host] = host_featureset, + [XEN_SYSCTL_cpu_featureset_pv] = pv_featureset, + [XEN_SYSCTL_cpu_featureset_hvm] = hvm_featureset, + }; + const uint32_t *featureset = NULL; + unsigned int nr; + + /* Request for maximum number of features? */ + if ( guest_handle_is_null(sysctl->u.cpu_featureset.features) ) + { + sysctl->u.cpu_featureset.nr_features = FSCAPINTS; + if ( __copy_field_to_guest(u_sysctl, sysctl, + u.cpu_featureset.nr_features) ) + ret = -EFAULT; + break; + } + + /* Clip the number of entries. */ + nr = min(sysctl->u.cpu_featureset.nr_features, FSCAPINTS); + + /* Look up requested featureset. */ + if ( sysctl->u.cpu_featureset.index < ARRAY_SIZE(featureset_table) ) + featureset = featureset_table[sysctl->u.cpu_featureset.index]; + + /* Bad featureset index? */ + if ( !featureset ) + ret = -EINVAL; + + /* Copy the requested featureset into place. */ + if ( !ret && copy_to_guest(sysctl->u.cpu_featureset.features, + featureset, nr) ) + ret = -EFAULT; + + /* Inform the caller of how many features we wrote. */ + sysctl->u.cpu_featureset.nr_features = nr; + if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, + u.cpu_featureset.nr_features) ) + ret = -EFAULT; + + /* Inform the caller if there was more data to provide. */ + if ( !ret && nr < FSCAPINTS ) + ret = -ENOBUFS; + + break; + } + default: ret = -ENOSYS; break; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 1ab16db..4596d20 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -787,6 +787,31 @@ struct xen_sysctl_cpu_levelling_caps { typedef struct xen_sysctl_cpu_levelling_caps xen_sysctl_cpu_levelling_caps_t; DEFINE_XEN_GUEST_HANDLE(xen_sysctl_cpu_levelling_caps_t); +/* + * XEN_SYSCTL_get_cpu_featureset (x86 specific) + * + * Return information about featuresets available on this host. + * - Raw: The real cpuid values. + * - Host: The values Xen is using, (after command line overrides, etc). + * - PV: Maximum set of features which can be given to a PV guest. + * - HVM: Maximum set of features which can be given to a HVM guest. + */ +struct xen_sysctl_cpu_featureset { +#define XEN_SYSCTL_cpu_featureset_raw 0 +#define XEN_SYSCTL_cpu_featureset_host 1 +#define XEN_SYSCTL_cpu_featureset_pv 2 +#define XEN_SYSCTL_cpu_featureset_hvm 3 + uint32_t index; /* IN: Which featureset to query? */ + uint32_t nr_features; /* IN/OUT: Number of entries in/written to + * 'features', or the maximum number of features if + * the guest handle is NULL. NB. All featuresets + * come from the same numberspace, so have the same + * maximum length. */ + XEN_GUEST_HANDLE_64(uint32) features; /* OUT: */ +}; +typedef struct xen_sysctl_featureset xen_sysctl_featureset_t; +DEFINE_XEN_GUEST_HANDLE(xen_sysctl_featureset_t); + struct xen_sysctl { uint32_t cmd; #define XEN_SYSCTL_readconsole 1 @@ -813,6 +838,7 @@ struct xen_sysctl { #define XEN_SYSCTL_psr_cat_op 23 #define XEN_SYSCTL_tmem_op 24 #define XEN_SYSCTL_get_cpu_levelling_caps 25 +#define XEN_SYSCTL_get_cpu_featureset 26 uint32_t interface_version; /* XEN_SYSCTL_INTERFACE_VERSION */ union { struct xen_sysctl_readconsole readconsole; @@ -839,6 +865,7 @@ struct xen_sysctl { struct xen_sysctl_psr_cat_op psr_cat_op; struct xen_sysctl_tmem_op tmem_op; struct xen_sysctl_cpu_levelling_caps cpu_levelling_caps; + struct xen_sysctl_cpu_featureset cpu_featureset; uint8_t pad[128]; } u; }; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 7f9d90d..233612e 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -811,6 +811,9 @@ static int flask_sysctl(int cmd) case XEN_SYSCTL_get_cpu_levelling_caps: return domain_has_xen(current->domain, XEN2__GET_CPU_LEVELLING_CAPS); + case XEN_SYSCTL_get_cpu_featureset: + return domain_has_xen(current->domain, XEN2__GET_CPU_FEATURESET); + default: printk("flask_sysctl: Unknown op %d\n", cmd); return -EPERM; diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 31ecf02..0ebb56b 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -95,6 +95,8 @@ class xen2 pmu_use # XEN_SYSCTL_get_cpu_levelling_caps get_cpu_levelling_caps +# XEN_SYSCTL_get_cpu_featureset + get_cpu_featureset } # Classes domain and domain2 consist of operations that a domain performs on