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 06/13] libs/guest: introduce helper to check cpu policy compatibility
Date: Fri, 30 Apr 2021 17:52:04 +0200 [thread overview]
Message-ID: <20210430155211.3709-7-roger.pau@citrix.com> (raw)
In-Reply-To: <20210430155211.3709-1-roger.pau@citrix.com>
Such helpers is just a wrapper to the existing
x86_cpu_policies_are_compatible function. This requires building
policy.c from libx86 on user land also.
No user of the interface introduced.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Changes since v1:
- Initialize err.
- Explicitly name parameters as host and guest.
---
tools/include/xenctrl.h | 4 ++++
tools/libs/guest/Makefile | 2 +-
tools/libs/guest/xg_cpuid_x86.c | 19 +++++++++++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h
index 9a6d1b126d8..5f699c09509 100644
--- a/tools/include/xenctrl.h
+++ b/tools/include/xenctrl.h
@@ -2619,6 +2619,10 @@ int xc_cpu_policy_update_cpuid(xc_interface *xch, xc_cpu_policy_t policy,
int xc_cpu_policy_update_msrs(xc_interface *xch, xc_cpu_policy_t policy,
const xen_msr_entry_t *msrs, uint32_t nr);
+/* Compatibility calculations. */
+bool xc_cpu_policy_is_compatible(xc_interface *xch, const xc_cpu_policy_t host,
+ const xc_cpu_policy_t guest);
+
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/Makefile b/tools/libs/guest/Makefile
index 604e1695d6a..6d2a1d5bbc0 100644
--- a/tools/libs/guest/Makefile
+++ b/tools/libs/guest/Makefile
@@ -40,7 +40,7 @@ $(patsubst %.c,%.opic,$(ELF_SRCS-y)): CFLAGS += -Wno-pointer-sign
ifeq ($(CONFIG_X86),y) # Add libx86 to the build
vpath %.c ../../../xen/lib/x86
-SRCS-y += cpuid.c msr.c
+SRCS-y += cpuid.c msr.c policy.c
endif
# new domain builder
diff --git a/tools/libs/guest/xg_cpuid_x86.c b/tools/libs/guest/xg_cpuid_x86.c
index 37e55279ffe..6b8bae00334 100644
--- a/tools/libs/guest/xg_cpuid_x86.c
+++ b/tools/libs/guest/xg_cpuid_x86.c
@@ -930,3 +930,22 @@ int xc_cpu_policy_update_msrs(xc_interface *xch, xc_cpu_policy_t policy,
return rc;
}
+
+bool xc_cpu_policy_is_compatible(xc_interface *xch, const xc_cpu_policy_t host,
+ const xc_cpu_policy_t guest)
+{
+ struct cpu_policy_errors err = INIT_CPU_POLICY_ERRORS;
+ struct cpu_policy h = { &host->cpuid, &host->msr };
+ struct cpu_policy g = { &guest->cpuid, &guest->msr };
+ int rc = x86_cpu_policies_are_compatible(&h, &g, &err);
+
+ if ( !rc )
+ return true;
+
+ if ( err.leaf != -1 )
+ ERROR("Leaf %#x subleaf %#x is not compatible", err.leaf, err.subleaf);
+ if ( err.msr != -1 )
+ ERROR("MSR index %#x is not compatible", err.msr);
+
+ return false;
+}
--
2.31.1
next prev parent reply other threads:[~2021-04-30 15:54 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 ` Roger Pau Monne [this message]
2021-05-04 16:27 ` [PATCH v3 06/13] libs/guest: introduce helper to check cpu policy compatibility 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 ` [PATCH v3 11/13] libs/guest: apply a featureset into a cpu policy Roger Pau Monne
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-7-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).