OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lguest: fix lguest wake on guest clock tick, or fd activity

Browse Source 
The Launcher could be inside the Guest on another CPU; wake_up_process
will do nothing because it is "running".  kick_process will knock it
back into our kernel in this case, otherwise we'll miss it until the
next guest exit.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2009-06-12 22:27:01 -06:00
parent b43e352139
commit a6c372de6e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/lguest/interrupts_and_traps.c
View File

@ -511,9 +511,9 @@ static enum hrtimer_restart clockdev_fn(struct hrtimer *timer)
/* Remember the first interrupt is the timer interrupt. */
set_bit(0, cpu->irqs_pending);
/* If the Guest is actually stopped, we need to wake it up. */
if (cpu->halted)
wake_up_process(cpu->tsk);
/* Guest may be stopped or running on another CPU. */
if (!wake_up_process(cpu->tsk))
kick_process(cpu->tsk);
return HRTIMER_NORESTART;
}

4
drivers/lguest/lguest_user.c
View File

@ -24,8 +24,8 @@ static int break_guest_out(struct lg_cpu *cpu, const unsigned long __user*input)
if (on) {
cpu->break_out = 1;
/* Pop it out of the Guest (may be running on different CPU) */
wake_up_process(cpu->tsk);
if (!wake_up_process(cpu->tsk))
kick_process(cpu->tsk);
/* Wait for them to reset it */
return wait_event_interruptible(cpu->break_wq, !cpu->break_out);
} else {