lkml.org 
[lkml]   [2009]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/47] KVM: Call kvm_vcpu_kick() inside pic spinlock
    Date
    From: Gleb Natapov <gleb@redhat.com>

    d5ecfdd25 moved it out because back than it was impossible to
    call it inside spinlock. This restriction no longer exists.

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

    diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c
    index daf4606..d27320c 100644
    --- a/arch/x86/kvm/i8259.c
    +++ b/arch/x86/kvm/i8259.c
    @@ -43,11 +43,9 @@ static void pic_unlock(struct kvm_pic *s)
    {
    struct kvm *kvm = s->kvm;
    unsigned acks = s->pending_acks;
    - bool wakeup = s->wakeup_needed;
    struct kvm_vcpu *vcpu;

    s->pending_acks = 0;
    - s->wakeup_needed = false;

    spin_unlock(&s->lock);

    @@ -56,12 +54,6 @@ static void pic_unlock(struct kvm_pic *s)
    __ffs(acks));
    acks &= acks - 1;
    }
    -
    - if (wakeup) {
    - vcpu = s->kvm->bsp_vcpu;
    - if (vcpu)
    - kvm_vcpu_kick(vcpu);
    - }
    }

    static void pic_clear_isr(struct kvm_kpic_state *s, int irq)
    @@ -527,7 +519,7 @@ static void pic_irq_request(void *opaque, int level)
    s->output = level;
    if (vcpu && level && (s->pics[0].isr_ack & (1 << irq))) {
    s->pics[0].isr_ack &= ~(1 << irq);
    - s->wakeup_needed = true;
    + kvm_vcpu_kick(vcpu);
    }
    }

    diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
    index 9f59318..7d6058a 100644
    --- a/arch/x86/kvm/irq.h
    +++ b/arch/x86/kvm/irq.h
    @@ -63,7 +63,6 @@ struct kvm_kpic_state {

    struct kvm_pic {
    spinlock_t lock;
    - bool wakeup_needed;
    unsigned pending_acks;
    struct kvm *kvm;
    struct kvm_kpic_state pics[2]; /* 0 is master pic, 1 is slave pic */
    --
    1.6.4.1


    \
     
     \ /
      Last update: 2009-08-26 12:57    [W:5.912 / U:0.456 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site