renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
Code

KVM: Call ack notifiers from PIC when guest OS acks an IRQ.

Browse Source 
Currently they are called when irq vector is been delivered.  Calling ack
notifiers at this point is wrong.  Device assignment ack notifier enables
host interrupts, but guest not yet had a chance to clear interrupt
condition in a device.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Gleb Natapov 2009-08-04 15:30:28 +03:00 committed by Avi Kivity
parent 956f97cf66
commit 938396a234
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/x86/kvm/i8259.c
View File

@ -41,25 +41,16 @@ static void pic_lock(struct kvm_pic *s)
static void pic_unlock(struct kvm_pic *s) static void pic_unlock(struct kvm_pic *s)
__releases(&s->lock) __releases(&s->lock)
{ {
struct kvm *kvm = s->kvm;
unsigned acks = s->pending_acks;
struct kvm_vcpu *vcpu;
s->pending_acks = 0;
spin_unlock(&s->lock); spin_unlock(&s->lock);
while (acks) {
kvm_notify_acked_irq(kvm, SELECT_PIC(__ffs(acks)),
__ffs(acks));
acks &= acks - 1;
}
} }
static void pic_clear_isr(struct kvm_kpic_state *s, int irq) static void pic_clear_isr(struct kvm_kpic_state *s, int irq)
{ {
s->isr &= ~(1 << irq); s->isr &= ~(1 << irq);
s->isr_ack |= (1 << irq); s->isr_ack |= (1 << irq);
if (s != &s->pics_state->pics[0])
irq += 8;
kvm_notify_acked_irq(s->pics_state->kvm, SELECT_PIC(irq), irq);
} }
void kvm_pic_clear_isr_ack(struct kvm *kvm) void kvm_pic_clear_isr_ack(struct kvm *kvm)
@ -240,7 +231,6 @@ int kvm_pic_read_irq(struct kvm *kvm)
} }
pic_update_irq(s); pic_update_irq(s);
pic_unlock(s); pic_unlock(s);
kvm_notify_acked_irq(kvm, SELECT_PIC(irq), irq);
return intno; return intno;
} }
@ -260,7 +250,7 @@ void kvm_pic_reset(struct kvm_kpic_state *s)
if (vcpu0 && kvm_apic_accept_pic_intr(vcpu0)) if (vcpu0 && kvm_apic_accept_pic_intr(vcpu0))
if (s->irr & (1 << irq) || s->isr & (1 << irq)) { if (s->irr & (1 << irq) || s->isr & (1 << irq)) {
n = irq + irqbase; n = irq + irqbase;
s->pics_state->pending_acks |= 1 << n; kvm_notify_acked_irq(kvm, SELECT_PIC(n), n);
} }
} }
s->last_irr = 0; s->last_irr = 0;