From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH 2/3] KVM: Use kvm_free_assigned_irq() for free irq Date: Tue, 30 Dec 2008 12:28:21 +0200 Message-ID: <4959F7C5.101@redhat.com> References: <1230616173-17723-1-git-send-email-sheng@linux.intel.com> <1230616173-17723-3-git-send-email-sheng@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Sheng Yang Return-path: Received: from mx2.redhat.com ([66.187.237.31]:44579 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751497AbYL3K2Y (ORCPT ); Tue, 30 Dec 2008 05:28:24 -0500 In-Reply-To: <1230616173-17723-3-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: Sheng Yang wrote: > Which is more convenient... > > Signed-off-by: Sheng Yang > --- > virt/kvm/kvm_main.c | 10 ++-------- > 1 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index ffd261d..cd84b3e 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -284,11 +284,7 @@ static int assigned_device_update_intx(struct kvm *kvm, > return 0; > > if (irqchip_in_kernel(kvm)) { > - if (!msi2intx && > - adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI) { > - free_irq(adev->host_irq, (void *)kvm); > - pci_disable_msi(adev->dev); > - } > + kvm_free_assigned_irq(kvm, adev); > This will call cancel_work_sync(), which may wait upon kvm->lock, which I think we hold here -> deadlock. I think that the current code has even bigger problems (races), since a scheduled work can arrive after the interrupt has been freed and reallocated. -- error compiling committee.c: too many arguments to function