Merge branch 'xen-tmem-selfballoon-v8' of git://git.kernel.org/pub/scm/linux/kernel...

* 'xen-tmem-selfballoon-v8' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem:
  xen: tmem: self-ballooning and frontswap-selfshrinking

diff --combined drivers/xen/Kconfig
index be8732c321858bca07ec3df06f4bb95ce9bd3a59,fd3266696a4d52ba357d5738bfb77f56d145d1fb..5014c6dcbdfaa11659893a977465ee811c44e12b
--- 1/drivers/xen/Kconfig
--- 2/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -8,6 -8,23 +8,23 @@@ config XEN_BALLOO
          The balloon driver allows the Xen domain to request more memory from
          the system to expand the domain's memory allocation, or alternatively
          return unneeded memory to the system.
+ 
+ config XEN_SELFBALLOONING
+       bool "Dynamically self-balloon kernel memory to target"
+       depends on XEN && XEN_BALLOON && CLEANCACHE && SWAP
+       default n
+       help
+         Self-ballooning dynamically balloons available kernel memory driven
+         by the current usage of anonymous memory ("committed AS") and
+         controlled by various sysfs-settable parameters.  Configuring
+         FRONTSWAP is highly recommended; if it is not configured, self-
+         ballooning is disabled by default but can be enabled with the
+         'selfballooning' kernel boot parameter.  If FRONTSWAP is configured,
+         frontswap-selfshrinking is enabled by default but can be disabled
+         with the 'noselfshrink' kernel boot parameter; and self-ballooning
+         is enabled by default but can be disabled with the 'noselfballooning'
+         kernel boot parameter.  Note that systems without a sufficiently
+         large swap device should not enable self-ballooning.
  
  config XEN_SCRUB_PAGES
        bool "Scrub pages before returning them to system"
@@@ -105,11 -122,4 +122,11 @@@ config SWIOTLB_XE
        depends on PCI
        select SWIOTLB
  
 +config XEN_TMEM
 +      bool
 +      default y if (CLEANCACHE || FRONTSWAP)
 +      help
 +        Shim to interface in-kernel Transcendent Memory hooks
 +        (e.g. cleancache and frontswap) to Xen tmem hypercalls.
 +
  endmenu

diff --combined drivers/xen/Makefile
index 7c1bc0a4d9f459b6131e248fbb59ce707cfd6d7e,458057464dd1261d71f4f9ac97cbe0d8fc206260..bc3bf5679f6e38fa7281f5461e7e54468b8982e0
--- 1/drivers/xen/Makefile
--- 2/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -1,5 -1,6 +1,5 @@@
  obj-y += grant-table.o features.o events.o manage.o balloon.o
  obj-y += xenbus/
 -obj-y += tmem.o
  
  nostackp := $(call cc-option, -fno-stack-protector)
  CFLAGS_features.o                     := $(nostackp)
@@@ -8,13 -9,13 +8,14 @@@ obj-$(CONFIG_BLOCK)                   += biomerge.
  obj-$(CONFIG_HOTPLUG_CPU)             += cpu_hotplug.o
  obj-$(CONFIG_XEN_XENCOMM)             += xencomm.o
  obj-$(CONFIG_XEN_BALLOON)             += xen-balloon.o
+ obj-$(CONFIG_XEN_SELFBALLOONING)      += xen-selfballoon.o
  obj-$(CONFIG_XEN_DEV_EVTCHN)          += xen-evtchn.o
  obj-$(CONFIG_XEN_GNTDEV)              += xen-gntdev.o
  obj-$(CONFIG_XEN_GRANT_DEV_ALLOC)     += xen-gntalloc.o
  obj-$(CONFIG_XENFS)                   += xenfs/
  obj-$(CONFIG_XEN_SYS_HYPERVISOR)      += sys-hypervisor.o
  obj-$(CONFIG_XEN_PLATFORM_PCI)                += xen-platform-pci.o
 +obj-$(CONFIG_XEN_TMEM)                        += tmem.o
  obj-$(CONFIG_SWIOTLB_XEN)             += swiotlb-xen.o
  obj-$(CONFIG_XEN_DOM0)                        += pci.o