| Message ID | 1395286089-5406-3-git-send-email-bsd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Commit description is missing. On 2014-03-20 04:28, Bandan Das wrote: > Signed-off-by: Bandan Das <bsd@redhat.com> > --- > arch/x86/kvm/irq.c | 1 + > arch/x86/kvm/vmx.c | 17 +++++++++++++++++ > 2 files changed, 18 insertions(+) > > diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c > index 484bc87..bd0da43 100644 > --- a/arch/x86/kvm/irq.c > +++ b/arch/x86/kvm/irq.c > @@ -113,6 +113,7 @@ int kvm_cpu_get_interrupt(struct kvm_vcpu *v) > > return kvm_get_apic_interrupt(v); /* APIC */ > } > +EXPORT_SYMBOL_GPL(kvm_cpu_get_interrupt); > > void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu) > { > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index 26c1d38..c707389 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -4491,6 +4491,16 @@ static bool nested_exit_on_intr(struct kvm_vcpu *vcpu) > PIN_BASED_EXT_INTR_MASK; > } > > +/* > + * In nested virtualization, check if L1 has set > + * VM_EXIT_ACK_INTR_ON_EXIT This comment does not really contribute much information compared to the code below. > + */ > +static bool nested_exit_intr_ack_set(struct kvm_vcpu *vcpu) > +{ > + return get_vmcs12(vcpu)->vm_exit_controls & > + VM_EXIT_ACK_INTR_ON_EXIT; > +} > + > static bool nested_exit_on_nmi(struct kvm_vcpu *vcpu) > { > return get_vmcs12(vcpu)->pin_based_vm_exec_control & > @@ -8448,6 +8458,13 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, > prepare_vmcs12(vcpu, vmcs12, exit_reason, exit_intr_info, > exit_qualification); > > + if ((exit_reason == EXIT_REASON_EXTERNAL_INTERRUPT) > + && nested_exit_intr_ack_set(vcpu)) { > + int irq = kvm_cpu_get_interrupt(vcpu); > + vmcs12->vm_exit_intr_info = irq | > + INTR_INFO_VALID_MASK | INTR_TYPE_EXT_INTR; > + } > + > trace_kvm_nested_vmexit_inject(vmcs12->vm_exit_reason, > vmcs12->exit_qualification, > vmcs12->idt_vectoring_info_field, > Looks correct. What about adding a corresponding unit test kvm-unit-tests/x86/vmx_tests.c)? I would highly recommend this. Jan
Jan Kiszka <jan.kiszka@siemens.com> writes: > Commit description is missing. > > On 2014-03-20 04:28, Bandan Das wrote: >> Signed-off-by: Bandan Das <bsd@redhat.com> >> --- >> arch/x86/kvm/irq.c | 1 + >> arch/x86/kvm/vmx.c | 17 +++++++++++++++++ >> 2 files changed, 18 insertions(+) >> >> diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c >> index 484bc87..bd0da43 100644 >> --- a/arch/x86/kvm/irq.c >> +++ b/arch/x86/kvm/irq.c >> @@ -113,6 +113,7 @@ int kvm_cpu_get_interrupt(struct kvm_vcpu *v) >> >> return kvm_get_apic_interrupt(v); /* APIC */ >> } >> +EXPORT_SYMBOL_GPL(kvm_cpu_get_interrupt); >> >> void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu) >> { >> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c >> index 26c1d38..c707389 100644 >> --- a/arch/x86/kvm/vmx.c >> +++ b/arch/x86/kvm/vmx.c >> @@ -4491,6 +4491,16 @@ static bool nested_exit_on_intr(struct kvm_vcpu *vcpu) >> PIN_BASED_EXT_INTR_MASK; >> } >> >> +/* >> + * In nested virtualization, check if L1 has set >> + * VM_EXIT_ACK_INTR_ON_EXIT > > This comment does not really contribute much information compared to the > code below. > >> + */ >> +static bool nested_exit_intr_ack_set(struct kvm_vcpu *vcpu) >> +{ >> + return get_vmcs12(vcpu)->vm_exit_controls & >> + VM_EXIT_ACK_INTR_ON_EXIT; >> +} >> + >> static bool nested_exit_on_nmi(struct kvm_vcpu *vcpu) >> { >> return get_vmcs12(vcpu)->pin_based_vm_exec_control & >> @@ -8448,6 +8458,13 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, >> prepare_vmcs12(vcpu, vmcs12, exit_reason, exit_intr_info, >> exit_qualification); >> >> + if ((exit_reason == EXIT_REASON_EXTERNAL_INTERRUPT) >> + && nested_exit_intr_ack_set(vcpu)) { >> + int irq = kvm_cpu_get_interrupt(vcpu); >> + vmcs12->vm_exit_intr_info = irq | >> + INTR_INFO_VALID_MASK | INTR_TYPE_EXT_INTR; >> + } >> + >> trace_kvm_nested_vmexit_inject(vmcs12->vm_exit_reason, >> vmcs12->exit_qualification, >> vmcs12->idt_vectoring_info_field, >> > > Looks correct. What about adding a corresponding unit test > kvm-unit-tests/x86/vmx_tests.c)? I would highly recommend this. Thanks for pointing this out, I will take a look. > Jan -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c index 484bc87..bd0da43 100644 --- a/arch/x86/kvm/irq.c +++ b/arch/x86/kvm/irq.c @@ -113,6 +113,7 @@ int kvm_cpu_get_interrupt(struct kvm_vcpu *v) return kvm_get_apic_interrupt(v); /* APIC */ } +EXPORT_SYMBOL_GPL(kvm_cpu_get_interrupt); void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu) { diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 26c1d38..c707389 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -4491,6 +4491,16 @@ static bool nested_exit_on_intr(struct kvm_vcpu *vcpu) PIN_BASED_EXT_INTR_MASK; } +/* + * In nested virtualization, check if L1 has set + * VM_EXIT_ACK_INTR_ON_EXIT + */ +static bool nested_exit_intr_ack_set(struct kvm_vcpu *vcpu) +{ + return get_vmcs12(vcpu)->vm_exit_controls & + VM_EXIT_ACK_INTR_ON_EXIT; +} + static bool nested_exit_on_nmi(struct kvm_vcpu *vcpu) { return get_vmcs12(vcpu)->pin_based_vm_exec_control & @@ -8448,6 +8458,13 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, prepare_vmcs12(vcpu, vmcs12, exit_reason, exit_intr_info, exit_qualification); + if ((exit_reason == EXIT_REASON_EXTERNAL_INTERRUPT) + && nested_exit_intr_ack_set(vcpu)) { + int irq = kvm_cpu_get_interrupt(vcpu); + vmcs12->vm_exit_intr_info = irq | + INTR_INFO_VALID_MASK | INTR_TYPE_EXT_INTR; + } + trace_kvm_nested_vmexit_inject(vmcs12->vm_exit_reason, vmcs12->exit_qualification, vmcs12->idt_vectoring_info_field,
Signed-off-by: Bandan Das <bsd@redhat.com> --- arch/x86/kvm/irq.c | 1 + arch/x86/kvm/vmx.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+)