Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a506b12 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: x86 emulator: add NoAccess flag for memory instructions that skip access 



Use for INVLPG, which accesses the tlb, not memory.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent b27f3856

arch/x86/kvm/emulate.c

+4 −2
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
#define Group       (1<<14)     /* Bits 3:5 of modrm byte extend opcode */

#define GroupDual   (1<<15)     /* Alternate decoding of mod == 3 */

/* Misc flags */

#define NoAccess    (1<<23) /* Don't access memory (lea/invlpg/verr etc) */

#define Op3264      (1<<24) /* Operand is 64b in long mode, 32b otherwise */

#define Undefined   (1<<25) /* No Such Instruction */

#define Lock        (1<<26) /* lock prefix is allowed for the instruction */
@@ -2067,7 +2068,8 @@ static struct opcode group5[] = { 
static struct group_dual group7 = { {

	N, N, D(ModRM | SrcMem | Priv), D(ModRM | SrcMem | Priv),

	D(SrcNone | ModRM | DstMem | Mov), N,

	D(SrcMem16 | ModRM | Mov | Priv), D(SrcMem | ModRM | ByteOp | Priv),

	D(SrcMem16 | ModRM | Mov | Priv),

	D(SrcMem | ModRM | ByteOp | Priv | NoAccess),

}, {

	D(SrcNone | ModRM | Priv), N, N, D(SrcNone | ModRM | Priv),

	D(SrcNone | ModRM | DstMem | Mov), N,
@@ -2456,7 +2458,7 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt) 
		c->src.bytes = (c->d & ByteOp) ? 1 :

							   c->op_bytes;

		/* Don't fetch the address for invlpg: it could be unmapped. */

		if (c->twobyte && c->b == 0x01 && c->modrm_reg == 7)

		if (c->d & NoAccess)

			break;

	srcmem_common:

		/*