Re: [PATCH v3 2/4] xen/balloon: make the balloon wait interruptible

2020-08-03 Thread Jürgen Groß

On 27.07.20 11:13, Roger Pau Monne wrote:

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

Signed-off-by: Roger Pau Monné 
Reviewed-by: Juergen Gross 
Cc: sta...@vger.kernel.org


Pushed to: xen/tip.git for-linus-5.9


Juergen


[PATCH v3 2/4] xen/balloon: make the balloon wait interruptible

2020-07-27 Thread Roger Pau Monne
So it can be killed, or else processes can get hung indefinitely
waiting for balloon pages.

Signed-off-by: Roger Pau Monné 
Reviewed-by: Juergen Gross 
Cc: sta...@vger.kernel.org
---
Cc: Boris Ostrovsky 
Cc: Juergen Gross 
Cc: Stefano Stabellini 
Cc: xen-de...@lists.xenproject.org
---
 drivers/xen/balloon.c | 6 --
 1 file 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(_mutex);
-   wait_event(balloon_wq,
+   rc = wait_event_interruptible(balloon_wq,
   !list_empty(_pages));
mutex_lock(_mutex);
-   return 0;
+   return rc ? -ENOMEM : 0;
}
}
 
-- 
2.27.0