libs/guest: new CPUID/MSR interface
v7 cover libs/guest: new CPUID/MSR interface
Hello,
The following series introduces a new CPUID/MSR interface for the xenguest library. Such interface handles both CPUID and MSRs using the same opaque object, and provides some helpers for the user to peek or modify such data without exposing the backing type. This is useful for future development as CPUID and MSRs are closely related, so it makes handling those much easier if they are inside the same object (ie: a change to a CPUID bit might expose or hide an MSR).
In this patch series libxl and other in tree users have been switched to use the new interface, so it shouldn't result in any functional change from a user point of view.
Note there are still some missing pieces likely. The way to modify CPUID data is not ideal, as it requires fetching a leaf and modifying it directly. We might want some kind of interface in order to set specific CPUID features more easily, but that's to be discussed, and would be done as a follow up series.
The addition of a helper to generate compatible policies given two inputs has been removed from this iteration, sine Andrew Cooper has posted a patch to set the foundation for that, and further work should be done against that baseline.
Thanks, Roger.
Jan Beulich (1):
x86/CPUID: shrink max_{,sub}leaf fields according to actual leaf
contents
Roger Pau Monne (10):
libx86: introduce helper to fetch cpuid leaf libs/guest: allow fetching a specific CPUID leaf from a cpu policy
libx86: introduce helper to fetch msr entry
libs/guest: allow fetching a specific MSR entry from a cpu policy libs/guest: make a cpu policy compatible with older Xen versions libs/guest: introduce helper set cpu topology in cpu policy libs/guest: rework xc_cpuid_xend_policy
libs/guest: apply a featureset into a cpu policy libs/{light,guest}: implement xc_cpuid_apply_policy in libxl libs/guest: (re)move xc_cpu_policy_apply_cpuid
tools/include/libxl.h | 6 +- tools/include/xenctrl.h | 44 -- tools/include/xenguest.h | 26 + tools/libs/guest/xg_cpuid_x86.c | 607 ++++++++--------------- tools/libs/light/libxl_cpuid.c | 205 +++++++- tools/libs/light/libxl_internal.h | 26 + tools/tests/cpu-policy/test-cpu-policy.c | 326 +++++++++++- xen/arch/x86/cpuid.c | 55 +- xen/include/xen/lib/x86/cpuid.h | 26 + xen/include/xen/lib/x86/msr.h | 20 +- xen/lib/x86/cpuid.c | 91 ++++ xen/lib/x86/msr.c | 41 +- 12 files changed, 925 insertions(+), 548 deletions(-)
Signature · 1 line
2.34.1
PATCH v7 1/11 libx86: introduce helper to fetch cpuid leaf
Introduce a helper based on the current Xen guest_cpuid code in order to fetch a cpuid leaf from a policy. The newly introduced function in cpuid.c should not be directly called and instead the provided x86_cpuid_get_leaf macro should be used that will properly deal with const and non-const inputs.
Also add a test to check that the introduced helper doesn't go over the bounds of the policy.
Note the code in x86_cpuid_copy_from_buffer is not switched to use the new function because of the boundary checks against the max fields of the policy, which might not be properly set at the point where x86_cpuid_copy_from_buffer get called, for example when filling an empty policy from scratch.
---
Changes since v6:
- Add more tests.
- Drop Jan R-b.
Changes since v4:
- Rename _x86_cpuid_get_leaf to x86_cpuid_get_leaf_const.
Changes since v3:
- New in this version.
--- tools/tests/cpu-policy/test-cpu-policy.c | 177 +++++++++++++++++++++++ xen/arch/x86/cpuid.c | 55 +------ xen/include/xen/lib/x86/cpuid.h | 19 +++ xen/lib/x86/cpuid.c | 52 +++++++ 4 files changed, 255 insertions(+), 48 deletions(-)
tools/tests/cpu-policy/test-cpu-policy.c +177 -0
@@ -1,6 +1,7 @@#include <assert.h> #include <errno.h> #include <stdbool.h> +#include <stddef.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h>
@@ -570,6 +571,180 @@ static void test_cpuid_out_of_range_clearing(void) } } +static void test_cpuid_get_leaf_failure (void ) +{ +static const struct test { +struct cpuid_policy p; +const char *name; +uint32_t leaf, subleaf; + } tests[] = { +/* Test for invalid configurations in the object itself. */ + { + .name ="Basic max leaf >= array size" , + .p = { + .basic.max_leaf =CPUID_GUEST_NR_BASIC , + }, + }, + { + .name ="Feature max leaf >= array size" , + .p = { + .basic.max_leaf =CPUID_GUEST_NR_BASIC -1 , + .feat.max_subleaf =CPUID_GUEST_NR_FEAT , + }, + .leaf =0x7 , + }, + { + .name ="Extended max leaf >= array size" , + .p = { + .extd.max_leaf =0x80000000 +CPUID_GUEST_NR_EXTD , + }, + .leaf =0x80000000 , + }, + +/* Test out-of-bounds checks in the accessor. */ + { + .name ="Basic leaf >= max leaf" , + .p = { + .basic.max_leaf =CPUID_GUEST_NR_BASIC -1 , + }, + .leaf =CPUID_GUEST_NR_BASIC , + }, + { + .name ="Cache leaf >= cache array size" , + .p = { + .basic.max_leaf =CPUID_GUEST_NR_BASIC -1 , + }, + .leaf =0x4 , + .subleaf =CPUID_GUEST_NR_CACHE , + }, + { + .name ="Feature leaf >= max leaf" , + .p = { + .basic.max_leaf =CPUID_GUEST_NR_BASIC -1 , + .feat.max_subleaf =CPUID_GUEST_NR_FEAT -1 , + }, + .leaf =0x7 , + .subleaf =CPUID_GUEST_NR_FEAT , + }, + { + .name ="Extended Topo leaf >= cache array size" , + .p = { + .basic.max_leaf =CPUID_GUEST_NR_BASIC -1 , + }, + .leaf =0xb , + .subleaf =CPUID_GUEST_NR_TOPO , + }, + { + .name ="Xstate leaf >= cache array size" , + .p = { + .basic.max_leaf =CPUID_GUEST_NR_BASIC -1 , + }, + .leaf =0xd , + .subleaf =CPUID_GUEST_NR_XSTATE , + }, + { + .name ="Extended leaf >= max leaf" , + .p = { + .extd.max_leaf =0x80000000 +CPUID_GUEST_NR_EXTD -1 , + }, + .leaf =0x80000000 +CPUID_GUEST_NR_EXTD , + }, + +/* Test fetching Xsave without present. */ + { + .name ="Fetch Xsave without present" , + .p = { + .basic = { + .max_leaf =CPUID_GUEST_NR_BASIC -1 , + .xsave = false, + }, + }, + .leaf =0xd , + }, + + }; +const struct cpuid_policy pc = {}; +const struct cpuid_leaf *lc; +struct cpuid_policy p = {}; +struct cpuid_leaf *l; + +/* Constness build test. */ + lc =x86_cpuid_get_leaf (&pc,0 ,0 ); + l =x86_cpuid_get_leaf (&p,0 ,0 ); + +printf ("Testing CPUID get leaf bound checking:\n" ); + +for (size_t i =0 ; i <ARRAY_SIZE (tests); ++i ) + { +const struct test *t = &tests[i]; +const struct cpuid_policy *p =memdup (&t->p); + +if (x86_cpuid_get_leaf_const (p, t->leaf, t->subleaf) ) +fail (" Test %s get leaf fail\n" , t->name); + } +} + +static void test_cpuid_get_leaf (void ) +{ +static const struct cpuid_policy policy = { + .basic = { + .max_leaf =CPUID_GUEST_NR_BASIC -1 , + .xsave = true, + }, + .feat.max_subleaf =CPUID_GUEST_NR_FEAT -1 , + .extd.max_leaf =0x80000000 +CPUID_GUEST_NR_EXTD -1 , + }; +static const struct test { +const char *name; +uint32_t leaf, subleaf; +size_t offset; + } tests[] = { +/* Test fetch different leaves. */ + { + .name ="Fetch basic leaf" , + .offset = offsetof(struct cpuid_policy, basic.raw[0]), + }, + { + .name ="Fetch cache leaf" , + .leaf =0x4 , + .offset = offsetof(struct cpuid_policy, cache.raw[0]), + }, + { + .name ="Fetch feature leaf" , + .leaf =0x7 , + .offset = offsetof(struct cpuid_policy, feat.raw[0]), + }, + { + .name ="Fetch Topo leaf" , + .leaf =0xb , + .offset = offsetof(struct cpuid_policy, topo.raw[0]), + }, + { + .name ="Fetch Xstate leaf" , + .leaf =0xd , + .offset = offsetof(struct cpuid_policy, xstate.raw[0]), + }, + { + .name ="Fetch extended leaf" , + .leaf =0x80000000 , + .offset = offsetof(struct cpuid_policy, extd.raw[0]), + }, + }; +const struct cpuid_policy *p =memdup (&policy); + +printf ("Testing CPUID get leaf:\n" ); + +for (size_t i =0 ; i <ARRAY_SIZE (tests); ++i ) + { +const struct test *t = &tests[i]; +const struct cpuid_leaf *l =x86_cpuid_get_leaf_const (p, t->leaf, + t->subleaf); + +if ( l != (const void *)p + t->offset ) +fail (" Test %s get leaf fail\n" , t->name); + } +} +static void test_is_compatible_success (void ) { static struct test {
@@ -685,6 +860,8 @@ int main(int argc, char **argv)test_cpuid_serialise_success ();test_cpuid_deserialise_failure ();test_cpuid_out_of_range_clearing (); +test_cpuid_get_leaf_failure (); +test_cpuid_get_leaf ();test_msr_serialise_success ();test_msr_deserialise_failure ();
xen/arch/x86/cpuid.c +7 -48
70 lines not on this page · raw message
xen/include/xen/lib/x86/cpuid.h +19 -0
@@ -431,6 +431,25 @@ int x86_cpuid_copy_from_buffer(struct cpuid_policy *policy, uint32_t nr_entries, uint32_t *err_leaf, uint32_t *err_subleaf); +/** +* Get a cpuid leaf from a policy object. +* +* @param policy The cpuid_policy object. +* @param leaf The leaf index. +* @param subleaf The subleaf index. +* @returns a pointer to the requested leaf or NULL in case of error. +* +* The function will perform out of bound checks. Do not call this function +* directly and instead use x86_cpuid_get_leaf that will deal with both const +* and non-const policies returning a pointer with constness matching that of +* the input. +*/ +const struct cpuid_leaf *x86_cpuid_get_leaf_const (const struct cpuid_policy *p, +uint32_t leaf, +uint32_t subleaf); +#define x86_cpuid_get_leaf (p, l, s) \ + ((__typeof__(&(p)->basic.raw[0]))x86_cpuid_get_leaf_const(p, l, s)) +#endif /* !XEN_LIB_X86_CPUID_H */ /*
xen/lib/x86/cpuid.c +52 -0
58 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v7 01/11] libx86: introduce helper to fetch cpuid leaf
Quoted 15 lines · Roger Pau Monne
Introduce a helper based on the current Xen
guest_cpuidcode in order to fetch a cpuid leaf from a policy. The newly introduced function incpuid.cshould not be directly called and instead the providedx86_cpuid_get_leafmacro should be used that will properly deal with const and non-const inputs.Also add a test to check that the introduced helper doesn't go over the bounds of the policy.
Note the code in
x86_cpuid_copy_from_bufferis not switched to use the new function because of the boundary checks against the max fields of the policy, which might not be properly set at the point wherex86_cpuid_copy_from_bufferget called, for example when filling an empty policy from scratch.
Quoted 6 lines
Suggested-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>---
Changes since v6:
- Add more tests.
- Drop Jan R-b.
Please feel free to reinstate.
Jan
PATCH v7 2/11 libs/guest: allow fetching a specific CPUID leaf from a cpu policy
In reply to Roger Pau MonneIntroduce an interface that returns a specific leaf/subleaf from a cpu policy in xen_cpuid_leaf_t format.
This is useful to callers can peek data from the opaque xc_cpu_policy_t type.
No caller of the interface introduced on this patch.
---
Changes since v6:
- Add newline before return.
Changes since v5:
- Zero out parameter.
Changes since v3:
- Use x86_cpuid_get_leaf.
Changes since v1:
- Use find leaf.
--- tools/include/xenguest.h | 3 +++ tools/libs/guest/xg_cpuid_x86.c | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+)
tools/include/xenguest.h +3 -0
@@ -807,6 +807,9 @@ int xc_cpu_policy_update_cpuid(xc_interface *xch, xc_cpu_policy_t *policy, uint32_t nr);int xc_cpu_policy_update_msrs (xc_interface *xch,xc_cpu_policy_t *policy,const xen_msr_entry_t *msrs,uint32_t nr); +int xc_cpu_policy_get_cpuid (xc_interface *xch,const xc_cpu_policy_t *policy, +uint32_t leaf,uint32_t subleaf, +xen_cpuid_leaf_t *out);/* Compatibility calculations. */ bool xc_cpu_policy_is_compatible(xc_interface *xch, xc_cpu_policy_t *host,
tools/libs/guest/xg_cpuid_x86.c +26 -0
@@ -855,6 +855,32 @@ int xc_cpu_policy_update_msrs(xc_interface *xch, xc_cpu_policy_t *policy,return rc; } +int xc_cpu_policy_get_cpuid (xc_interface *xch,const xc_cpu_policy_t *policy, +uint32_t leaf,uint32_t subleaf, +xen_cpuid_leaf_t *out) +{ +const struct cpuid_leaf *tmp; + + *out = (xen_cpuid_leaf_t ){}; + + tmp =x86_cpuid_get_leaf (&policy->cpuid, leaf, subleaf); +if ( !tmp ) + { +/* Unable to find a matching leaf. */ + errno =ENOENT ; +return -1 ; + } + + out->leaf = leaf; + out->subleaf = subleaf; + out->a = tmp->a; + out->b = tmp->b; + out->c = tmp->c; + out->d = tmp->d; + +return 0 ; +} +bool xc_cpu_policy_is_compatible (xc_interface *xch,xc_cpu_policy_t *host,xc_cpu_policy_t *guest) {
Signature · 1 line
2.34.1
PATCH v7 3/11 libx86: introduce helper to fetch msr entry
In reply to Roger Pau MonneUse such helper in order to replace the code in x86_msr_copy_from_buffer. Note the introduced helper should not be directly called and instead x86_msr_get_entry should be used that will properly deal with const and non-const inputs.
Note this requires making the raw fields uint64_t so that it can accommodate the maximum size of MSRs values, and in turn removing the truncation tests.
---
Changes since v4:
- Rename _x86_msr_get_entry to x86_msr_get_entry_const.
- Add newline before endif.
Changes since v3:
- New in this version.
--- tools/tests/cpu-policy/test-cpu-policy.c | 48 +++++++++++++++++++----- xen/include/xen/lib/x86/msr.h | 20 +++++++++- xen/lib/x86/msr.c | 41 ++++++++++---------- 3 files changed, 76 insertions(+), 33 deletions(-)
tools/tests/cpu-policy/test-cpu-policy.c +38 -10
@@ -387,16 +387,6 @@ static void test_msr_deserialise_failure(void) .msr = { .idx = 0xce, .flags = 1 }, .rc = -EINVAL, }, - { - .name = "truncated val", - .msr = { .idx = 0xce, .val = ~0ull }, - .rc = -EOVERFLOW, - }, - { - .name = "truncated val", - .msr = { .idx = 0x10a, .val = ~0ull }, - .rc = -EOVERFLOW, - }, };printf ("Testing MSR deserialise failure:\n" );
@@ -745,6 +735,43 @@ static void test_cpuid_get_leaf(void) } } +static void test_msr_get_entry (void ) +{ +static const struct test { +const char *name; +unsigned int idx; +bool success; + } tests[] = { + { + .name ="bad msr index" , + .idx =-1 , + }, + { + .name ="good msr index" , + .idx =0xce , + .success = true, + }, + }; +const struct msr_policy pc; +const uint64_t *ec; +struct msr_policy p; +uint64_t *e; + +/* Constness build test. */ + ec =x86_msr_get_entry (&pc,0 ); + e =x86_msr_get_entry (&p,0 ); + +printf ("Testing MSR get leaf:\n" ); + +for (size_t i =0 ; i <ARRAY_SIZE (tests); ++i ) + { +const struct test *t = &tests[i]; + +if ( !!x86_msr_get_entry (&pc, t->idx) != t->success ) +fail (" Test %s failed\n" , t->name); + } +} +static void test_is_compatible_success (void ) { static struct test {
@@ -865,6 +892,7 @@ int main(int argc, char **argv)test_msr_serialise_success ();test_msr_deserialise_failure (); +test_msr_get_entry ();test_is_compatible_success ();test_is_compatible_failure ();
xen/include/xen/lib/x86/msr.h +18 -2
@@ -17,7 +17,7 @@ struct msr_policy* is dependent on real hardware support. */ union { -uint32_t raw; +uint64_t raw;struct { uint32_t :31;bool cpuid_faulting:1 ;
@@ -32,7 +32,7 @@ struct msr_policy* fixed in hardware. */ union { -uint32_t raw; +uint64_t raw;struct {bool rdcl_no:1 ;bool ibrs_all:1 ;
@@ -91,6 +91,22 @@ int x86_msr_copy_from_buffer(struct msr_policy *policy, const msr_entry_buffer_t msrs, uint32_t nr_entries, uint32_t *err_msr); +/** +* Get a MSR entry from a policy object. +* +* @param policy The msr_policy object. +* @param idx The index. +* @returns a pointer to the requested leaf or NULL in case of error. +* +* Do not call this function directly and instead use x86_msr_get_entry that +* will deal with both const and non-const policies returning a pointer with +* constness matching that of the input. +*/ +const uint64_t *x86_msr_get_entry_const (const struct msr_policy *policy, +uint32_t idx); +#define x86_msr_get_entry (p, i) \ + ((__typeof__(&(p)->platform_info.raw))x86_msr_get_entry_const(p, i)) +#endif /* !XEN_LIB_X86_MSR_H */ /*
xen/lib/x86/msr.c +20 -21
63 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v7 03/11] libx86: introduce helper to fetch msr entry
Quoted 11 lines · Roger Pau Monne
Use such helper in order to replace the code in
x86_msr_copy_from_buffer. Note the introduced helper should not be directly called and insteadx86_msr_get_entryshould be used that will properly deal with const and non-const inputs.Note this requires making the raw fields
uint64_tso that it can accommodate the maximum size of MSRs values, and in turn removing the truncation tests.Suggested-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>
PATCH v7 4/11 libs/guest: allow fetching a specific MSR entry from a cpu policy
In reply to Roger Pau MonneIntroduce an interface that returns a specific MSR entry from a cpu policy in xen_msr_entry_t format.
This is useful to callers can peek data from the opaque xc_cpu_policy_t type.
No caller of the interface introduced on this patch.
---
Changes since v3:
- Use x86_msr_get_entry.
Changes since v1:
- Introduce a helper to perform a binary search of the MSR entries array.
--- tools/include/xenguest.h | 2 ++ tools/libs/guest/xg_cpuid_x86.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+)
tools/include/xenguest.h +2 -0
@@ -810,6 +810,8 @@ int xc_cpu_policy_update_msrs(xc_interface *xch, xc_cpu_policy_t *policy,int xc_cpu_policy_get_cpuid (xc_interface *xch,const xc_cpu_policy_t *policy,uint32_t leaf,uint32_t subleaf,xen_cpuid_leaf_t *out); +int xc_cpu_policy_get_msr (xc_interface *xch,const xc_cpu_policy_t *policy, +uint32_t msr,xen_msr_entry_t *out);/* Compatibility calculations. */ bool xc_cpu_policy_is_compatible(xc_interface *xch, xc_cpu_policy_t *host,
tools/libs/guest/xg_cpuid_x86.c +20 -0
@@ -881,6 +881,26 @@ int xc_cpu_policy_get_cpuid(xc_interface *xch, const xc_cpu_policy_t *policy,return 0 ; } +int xc_cpu_policy_get_msr (xc_interface *xch,const xc_cpu_policy_t *policy, +uint32_t msr,xen_msr_entry_t *out) +{ +const uint64_t *val; + + *out = (xen_msr_entry_t ){}; + + val =x86_msr_get_entry (&policy->msr, msr); +if ( !val ) + { + errno =ENOENT ; +return -1 ; + } + + out->idx = msr; + out->val = *val; + +return 0 ; +} +bool xc_cpu_policy_is_compatible (xc_interface *xch,xc_cpu_policy_t *host,xc_cpu_policy_t *guest) {
Signature · 1 line
2.34.1
PATCH v7 5/11 libs/guest: make a cpu policy compatible with older Xen versions
In reply to Roger Pau MonneOlder Xen versions used to expose some CPUID bits which are no longer exposed by default. In order to keep a compatible behavior with guests migrated from versions of Xen that don't encode the CPUID data on the migration stream introduce a function that sets the same bits as older Xen versions.
This is pulled out from xc_cpuid_apply_policy which already has this logic present.
No functional change intended.
---
Changes since v6:
- Pass the host policy to the newly created helper.
Changes since v3:
- Rename function to xc_cpu_policy_make_compat_4_12.
Changes since v1:
- Move comments and explicitly mention pre-4.13 Xen.
--- tools/include/xenguest.h | 4 +++ tools/libs/guest/xg_cpuid_x86.c | 50 +++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 18 deletions(-)
tools/include/xenguest.h +4 -0
@@ -817,6 +817,10 @@ int xc_cpu_policy_get_msr(xc_interface *xch, const xc_cpu_policy_t *policy,bool xc_cpu_policy_is_compatible (xc_interface *xch,xc_cpu_policy_t *host,xc_cpu_policy_t *guest); +/* Make a policy compatible with pre-4.13 Xen versions. */ +void xc_cpu_policy_make_compat_4_12 (xc_interface *xch,xc_cpu_policy_t *policy, +const xc_cpu_policy_t *host,bool hvm); +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);
tools/libs/guest/xg_cpuid_x86.c +32 -18
83 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 6/11 libs/guest: introduce helper set cpu topology in cpu policy
In reply to Roger Pau MonneThis logic is pulled out from xc_cpuid_apply_policy and placed into a separate helper. Note the legacy part of the introduced function, as long term Xen will require a proper topology setter function capable of expressing a more diverse set of topologies.
No functional change intended.
---
Changes since v6:
- Pass a host policy to xc_cpu_policy_legacy_topology.
Changes since v5:
- Keep using the host featureset.
- Fix copied comment typo.
Changes since v4:
- s/xc_cpu_policy_topology/xc_cpu_policy_legacy_topology/
--- tools/include/xenguest.h | 9 ++ tools/libs/guest/xg_cpuid_x86.c | 165 ++++++++++++++++---------------- 2 files changed, 91 insertions(+), 83 deletions(-)
tools/include/xenguest.h +9 -0
@@ -821,6 +821,15 @@ bool xc_cpu_policy_is_compatible(xc_interface *xch, xc_cpu_policy_t *host,void xc_cpu_policy_make_compat_4_12 (xc_interface *xch,xc_cpu_policy_t *policy,const xc_cpu_policy_t *host,bool hvm); +/* +* Setup the legacy policy topology. +* +* The `host` parameter should only be provided when creating a policy for a PV +* guest. +*/ +void xc_cpu_policy_legacy_topology (xc_interface *xch,xc_cpu_policy_t *policy, +const xc_cpu_policy_t *host); +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);
tools/libs/guest/xg_cpuid_x86.c +82 -83
195 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 7/11 libs/guest: rework xc_cpuid_xend_policy
In reply to Roger Pau MonneRename xc_cpuid_xend_policy to xc_cpu_policy_apply_cpuid and make it public. Modify the function internally to use the new xc_cpu_policy_* set of functions. Also don't apply the passed policy to a domain directly, and instead modify the provided xc_cpu_policy_t. The caller will be responsible of applying the modified cpu policy to the domain.
Note that further patches will end up removing this function, as the callers should have the necessary helpers to modify an xc_cpu_policy_t themselves.
The find_leaf helper and related comparison function is also removed, as it's no longer needed to search for cpuid leafs as finding the matching leaves is now done using xc_cpu_policy_get_cpuid.
No functional change intended.
---
Changes since v6:
- Pass a host policy to xc_cpuid_apply_policy.
Changes since v3:
- Drop find_leaf and comparison helper.
--- tools/include/xenguest.h | 5 + tools/libs/guest/xg_cpuid_x86.c | 203 ++++++++++++-------------------- 2 files changed, 81 insertions(+), 127 deletions(-)
tools/include/xenguest.h +5 -0
@@ -830,6 +830,11 @@ void xc_cpu_policy_make_compat_4_12(xc_interface *xch, xc_cpu_policy_t *policy,void xc_cpu_policy_legacy_topology (xc_interface *xch,xc_cpu_policy_t *policy,const xc_cpu_policy_t *host); +/* Apply an xc_xend_cpuid object to the policy. */ +int xc_cpu_policy_apply_cpuid (xc_interface *xch,xc_cpu_policy_t *policy, +const xc_cpu_policy_t *host, +const struct xc_xend_cpuid *cpuid,bool hvm); +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);
tools/libs/guest/xg_cpuid_x86.c +76 -127
267 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 8/11 libs/guest: apply a featureset into a cpu policy
In reply to Roger Pau MonnePull 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.
--- tools/include/xenguest.h | 5 ++ tools/libs/guest/xg_cpuid_x86.c | 95 ++++++++++++++++++++------------- 2 files changed, 62 insertions(+), 38 deletions(-)
tools/include/xenguest.h +5 -0
@@ -835,6 +835,11 @@ int xc_cpu_policy_apply_cpuid(xc_interface *xch, xc_cpu_policy_t *policy,const xc_cpu_policy_t *host, 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);
tools/libs/guest/xg_cpuid_x86.c +57 -38
106 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 9/11 libs/{light,guest}: implement xc_cpuid_apply_policy in libxl
In reply to Roger Pau MonneWith the addition of the xc_cpu_policy_* now libxl can have better control over the cpu policy, this allows removing the xc_cpuid_apply_policy function and instead coding the required bits by libxl in libxl__cpuid_legacy directly.
Remove xc_cpuid_apply_policy.
---
Changes since v6:
- Use a single call to libxl_cpuid_parse_config in order to add the extra options.
Changes since v4:
- Correctly account for PVH guests being HVM in libxl__cpuid_legacy.
- PAE option is only available to HVM guests (_not_ including PVH).
Changes since v2:
- Use 'r' for libxc return values.
- Fix comment about making a cpu policy compatible.
- Use LOG*D macros.
--- tools/include/xenctrl.h | 18 ----- tools/libs/guest/xg_cpuid_x86.c | 133 -------------------------------- tools/libs/light/libxl_cpuid.c | 73 ++++++++++++++++-- 3 files changed, 67 insertions(+), 157 deletions(-)
tools/include/xenctrl.h +0 -18
@@ -1829,24 +1829,6 @@ struct xc_xend_cpuid {char *policy[4 ]; }; -/* -* Make adjustments to the CPUID settings for a domain. -* -* This path is used in two cases. First, for fresh boots of the domain, and -* secondly for migrate-in/restore of pre-4.14 guests (where CPUID data was -* missing from the stream). The @restore parameter distinguishes these -* cases, and the generated policy must be compatible with a 4.13. -* -* Either pass a full new @featureset (and @nr_features), or adjust individual -* features (@pae, @itsc, @nested_virt). -* -* Then (optionally) apply legacy XEND overrides (@xend) to the result. -*/ -int xc_cpuid_apply_policy (xc_interface *xch, -uint32_t domid,bool restore, -const uint32_t *featureset, -unsigned int nr_features,bool pae,bool itsc, -bool nested_virt,const struct xc_xend_cpuid *xend);int xc_mca_op (xc_interface *xch,struct xen_mc *mc);int xc_mca_op_inject_v2 (xc_interface *xch,unsigned int flags,xc_cpumap_t cpumap,unsigned int nr_cpus);
tools/libs/guest/xg_cpuid_x86.c +0 -133
139 lines not on this page · raw message
tools/libs/light/libxl_cpuid.c +67 -6
96 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 10/11 libs/guest: (re)move xc_cpu_policy_apply_cpuid
In reply to Roger Pau MonneMove the logic from xc_cpu_policy_apply_cpuid into libxl, now that the xc_cpu_policy_* helpers allow modifying a cpu policy. By moving such parsing into libxl directly we can get rid of xc_xend_cpuid, as libxl will now implement it's own private type for storing CPUID information, which currently matches xc_xend_cpuid.
Note the function logic is moved as-is, but requires adapting to the libxl coding style.
No functional change intended.
---
Changes since v2:
- Use LOG*D.
- Pass a gc to apply_policy.
- Use 'r' for libxc return values.
--- tools/include/libxl.h | 6 +- tools/include/xenctrl.h | 26 ------ tools/include/xenguest.h | 5 -- tools/libs/guest/xg_cpuid_x86.c | 116 -------------------------- tools/libs/light/libxl_cpuid.c | 133 ++++++++++++++++++++++++++++-- tools/libs/light/libxl_internal.h | 26 ++++++ 6 files changed, 156 insertions(+), 156 deletions(-)
tools/include/libxl.h +3 -3
@@ -1420,10 +1420,10 @@ void libxl_bitmap_init(libxl_bitmap *map);void libxl_bitmap_dispose (libxl_bitmap *map);/* -* libxl_cpuid_policy is opaque in the libxl ABI. Users of both libxl and -* libxc may not make assumptions about xc_xend_cpuid. +* libxl_cpuid_policy is opaque in the libxl ABI. Users of libxl may not make +* assumptions about libxl__cpuid_policy. */ -typedef struct xc_xend_cpuid libxl_cpuid_policy ; +typedef struct libxl__cpuid_policy libxl_cpuid_policy ;typedef libxl_cpuid_policy *libxl_cpuid_policy_list ;void libxl_cpuid_dispose (libxl_cpuid_policy_list *cpuid_list);int libxl_cpuid_policy_list_length (const libxl_cpuid_policy_list *l);
tools/include/xenctrl.h +0 -26
@@ -1803,32 +1803,6 @@ int xc_domain_debug_control(xc_interface *xch,#if defined(__i386__) || defined(__x86_64__) -/* -* CPUID policy data, expressed in the legacy XEND format. -* -* Policy is an array of strings, 32 chars long: -* policy[0] = eax -* policy[1] = ebx -* policy[2] = ecx -* policy[3] = edx -* -* The format of the string is the following: -* '1' -> force to 1 -* '0' -> force to 0 -* 'x' -> we don't care (use default) -* 'k' -> pass through host value -* 's' -> legacy alias for 'k' -*/ -struct xc_xend_cpuid { -union { -struct { -uint32_t leaf, subleaf; - }; -uint32_t input[2 ]; - }; -char *policy[4 ]; -}; -int xc_mca_op (xc_interface *xch,struct xen_mc *mc);int xc_mca_op_inject_v2 (xc_interface *xch,unsigned int flags,xc_cpumap_t cpumap,unsigned int nr_cpus);
tools/include/xenguest.h +0 -5
@@ -830,11 +830,6 @@ void xc_cpu_policy_make_compat_4_12(xc_interface *xch, xc_cpu_policy_t *policy,void xc_cpu_policy_legacy_topology (xc_interface *xch,xc_cpu_policy_t *policy,const xc_cpu_policy_t *host); -/* Apply an xc_xend_cpuid object to the policy. */ -int xc_cpu_policy_apply_cpuid (xc_interface *xch,xc_cpu_policy_t *policy, -const xc_cpu_policy_t *host, -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,
tools/libs/guest/xg_cpuid_x86.c +0 -116
122 lines not on this page · raw message
tools/libs/light/libxl_cpuid.c +127 -6
157 lines not on this page · raw message
tools/libs/light/libxl_internal.h +26 -0
@@ -2059,6 +2059,32 @@ typedef yajl_gen_status (*libxl__gen_json_callback)(yajl_gen hand, void *); _hidden char *libxl__object_to_json(libxl_ctx *ctx, const char *type,libxl__gen_json_callback gen,void *p); +/* +* CPUID policy data, expressed in the internal libxl format. +* +* Policy is an array of strings, 32 chars long: +* policy[0] = eax +* policy[1] = ebx +* policy[2] = ecx +* policy[3] = edx +* +* The format of the string is the following: +* '1' -> force to 1 +* '0' -> force to 0 +* 'x' -> we don't care (use default) +* 'k' -> pass through host value +* 's' -> legacy alias for 'k' +*/ +struct libxl__cpuid_policy { +union { +struct { +uint32_t leaf, subleaf; + }; +uint32_t input[2 ]; + }; +char *policy[4 ]; +}; + _hidden int libxl__cpuid_legacy(libxl_ctx *ctx, uint32_t domid, bool retore,libxl_domain_build_info *info);
Signature · 1 line
2.34.1
PATCH v7 11/11 x86/CPUID: shrink max_{,sub}leaf fields according to actual leaf contents
In reply to Roger Pau MonneFrom: Jan Beulich <[email protected]>
Zapping leaf data for out of range leaves is just one half of it: To avoid guests (bogusly or worse) inferring information from mere leaf presence, also shrink maximum indicators such that the respective trailing entry is not all blank (unless of course it's the initial subleaf of a leaf that's not the final one).
This is also in preparation of bumping the maximum basic leaf we support, to ensure guests not getting exposed related features won't observe a change in behavior.
Note that such shrinking is only done when creating a policy for a domain from scratch. Migrated in domains keep their previous policy if present untouched, and for migrated in domains not having CPUID data the crafted Xen pre-4.13 policy is not trimmed to keep a behavior compatible with those older Xen versions.
---
Changes since v4:
- New in this version, picked up from 540d911c2813.
- Only shrink policies for newly created domains.
--- tools/include/xenguest.h | 3 + tools/libs/guest/xg_cpuid_x86.c | 5 ++ tools/libs/light/libxl_cpuid.c | 7 ++ tools/tests/cpu-policy/test-cpu-policy.c | 101 +++++++++++++++++++++++ xen/include/xen/lib/x86/cpuid.h | 7 ++ xen/lib/x86/cpuid.c | 39 +++++++++ 6 files changed, 162 insertions(+)
tools/include/xenguest.h +3 -0
@@ -835,6 +835,9 @@ int xc_cpu_policy_apply_featureset(xc_interface *xch, xc_cpu_policy_t *policy,const uint32_t *featureset, unsigned int nr_features); +/* Sanitize a policy: can change the contents of the passed policy. */ +void xc_cpu_policy_sanitize (xc_interface *xch,xc_cpu_policy_t *policy); +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);
tools/libs/guest/xg_cpuid_x86.c +5 -0
@@ -651,3 +651,8 @@ int xc_cpu_policy_apply_featureset(xc_interface *xch, xc_cpu_policy_t *policy,return 0 ; } + +void xc_cpu_policy_sanitize (xc_interface *xch,xc_cpu_policy_t *policy) +{ +x86_cpuid_policy_shrink_max_leaves (&policy->cpuid); +}
tools/libs/light/libxl_cpuid.c +7 -0
@@ -660,6 +660,13 @@ int libxl__cpuid_legacy(libxl_ctx *ctx, uint32_t domid, bool restore, goto out; } +/* +* Do not attempt any modifications if creating a policy that aims to be +* compatible with pre-4.13 Xen versions. +*/ +if (!restore) +xc_cpu_policy_sanitize (ctx->xch, policy); + r =xc_cpu_policy_set_domain (ctx->xch, domid, policy);if (r) {LOGED (ERROR , domid,"Failed to set domain CPUID policy" );
tools/tests/cpu-policy/test-cpu-policy.c +101 -0
123 lines not on this page · raw message
xen/include/xen/lib/x86/cpuid.h +7 -0
@@ -386,6 +386,13 @@ void x86_cpuid_policy_fill_native(struct cpuid_policy *p);*/ void x86_cpuid_policy_clear_out_of_range_leaves (struct cpuid_policy *p); +/** +* Shrink max leaf/subleaf values such that the last respective valid entry +* isn't all blank. While permitted by the spec, such extraneous leaves may +* provide undue "hints" to guests. +*/ +void x86_cpuid_policy_shrink_max_leaves (struct cpuid_policy *p); +#ifdef __XEN__#include <public/arch-x86/xen.h> typedef XEN_GUEST_HANDLE_64 (xen_cpuid_leaf_t)cpuid_leaf_buffer_t ;
xen/lib/x86/cpuid.c +39 -0
@@ -236,6 +236,45 @@ void x86_cpuid_policy_clear_out_of_range_leaves(struct cpuid_policy *p) ARRAY_SIZE(p->extd.raw) - 1); } +void x86_cpuid_policy_shrink_max_leaves (struct cpuid_policy *p) +{ +unsigned int i; + + p->basic.raw[0x4 ] = p->cache.raw[0 ]; + +for ( i = p->feat.max_subleaf; i; --i ) +if ( p->feat.raw[i].a | p->feat.raw[i].b | + p->feat.raw[i].c | p->feat.raw[i].d ) +break ; + p->feat.max_subleaf = i; + p->basic.raw[0x7 ] = p->feat.raw[i]; + + p->basic.raw[0xb ] = p->topo.raw[0 ]; + +/* +* Due to the way xstate gets handled in the hypervisor (see +* recalculate_xstate()) there is (for now at least) no need to fiddle +* with the xstate subleaves (IOW we assume they're already in consistent +* shape, for coming from either hardware or recalculate_xstate()). +*/ + p->basic.raw[0xd ] = p->xstate.raw[0 ]; + +for ( i = p->basic.max_leaf; i; --i ) +if ( p->basic.raw[i].a | p->basic.raw[i].b | + p->basic.raw[i].c | p->basic.raw[i].d ) +break ; + p->basic.max_leaf = i; + +for ( i = p->extd.max_leaf &0xffff ; i; --i ) +if ( p->extd.raw[i].a | p->extd.raw[i].b | + p->extd.raw[i].c | p->extd.raw[i].d ) +break ; +if ( i | p->extd.raw[0 ].b | p->extd.raw[0 ].c | p->extd.raw[0 ].d ) + p->extd.max_leaf =0x80000000 | i; +else + p->extd.max_leaf =0 ; +} +const uint32_t *x86_cpuid_lookup_deep_deps (uint32_t feature) {static const uint32_t deep_features[] =INIT_DEEP_FEATURES ;
Signature · 1 line
2.34.1