deal with interrupt shadow state for emulated instruction
PATCH 1/1 deal with interrupt shadow state for emulated instruction
we currently unblock shadow interrupt state when we skip an instruction, but failing to do so when we actually emulate one. This blocks interrupts in key instruction blocks, in particular sti; hlt; sequences
If the instruction emulated is an sti, we have to block shadow interrupts. The same goes for mov ss. pop ss also needs it, but we don't currently emulate it.
Without this patch, I cannot boot gpxe option roms at vmx machines. This is described at https://bugzilla.redhat.com/show_bug.cgi?id=494469
--- arch/x86/include/asm/kvm_host.h | 2 + arch/x86/include/asm/kvm_x86_emulate.h | 6 ++++ arch/x86/kvm/svm.c | 25 +++++++++++++++- arch/x86/kvm/vmx.c | 49 ++++++++++++++++++++++++++------ arch/x86/kvm/x86.c | 7 ++++- arch/x86/kvm/x86_emulate.c | 21 +++++++++++++- 6 files changed, 98 insertions(+), 12 deletions(-)
arch/x86/include/asm/kvm_host.h +2 -0
@@ -510,6 +510,8 @@ struct kvm_x86_ops {void (*run)(struct kvm_vcpu *vcpu,struct kvm_run *run);int (*handle_exit)(struct kvm_run *run,struct kvm_vcpu *vcpu);void (*skip_emulated_instruction)(struct kvm_vcpu *vcpu); +void (*set_interrupt_shadow)(struct kvm_vcpu *vcpu,int mask); +u32 (*get_interrupt_shadow)(struct kvm_vcpu *vcpu);void (*patch_hypercall)(struct kvm_vcpu *vcpu,unsigned char *hypercall_addr);void (*set_irq)(struct kvm_vcpu *vcpu,int vec);
arch/x86/include/asm/kvm_x86_emulate.h +6 -0
@@ -143,6 +143,9 @@ struct decode_cache {struct fetch_cache fetch; }; +#define X86_SHADOW_INT_MOV_SS 1 +#define X86_SHADOW_INT_STI 2 +struct x86_emulate_ctxt {/* Register state before/after emulation. */ struct kvm_vcpu *vcpu;
@@ -152,6 +155,9 @@ struct x86_emulate_ctxt {int mode;u32 cs_base; +/* interruptibility state, as a result of execution of STI or MOV SS */ +int interruptibility; +/* decode cache */ struct decode_cache decode; };
arch/x86/kvm/svm.c +24 -1
@@ -202,6 +202,27 @@ static int is_external_interrupt(u32 info)return info == (SVM_EVTINJ_VALID |SVM_EVTINJ_TYPE_INTR ); } +static u32 svm_get_interrupt_shadow (struct kvm_vcpu *vcpu) +{ +struct vcpu_svm *svm =to_svm (vcpu); +u32 ret =0 ; + +if (svm->vmcb->control.int_state &SVM_INTERRUPT_SHADOW_MASK ) + ret |= (X86_SHADOW_INT_STI &&X86_SHADOW_INT_MOV_SS ); +return ret; +} + +static void svm_set_interrupt_shadow (struct kvm_vcpu *vcpu,int mask) +{ +struct vcpu_svm *svm =to_svm (vcpu); + +if (mask ==0 ) + svm->vmcb->control.int_state &= ~SVM_INTERRUPT_SHADOW_MASK ; +else + svm->vmcb->control.int_state |=SVM_INTERRUPT_SHADOW_MASK ; + +} +static void skip_emulated_instruction (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu);
@@ -215,7 +236,7 @@ static void skip_emulated_instruction(struct kvm_vcpu *vcpu) __func__, kvm_rip_read(vcpu), svm->next_rip);kvm_rip_write (vcpu, svm->next_rip); - svm->vmcb->control.int_state &= ~SVM_INTERRUPT_SHADOW_MASK ; +svm_set_interrupt_shadow (vcpu,0 ); }static int has_svm (void )
@@ -2637,6 +2658,8 @@ static struct kvm_x86_ops svm_x86_ops = { .run = svm_vcpu_run, .handle_exit = handle_exit, .skip_emulated_instruction = skip_emulated_instruction, + .set_interrupt_shadow= svm_set_interrupt_shadow, + .get_interrupt_shadow = svm_get_interrupt_shadow, .patch_hypercall = svm_patch_hypercall, .set_irq = svm_set_irq, .set_nmi = svm_inject_nmi,
arch/x86/kvm/vmx.c +40 -9
69 lines not on this page · raw message
arch/x86/kvm/x86.c +6 -1
@@ -2362,7 +2362,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,u16 error_code, int emulation_type) { - int r; + int r, shadow_mask;struct decode_cache *c;kvm_clear_exception_queue (vcpu);
@@ -2415,7 +2415,12 @@ int emulate_instruction(struct kvm_vcpu *vcpu,return EMULATE_DONE ; } + vcpu->arch.emulate_ctxt.interruptibility =0 ; r =x86_emulate_insn (&vcpu->arch.emulate_ctxt, &emulate_ops); + shadow_mask = vcpu->arch.emulate_ctxt.interruptibility; + +if (r ==0 ) + kvm_x86_ops->set_interrupt_shadow (vcpu, shadow_mask);if (vcpu->arch.pio.string)return EMULATE_DO_MMIO ;
arch/x86/kvm/x86_emulate.c +20 -1
@@ -1618,6 +1618,14 @@ special_insn:int err; sel = c->src.val; +if (c->modrm_reg ==VCPU_SREG_SS ) { +u32 int_shadow = + kvm_x86_ops->get_interrupt_shadow (ctxt->vcpu); +/* See sti emulation for an explanation of this */ +if (!(int_shadow &X86_SHADOW_INT_MOV_SS )) + ctxt->interruptibility =X86_SHADOW_INT_MOV_SS ; + } +if (c->modrm_reg <=5 ) { type_bits = (c->modrm_reg ==1 ) ?9 :1 ; err = kvm_load_segment_descriptor(ctxt->vcpu, sel,
@@ -1846,10 +1854,21 @@ special_insn: ctxt->eflags &= ~X86_EFLAGS_IF ; c->dst.type =OP_NONE ;/* Disable writeback. */ break ; -case 0xfb :/* sti */ +case 0xfb : {/* sti */ +u32 int_shadow = kvm_x86_ops->get_interrupt_shadow (ctxt->vcpu); +/* +* an sti; sti; sequence only disable interrupts for the first +* instruction. So, if the last instruction, be it emulated or +* not, left the system with the INT_STI flag enabled, it +* means that the last instruction is an sti. We should not +* leave the flag on in this case +*/ +if (!(int_shadow &X86_SHADOW_INT_STI )) + ctxt->interruptibility =X86_SHADOW_INT_STI ; ctxt->eflags |=X86_EFLAGS_IF ; c->dst.type =OP_NONE ;/* Disable writeback. */ break ; + }case 0xfc :/* cld */ ctxt->eflags &= ~EFLG_DF ; c->dst.type =OP_NONE ;/* Disable writeback. */
Signature · 1 line
1.5.6.6
arch/x86/include/asm/kvm_host.h struct kvm_x86_ops { · line 513
Quoted 9 lines · Glauber Costa
arch/x86/include/asm/kvm_host.h +1
-0@@ -510,6 +510,8 @@ struct kvm_x86_ops {void (*run)(struct kvm_vcpu *vcpu,struct kvm_run *run);int (*handle_exit)(struct kvm_run *run,struct kvm_vcpu *vcpu);void (*skip_emulated_instruction)(struct kvm_vcpu *vcpu); +void (*set_interrupt_shadow)(struct kvm_vcpu *vcpu,int mask);
There is .drop_interrupt_shadow() callback. The patch should remove it and replace its use by set_interrupt_shadow().
--
Gleb.
Quoted 15 lines · Gleb Natapov
arch/x86/include/asm/kvm_host.h struct kvm_x86_ops { · line 514
Quoted 10 lines · Glauber Costa
arch/x86/include/asm/kvm_host.h +1
-0@@ -510,6 +510,8 @@ struct kvm_x86_ops {void (*run)(struct kvm_vcpu *vcpu,struct kvm_run *run);int (*handle_exit)(struct kvm_run *run,struct kvm_vcpu *vcpu);void (*skip_emulated_instruction)(struct kvm_vcpu *vcpu); +void (*set_interrupt_shadow)(struct kvm_vcpu *vcpu,int mask);There is .drop_interrupt_shadow() callback. The patch should remove it and replace its use by
set_interrupt_shadow().
That would be [PATCH 1/2].
Signature · 1 line
Do not meddle in the internals of kernels, for they are subtle and quick to panic.
Quoted 17 lines · Avi Kivity
Quoted 15 lines · Gleb Natapov
arch/x86/include/asm/kvm_host.h struct kvm_x86_ops { · line 514
Quoted 10 lines · Glauber Costa
arch/x86/include/asm/kvm_host.h +1
-0@@ -510,6 +510,8 @@ struct kvm_x86_ops {void (*run)(struct kvm_vcpu *vcpu,struct kvm_run *run);int (*handle_exit)(struct kvm_run *run,struct kvm_vcpu *vcpu);void (*skip_emulated_instruction)(struct kvm_vcpu *vcpu); +void (*set_interrupt_shadow)(struct kvm_vcpu *vcpu,int mask);There is .drop_interrupt_shadow() callback. The patch should remove it and replace its use by
set_interrupt_shadow().
Quoted 1 line
That would be [PATCH 1/2].
[PATCH 2/2]. Otherwise we will break bisectability, as the pure removal of this function would lead us to a non-functioning kernel for no reason.
Avi: if this patch is okay, please apply. I'll send another one later that replaces the existing .drop_interrupt_shadow by the (then) in tree set_interrupt_shadow.
Quoted 18 lines · Glauber Costa
Quoted 17 lines · Avi Kivity
Quoted 15 lines · Gleb Natapov
arch/x86/include/asm/kvm_host.h struct kvm_x86_ops { · line 514
Quoted 10 lines · Glauber Costa
arch/x86/include/asm/kvm_host.h +1
-0@@ -510,6 +510,8 @@ struct kvm_x86_ops {void (*run)(struct kvm_vcpu *vcpu,struct kvm_run *run);int (*handle_exit)(struct kvm_run *run,struct kvm_vcpu *vcpu);void (*skip_emulated_instruction)(struct kvm_vcpu *vcpu); +void (*set_interrupt_shadow)(struct kvm_vcpu *vcpu,int mask);There is .drop_interrupt_shadow() callback. The patch should remove it and replace its use by
set_interrupt_shadow().
Quoted 7 lines
Quoted 1 line
That would be [PATCH 1/2].
[PATCH 2/2]. Otherwise we will break bisectability, as the pure removal of this function would lead us to a non-functioning kernel for no reason.
Avi: if this patch is okay, please apply. I'll send another one later that replaces the existing .drop_interrupt_shadow by the (then) in tree
set_interrupt_shadow.
It is not always easy to understand what Avi means :) but my interpretation was that patch 1/2 should replace drop_interrupt_shadow() with set_interrupt_shadow() and 2/2 should be only emulation changes.
--
Gleb.
Quoted 23 lines · Gleb Natapov
Quoted 22 lines · Glauber Costa
Quoted 17 lines · Avi Kivity
Quoted 15 lines · Gleb Natapov
arch/x86/include/asm/kvm_host.h struct kvm_x86_ops { · line 514
Quoted 10 lines · Glauber Costa
arch/x86/include/asm/kvm_host.h +1
-0@@ -510,6 +510,8 @@ struct kvm_x86_ops {void (*run)(struct kvm_vcpu *vcpu,struct kvm_run *run);int (*handle_exit)(struct kvm_run *run,struct kvm_vcpu *vcpu);void (*skip_emulated_instruction)(struct kvm_vcpu *vcpu); +void (*set_interrupt_shadow)(struct kvm_vcpu *vcpu,int mask);There is .drop_interrupt_shadow() callback. The patch should remove it and replace its use by
set_interrupt_shadow().Quoted 1 line
That would be [PATCH 1/2].
[PATCH 2/2]. Otherwise we will break bisectability, as the pure removal of this function would lead us to a non-functioning kernel for no reason.
Quoted 6 lines
Quoted 3 lines
Avi: if this patch is okay, please apply. I'll send another one later that replaces the existing .drop_interrupt_shadow by the (then) in tree
set_interrupt_shadow.It is not always easy to understand what Avi means :) but my interpretation was that patch 1/2 should replace
drop_interrupt_shadow()withset_interrupt_shadow()and 2/2 should be only emulation changes.
ok... I'll send an updated version.