From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Wei Liu <wei.liu2@citrix.com>,
Ian Campbell <Ian.Campbell@citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Rob Hoes <Rob.Hoes@citrix.com>, David Scott <dave@recoil.org>
Subject: [PATCH RFC 24/31] tools/stubs: Expose host levelling capabilities to userspace
Date: Wed, 16 Dec 2015 21:24:26 +0000 [thread overview]
Message-ID: <1450301073-28191-25-git-send-email-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <1450301073-28191-1-git-send-email-andrew.cooper3@citrix.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
CC: David Scott <dave@recoil.org>
CC: Rob Hoes <Rob.Hoes@citrix.com>
---
tools/libxc/include/xenctrl.h | 2 ++
tools/libxc/xc_misc.c | 14 ++++++++++++++
tools/ocaml/libs/xc/xenctrl.ml | 2 ++
tools/ocaml/libs/xc/xenctrl.mli | 2 ++
tools/ocaml/libs/xc/xenctrl_stubs.c | 20 ++++++++++++++++++++
5 files changed, 40 insertions(+)
diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h
index b44aec7..401a6f8 100644
--- a/tools/libxc/include/xenctrl.h
+++ b/tools/libxc/include/xenctrl.h
@@ -2843,6 +2843,8 @@ 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);
+int xc_get_levelling_caps(xc_interface *xch, uint64_t *caps);
+
int xc_get_featureset(xc_interface *xch, uint32_t index,
uint32_t *nr_features, uint32_t *featureset);
#endif
diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c
index 4d7af3d..7707a70 100644
--- a/tools/libxc/xc_misc.c
+++ b/tools/libxc/xc_misc.c
@@ -745,6 +745,20 @@ int xc_get_featureset(xc_interface *xch, uint32_t index,
return ret;
}
+int xc_get_levelling_caps(xc_interface *xch, uint64_t *caps)
+{
+ DECLARE_SYSCTL;
+ int ret;
+
+ sysctl.cmd = XEN_SYSCTL_get_levelling_caps;
+ ret = do_sysctl(xch, &sysctl);
+
+ if ( !ret )
+ *caps = sysctl.u.levelling.caps;
+
+ return ret;
+}
+
/*
* Local variables:
* mode: C
diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml
index 15c7eb0..d651533 100644
--- a/tools/ocaml/libs/xc/xenctrl.ml
+++ b/tools/ocaml/libs/xc/xenctrl.ml
@@ -247,6 +247,8 @@ external version_capabilities: handle -> string =
type featureset_index = Featureset_host | Featureset_pv | Featureset_hvm
external get_featureset : handle -> featureset_index -> int64 array = "stub_xc_get_featureset"
+external get_levelling_caps : handle -> int64 = "stub_xc_get_levelling_caps"
+
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 42d6199..1342a5e 100644
--- a/tools/ocaml/libs/xc/xenctrl.mli
+++ b/tools/ocaml/libs/xc/xenctrl.mli
@@ -152,6 +152,8 @@ external version_capabilities : handle -> string
type featureset_index = Featureset_host | Featureset_pv | Featureset_hvm
external get_featureset : handle -> featureset_index -> int64 array = "stub_xc_get_featureset"
+external get_levelling_caps : handle -> int64 = "stub_xc_get_levelling_caps"
+
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 a47473b..3ae2060 100644
--- a/tools/ocaml/libs/xc/xenctrl_stubs.c
+++ b/tools/ocaml/libs/xc/xenctrl_stubs.c
@@ -1255,6 +1255,26 @@ CAMLprim value stub_xc_get_featureset(value xch, value idx)
CAMLreturn(bitmap_val);
}
+CAMLprim value stub_xc_get_levelling_caps(value xch)
+{
+ CAMLparam1(xch);
+
+ /* Safe, because of the global ocaml lock. */
+ static uint64_t caps;
+ static bool have_caps;
+
+ if (!have_caps)
+ {
+ int ret = xc_get_levelling_caps(_H(xch), &caps);
+
+ if (ret || (caps > INT64_MAX))
+ failwith_xc(_H(xch));
+ have_caps = true;
+ }
+
+ CAMLreturn(caml_copy_int64(caps));
+}
+
CAMLprim value stub_xc_watchdog(value xch, value domid, value timeout)
{
CAMLparam3(xch, domid, timeout);
--
2.1.4
next prev parent reply other threads:[~2015-12-16 21:24 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-16 21:24 [PATCH RFC 00/31] x86: Improvements to cpuid handling for guests Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 01/31] xen/public: Export featureset information in the public API Andrew Cooper
2015-12-22 16:28 ` Jan Beulich
2015-12-22 16:42 ` Andrew Cooper
2015-12-22 16:59 ` Jan Beulich
2015-12-23 10:05 ` Andrew Cooper
2015-12-23 10:24 ` Jan Beulich
2015-12-23 11:26 ` Andrew Cooper
2016-01-06 7:43 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 02/31] tools/libxc: Use public/featureset.h for cpuid policy generation Andrew Cooper
2015-12-22 16:29 ` Jan Beulich
2016-01-05 14:13 ` Ian Campbell
2016-01-05 14:17 ` Andrew Cooper
2016-01-05 14:18 ` Ian Campbell
2016-01-05 14:23 ` Andrew Cooper
2016-01-05 15:02 ` Ian Campbell
2016-01-05 15:42 ` Andrew Cooper
2016-01-05 16:09 ` Ian Campbell
2015-12-16 21:24 ` [PATCH RFC 03/31] xen/x86: Store antifeatures inverted in a featureset Andrew Cooper
2015-12-22 16:32 ` Jan Beulich
2015-12-22 17:03 ` Andrew Cooper
2016-01-05 14:19 ` Ian Campbell
2016-01-05 14:24 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 04/31] xen/x86: Mask out unknown features from Xen's capabilities Andrew Cooper
2015-12-22 16:42 ` Jan Beulich
2015-12-22 17:01 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 05/31] xen/x86: Collect more CPUID feature words Andrew Cooper
2015-12-22 16:46 ` Jan Beulich
2015-12-22 17:17 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 06/31] xen/x86: Infrastructure to calculate guest featuresets Andrew Cooper
2015-12-22 16:50 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 07/31] xen/x86: Export host featureset via SYSCTL Andrew Cooper
2015-12-22 16:57 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 08/31] tools/stubs: Expose host featureset to userspace Andrew Cooper
2016-01-05 15:36 ` Ian Campbell
2016-01-05 15:59 ` Andrew Cooper
2016-01-05 16:09 ` Ian Campbell
2016-01-05 16:19 ` Andrew Cooper
2016-01-05 16:38 ` Ian Campbell
2015-12-16 21:24 ` [PATCH RFC 09/31] xen/x86: Calculate PV featureset Andrew Cooper
2015-12-22 17:07 ` Jan Beulich
2015-12-22 17:13 ` Andrew Cooper
2015-12-22 17:18 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 10/31] xen/x86: Calculate HVM featureset Andrew Cooper
2015-12-22 17:11 ` Jan Beulich
2015-12-22 17:21 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 11/31] xen/x86: Calculate Raw featureset Andrew Cooper
2015-12-22 17:14 ` Jan Beulich
2015-12-22 17:27 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 12/31] tools: Utility for dealing with featuresets Andrew Cooper
2016-01-05 15:17 ` Ian Campbell
2016-01-05 16:14 ` Andrew Cooper
2016-01-05 16:34 ` Ian Campbell
2016-01-05 17:13 ` Andrew Cooper
2016-01-05 17:37 ` Ian Campbell
2016-01-05 18:04 ` Andrew Cooper
2016-01-06 10:38 ` Ian Campbell
2016-01-06 10:40 ` Ian Campbell
2016-01-06 10:42 ` Ian Campbell
2015-12-16 21:24 ` [PATCH RFC 13/31] tools/libxc: Wire a featureset through to cpuid policy logic Andrew Cooper
2016-01-05 15:42 ` Ian Campbell
2016-01-05 16:20 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 14/31] tools/libxc: Use featureset rather than guesswork Andrew Cooper
2016-01-05 15:54 ` Ian Campbell
2016-01-05 16:22 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 15/31] x86: Generate deep dependencies of x86 features Andrew Cooper
2016-01-05 16:03 ` Ian Campbell
2016-01-05 16:42 ` Andrew Cooper
2016-01-05 16:54 ` Ian Campbell
2016-01-05 17:09 ` Andrew Cooper
2016-01-05 17:19 ` Ian Campbell
2015-12-16 21:24 ` [PATCH RFC 16/31] x86: Automatically generate known_features Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 17/31] xen/x86: Clear dependent features when clearing a cpu cap Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 18/31] xen/x86: Improve disabling of features which have dependencies Andrew Cooper
2016-01-21 16:48 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 19/31] tools/libxc: Sanitise guest featuresets Andrew Cooper
2016-01-05 16:05 ` Ian Campbell
2015-12-16 21:24 ` [PATCH RFC 20/31] x86: Improvements to in-hypervisor cpuid sanity checks Andrew Cooper
2016-01-21 17:02 ` Jan Beulich
2016-01-21 17:21 ` Andrew Cooper
2016-01-21 18:15 ` Andrew Cooper
2016-01-22 7:47 ` Jan Beulich
2016-01-22 7:45 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 21/31] x86/domctl: Break out logic to update domain state from cpuid information Andrew Cooper
2016-01-21 17:05 ` Jan Beulich
2016-01-21 17:08 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 22/31] x86/cpu: Move set_cpumask() calls into c_early_init() Andrew Cooper
2016-01-21 17:08 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 23/31] xen/x86: Export cpuid levelling capabilities via SYSCTL Andrew Cooper
2016-01-21 17:23 ` Jan Beulich
2015-12-16 21:24 ` Andrew Cooper [this message]
2015-12-16 21:24 ` [PATCH RFC 25/31] xen/x86: Common infrastructure for levelling context switching Andrew Cooper
2016-01-22 8:56 ` Jan Beulich
2016-01-22 10:05 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 26/31] xen/x86: Rework AMD masking MSR setup Andrew Cooper
2016-01-22 9:27 ` Jan Beulich
2016-01-22 11:01 ` Andrew Cooper
2016-01-22 11:13 ` Jan Beulich
2016-01-22 13:59 ` Andrew Cooper
2016-01-22 14:12 ` Jan Beulich
2016-01-22 17:03 ` Andrew Cooper
2016-01-25 11:25 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 27/31] xen/x86: Rework Intel masking/faulting setup Andrew Cooper
2016-01-22 9:40 ` Jan Beulich
2016-01-22 14:09 ` Andrew Cooper
2016-01-22 14:29 ` Jan Beulich
2016-01-22 14:46 ` Andrew Cooper
2016-01-22 14:53 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 28/31] xen/x86: Context switch all levelling state in context_switch() Andrew Cooper
2016-01-22 9:52 ` Jan Beulich
2016-01-22 14:19 ` Andrew Cooper
2016-01-22 14:31 ` Jan Beulich
2016-01-22 14:39 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 29/31] x86/pv: Provide custom cpumasks for PV domains Andrew Cooper
2016-01-22 9:56 ` Jan Beulich
2016-01-22 14:24 ` Andrew Cooper
2016-01-22 14:33 ` Jan Beulich
2016-01-22 14:42 ` Andrew Cooper
2016-01-22 14:48 ` Jan Beulich
2016-01-22 14:56 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 30/31] x86/domctl: Update PV domain cpumasks when setting cpuid policy Andrew Cooper
2016-01-22 10:02 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 31/31] tools/libxc: Calculate xstate cpuid leaf from guest information Andrew Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450301073-28191-25-git-send-email-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=Rob.Hoes@citrix.com \
--cc=dave@recoil.org \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).