diff options
| author | Michal Hocko <mhocko@suse.cz> | 2011-09-27 02:56:03 -0400 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-10-26 20:26:18 -0400 |
| commit | 0acf00014bcfd71090c3b0d43c98e970108064e4 (patch) | |
| tree | fcd5be7a9def49cd31cdd23c4ddafe4bd0e48ac9 | |
| parent | 89cfc99177c9270c5c6d429f6c5177ab3428ad57 (diff) | |
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.c | 14 |
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) | |||
| 232 | } | 232 | } |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | /* | ||
| 236 | * All long-lived kernel loops need to check with this horrible | ||
| 237 | * thing called the freezer. If the Host is trying to suspend, | ||
| 238 | * it stops us. | ||
| 239 | */ | ||
| 240 | try_to_freeze(); | ||
| 241 | |||
| 235 | /* Check for signals */ | 242 | /* Check for signals */ |
| 236 | if (signal_pending(current)) | 243 | if (signal_pending(current)) |
| 237 | return -ERESTARTSYS; | 244 | return -ERESTARTSYS; |
| @@ -246,13 +253,6 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user) | |||
| 246 | try_deliver_interrupt(cpu, irq, more); | 253 | try_deliver_interrupt(cpu, irq, more); |
| 247 | 254 | ||
| 248 | /* | 255 | /* |
| 249 | * All long-lived kernel loops need to check with this horrible | ||
| 250 | * thing called the freezer. If the Host is trying to suspend, | ||
| 251 | * it stops us. | ||
| 252 | */ | ||
| 253 | try_to_freeze(); | ||
| 254 | |||
| 255 | /* | ||
| 256 | * Just make absolutely sure the Guest is still alive. One of | 256 | * Just make absolutely sure the Guest is still alive. One of |
| 257 | * those hypercalls could have been fatal, for example. | 257 | * those hypercalls could have been fatal, for example. |
| 258 | */ | 258 | */ |
