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 1/7] x86emul: add wrappers to check for AMD-like behavior
Date: Tue, 24 Mar 2020 17:26:03 +0100 [thread overview]
Message-ID: <553aaf64-1171-2354-95a9-d5e54d3b21c4@suse.com> (raw)
In-Reply-To: <cfeb8fcf-3ba6-674c-17a9-93be9e746930@suse.com>
These are to aid readbility at their use sites, in particular because
we're going to gain more of them.
Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -1836,6 +1836,18 @@ in_protmode(
return !(in_realmode(ctxt, ops) || (ctxt->regs->eflags & X86_EFLAGS_VM));
}
+static bool
+_amd_like(const struct cpuid_policy *cp)
+{
+ return cp->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON);
+}
+
+static bool
+amd_like(const struct x86_emulate_ctxt *ctxt)
+{
+ return _amd_like(ctxt->cpuid);
+}
+
#define vcpu_has_fpu() (ctxt->cpuid->basic.fpu)
#define vcpu_has_sep() (ctxt->cpuid->basic.sep)
#define vcpu_has_cx8() (ctxt->cpuid->basic.cx8)
@@ -1995,7 +2007,7 @@ protmode_load_seg(
case x86_seg_tr:
goto raise_exn;
}
- if ( !(cp->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ||
+ if ( !_amd_like(cp) ||
!ops->read_segment ||
ops->read_segment(seg, sreg, ctxt) != X86EMUL_OKAY )
memset(sreg, 0, sizeof(*sreg));
@@ -2122,9 +2134,7 @@ protmode_load_seg(
* - all 16 bytes read with the high 8 bytes ignored on AMD.
*/
bool wide = desc.b & 0x1000
- ? false : (desc.b & 0xf00) != 0xc00 &&
- !(cp->x86_vendor &
- (X86_VENDOR_AMD | X86_VENDOR_HYGON))
+ ? false : (desc.b & 0xf00) != 0xc00 && !_amd_like(cp)
? mode_64bit() : ctxt->lma;
if ( wide )
@@ -2142,9 +2152,7 @@ protmode_load_seg(
default:
return rc;
}
- if ( !mode_64bit() &&
- (cp->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) &&
- (desc.b & 0xf00) != 0xc00 )
+ if ( !mode_64bit() && _amd_like(cp) && (desc.b & 0xf00) != 0xc00 )
desc_hi.b = desc_hi.a = 0;
if ( (desc_hi.b & 0x00001f00) ||
(seg != x86_seg_none &&
@@ -2525,9 +2533,7 @@ x86_decode_onebyte(
case 3: /* call (far, absolute indirect) */
case 5: /* jmp (far, absolute indirect) */
/* REX.W ignored on a vendor-dependent basis. */
- if ( op_bytes == 8 &&
- (ctxt->cpuid->x86_vendor &
- (X86_VENDOR_AMD | X86_VENDOR_HYGON)) )
+ if ( op_bytes == 8 && amd_like(ctxt) )
op_bytes = 4;
state->desc = DstNone | SrcMem | Mov;
break;
@@ -2651,8 +2657,7 @@ x86_decode_twobyte(
case 0xb4: /* lfs */
case 0xb5: /* lgs */
/* REX.W ignored on a vendor-dependent basis. */
- if ( op_bytes == 8 &&
- (ctxt->cpuid->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) )
+ if ( op_bytes == 8 && amd_like(ctxt) )
op_bytes = 4;
break;
@@ -4068,9 +4073,7 @@ x86_emulate(
if ( ea.type == OP_REG )
src.val = *ea.reg;
else if ( (rc = read_ulong(ea.mem.seg, ea.mem.off, &src.val,
- (op_bytes == 2 &&
- !(ctxt->cpuid->x86_vendor &
- (X86_VENDOR_AMD | X86_VENDOR_HYGON))
+ (op_bytes == 2 && !amd_like(ctxt)
? 2 : 4),
ctxt, ops)) )
goto done;
next prev parent reply other threads:[~2020-03-24 16:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 16:18 [Xen-devel] [PATCH 0/7] x86emul: (mainly) vendor specific behavior adjustments Jan Beulich
2020-03-24 16:26 ` Jan Beulich [this message]
2020-03-25 13:26 ` [Xen-devel] [PATCH 1/7] x86emul: add wrappers to check for AMD-like behavior Andrew Cooper
2020-03-24 16:26 ` [Xen-devel] [PATCH 2/7] x86emul: vendor specific near RET behavior in 64-bit mode Jan Beulich
2020-03-25 13:36 ` Andrew Cooper
2020-03-24 16:27 ` [Xen-devel] [PATCH 3/7] x86emul: vendor specific direct branch " Jan Beulich
2020-03-25 14:10 ` Andrew Cooper
2020-03-24 16:27 ` [Xen-devel] [PATCH 4/7] x86emul: vendor specific near indirect " Jan Beulich
2020-03-25 14:11 ` Andrew Cooper
2020-03-24 16:28 ` [Xen-devel] [PATCH 5/7] x86emul: vendor specific SYSENTER/SYSEXIT behavior in long mode Jan Beulich
2020-03-25 14:15 ` Andrew Cooper
2020-03-24 16:28 ` [Xen-devel] [PATCH 6/7] x86emul: vendor specific SYSCALL behavior Jan Beulich
2020-03-25 9:44 ` Andrew Cooper
2020-03-24 16:29 ` [Xen-devel] [PATCH 7/7] x86emul: support SYSRET Jan Beulich
2020-03-25 10:00 ` Andrew Cooper
2020-03-25 10:19 ` Jan Beulich
2020-03-25 10:47 ` Andrew Cooper
2020-03-25 11:55 ` Jan Beulich
2020-03-25 12:25 ` 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=553aaf64-1171-2354-95a9-d5e54d3b21c4@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).