From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Jan Beulich <JBeulich@suse.com>,
xen-devel <xen-devel@lists.xenproject.org>
Subject: Re: [PATCH 02/17] x86emul: fetch all insn bytes during the decode phase
Date: Tue, 13 Sep 2016 19:44:04 +0100 [thread overview]
Message-ID: <93f6907a-3bb9-d7f2-2822-298098993951@citrix.com> (raw)
In-Reply-To: <57D17EC6020000780010D14C@prv-mh.provo.novell.com>
On 08/09/16 14:07, Jan Beulich wrote:
> This way we can offer to callers the service of just sizing
> instructions, and we also can better guarantee not to raise the wrong
> fault due to not having read all relevant bytes.
>
> 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
> @@ -129,8 +129,8 @@ static const opcode_desc_t opcode_table[
> ImplicitOps, ImplicitOps, ImplicitOps, ImplicitOps,
> ImplicitOps|Mov, ImplicitOps|Mov, ImplicitOps, ImplicitOps,
> /* 0xA0 - 0xA7 */
> - ByteOp|DstEax|SrcImplicit|Mov, DstEax|SrcImplicit|Mov,
> - ByteOp|ImplicitOps|Mov, ImplicitOps|Mov,
> + ByteOp|DstEax|SrcMem|Mov, DstEax|SrcMem|Mov,
> + ByteOp|DstMem|SrcEax|Mov, DstMem|SrcEax|Mov,
> ByteOp|ImplicitOps|Mov, ImplicitOps|Mov,
> ByteOp|ImplicitOps, ImplicitOps,
> /* 0xA8 - 0xAF */
> @@ -1602,6 +1602,45 @@ struct x86_emulate_state {
> #define _regs (state->regs)
>
> static int
> +x86_decode_base(
What do you mean by decode_base here?
> + struct x86_emulate_state *state,
> + struct x86_emulate_ctxt *ctxt,
> + const struct x86_emulate_ops *ops)
> +{
> + int rc = X86EMUL_OKAY;
> +
> + switch ( state->opcode )
> + {
> + case 0x9a: /* call (far, absolute) */
> + case 0xea: /* jmp (far, absolute) */
> + generate_exception_if(mode_64bit(), EXC_UD, -1);
> +
> + imm1 = insn_fetch_bytes(op_bytes);
> + imm2 = insn_fetch_type(uint16_t);
> + break;
> +
> + case 0xa0: case 0xa1: /* mov mem.offs,{%al,%ax,%eax,%rax} */
> + case 0xa2: case 0xa3: /* mov {%al,%ax,%eax,%rax},mem.offs */
> + /* Source EA is not encoded via ModRM. */
> + ea.mem.off = insn_fetch_bytes(ad_bytes);
> + break;
> +
> + case 0xb8 ... 0xbf: /* mov imm{16,32,64},r{16,32,64} */
> + if ( op_bytes == 8 ) /* Fetch more bytes to obtain imm64. */
> + imm1 = ((uint32_t)imm1 |
> + ((uint64_t)insn_fetch_type(uint32_t) << 32));
> + break;
> +
> + case 0xc8: /* enter imm16,imm8 */
> + imm2 = insn_fetch_type(uint8_t);
> + break;
> + }
> +
> + done:
> + return rc;
> +}
> +
> +static int
> x86_decode(
> struct x86_emulate_state *state,
> struct x86_emulate_ctxt *ctxt,
> @@ -1994,10 +2033,29 @@ x86_decode(
> state->opcode = b;
> state->desc = d;
>
> + switch ( ext )
> + {
> + case ext_none:
> + rc = x86_decode_base(state, ctxt, ops);
> + break;
> +
> + case ext_0f:
> + case ext_0f38:
> + break;
> +
> + default:
> + ASSERT_UNREACHABLE();
> + return X86EMUL_UNHANDLEABLE;
> + }
> +
> done:
> return rc;
> }
>
> +/* No insn fetching past this point. */
> +#undef insn_fetch_bytes
> +#undef insn_fetch_type
> +
> int
> x86_emulate(
> struct x86_emulate_ctxt *ctxt,
> @@ -2560,6 +2618,8 @@ x86_emulate(
> case 0xc6 ... 0xc7: /* mov (sole member of Grp11) */
> generate_exception_if((modrm_reg & 7) != 0, EXC_UD, -1);
> case 0x88 ... 0x8b: /* mov */
> + case 0xa0 ... 0xa1: /* mov mem.offs,{%al,%ax,%eax,%rax} */
> + case 0xa2 ... 0xa3: /* mov {%al,%ax,%eax,%rax},mem.offs */
> dst.val = src.val;
> break;
>
> @@ -2644,18 +2704,13 @@ x86_emulate(
>
> case 0x9a: /* call (far, absolute) */ {
> struct segment_register reg;
> - uint16_t sel;
> - uint32_t eip;
>
> - generate_exception_if(mode_64bit(), EXC_UD, -1);
> + ASSERT(!mode_64bit());
Are we going to strictly require that noone ever hand-crafts a
x86_emulate_state and hands it to x86_emulate()?
I would suggest leaving the generate_exception_if(mode_64bit(), EXC_UD,
-1); after the ASSERT() so even if we do end up in a wonky state, we
don't try to jump the guest to 0.
Similarly for jmp.
~Andrew
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-09-13 18:44 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-08 12:58 [PATCH 00/17] x86: split insn emulator decode and execution Jan Beulich
2016-09-08 13:04 ` [PATCH 01/17] x86emul: split instruction decoding from execution Jan Beulich
2016-09-09 18:35 ` Andrew Cooper
2016-09-12 7:20 ` Jan Beulich
2016-09-08 13:07 ` [PATCH 02/17] x86emul: fetch all insn bytes during the decode phase Jan Beulich
2016-09-13 18:44 ` Andrew Cooper [this message]
2016-09-14 9:55 ` Jan Beulich
2016-09-23 14:48 ` Andrew Cooper
2016-09-23 15:04 ` Jan Beulich
2016-09-08 13:08 ` [PATCH 04/17] x86emul: track only rIP in emulator state Jan Beulich
2016-09-08 13:23 ` Jan Beulich
2016-09-08 13:09 ` [PATCH 03/17] " Jan Beulich
2016-09-13 19:09 ` Andrew Cooper
2016-09-14 9:58 ` Jan Beulich
2016-09-08 13:10 ` [PATCH 04/17] x86emul: complete decoding of two-byte instructions Jan Beulich
2016-09-14 14:22 ` Andrew Cooper
2016-09-14 15:05 ` Jan Beulich
2016-09-23 16:34 ` Andrew Cooper
2016-09-26 7:34 ` Jan Beulich
2016-09-27 13:28 ` Andrew Cooper
2016-09-27 13:51 ` Jan Beulich
2016-09-08 13:11 ` [PATCH 05/17] x86emul: add XOP decoding Jan Beulich
2016-09-14 16:11 ` Andrew Cooper
2016-09-14 16:21 ` Jan Beulich
2016-09-23 17:01 ` Andrew Cooper
2016-09-08 13:12 ` [PATCH 06/17] x86emul: add EVEX decoding Jan Beulich
2016-09-14 17:05 ` Andrew Cooper
2016-09-15 6:26 ` Jan Beulich
2016-09-08 13:13 ` [PATCH 07/17] x86emul: move x86_execute() common epilogue code Jan Beulich
2016-09-08 13:28 ` Jan Beulich
2016-09-14 17:13 ` Andrew Cooper
2016-09-08 13:14 ` [PATCH 08/17] x86emul: generate and make use of canonical opcode representation Jan Beulich
2016-09-14 17:30 ` Andrew Cooper
2016-09-15 6:43 ` Jan Beulich
2016-09-27 14:03 ` Andrew Cooper
2016-09-28 7:24 ` Jan Beulich
2016-09-08 13:14 ` [PATCH 09/17] SVM: use generic instruction decoding Jan Beulich
2016-09-14 17:56 ` Andrew Cooper
2016-09-15 6:55 ` Jan Beulich
2016-09-27 13:42 ` Andrew Cooper
2016-09-27 13:56 ` Jan Beulich
2016-09-27 15:53 ` Andrew Cooper
2016-09-08 13:16 ` [PATCH 10/17] x86/32on64: use generic instruction decoding for call gate emulation Jan Beulich
2016-09-08 13:17 ` [PATCH 11/17] x86/PV: split out dealing with CRn from privileged instruction handling Jan Beulich
2016-09-08 13:17 ` [PATCH 12/17] x86/PV: split out dealing with DRn " Jan Beulich
2016-09-08 13:18 ` [PATCH 13/17] x86/PV: split out dealing with MSRs " Jan Beulich
2016-09-08 13:18 ` [PATCH 14/17] x86emul: support XSETBV Jan Beulich
2016-09-08 13:19 ` [PATCH 15/17] x86emul: sort opcode 0f01 special case switch() statement Jan Beulich
2016-09-08 13:20 ` [PATCH 16/17] x86/PV: use generic emulator for privileged instruction handling Jan Beulich
2016-09-08 13:21 ` [PATCH 17/17] x86emul: don't assume a memory operand 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=93f6907a-3bb9-d7f2-2822-298098993951@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=JBeulich@suse.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 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).