[aws][PATCH] UBUNTU: [Config] AWS: CONFIG_XEN_BALLOON=n

[Dan Streetman]

BugLink: http://bugs.launchpad.net/bugs/1668129

Disable XEN_BALLOON, as ballooning is not used by AWS and it causes
problems when the guest uses the memory in the balloon region; e.g.
for DMA with a hypervisor-provided NVMe device, because the hypervisor
is not expecting DMA to/from the physical pages in the ballooned region.

Signed-off-by: Dan Streetman <dan.streetman at canonical.com>
---
 debian.master/config/amd64/config.common.amd64 | 1 -
 debian.master/config/annotations               | 8 +++-----
 debian.master/config/config.common.ubuntu      | 5 +----
 debian.master/config/i386/config.common.i386   | 1 -
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index e309fcb..d2574f7 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -462,7 +462,6 @@ CONFIG_X25=m
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_XEN=y
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_XILLYBUS=m
 CONFIG_XZ_DEC_ARM=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f9ace85..61b5352 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7114,11 +7114,9 @@ CONFIG_XEN_SYMS                                 policy<{'amd64': 'y', 'i386': 'y
 CONFIG_XEN_ACPI_PROCESSOR                       mark<ENFORCED> <boot essential on XEN host>
 
 # Menu: Device Drivers >> Xen driver support >> Xen memory balloon driver
-CONFIG_XEN_BALLOON                              policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}>
-CONFIG_XEN_SELFBALLOONING                       policy<{'amd64': 'y', 'i386': 'y'}>
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG               policy<{'amd64': 'y', 'i386': 'y'}>
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT         policy<{'amd64': '512', 'i386': '4'}>
-CONFIG_XEN_SCRUB_PAGES                          policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}>
+CONFIG_XEN_BALLOON                              policy<{'amd64': 'n', 'arm64': 'n', 'i386': 'n'}>
+#
+CONFIG_XEN_BALLOON                              note<LP:#1668129>
 
 # Menu: Dump support
 #
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 21922c6..8861327 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -9018,8 +9018,7 @@ CONFIG_XEN_ACPI=y
 CONFIG_XEN_ACPI_PROCESSOR=y
 CONFIG_XEN_AUTO_XLATE=y
 CONFIG_XEN_BACKEND=y
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
+# CONFIG_XEN_BALLOON is not set
 CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_COMPAT_XENFS=y
@@ -9041,10 +9040,8 @@ CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_PVH=y
 CONFIG_XEN_PVHVM=y
 CONFIG_XEN_SAVE_RESTORE=y
-CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_SCSI_BACKEND=m
 CONFIG_XEN_SCSI_FRONTEND=m
-CONFIG_XEN_SELFBALLOONING=y
 CONFIG_XEN_SYMS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_XEN_TMEM=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index a8bff36..6ed1c5e 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -458,7 +458,6 @@ CONFIG_X25=m
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_XEN=y
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=4
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_XILLYBUS=m
 CONFIG_XZ_DEC_ARM=y
-- 
2.9.3