[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110317085333.GA7336@redhat.com>
Date: Thu, 17 Mar 2011 10:53:33 +0200
From: "Michael S. Tsirkin" <mst@...hat.com>
To: Avi Kivity <avi@...hat.com>, Marcelo Tosatti <mtosatti@...hat.com>,
kvm@...r.kernel.org, linux-kernel@...r.kernel.org,
jean-philippe.menil@...v-nantes.fr, stable@...nel.org
Cc: Jason Wang <jasowang@...hat.com>
Subject: [PATCH] kvm: fix crash on irqfd deassign
irqfd in kvm used flush_work incorrectly:
it assumed that work scheduled previously can't run
after flush_work, but since kvm uses a non-reentrant
workqueue (by means of schedule_work)
we need flush_work_sync to get that guarantee.
Signed-off-by: Michael S. Tsirkin <mst@...hat.com>
Reported-by: Jean-Philippe Menil <jean-philippe.menil@...v-nantes.fr>
Tested-by: Jean-Philippe Menil <jean-philippe.menil@...v-nantes.fr>
---
Note: this is needed for kernel 2.6.39 and earlier.
virt/kvm/eventfd.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 2ca4535..cdf51c9 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -90,7 +90,7 @@ irqfd_shutdown(struct work_struct *work)
* We know no new events will be scheduled at this point, so block
* until all previously outstanding events have completed
*/
- flush_work(&irqfd->inject);
+ flush_work_sync(&irqfd->inject);
/*
* It is now safe to release the object's resources
--
1.7.3.2.91.g446ac
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists