From: "Jan Beulich" <JBeulich@suse.com>
To: xen-devel <xen-devel@lists.xenproject.org>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Wei Liu <wei.liu2@citrix.com>, Juergen Gross <jgross@suse.com>,
Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH v2] x86emul: don't read mask register on AVX512F-incapable platforms
Date: Fri, 29 Mar 2019 01:42:02 -0600 [thread overview]
Message-ID: <5C9DCC4A0200007800222AEA@prv1-mh.provo.novell.com> (raw)
In-Reply-To: 5C9CFE7102000078002229A1@prv1-mh.provo.novell.com
Nor when register state isn't sufficiently enabled.
Reported-by: George Dunlap <george.dunlap@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
This is surely a stable tree candidate, unless it could still make it
into 4.12 before the release.
---
v2: Add XCR0 check.
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -3511,7 +3511,8 @@ x86_emulate(
}
/* With a memory operand, fetch the mask register in use (if any). */
- if ( ea.type == OP_MEM && evex.opmsk )
+ if ( ea.type == OP_MEM && cpu_has_avx512f && evex.opmsk &&
+ _get_fpu(fpu_type = X86EMUL_FPU_opmask, ctxt, ops) == X86EMUL_OKAY )
{
uint8_t *stb = get_stub(stub);
@@ -3532,6 +3533,14 @@ x86_emulate(
fault_suppression = true;
}
+ if ( fpu_type == X86EMUL_FPU_opmask )
+ {
+ /* Squash (side) effects of the _get_fpu() above. */
+ x86_emul_reset_event(ctxt);
+ put_fpu(X86EMUL_FPU_opmask, false, state, ctxt, ops);
+ fpu_type = X86EMUL_FPU_none;
+ }
+
/* Decode (but don't fetch) the destination operand: register or memory. */
switch ( d & DstMask )
{
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-03-29 7:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-28 17:03 [PATCH] x86emul: don't read mask register on AVX512F-incapable platforms Jan Beulich
2019-03-28 17:44 ` George Dunlap
2019-03-28 18:03 ` Andrew Cooper
2019-03-29 6:59 ` Jan Beulich
2019-03-29 7:42 ` Jan Beulich [this message]
2019-03-29 9:19 ` [PATCH v2] " Andrew Cooper
2019-03-29 9:36 ` Jan Beulich
2019-03-29 10:02 ` Andrew Cooper
2019-03-29 10:56 ` Jan Beulich
2019-04-01 14:14 ` Andrew Cooper
2019-04-01 15:02 ` 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=5C9DCC4A0200007800222AEA@prv1-mh.provo.novell.com \
--to=jbeulich@suse.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=jgross@suse.com \
--cc=roger.pau@citrix.com \
--cc=wei.liu2@citrix.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.