diff options
| author | Roger Pau Monne <roger.pau@citrix.com> | 2020-07-27 11:13:40 +0200 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2020-08-03 08:15:09 +0200 |
| commit | 88a479ff6ef8af7f07e11593d58befc644244ff7 (patch) | |
| tree | c31c6ce26f10d49c9404f28545041bf99e052d39 /drivers/xen | |
| parent | xen/balloon: fix accounting in alloc_xenballooned_pages error path (diff) | |
| download | linux-88a479ff6ef8af7f07e11593d58befc644244ff7.tar.xz linux-88a479ff6ef8af7f07e11593d58befc644244ff7.zip | |
xen/balloon: make the balloon wait interruptible
So it can be killed, or else processes can get hung indefinitely
waiting for balloon pages.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200727091342.52325-3-roger.pau@citrix.com
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/balloon.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index 3cb10ed32557..292413b27575 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -568,11 +568,13 @@ static int add_ballooned_pages(int nr_pages) if (xen_hotplug_unpopulated) { st = reserve_additional_memory(); if (st != BP_ECANCELED) { + int rc; + mutex_unlock(&balloon_mutex); - wait_event(balloon_wq, + rc = wait_event_interruptible(balloon_wq, !list_empty(&ballooned_pages)); mutex_lock(&balloon_mutex); - return 0; + return rc ? -ENOMEM : 0; } } |