diff options
| author | Juergen Gross <jgross@suse.com> | 2021-09-20 12:03:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-30 10:09:26 +0200 |
| commit | 3a0f951e37259309ad851e3d7491061d21657108 (patch) | |
| tree | df6bb1372b63f3ca52b48baf17e02942d4ad869a /drivers/xen | |
| parent | f80b6793811d79f5761d8c1315c09238e2ac295e (diff) | |
| download | linux-stable-3a0f951e37259309ad851e3d7491061d21657108.tar.gz linux-stable-3a0f951e37259309ad851e3d7491061d21657108.tar.bz2 linux-stable-3a0f951e37259309ad851e3d7491061d21657108.zip | |
xen/balloon: fix balloon kthread freezing
commit 96f5bd03e1be606987644b71899ea56a8d05f825 upstream.
Commit 8480ed9c2bbd56 ("xen/balloon: use a kernel thread instead a
workqueue") switched the Xen balloon driver to use a kernel thread.
Unfortunately the patch omitted to call try_to_freeze() or to use
wait_event_freezable_timeout(), causing a system suspend to fail.
Fixes: 8480ed9c2bbd56 ("xen/balloon: use a kernel thread instead a workqueue")
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Link: https://lore.kernel.org/r/20210920100345.21939-1-jgross@suse.com
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/balloon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index 2762d246991b..be31c296eed4 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -539,8 +539,8 @@ static int balloon_thread(void *unused) timeout = 3600 * HZ; credit = current_credit(); - wait_event_interruptible_timeout(balloon_thread_wq, - balloon_thread_cond(state, credit), timeout); + wait_event_freezable_timeout(balloon_thread_wq, + balloon_thread_cond(state, credit), timeout); if (kthread_should_stop()) return 0; |