From: Roger Pau Monne <roger.pau@citrix.com>
To: <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Roger Pau Monne <roger.pau@citrix.com>,
Ian Jackson <iwj@xenproject.org>, Wei Liu <wl@xen.org>
Subject: [PATCH v3 11/13] libs/guest: apply a featureset into a cpu policy
Date: Fri, 30 Apr 2021 17:52:09 +0200 [thread overview]
Message-ID: <20210430155211.3709-12-roger.pau@citrix.com> (raw)
In-Reply-To: <20210430155211.3709-1-roger.pau@citrix.com>
Pull out the code from xc_cpuid_apply_policy that applies a featureset
to a cpu policy and place it on it's own standalone function that's
part of the public interface.
No functional change intended.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
tools/include/xenctrl.h | 5 ++
tools/libs/guest/xg_cpuid_x86.c | 95 ++++++++++++++++++++-------------
2 files changed, 62 insertions(+), 38 deletions(-)
diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h
index ce0785f7654..3fef954d1d1 100644
--- a/tools/include/xenctrl.h
+++ b/tools/include/xenctrl.h
@@ -2639,6 +2639,11 @@ int xc_cpu_policy_legacy_topology(xc_interface *xch, xc_cpu_policy_t policy,
int xc_cpu_policy_apply_cpuid(xc_interface *xch, xc_cpu_policy_t policy,
const struct xc_xend_cpuid *cpuid, bool hvm);
+/* Apply a featureset to the policy. */
+int xc_cpu_policy_apply_featureset(xc_interface *xch, xc_cpu_policy_t policy,
+ const uint32_t *featureset,
+ unsigned int nr_features);
+
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);
diff --git a/tools/libs/guest/xg_cpuid_x86.c b/tools/libs/guest/xg_cpuid_x86.c
index d313a093af6..e2237e33709 100644
--- a/tools/libs/guest/xg_cpuid_x86.c
+++ b/tools/libs/guest/xg_cpuid_x86.c
@@ -477,46 +477,15 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, bool restore,
if ( featureset )
{
- uint32_t disabled_features[FEATURESET_NR_ENTRIES],
- feat[FEATURESET_NR_ENTRIES] = {};
- static const uint32_t deep_features[] = INIT_DEEP_FEATURES;
- unsigned int i, b;
-
- /*
- * The user supplied featureset may be shorter or longer than
- * FEATURESET_NR_ENTRIES. Shorter is fine, and we will zero-extend.
- * Longer is fine, so long as it only padded with zeros.
- */
- unsigned int user_len = min(FEATURESET_NR_ENTRIES + 0u, nr_features);
-
- /* Check for truncated set bits. */
- rc = -EOPNOTSUPP;
- for ( i = user_len; i < nr_features; ++i )
- if ( featureset[i] != 0 )
- goto out;
-
- memcpy(feat, featureset, sizeof(*featureset) * user_len);
-
- /* Disable deep dependencies of disabled features. */
- for ( i = 0; i < ARRAY_SIZE(disabled_features); ++i )
- disabled_features[i] = ~feat[i] & deep_features[i];
-
- for ( b = 0; b < sizeof(disabled_features) * CHAR_BIT; ++b )
+ policy.cpuid = *p;
+ rc = xc_cpu_policy_apply_featureset(xch, &policy, featureset,
+ nr_features);
+ if ( rc )
{
- const uint32_t *dfs;
-
- if ( !test_bit(b, disabled_features) ||
- !(dfs = x86_cpuid_lookup_deep_deps(b)) )
- continue;
-
- for ( i = 0; i < ARRAY_SIZE(disabled_features); ++i )
- {
- feat[i] &= ~dfs[i];
- disabled_features[i] &= ~dfs[i];
- }
+ ERROR("Failed to apply featureset to policy");
+ goto out;
}
-
- cpuid_featureset_to_policy(feat, p);
+ *p = policy.cpuid;
}
else
{
@@ -1108,3 +1077,53 @@ int xc_cpu_policy_legacy_topology(xc_interface *xch, xc_cpu_policy_t policy,
return 0;
}
+
+int xc_cpu_policy_apply_featureset(xc_interface *xch, xc_cpu_policy_t policy,
+ const uint32_t *featureset,
+ unsigned int nr_features)
+{
+ uint32_t disabled_features[FEATURESET_NR_ENTRIES],
+ feat[FEATURESET_NR_ENTRIES] = {};
+ static const uint32_t deep_features[] = INIT_DEEP_FEATURES;
+ unsigned int i, b;
+
+ /*
+ * The user supplied featureset may be shorter or longer than
+ * FEATURESET_NR_ENTRIES. Shorter is fine, and we will zero-extend.
+ * Longer is fine, so long as it only padded with zeros.
+ */
+ unsigned int user_len = min(FEATURESET_NR_ENTRIES + 0u, nr_features);
+
+ /* Check for truncated set bits. */
+ for ( i = user_len; i < nr_features; ++i )
+ if ( featureset[i] != 0 )
+ {
+ errno = EOPNOTSUPP;
+ return -1;
+ }
+
+ memcpy(feat, featureset, sizeof(*featureset) * user_len);
+
+ /* Disable deep dependencies of disabled features. */
+ for ( i = 0; i < ARRAY_SIZE(disabled_features); ++i )
+ disabled_features[i] = ~feat[i] & deep_features[i];
+
+ for ( b = 0; b < sizeof(disabled_features) * CHAR_BIT; ++b )
+ {
+ const uint32_t *dfs;
+
+ if ( !test_bit(b, disabled_features) ||
+ !(dfs = x86_cpuid_lookup_deep_deps(b)) )
+ continue;
+
+ for ( i = 0; i < ARRAY_SIZE(disabled_features); ++i )
+ {
+ feat[i] &= ~dfs[i];
+ disabled_features[i] &= ~dfs[i];
+ }
+ }
+
+ cpuid_featureset_to_policy(feat, &policy->cpuid);
+
+ return 0;
+}
--
2.31.1
next prev parent reply other threads:[~2021-04-30 15:55 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 15:51 [PATCH v3 00/13] libs/guest: new CPUID/MSR interface Roger Pau Monne
2021-04-30 15:51 ` [PATCH v3 01/13] libxl: don't ignore the return value from xc_cpuid_apply_policy Roger Pau Monne
2021-05-04 14:07 ` Anthony PERARD
2021-04-30 15:52 ` [PATCH v3 02/13] libs/guest: allow fetching a specific CPUID leaf from a cpu policy Roger Pau Monne
2021-05-04 11:59 ` Andrew Cooper
2021-05-04 13:47 ` Roger Pau Monné
2021-05-04 15:46 ` Andrew Cooper
2021-04-30 15:52 ` [PATCH v3 03/13] libs/guest: allow fetching a specific MSR entry " Roger Pau Monne
2021-05-03 10:41 ` Jan Beulich
2021-05-04 10:56 ` Roger Pau Monné
2021-05-04 11:40 ` Jan Beulich
2021-05-04 11:58 ` Roger Pau Monné
2021-05-04 17:11 ` Andrew Cooper
2021-05-05 7:38 ` Jan Beulich
2021-04-30 15:52 ` [PATCH v3 04/13] libs/guest: allow updating a cpu policy CPUID data Roger Pau Monne
2021-05-04 16:19 ` Andrew Cooper
2021-04-30 15:52 ` [PATCH v3 05/13] libs/guest: allow updating a cpu policy MSR data Roger Pau Monne
2021-05-04 16:20 ` Andrew Cooper
2021-04-30 15:52 ` [PATCH v3 06/13] libs/guest: introduce helper to check cpu policy compatibility Roger Pau Monne
2021-05-04 16:27 ` Andrew Cooper
2021-04-30 15:52 ` [PATCH v3 07/13] libs/guest: obtain a compatible cpu policy from two input ones Roger Pau Monne
2021-05-03 10:43 ` Jan Beulich
2021-05-04 11:56 ` Roger Pau Monné
2021-05-04 12:12 ` Jan Beulich
2021-05-04 16:50 ` Andrew Cooper
2021-04-30 15:52 ` [PATCH v3 08/13] libs/guest: make a cpu policy compatible with older Xen versions Roger Pau Monne
2021-05-03 11:09 ` Jan Beulich
2021-05-04 15:34 ` Roger Pau Monné
2021-05-05 7:42 ` Jan Beulich
2021-05-06 10:23 ` Roger Pau Monné
2021-05-06 10:52 ` Jan Beulich
2021-04-30 15:52 ` [PATCH v3 09/13] libs/guest: introduce helper set cpu topology in cpu policy Roger Pau Monne
2021-04-30 15:52 ` [PATCH v3 10/13] libs/guest: rework xc_cpuid_xend_policy Roger Pau Monne
2021-04-30 15:52 ` Roger Pau Monne [this message]
2021-04-30 15:52 ` [PATCH v3 12/13] libs/{light,guest}: implement xc_cpuid_apply_policy in libxl Roger Pau Monne
2021-05-04 14:08 ` Anthony PERARD
2021-04-30 15:52 ` [PATCH v3 13/13] libs/guest: (re)move xc_cpu_policy_apply_cpuid Roger Pau Monne
2021-05-04 14:08 ` Anthony PERARD
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=20210430155211.3709-12-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=iwj@xenproject.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.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).