[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090618174421.24119.86566.stgit@dev.haskins.net>
Date: Thu, 18 Jun 2009 13:44:21 -0400
From: Gregory Haskins <ghaskins@...ell.com>
To: kvm@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, davidel@...ilserver.org,
mingo@...e.hu, mst@...hat.com, avi@...hat.com,
paulmck@...ux.vnet.ibm.com, rusty@...tcorp.com.au
Subject: [KVM PATCH 2/4] KVM: fix irqfd error checking
Michael Tsirkin pointed out that f_ops->poll() does not return a standard
"int" error, yet we are treating it as such. Lets fix this.
Reported-by: Michael S. Tsirkin <mst@...hat.com>
Signed-off-by: Gregory Haskins <ghaskins@...ell.com>
---
virt/kvm/eventfd.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index a0e329f..a9e7de7 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -144,6 +144,7 @@ kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags)
struct _irqfd *irqfd;
struct file *file = NULL;
int ret;
+ unsigned int events;
irqfd = kzalloc(sizeof(*irqfd), GFP_KERNEL);
if (!irqfd)
@@ -169,9 +170,7 @@ kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags)
init_waitqueue_func_entry(&irqfd->wait, irqfd_wakeup);
init_poll_funcptr(&irqfd->pt, irqfd_ptable_queue_proc);
- ret = file->f_op->poll(file, &irqfd->pt);
- if (ret < 0)
- goto fail;
+ events = file->f_op->poll(file, &irqfd->pt);
kvm_get_kvm(kvm);
@@ -180,6 +179,12 @@ kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags)
mutex_unlock(&kvm->lock);
/*
+ * Check if there was an event already queued
+ */
+ if (events & POLLIN)
+ schedule_work(&irqfd->inject);
+
+ /*
* do not drop the file until the irqfd is fully initialized, otherwise
* we might race against the POLLHUP
*/
@@ -188,9 +193,6 @@ kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags)
return 0;
fail:
- if (irqfd->wqh)
- remove_wait_queue(irqfd->wqh, &irqfd->wait);
-
if (file && !IS_ERR(file))
fput(file);
--
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