Sophie

Sophie

distrib > Mandriva > current > x86_64 > by-pkgid > d41cc2729f5f0fbbd2607b14a49457f3 > files > 25

kernel-xen-2.6.32.11-2mdv2010.1.src.rpm

From: ccoffing@novell.com
Subject: Expose min/max limits of domain ballooning
Patch-mainline: obsolete
References: 152667, 184727

jb: Also added this to the sysfs representation.

--- sle11sp1-2010-02-02.orig/drivers/xen/balloon/balloon.c	2010-02-02 14:56:27.000000000 +0100
+++ sle11sp1-2010-02-02/drivers/xen/balloon/balloon.c	2010-02-02 15:08:54.000000000 +0100
@@ -239,7 +239,7 @@ static unsigned long current_target(void
 	return target;
 }
 
-static unsigned long minimum_target(void)
+unsigned long balloon_minimum_target(void)
 {
 #ifndef CONFIG_XEN
 #define max_pfn num_physpages
@@ -461,7 +461,7 @@ static void balloon_process(struct work_
 void balloon_set_new_target(unsigned long target)
 {
 	/* No need for lock. Not read-modify-write updates. */
-	bs.target_pages = max(target, minimum_target());
+	bs.target_pages = max(target, balloon_minimum_target());
 	schedule_work(&balloon_worker);
 }
 
@@ -536,10 +536,13 @@ static int balloon_read(char *page, char
 		page,
 		"Current allocation: %8lu kB\n"
 		"Requested target:   %8lu kB\n"
+		"Minimum target:     %8lu kB\n"
+		"Maximum target:     %8lu kB\n"
 		"Low-mem balloon:    %8lu kB\n"
 		"High-mem balloon:   %8lu kB\n"
 		"Driver pages:       %8lu kB\n",
 		PAGES2KB(bs.current_pages), PAGES2KB(bs.target_pages), 
+		PAGES2KB(balloon_minimum_target()), PAGES2KB(num_physpages),
 		PAGES2KB(bs.balloon_low), PAGES2KB(bs.balloon_high),
 		PAGES2KB(bs.driver_pages));
 
--- sle11sp1-2010-02-02.orig/drivers/xen/balloon/common.h	2009-06-09 15:01:37.000000000 +0200
+++ sle11sp1-2010-02-02/drivers/xen/balloon/common.h	2009-08-19 10:36:49.000000000 +0200
@@ -52,5 +52,6 @@ int balloon_sysfs_init(void);
 void balloon_sysfs_exit(void);
 
 void balloon_set_new_target(unsigned long target);
+unsigned long balloon_minimum_target(void);
 
 #endif /* __XEN_BALLOON_COMMON_H__ */
--- sle11sp1-2010-02-02.orig/drivers/xen/balloon/sysfs.c	2009-11-06 10:51:55.000000000 +0100
+++ sle11sp1-2010-02-02/drivers/xen/balloon/sysfs.c	2009-08-19 10:36:47.000000000 +0200
@@ -31,6 +31,7 @@
 #include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/init.h>
+#include <linux/mm.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/sysdev.h>
@@ -53,6 +54,8 @@
 	static SYSDEV_ATTR(name, S_IRUGO, show_##name, NULL)
 
 BALLOON_SHOW(current_kb, "%lu\n", PAGES2KB(bs.current_pages));
+BALLOON_SHOW(min_kb, "%lu\n", PAGES2KB(balloon_minimum_target()));
+BALLOON_SHOW(max_kb, "%lu\n", PAGES2KB(num_physpages));
 BALLOON_SHOW(low_kb, "%lu\n", PAGES2KB(bs.balloon_low));
 BALLOON_SHOW(high_kb, "%lu\n", PAGES2KB(bs.balloon_high));
 BALLOON_SHOW(driver_kb, "%lu\n", PAGES2KB(bs.driver_pages));
@@ -123,6 +126,8 @@ static struct sysdev_attribute *balloon_
 
 static struct attribute *balloon_info_attrs[] = {
 	&attr_current_kb.attr,
+	&attr_min_kb.attr,
+	&attr_max_kb.attr,
 	&attr_low_kb.attr,
 	&attr_high_kb.attr,
 	&attr_driver_kb.attr,