UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: x86: emulate sldt and str 

These are needed to handle the descriptor table vmexits when emulating
UMIP.

Reviewed-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2016-07-12 10:35:51 +02:00
parent ae3e61e1c2
commit dd307d017b
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arch/x86/kvm/emulate.c
View File

@ -3633,15 +3633,25 @@ static int em_rdmsr(struct x86_emulate_ctxt *ctxt)
return X86EMUL_CONTINUE; return X86EMUL_CONTINUE;
} }
static int em_store_sreg(struct x86_emulate_ctxt *ctxt, int segment)
{
if (segment > VCPU_SREG_GS &&
(ctxt->ops->get_cr(ctxt, 4) & X86_CR4_UMIP) &&
ctxt->ops->cpl(ctxt) > 0)
return emulate_gp(ctxt, 0);
ctxt->dst.val = get_segment_selector(ctxt, segment);
if (ctxt->dst.bytes == 4 && ctxt->dst.type == OP_MEM)
ctxt->dst.bytes = 2;
return X86EMUL_CONTINUE;
}
static int em_mov_rm_sreg(struct x86_emulate_ctxt *ctxt) static int em_mov_rm_sreg(struct x86_emulate_ctxt *ctxt)
{ {
if (ctxt->modrm_reg > VCPU_SREG_GS) if (ctxt->modrm_reg > VCPU_SREG_GS)
return emulate_ud(ctxt); return emulate_ud(ctxt);
ctxt->dst.val = get_segment_selector(ctxt, ctxt->modrm_reg); return em_store_sreg(ctxt, ctxt->modrm_reg);
if (ctxt->dst.bytes == 4 && ctxt->dst.type == OP_MEM)
ctxt->dst.bytes = 2;
return X86EMUL_CONTINUE;
} }
static int em_mov_sreg_rm(struct x86_emulate_ctxt *ctxt) static int em_mov_sreg_rm(struct x86_emulate_ctxt *ctxt)
@ -3659,6 +3669,11 @@ static int em_mov_sreg_rm(struct x86_emulate_ctxt *ctxt)
return load_segment_descriptor(ctxt, sel, ctxt->modrm_reg); return load_segment_descriptor(ctxt, sel, ctxt->modrm_reg);
} }
static int em_sldt(struct x86_emulate_ctxt *ctxt)
{
return em_store_sreg(ctxt, VCPU_SREG_LDTR);
}
static int em_lldt(struct x86_emulate_ctxt *ctxt) static int em_lldt(struct x86_emulate_ctxt *ctxt)
{ {
u16 sel = ctxt->src.val; u16 sel = ctxt->src.val;
@ -3668,6 +3683,11 @@ static int em_lldt(struct x86_emulate_ctxt *ctxt)
return load_segment_descriptor(ctxt, sel, VCPU_SREG_LDTR); return load_segment_descriptor(ctxt, sel, VCPU_SREG_LDTR);
} }
static int em_str(struct x86_emulate_ctxt *ctxt)
{
return em_store_sreg(ctxt, VCPU_SREG_TR);
}
static int em_ltr(struct x86_emulate_ctxt *ctxt) static int em_ltr(struct x86_emulate_ctxt *ctxt)
{ {
u16 sel = ctxt->src.val; u16 sel = ctxt->src.val;
@ -4372,8 +4392,8 @@ static const struct opcode group5[] = {
}; };
static const struct opcode group6[] = { static const struct opcode group6[] = {
DI(Prot | DstMem, sldt), II(Prot | DstMem, em_sldt, sldt),
DI(Prot | DstMem, str), II(Prot | DstMem, em_str, str),
II(Prot | Priv | SrcMem16, em_lldt, lldt), II(Prot | Priv | SrcMem16, em_lldt, lldt),
II(Prot | Priv | SrcMem16, em_ltr, ltr), II(Prot | Priv | SrcMem16, em_ltr, ltr),
N, N, N, N, N, N, N, N,