public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] kvm: don't take vcpu mutex for obviously invalid vcpu ioctls
@ 2014-09-19 23:03 David Matlack
  2014-09-22 10:50 ` Paolo Bonzini
  2014-09-22 20:08 ` Marcelo Tosatti
  0 siblings, 2 replies; 16+ messages in thread
From: David Matlack @ 2014-09-19 23:03 UTC (permalink / raw)
  To: Gleb Natapov, Paolo Bonzini, kvm, linux-kernel; +Cc: David Matlack

vcpu ioctls can hang the calling thread if issued while a vcpu is
running. If we know ioctl is going to be rejected as invalid anyway,
we can fail before trying to take the vcpu mutex.

This patch does not change functionality, it just makes invalid ioctls
fail faster.

Signed-off-by: David Matlack <dmatlack@google.com>
---
 virt/kvm/kvm_main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 96ec622..f9234e5 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -52,6 +52,7 @@
 
 #include <asm/processor.h>
 #include <asm/io.h>
+#include <asm/ioctl.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 
@@ -1975,6 +1976,9 @@ static long kvm_vcpu_ioctl(struct file *filp,
 	if (vcpu->kvm->mm != current->mm)
 		return -EIO;
 
+	if (unlikely(_IOC_TYPE(ioctl) != KVMIO))
+		return -EINVAL;
+
 #if defined(CONFIG_S390) || defined(CONFIG_PPC) || defined(CONFIG_MIPS)
 	/*
 	 * Special cases: vcpu ioctls that are asynchronous to vcpu execution,
-- 
2.1.0.rc2.206.gedb03e5

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2014-09-23  8:23 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-19 23:03 [PATCH] kvm: don't take vcpu mutex for obviously invalid vcpu ioctls David Matlack
2014-09-22 10:50 ` Paolo Bonzini
2014-09-22 13:45   ` Christian Borntraeger
2014-09-22 14:31     ` Paolo Bonzini
2014-09-22 18:35       ` David Matlack
2014-09-22 19:20       ` Christian Borntraeger
2014-09-22 19:29         ` Paolo Bonzini
2014-09-23  6:49           ` Gleb Natapov
2014-09-23  8:06             ` Christian Borntraeger
2014-09-23  8:23               ` Paolo Bonzini
2014-09-22 19:40         ` David Matlack
2014-09-22 20:08 ` Marcelo Tosatti
2014-09-22 21:29   ` Paolo Bonzini
2014-09-22 23:00     ` Marcelo Tosatti
2014-09-22 22:58   ` David Matlack
2014-09-23  0:13     ` Marcelo Tosatti

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox