@@ -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>
@@ -565,6 +566,180 @@ static void test_cpuid_out_of_range_clearing(void)
}
}
+static void test_cpuid_get_leaf_failure(void)
+{
+ static const struct test {
+ struct cpu_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 cpu_policy pc = {};
+ const struct cpuid_leaf *lc;
+ struct cpu_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 cpu_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 cpu_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 cpu_policy, basic.raw[0]),
+ },
+ {
+ .name = "Fetch cache leaf",
+ .leaf = 0x4,
+ .offset = offsetof(struct cpu_policy, cache.raw[0]),
+ },
+ {
+ .name = "Fetch feature leaf",
+ .leaf = 0x7,
+ .offset = offsetof(struct cpu_policy, feat.raw[0]),
+ },
+ {
+ .name = "Fetch Topo leaf",
+ .leaf = 0xb,
+ .offset = offsetof(struct cpu_policy, topo.raw[0]),
+ },
+ {
+ .name = "Fetch Xstate leaf",
+ .leaf = 0xd,
+ .offset = offsetof(struct cpu_policy, xstate.raw[0]),
+ },
+ {
+ .name = "Fetch extended leaf",
+ .leaf = 0x80000000,
+ .offset = offsetof(struct cpu_policy, extd.raw[0]),
+ },
+ };
+ const struct cpu_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 {
@@ -660,6 +835,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();
@@ -50,48 +50,16 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf,
switch ( leaf )
{
case 0 ... CPUID_GUEST_NR_BASIC - 1:
- ASSERT(p->basic.max_leaf < ARRAY_SIZE(p->basic.raw));
- if ( leaf > min_t(uint32_t, p->basic.max_leaf,
- ARRAY_SIZE(p->basic.raw) - 1) )
- return;
-
- switch ( leaf )
- {
- case 0x4:
- if ( subleaf >= ARRAY_SIZE(p->cache.raw) )
- return;
-
- *res = array_access_nospec(p->cache.raw, subleaf);
- break;
-
- case 0x7:
- ASSERT(p->feat.max_subleaf < ARRAY_SIZE(p->feat.raw));
- if ( subleaf > min_t(uint32_t, p->feat.max_subleaf,
- ARRAY_SIZE(p->feat.raw) - 1) )
- return;
-
- *res = array_access_nospec(p->feat.raw, subleaf);
- break;
-
- case 0xb:
- if ( subleaf >= ARRAY_SIZE(p->topo.raw) )
- return;
-
- *res = array_access_nospec(p->topo.raw, subleaf);
- break;
-
- case XSTATE_CPUID:
- if ( !p->basic.xsave || subleaf >= ARRAY_SIZE(p->xstate.raw) )
- return;
+ case 0x80000000 ... 0x80000000 + CPUID_GUEST_NR_EXTD - 1:
+ {
+ const struct cpuid_leaf *tmp = x86_cpuid_get_leaf(p, leaf, subleaf);
- *res = array_access_nospec(p->xstate.raw, subleaf);
- break;
+ if ( !tmp )
+ return;
- default:
- *res = array_access_nospec(p->basic.raw, leaf);
- break;
- }
+ *res = *tmp;
break;
+ }
case 0x40000000 ... 0x400000ff:
if ( is_viridian_domain(d) )
@@ -106,15 +74,6 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf,
case 0x40000100 ... 0x400001ff:
return cpuid_hypervisor_leaves(v, leaf, subleaf, res);
- case 0x80000000 ... 0x80000000 + CPUID_GUEST_NR_EXTD - 1:
- ASSERT((p->extd.max_leaf & 0xffff) < ARRAY_SIZE(p->extd.raw));
- if ( (leaf & 0xffff) > min_t(uint32_t, p->extd.max_leaf & 0xffff,
- ARRAY_SIZE(p->extd.raw) - 1) )
- return;
-
- *res = array_access_nospec(p->extd.raw, leaf & 0xffff);
- break;
-
default:
return;
}
@@ -540,6 +540,25 @@ int x86_cpu_policies_are_compatible(const struct cpu_policy *host,
const struct cpu_policy *guest,
struct cpu_policy_errors *err);
+/**
+ * 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 cpu_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_POLICIES_H */
/*
@@ -546,6 +546,58 @@ int x86_cpuid_copy_from_buffer(struct cpu_policy *p,
return -ERANGE;
}
+const struct cpuid_leaf *x86_cpuid_get_leaf_const(const struct cpu_policy *p,
+ uint32_t leaf,
+ uint32_t subleaf)
+{
+ switch ( leaf )
+ {
+ case 0 ... CPUID_GUEST_NR_BASIC - 1:
+ if ( p->basic.max_leaf >= ARRAY_SIZE(p->basic.raw) ||
+ leaf > p->basic.max_leaf )
+ return NULL;
+
+ switch ( leaf )
+ {
+ case 0x4:
+ if ( subleaf >= ARRAY_SIZE(p->cache.raw) )
+ return NULL;
+
+ return &array_access_nospec(p->cache.raw, subleaf);
+
+ case 0x7:
+ if ( p->feat.max_subleaf >= ARRAY_SIZE(p->feat.raw) ||
+ subleaf > p->feat.max_subleaf )
+ return NULL;
+
+ return &array_access_nospec(p->feat.raw, subleaf);
+
+ case 0xb:
+ if ( subleaf >= ARRAY_SIZE(p->topo.raw) )
+ return NULL;
+
+ return &array_access_nospec(p->topo.raw, subleaf);
+
+ case 0xd:
+ if ( !p->basic.xsave || subleaf >= ARRAY_SIZE(p->xstate.raw) )
+ return NULL;
+
+ return &array_access_nospec(p->xstate.raw, subleaf);
+ }
+
+ return &array_access_nospec(p->basic.raw, leaf);
+
+ case 0x80000000 ... 0x80000000 + CPUID_GUEST_NR_EXTD - 1:
+ if ( (p->extd.max_leaf & 0xffff) >= ARRAY_SIZE(p->extd.raw) ||
+ leaf > p->extd.max_leaf )
+ return NULL;
+
+ return &array_access_nospec(p->extd.raw, leaf & 0xffff);
+ }
+
+ return NULL;
+}
+
/*
* Local variables:
* mode: C
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. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> --- 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/cpu-policy.h | 19 +++ xen/lib/x86/cpuid.c | 52 +++++++ 4 files changed, 255 insertions(+), 48 deletions(-)