From: Michael S. Tsirkin Date: Thu, 17 Mar 2011 08:53:33 +0000 (+0200) Subject: KVM: fix crash on irqfd deassign X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9e02fb963352c5ad075d80dd3e852fbee9585575;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git 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 Reported-by: Jean-Philippe Menil Tested-by: Jean-Philippe Menil Signed-off-by: Avi Kivity --- diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 3656849f78a0..0d1fd5160adf 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