lkml.org 
[lkml]   [2009]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 41/45] KVM: Always request IRQ/NMI window if an interrupt is pending
    Date
    From: Gleb Natapov <gleb@redhat.com>

    Currently they are not requested if there is pending exception.

    Signed-off-by: Gleb Natapov <gleb@redhat.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
    ---
    arch/x86/kvm/x86.c | 30 ++++++++++++------------------
    1 files changed, 12 insertions(+), 18 deletions(-)

    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index e395ca4..efba9bc 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -3148,8 +3148,11 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu)
    kvm_x86_ops->update_cr8_intercept(vcpu, tpr, max_irr);
    }

    -static void inject_irq(struct kvm_vcpu *vcpu)
    +static void inject_pending_irq(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    {
    + if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)
    + kvm_x86_ops->set_interrupt_shadow(vcpu, 0);
    +
    /* try to reinject previous events if any */
    if (vcpu->arch.nmi_injected) {
    kvm_x86_ops->set_nmi(vcpu);
    @@ -3177,26 +3180,11 @@ static void inject_irq(struct kvm_vcpu *vcpu)
    }
    }

    -static void inject_pending_irq(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    -{
    - bool req_int_win = !irqchip_in_kernel(vcpu->kvm) &&
    - kvm_run->request_interrupt_window;
    -
    - if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)
    - kvm_x86_ops->set_interrupt_shadow(vcpu, 0);
    -
    - inject_irq(vcpu);
    -
    - /* enable NMI/IRQ window open exits if needed */
    - if (vcpu->arch.nmi_pending)
    - kvm_x86_ops->enable_nmi_window(vcpu);
    - else if (kvm_cpu_has_interrupt(vcpu) || req_int_win)
    - kvm_x86_ops->enable_irq_window(vcpu);
    -}
    -
    static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    {
    int r;
    + bool req_int_win = !irqchip_in_kernel(vcpu->kvm) &&
    + kvm_run->request_interrupt_window;

    if (vcpu->requests)
    if (test_and_clear_bit(KVM_REQ_MMU_RELOAD, &vcpu->requests))
    @@ -3250,6 +3238,12 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    else
    inject_pending_irq(vcpu, kvm_run);

    + /* enable NMI/IRQ window open exits if needed */
    + if (vcpu->arch.nmi_pending)
    + kvm_x86_ops->enable_nmi_window(vcpu);
    + else if (kvm_cpu_has_interrupt(vcpu) || req_int_win)
    + kvm_x86_ops->enable_irq_window(vcpu);
    +
    if (kvm_lapic_enabled(vcpu)) {
    if (!vcpu->arch.apic->vapic_addr)
    update_cr8_intercept(vcpu);
    --
    1.6.0.6


    \
     
     \ /
      Last update: 2009-05-24 17:55    [W:0.022 / U:0.248 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site