summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.cz>2011-09-27 08:56:03 +0200
committerRusty Russell <rusty@rustcorp.com.au>2011-10-27 02:26:18 +0200
commit0acf00014bcfd71090c3b0d43c98e970108064e4 (patch)
treefcd5be7a9def49cd31cdd23c4ddafe4bd0e48ac9
parentlguest: don't allow KVM-detection cpuid. (diff)
downloadlinux-0acf00014bcfd71090c3b0d43c98e970108064e4.tar.xz
linux-0acf00014bcfd71090c3b0d43c98e970108064e4.zip
lguest: move process freezing before pending signals check
run_guest tries to freeze the current process after it has handled pending interrupts and before it calls lguest_arch_run_guest. This doesn't work nicely if the task has been killed while being frozen and when we want to handle that signal as soon as possible. Let's move try_to_freeze before we check for pending signal so that we can get out of the loop as soon as possible. Signed-off-by: Michal Hocko <mhocko@suse.cz> Acked-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--drivers/lguest/core.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
index 5c13e93898f9..b5fdcb78a75b 100644
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
@@ -232,6 +232,13 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user)
}
}
+ /*
+ * All long-lived kernel loops need to check with this horrible
+ * thing called the freezer. If the Host is trying to suspend,
+ * it stops us.
+ */
+ try_to_freeze();
+
/* Check for signals */
if (signal_pending(current))
return -ERESTARTSYS;
@@ -246,13 +253,6 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user)
try_deliver_interrupt(cpu, irq, more);
/*
- * All long-lived kernel loops need to check with this horrible
- * thing called the freezer. If the Host is trying to suspend,
- * it stops us.
- */
- try_to_freeze();
-
- /*
* Just make absolutely sure the Guest is still alive. One of
* those hypercalls could have been fatal, for example.
*/