From patchwork Tue Aug 4 12:30:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 39104 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n74CUkRN007016 for ; Tue, 4 Aug 2009 12:30:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755409AbZHDMad (ORCPT ); Tue, 4 Aug 2009 08:30:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755406AbZHDMad (ORCPT ); Tue, 4 Aug 2009 08:30:33 -0400 Received: from mx2.redhat.com ([66.187.237.31]:57059 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755389AbZHDMab (ORCPT ); Tue, 4 Aug 2009 08:30:31 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n74CUWmt004942 for ; Tue, 4 Aug 2009 08:30:32 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n74CUVpa005790; Tue, 4 Aug 2009 08:30:31 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n74CUU68024176; Tue, 4 Aug 2009 08:30:30 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id E84BF18D467; Tue, 4 Aug 2009 15:30:29 +0300 (IDT) From: Gleb Natapov To: avi@redhat.com Cc: kvm@vger.kernel.org Subject: [PATCH 1/3] Call kvm_vcpu_kick() inside pic spinlock Date: Tue, 4 Aug 2009 15:30:27 +0300 Message-Id: <1249389029-12801-2-git-send-email-gleb@redhat.com> In-Reply-To: <1249389029-12801-1-git-send-email-gleb@redhat.com> References: <1249389029-12801-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 --- 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 */