[Xen-devel] [PATCH v2 2/2] xen/balloon: Enforce various limits on target

[Daniel Kiper <daniel.kiper@xxxxxxxxxx>]

This patch enforces on target limit statically defined in Linux Kernel
source and limit defined by hypervisor or host. This way the balloon
driver should not attempt to populate pages above given limits
because they may fail.

Particularly this patch fixes bug which led to flood
of dom0 kernel log with messages similar to:

System RAM resource [mem 0x1b8000000-0x1bfffffff] cannot be added
xen_balloon: reserve_additional_memory: add_memory() failed: -17

v2 - suggestions/fixes:
   - always use maximum reservation as a refernce
     (suggested by David Vrabel),
   - change logging level for dom0
     (suggested by Konrad Rzeszutek Wilk),
   - improve commit comment
     (suggested by David Vrabel).

Signed-off-by: Daniel Kiper <daniel.kiper@xxxxxxxxxx>
---
 drivers/xen/balloon.c |   40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 856661f..a3a8eaa 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -81,7 +81,6 @@ enum bp_state {
        BP_ECANCELED
 };
 
-
 static DEFINE_MUTEX(balloon_mutex);
 
 struct balloon_stats balloon_stats;
@@ -90,6 +89,12 @@ EXPORT_SYMBOL_GPL(balloon_stats);
 /* We increase/decrease in batches which fit in a page */
 static xen_pfn_t frame_list[PAGE_SIZE / sizeof(unsigned long)];
 
+/*
+ * Extra internal memory reserved by libxl.
+ * Check tools/libxl/libxl_memory.txt file in Xen source for more details.
+ */
+#define LIBXL_MAXMEM_CONSTANT_PAGES    (1024 * 1024 / PAGE_SIZE)
+
 #ifdef CONFIG_HIGHMEM
 #define inc_totalhigh_pages() (totalhigh_pages++)
 #define dec_totalhigh_pages() (totalhigh_pages--)
@@ -491,11 +496,42 @@ static void balloon_process(struct work_struct *work)
        mutex_unlock(&balloon_mutex);
 }
 
-/* Resets the Xen limit, sets new target, and kicks off processing. */
+/* Enforce limits, set new target and kick off processing. */
 void balloon_set_new_target(unsigned long target)
 {
+       domid_t domid = DOMID_SELF;
+       int rc;
+
+       /* Enforce statically defined limit. */
+       target = min(target, MAX_DOMAIN_PAGES);
+
+       rc = HYPERVISOR_memory_op(XENMEM_maximum_reservation, &domid);
+
+       if (xen_initial_domain()) {
+               if (rc <= 0) {
+                       pr_debug("xen_balloon: %s: Initial domain target limit "
+                                       "could not be established: %i\n",
+                                       __func__, rc);
+                       goto no_host_limit;
+               }
+       } else {
+               if (rc <= 0) {
+                       pr_info("xen_balloon: %s: Guest domain target limit "
+                               "could not be established: %i\n", __func__, rc);
+                       goto no_host_limit;
+               }
+
+               /* Do not take into account memory reserved for internal stuff. 
*/
+               rc -= LIBXL_MAXMEM_CONSTANT_PAGES;
+       }
+
+       /* Enforce hypervisor/host defined limit. */
+       target = min_t(unsigned long, target, rc);
+
+no_host_limit:
        /* No need for lock. Not read-modify-write updates. */
        balloon_stats.target_pages = target;
+
        schedule_delayed_work(&balloon_worker, 0);
 }
 EXPORT_SYMBOL_GPL(balloon_set_new_target);
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel