[xen] cancel ballooning if adding new memory failed (Closes: #776448)
svn path=/dists/sid/linux/; revision=22305
This commit is contained in:
parent
4f4c93c29b
commit
3392dfe657
|
@ -1,9 +1,13 @@
|
||||||
linux (3.16.7-ckt4-3) UNRELEASED; urgency=medium
|
linux (3.16.7-ckt4-3) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
|
[ Ben Hutchings ]
|
||||||
* [sh4] ftrace: Remove -m32 option from recordmcount.pl (Closes: #775611)
|
* [sh4] ftrace: Remove -m32 option from recordmcount.pl (Closes: #775611)
|
||||||
* [x86] Revert "KVM: Fix of previously incomplete fix for CVE-2014-8480"
|
* [x86] Revert "KVM: Fix of previously incomplete fix for CVE-2014-8480"
|
||||||
as that issue does not affect 3.16
|
as that issue does not affect 3.16
|
||||||
|
|
||||||
|
[ Ian Campbell ]
|
||||||
|
* [xen] cancel ballooning if adding new memory failed (Closes: #776448)
|
||||||
|
|
||||||
-- Ben Hutchings <ben@decadent.org.uk> Wed, 28 Jan 2015 17:52:39 +0000
|
-- Ben Hutchings <ben@decadent.org.uk> Wed, 28 Jan 2015 17:52:39 +0000
|
||||||
|
|
||||||
linux (3.16.7-ckt4-2) unstable; urgency=medium
|
linux (3.16.7-ckt4-2) unstable; urgency=medium
|
||||||
|
|
34
debian/patches/bugfix/all/xen-balloon-cancel-ballooning-if-adding-new-memory-f.patch
vendored
Normal file
34
debian/patches/bugfix/all/xen-balloon-cancel-ballooning-if-adding-new-memory-f.patch
vendored
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
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
|
||||||
|
|
|
@ -153,6 +153,7 @@ bugfix/all/xen-netback-support-frontends-without-feature-rx-not.patch
|
||||||
bugfix/all/aufs-move-d_rcu-from-overlapping-d_child-to-overlapping-d.patch
|
bugfix/all/aufs-move-d_rcu-from-overlapping-d_child-to-overlapping-d.patch
|
||||||
bugfix/all/net-mv643xx-disable-tso-by-default.patch
|
bugfix/all/net-mv643xx-disable-tso-by-default.patch
|
||||||
bugfix/all/Revert-swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unma.patch
|
bugfix/all/Revert-swiotlb-xen-pass-dev_addr-to-swiotlb_tbl_unma.patch
|
||||||
|
bugfix/all/xen-balloon-cancel-ballooning-if-adding-new-memory-f.patch
|
||||||
|
|
||||||
# memfd_create() & kdbus backport
|
# memfd_create() & kdbus backport
|
||||||
features/all/kdbus/mm-allow-drivers-to-prevent-new-writable-mappings.patch
|
features/all/kdbus/mm-allow-drivers-to-prevent-new-writable-mappings.patch
|
||||||
|
|
Loading…
Reference in New Issue