From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: "Andrew Cooper" <andrew.cooper3@citrix.com>,
"Wei Liu" <wl@xen.org>, "Roger Pau Monné" <roger.pau@citrix.com>
Subject: [Xen-devel] [PATCH] libx86/CPUID: fix (not just) leaf 7 processing
Date: Mon, 23 Mar 2020 13:06:32 +0100 [thread overview]
Message-ID: <75c077bc-ecf3-45fe-1a71-0804fe6aaaf4@suse.com> (raw)
For one, subleaves within the respective union shouldn't live in
separate sub-structures. And then x86_cpuid_policy_fill_native() should,
as it did originally, iterate over all subleaves here as well as over
all main leaves. Switch to using a "<= MIN()"-based approach similar to
that used in x86_cpuid_copy_to_buffer(). Also follow this for the
extended main leaves then.
Fixes: 1bd2b750537b ("libx86: Fix 32bit stubdom build of x86_cpuid_policy_fill_native()")
Fixes: 97e4ebdcd765 ("x86/CPUID: support leaf 7 subleaf 1 / AVX512_BF16")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/include/xen/lib/x86/cpuid.h
+++ b/xen/include/xen/lib/x86/cpuid.h
@@ -181,8 +181,7 @@ struct cpuid_policy
uint32_t _7d0;
struct { DECL_BITFIELD(7d0); };
};
- };
- struct {
+
/* Subleaf 1. */
union {
uint32_t _7a1;
--- a/xen/lib/x86/cpuid.c
+++ b/xen/lib/x86/cpuid.c
@@ -71,8 +71,8 @@ void x86_cpuid_policy_fill_native(struct
unsigned int i;
cpuid_leaf(0, &p->basic.raw[0]);
- for ( i = 1; i < min_t(unsigned int, ARRAY_SIZE(p->basic.raw),
- p->basic.max_leaf); ++i )
+ for ( i = 1; i <= MIN(p->basic.max_leaf,
+ ARRAY_SIZE(p->basic.raw) - 1); ++i )
{
switch ( i )
{
@@ -116,8 +116,8 @@ void x86_cpuid_policy_fill_native(struct
{
cpuid_count_leaf(7, 0, &p->feat.raw[0]);
- for ( i = 1; i < min_t(unsigned int, ARRAY_SIZE(p->feat.raw),
- p->feat.max_subleaf); ++i )
+ for ( i = 1; i <= MIN(p->feat.max_subleaf,
+ ARRAY_SIZE(p->feat.raw) - 1); ++i )
cpuid_count_leaf(7, i, &p->feat.raw[i]);
}
@@ -172,8 +172,8 @@ void x86_cpuid_policy_fill_native(struct
/* Extended leaves. */
cpuid_leaf(0x80000000, &p->extd.raw[0]);
- for ( i = 1; i < min_t(unsigned int, ARRAY_SIZE(p->extd.raw),
- p->extd.max_leaf + 1 - 0x80000000); ++i )
+ for ( i = 1; i <= MIN(p->extd.max_leaf & 0xffffU,
+ ARRAY_SIZE(p->extd.raw) - 1); ++i )
cpuid_leaf(0x80000000 + i, &p->extd.raw[i]);
x86_cpuid_policy_recalc_synth(p);
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next reply other threads:[~2020-03-23 12:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 12:06 Jan Beulich [this message]
2020-03-26 14:14 ` [Xen-devel] [PATCH] libx86/CPUID: fix (not just) leaf 7 processing 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=75c077bc-ecf3-45fe-1a71-0804fe6aaaf4@suse.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=roger.pau@citrix.com \
--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).