diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-03-17 04:53:33 -0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-04-06 06:15:55 -0400 |
| commit | 9e02fb963352c5ad075d80dd3e852fbee9585575 (patch) | |
| tree | d88553e3c2bb6affac29b529ce618eed95b8e918 /virt/kvm | |
| parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) | |
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@redhat.com>
Reported-by: Jean-Philippe Menil <jean-philippe.menil@univ-nantes.fr>
Tested-by: Jean-Philippe Menil <jean-philippe.menil@univ-nantes.fr>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt/kvm')
| -rw-r--r-- | 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 3656849f78a0..0d1fd5160adf 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c | |||
| @@ -90,7 +90,7 @@ irqfd_shutdown(struct work_struct *work) | |||
| 90 | * We know no new events will be scheduled at this point, so block | 90 | * We know no new events will be scheduled at this point, so block |
| 91 | * until all previously outstanding events have completed | 91 | * until all previously outstanding events have completed |
| 92 | */ | 92 | */ |
| 93 | flush_work(&irqfd->inject); | 93 | flush_work_sync(&irqfd->inject); |
| 94 | 94 | ||
| 95 | /* | 95 | /* |
| 96 | * It is now safe to release the object's resources | 96 | * It is now safe to release the object's resources |