Commit 3c6e276f authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: x86 emulator: add SVM intercepts 



Add intercept codes for instructions defined by SVM as
interceptable.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent c4f035c6

arch/x86/include/asm/kvm_emulate.h

+35 −0
Original line number Diff line number Diff line
@@ -281,6 +281,41 @@ enum x86_intercept_stage { 


enum x86_intercept {

	x86_intercept_none,

	x86_intercept_lmsw,

	x86_intercept_smsw,

	x86_intercept_lidt,

	x86_intercept_sidt,

	x86_intercept_lgdt,

	x86_intercept_sgdt,

	x86_intercept_lldt,

	x86_intercept_sldt,

	x86_intercept_ltr,

	x86_intercept_str,

	x86_intercept_rdtsc,

	x86_intercept_rdpmc,

	x86_intercept_pushf,

	x86_intercept_popf,

	x86_intercept_cpuid,

	x86_intercept_rsm,

	x86_intercept_iret,

	x86_intercept_intn,

	x86_intercept_invd,

	x86_intercept_pause,

	x86_intercept_hlt,

	x86_intercept_invlpg,

	x86_intercept_invlpga,

	x86_intercept_vmrun,

	x86_intercept_vmload,

	x86_intercept_vmsave,

	x86_intercept_vmmcall,

	x86_intercept_stgi,

	x86_intercept_clgi,

	x86_intercept_skinit,

	x86_intercept_rdtscp,

	x86_intercept_icebp,

	x86_intercept_wbinvd,

	x86_intercept_monitor,

	x86_intercept_mwait,



	nr_x86_intercepts

};

arch/x86/kvm/emulate.c

+13 −11
Original line number Diff line number Diff line
@@ -2469,15 +2469,15 @@ 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 | NoAccess),

	N, N, DI(ModRM | SrcMem | Priv, lgdt), DI(ModRM | SrcMem | Priv, lidt),

	DI(SrcNone | ModRM | DstMem | Mov, smsw), N,

	DI(SrcMem16 | ModRM | Mov | Priv, lmsw),

	DI(SrcMem | ModRM | ByteOp | Priv | NoAccess, invlpg),

}, {

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

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

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

	D(SrcMem16 | ModRM | Mov | Priv), N,

	DI(SrcNone | ModRM | DstMem | Mov, smsw), N,

	DI(SrcMem16 | ModRM | Mov | Priv, lmsw), N,

} };



static struct opcode group8[] = {
@@ -2556,7 +2556,7 @@ static struct opcode opcode_table[256] = { 
	/* 0x98 - 0x9F */

	D(DstAcc | SrcNone), I(ImplicitOps | SrcAcc, em_cwd),

	I(SrcImmFAddr | No64, em_call_far), N,

	D(ImplicitOps | Stack), D(ImplicitOps | Stack), N, N,

	DI(ImplicitOps | Stack, pushf), DI(ImplicitOps | Stack, popf), N, N,

	/* 0xA0 - 0xA7 */

	I2bv(DstAcc | SrcMem | Mov | MemAbs, em_mov),

	I2bv(DstMem | SrcAcc | Mov | MemAbs, em_mov),
@@ -2579,7 +2579,8 @@ static struct opcode opcode_table[256] = { 
	G(ByteOp, group11), G(0, group11),

	/* 0xC8 - 0xCF */

	N, N, N, D(ImplicitOps | Stack),

	D(ImplicitOps), D(SrcImmByte), D(ImplicitOps | No64), D(ImplicitOps),

	D(ImplicitOps), DI(SrcImmByte, intn),

	D(ImplicitOps | No64), DI(ImplicitOps, iret),

	/* 0xD0 - 0xD7 */

	D2bv(DstMem | SrcOne | ModRM), D2bv(DstMem | ModRM),

	N, N, N, N,
@@ -2594,7 +2595,8 @@ static struct opcode opcode_table[256] = { 
	D2bv(SrcNone | DstAcc),	D2bv(SrcAcc | ImplicitOps),

	/* 0xF0 - 0xF7 */

	N, N, N, N,

	D(ImplicitOps | Priv), D(ImplicitOps), G(ByteOp, group3), G(0, group3),

	DI(ImplicitOps | Priv, hlt), D(ImplicitOps),

	G(ByteOp, group3), G(0, group3),

	/* 0xF8 - 0xFF */

	D(ImplicitOps), D(ImplicitOps), D(ImplicitOps), D(ImplicitOps),

	D(ImplicitOps), D(ImplicitOps), G(0, group4), G(0, group5),
@@ -2604,7 +2606,7 @@ static struct opcode twobyte_table[256] = { 
	/* 0x00 - 0x0F */

	N, GD(0, &group7), N, N,

	N, D(ImplicitOps | VendorSpecific), D(ImplicitOps | Priv), N,

	D(ImplicitOps | Priv), D(ImplicitOps | Priv), N, N,

	DI(ImplicitOps | Priv, invd), DI(ImplicitOps | Priv, wbinvd), N, N,

	N, D(ImplicitOps | ModRM), N, N,

	/* 0x10 - 0x1F */

	N, N, N, N, N, N, N, N, D(ImplicitOps | ModRM), N, N, N, N, N, N, N,
@@ -2614,7 +2616,7 @@ static struct opcode twobyte_table[256] = { 
	N, N, N, N,

	N, N, N, N, N, N, N, N,

	/* 0x30 - 0x3F */

	D(ImplicitOps | Priv), I(ImplicitOps, em_rdtsc),

	D(ImplicitOps | Priv), II(ImplicitOps, em_rdtsc, rdtsc),

	D(ImplicitOps | Priv), N,

	D(ImplicitOps | VendorSpecific), D(ImplicitOps | Priv | VendorSpecific),

	N, N,