diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2010-01-13 11:58:09 -0500 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-01-25 09:26:37 -0500 |
commit | f1d1c309f35e9b0fb961cffd70fbd04f450ec47c (patch) | |
tree | b616c8bcd1d453c8dc4fcc5b927cc4a4f8a7e207 /virt | |
parent | 82b7005f0e72d8d1a8226e4c192cbb0850d10b3f (diff) |
KVM: only allow one gsi per fd
Looks like repeatedly binding same fd to multiple gsi's with irqfd can
use up a ton of kernel memory for irqfd structures.
A simple fix is to allow each fd to only trigger one gsi: triggering a
storm of interrupts in guest is likely useless anyway, and we can do it
by binding a single gsi to many interrupts if we really want to.
Cc: stable@kernel.org
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Acked-by: Gregory Haskins <ghaskins@novell.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/eventfd.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 30f70fd511c4..62e4cd947a90 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c | |||
@@ -166,7 +166,7 @@ irqfd_ptable_queue_proc(struct file *file, wait_queue_head_t *wqh, | |||
166 | static int | 166 | static int |
167 | kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi) | 167 | kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi) |
168 | { | 168 | { |
169 | struct _irqfd *irqfd; | 169 | struct _irqfd *irqfd, *tmp; |
170 | struct file *file = NULL; | 170 | struct file *file = NULL; |
171 | struct eventfd_ctx *eventfd = NULL; | 171 | struct eventfd_ctx *eventfd = NULL; |
172 | int ret; | 172 | int ret; |
@@ -203,9 +203,20 @@ kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi) | |||
203 | init_waitqueue_func_entry(&irqfd->wait, irqfd_wakeup); | 203 | init_waitqueue_func_entry(&irqfd->wait, irqfd_wakeup); |
204 | init_poll_funcptr(&irqfd->pt, irqfd_ptable_queue_proc); | 204 | init_poll_funcptr(&irqfd->pt, irqfd_ptable_queue_proc); |
205 | 205 | ||
206 | spin_lock_irq(&kvm->irqfds.lock); | ||
207 | |||
208 | ret = 0; | ||
209 | list_for_each_entry(tmp, &kvm->irqfds.items, list) { | ||
210 | if (irqfd->eventfd != tmp->eventfd) | ||
211 | continue; | ||
212 | /* This fd is used for another irq already. */ | ||
213 | ret = -EBUSY; | ||
214 | spin_unlock_irq(&kvm->irqfds.lock); | ||
215 | goto fail; | ||
216 | } | ||
217 | |||
206 | events = file->f_op->poll(file, &irqfd->pt); | 218 | events = file->f_op->poll(file, &irqfd->pt); |
207 | 219 | ||
208 | spin_lock_irq(&kvm->irqfds.lock); | ||
209 | list_add_tail(&irqfd->list, &kvm->irqfds.items); | 220 | list_add_tail(&irqfd->list, &kvm->irqfds.items); |
210 | spin_unlock_irq(&kvm->irqfds.lock); | 221 | spin_unlock_irq(&kvm->irqfds.lock); |
211 | 222 | ||