2010-07-07 11:12:45 +00:00
|
|
|
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.
|
|
|
|
|
|
2011-04-19 20:09:59 +00:00
|
|
|
--- head-2010-11-25.orig/drivers/xen/balloon/balloon.c 2010-11-25 11:55:54.000000000 +0100
|
|
|
|
|
+++ head-2010-11-25/drivers/xen/balloon/balloon.c 2010-11-25 13:47:01.000000000 +0100
|
|
|
|
|
@@ -236,7 +236,7 @@ static unsigned long current_target(void
|
2010-07-07 11:12:45 +00:00
|
|
|
return target;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-static unsigned long minimum_target(void)
|
|
|
|
|
+unsigned long balloon_minimum_target(void)
|
|
|
|
|
{
|
|
|
|
|
#ifndef CONFIG_XEN
|
|
|
|
|
#define max_pfn num_physpages
|
2011-04-19 20:09:59 +00:00
|
|
|
@@ -458,7 +458,7 @@ static void balloon_process(struct work_
|
2010-07-07 11:12:45 +00:00
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
2011-04-19 20:09:59 +00:00
|
|
|
@@ -533,10 +533,13 @@ static int balloon_read(char *page, char
|
2010-07-07 11:12:45 +00:00
|
|
|
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));
|
|
|
|
|
|
2011-04-19 20:09:59 +00:00
|
|
|
--- head-2010-11-25.orig/drivers/xen/balloon/common.h 2009-06-09 15:01:37.000000000 +0200
|
|
|
|
|
+++ head-2010-11-25/drivers/xen/balloon/common.h 2009-08-19 10:36:49.000000000 +0200
|
2010-07-07 11:12:45 +00:00
|
|
|
@@ -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__ */
|
2011-04-19 20:09:59 +00:00
|
|
|
--- head-2010-11-25.orig/drivers/xen/balloon/sysfs.c 2010-11-22 13:06:57.000000000 +0100
|
|
|
|
|
+++ head-2010-11-25/drivers/xen/balloon/sysfs.c 2009-08-19 10:36:47.000000000 +0200
|
2010-07-07 11:12:45 +00:00
|
|
|
@@ -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,
|
