Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e41ac0b authored by Roger Pau Monne's avatar Roger Pau Monne Committed by Greg Kroah-Hartman
Browse files

xen/balloon: make the balloon wait interruptible 



commit 88a479ff6ef8af7f07e11593d58befc644244ff7 upstream.

So it can be killed, or else processes can get hung indefinitely
waiting for balloon pages.

Signed-off-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
Reviewed-by: default avatarJuergen 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: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ee4c180d

drivers/xen/balloon.c

+4 −2
Original line number Diff line number Diff line
@@ -570,11 +570,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;

		}

	}