xen: make sysfs files behave as their names suggest
PATCH 1/1 xen: make sysfs files behave as their names suggest
1: make "target_kb" only accept and produce a memory size in kilobytes. 2: add a second "target" file which produces output in bytes, and will accept
memparse input (scaled bytes)
This fixes the rather irritating problem that writing the same value read back into target_kb would end up shrinking the domain by a factor of 1024, with generally bad results.
---drivers/xen/balloon.c | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
===================================================================
drivers/xen/balloon.c +0 -0
@@ -586,7 +586,7 @@
if (!capable(CAP_SYS_ADMIN)) return -EPERM;
- target_bytes = memparse(buf, &endchar);
+ target_bytes = simple_strtoull(buf, &endchar, 0) * 1024;
balloon_set_new_target(target_bytes >> PAGE_SHIFT);
@@ -596,8 +596,39 @@
static SYSDEV_ATTR(target_kb, S_IRUGO | S_IWUSR,
show_target_kb, store_target_kb);
+
+static ssize_t show_target(struct sys_device *dev, struct sysdev_attribute *attr,
+ char *buf)
+{
+ return sprintf(buf, "%llu\n",
+ (u64)balloon_stats.target_pages << PAGE_SHIFT);
+}
+
+static ssize_t store_target(struct sys_device *dev,
+ struct sysdev_attribute *attr, + const char *buf, + size_t count)
+{
+ char *endchar;
+ unsigned long long target_bytes;
+
+ if (!capable(CAP_SYS_ADMIN))
+ return -EPERM;
+
+ target_bytes = memparse(buf, &endchar);
+
+ balloon_set_new_target(target_bytes >> PAGE_SHIFT);
+
+ return count;
+}
+
+static SYSDEV_ATTR(target, S_IRUGO | S_IWUSR,
+ show_target, store_target);
+
+
static struct sysdev_attribute *balloon_attrs[] = {
&attr_target_kb,
+ &attr_target,
};
static struct attribute *balloon_info_attrs[] = {
Quoted 7 lines · Jeremy Fitzhardinge
1: make "
target_kb" only accept and produce a memory size in kilobytes. 2: add a second "target" file which produces output in bytes, and will accept
memparse input (scaled bytes)This fixes the rather irritating problem that writing the same value read back into
target_kbwould end up shrinking the domain by a factor of 1024, with generally bad results.
Are there any compatibility issues that we should care about related to this change?
Signature · 3 lines
Simon Horman VA Linux Systems Japan K.K., Sydney, Australia Satellite Office H: www.vergenet.net/~horms/ W: www.valinux.co.jp/en
Quoted 6 lines · Simon Horman
Quoted 4 lines · Jeremy Fitzhardinge
1: make "
target_kb" only accept and produce a memory size in kilobytes. 2: add a second "target" file which produces output in bytes, and will accept
memparse input (scaled bytes)
Quoted 8 lines
Quoted 4 lines
This fixes the rather irritating problem that writing the same value read back into
target_kbwould end up shrinking the domain by a factor of 1024, with generally bad results.Are there any compatibility issues that we should care about related to this change?
Well, in theory, but not in practice I think.
It changes the behaviour of target_kb from accepting bytes into kilobytes, and it no longer parses a k/m/g suffix. The old behaviour was a definite bug, given the name of the file, so I consider this to be pure bugfix. The kernel introducing this interface has only been out for a week or two, so I don't think there's much chance anyone has started relying on the buggy behaviour.
J
Quoted 16 lines · Jeremy Fitzhardinge
Quoted 6 lines · Simon Horman
Quoted 4 lines · Jeremy Fitzhardinge
1: make "
target_kb" only accept and produce a memory size in kilobytes. 2: add a second "target" file which produces output in bytes, and will accept
memparse input (scaled bytes)Quoted 8 lines
Quoted 4 lines
This fixes the rather irritating problem that writing the same value read back into
target_kbwould end up shrinking the domain by a factor of 1024, with generally bad results.Are there any compatibility issues that we should care about related to this change?
Quoted 8 lines
Well, in theory, but not in practice I think.
It changes the behaviour of
target_kbfrom accepting bytes into kilobytes, and it no longer parses a k/m/g suffix. The old behaviour was a definite bug, given the name of the file, so I consider this to be pure bugfix. The kernel introducing this interface has only been out for a week or two, so I don't think there's much chance anyone has started relying on the buggy behaviour.
Thanks for the clarification. I have no objections.
Signature · 3 lines
Simon Horman VA Linux Systems Japan K.K., Sydney, Australia Satellite Office H: www.vergenet.net/~horms/ W: www.valinux.co.jp/en
Ingo Molnar
AppliedQuoted 4 lines · Jeremy Fitzhardinge
1: make "
target_kb" only accept and produce a memory size in kilobytes. 2: add a second "target" file which produces output in bytes, and will accept
memparse input (scaled bytes)
Quoted 8 lines
This fixes the rather irritating problem that writing the same value read back into
target_kbwould end up shrinking the domain by a factor of 1024, with generally bad results.Signed-off-by Jeremy Fitzhardinge <[email protected]>---
drivers/xen/balloon.c| 33 ++++++++++++++++++++++++++++++++-1 file changed, 32 insertions(+), 1 deletion(-)
applied to tip/x86/urgent, thanks Jeremy!
Ingo