From: "Kang, Luwei" <luwei.kang@intel.com>
To: Andrew Cooper <andrew.cooper3@citrix.com>,
"xen-devel@lists.xen.org" <xen-devel@lists.xen.org>
Cc: "Han, Huaitong" <huaitong.han@intel.com>,
"Wang, Yong Y" <yong.y.wang@intel.com>,
"jbeulich@suse.com" <jbeulich@suse.com>
Subject: Re: [PATCH] x86/cpuid: fix dom0 crash on skylake machine
Date: Wed, 1 Jun 2016 10:54:28 +0000 [thread overview]
Message-ID: <82D7661F83C1A047AF7DC287873BF1E136ABAA08@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <574EA4F0.5030607@citrix.com>
Thank you Andrew Cooper, this patch indeed resolve my issue and two point need modify.
The code need move ahead of "break;"
@@ -1101,6 +1101,9 @@ void pv_cpuid(struct cpu_user_regs *regs)
if ( !is_control_domain(currd) && !is_hardware_domain(currd) )
cpuid_count(leaf, subleaf, &tmp, &b, &tmp, &tmp);
break;
+
+ a &= (uint32_t)pv_xfeature_mask;
+ d &= (uint32_t)(pv_xfeature_mask >> 32);
}
extraneous space after "&".
- sanitise_featureset(hvm_featureset);
+ sanitise_featureset(hvm_featureset, & hvm_xfeature_mask);
-----Original Message-----
From: Andrew Cooper [mailto:andrew.cooper3@citrix.com]
Sent: Wednesday, June 1, 2016 5:04 PM
To: Kang, Luwei <luwei.kang@intel.com>; xen-devel@lists.xen.org
Cc: jbeulich@suse.com; Han, Huaitong <huaitong.han@intel.com>; Wang, Yong Y <yong.y.wang@intel.com>
Subject: Re: [PATCH] x86/cpuid: fix dom0 crash on skylake machine
On 01/06/16 05:58, Luwei Kang wrote:
> CPUID.0XD.0X0.EAX is from machine value for dom0, and dom0 kernel will
> xsetbv with xfeatures_mask that is from CPUID.0XD.0X0.EAX, but
> handle_xsetbv has ingored XSTATE_PKRU with hardware protection fault
> emulation, so dom0 kernel will crash on skylake machine with PKRU support.
>
> Signed-off-by: Luwei Kang <luwei.kang@intel.com>
> ---
> xen/arch/x86/traps.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index
> 1ef8401..5e72e44 100644
> --- a/xen/arch/x86/traps.c
> +++ b/xen/arch/x86/traps.c
> @@ -1100,6 +1100,9 @@ void pv_cpuid(struct cpu_user_regs *regs)
> */
> if ( !is_control_domain(currd) && !is_hardware_domain(currd) )
> cpuid_count(leaf, subleaf, &tmp, &b, &tmp, &tmp);
> +
> + /* PV is not supported by XSTATE_PKRU. */
> + a &= ~XSTATE_PKRU;
> break;
> }
>
While this does work, it undoes some of the work I started with my cpuid improvements in 4.7
Does the attached patch also resolve your issue?
~Andrew
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-01 10:54 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-01 4:58 [PATCH] x86/cpuid: fix dom0 crash on skylake machine Luwei Kang
2016-06-01 5:54 ` Han, Huaitong
2016-06-01 8:49 ` Jan Beulich
2016-06-01 9:00 ` Han, Huaitong
2016-06-01 9:03 ` Andrew Cooper
2016-06-01 9:17 ` Jan Beulich
2016-06-01 9:34 ` Andrew Cooper
2016-06-01 9:43 ` Jan Beulich
2016-06-01 11:27 ` Andrew Cooper
2016-06-01 11:38 ` Jan Beulich
2016-06-01 11:45 ` Andrew Cooper
2016-06-01 12:01 ` Jan Beulich
2016-06-01 13:03 ` Andrew Cooper
2016-06-01 13:28 ` Jan Beulich
2016-06-02 11:12 ` Andrew Cooper
2016-06-02 11:34 ` Jan Beulich
2016-06-02 11:44 ` Andrew Cooper
2016-06-02 12:15 ` Jan Beulich
2016-06-01 9:21 ` Han, Huaitong
2016-06-01 9:30 ` Wei Liu
2016-06-01 9:45 ` Andrew Cooper
2016-06-01 10:54 ` Kang, Luwei [this message]
2016-06-01 10:57 ` Andrew Cooper
2016-06-01 9:04 ` Jan Beulich
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=82D7661F83C1A047AF7DC287873BF1E136ABAA08@SHSMSX101.ccr.corp.intel.com \
--to=luwei.kang@intel.com \
--cc=andrew.cooper3@citrix.com \
--cc=huaitong.han@intel.com \
--cc=jbeulich@suse.com \
--cc=xen-devel@lists.xen.org \
--cc=yong.y.wang@intel.com \
/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).