35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 8e9355d5afb3055cd77fae7015d3aa1fc6cecc10 Mon Sep 17 00:00:00 2001
|
|
From: David Vrabel <david.vrabel@citrix.com>
|
|
Date: Mon, 1 Sep 2014 18:52:44 +0100
|
|
Subject: [PATCH] xen/balloon: cancel ballooning if adding new memory failed
|
|
Origin: https://git.kernel.org/linus/3dcf63677d4eb7fdfc13290c8558c301d2588fe8
|
|
|
|
If the balloon driver is adding additional memory regions to the
|
|
balloon and add_memory() fails it will likely continuously fail so
|
|
cancel the balloon operation.
|
|
|
|
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
drivers/xen/balloon.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
|
|
index 5c660c7..1e0a317 100644
|
|
--- a/drivers/xen/balloon.c
|
|
+++ b/drivers/xen/balloon.c
|
|
@@ -230,8 +230,8 @@ static enum bp_state reserve_additional_memory(long credit)
|
|
rc = add_memory(nid, hotplug_start_paddr, balloon_hotplug << PAGE_SHIFT);
|
|
|
|
if (rc) {
|
|
- pr_info("%s: add_memory() failed: %i\n", __func__, rc);
|
|
- return BP_EAGAIN;
|
|
+ pr_warn("Cannot add additional memory (%i)\n", rc);
|
|
+ return BP_ECANCELED;
|
|
}
|
|
|
|
balloon_hotplug -= credit;
|
|
--
|
|
1.7.10.4
|
|
|