Skip to content

Commit

Permalink
xen: explicitly create/destroy stop_machine workqueues outside suspen…
Browse files Browse the repository at this point in the history
…d/resume region.

I have observed cases where the implicit stop_machine_destroy() done by
stop_machine() hangs while destroying the workqueues, specifically in
kthread_stop(). This seems to be because timer ticks are not restarted
until after stop_machine() returns.

Fortunately stop_machine provides a facility to pre-create/post-destroy
the workqueues so use this to ensure that workqueues are only destroyed
after everything is really up and running again.

I only actually observed this failure with 2.6.30. It seems that newer
kernels are somehow more robust against doing kthread_stop() without timer
interrupts (I tried some backports of some likely looking candidates but
did not track down the commit which added this robustness). However this
change seems like a reasonable belt&braces thing to do.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Stable Kernel <stable@kernel.org>
  • Loading branch information
Ian Campbell authored and Jeremy Fitzhardinge committed Dec 3, 2009
1 parent 65f6338 commit b4606f2
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion drivers/xen/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,20 @@ static void do_suspend(void)

shutting_down = SHUTDOWN_SUSPEND;

err = stop_machine_create();
if (err) {
printk(KERN_ERR "xen suspend: failed to setup stop_machine %d\n", err);
goto out;
}

#ifdef CONFIG_PREEMPT
/* If the kernel is preemptible, we need to freeze all the processes
to prevent them from being in the middle of a pagetable update
during suspend. */
err = freeze_processes();
if (err) {
printk(KERN_ERR "xen suspend: freeze failed %d\n", err);
goto out;
goto out_destroy_sm;
}
#endif

Expand Down Expand Up @@ -129,7 +135,11 @@ static void do_suspend(void)
out_thaw:
#ifdef CONFIG_PREEMPT
thaw_processes();

out_destroy_sm:
#endif
stop_machine_destroy();

out:
shutting_down = SHUTDOWN_INVALID;
}
Expand Down

0 comments on commit b4606f2

Please sign in to comment.