9 files changed, 494 insertions, 59 deletions

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 1bbb9108f31e..c0c490ea7d1b 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -51,3 +51,13 @@ config XEN_COMPAT_XENFS
          a xen platform.
          If in doubt, say yes.
 
+config XEN_SYS_HYPERVISOR
+       bool "Create xen entries under /sys/hypervisor"
+       depends on XEN && SYSFS
+       select SYS_HYPERVISOR
+       default y
+       help
+         Create entries under /sys/hypervisor describing the Xen
+         hypervisor environment.  When running native or in another
+         virtual environment, /sys/hypervisor will still be present,
+         but will have no xen contents.
\ No newline at end of file
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 1567639847e7..ec2a39b1e26f 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_XEN_XENCOMM)	+= xencomm.o
 obj-$(CONFIG_XEN_BALLOON)       += balloon.o
 obj-$(CONFIG_XEN_DEV_EVTCHN)    += evtchn.o
 obj-$(CONFIG_XENFS)             += xenfs/
+obj-$(CONFIG_XEN_SYS_HYPERVISOR)        += sys-hypervisor.o
\ No newline at end of file
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index b703dd2c9f11..5269bb4d2496 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -104,9 +104,8 @@ static void do_suspend(void)
                 goto out;
         }
 
-        printk("suspending xenbus...\n");
-        /* XXX use normal device tree? */
-        xenbus_suspend();
+        printk(KERN_DEBUG "suspending xenstore...\n");
+        xs_suspend();
 
         err = stop_machine(xen_suspend, &cancelled, cpumask_of(0));
         if (err) {
@@ -116,9 +115,9 @@ static void do_suspend(void)
 
         if (!cancelled) {
                 xen_arch_resume();
-                xenbus_resume();
+                xs_resume();
         } else
-                xenbus_suspend_cancel();
+                xs_suspend_cancel();
 
         device_resume(PMSG_RESUME);
 
diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c
new file mode 100644
index 000000000000..88a60e03ccf0
--- /dev/null
+++ b/drivers/xen/sys-hypervisor.c
@@ -0,0 +1,445 @@
+/*
+ *  copyright (c) 2006 IBM Corporation
+ *  Authored by: Mike D. Day <ncmike@us.ibm.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/kobject.h>
+
+#include <asm/xen/hypervisor.h>
+#include <asm/xen/hypercall.h>
+
+#include <xen/xenbus.h>
+#include <xen/interface/xen.h>
+#include <xen/interface/version.h>
+
+#define HYPERVISOR_ATTR_RO(_name) \
+static struct hyp_sysfs_attr  _name##_attr = __ATTR_RO(_name)
+
+#define HYPERVISOR_ATTR_RW(_name) \
+static struct hyp_sysfs_attr _name##_attr = \
+        __ATTR(_name, 0644, _name##_show, _name##_store)
+
+struct hyp_sysfs_attr {
+        struct attribute attr;
+        ssize_t (*show)(struct hyp_sysfs_attr *, char *);
+        ssize_t (*store)(struct hyp_sysfs_attr *, const char *, size_t);
+        void *hyp_attr_data;
+};
+
+static ssize_t type_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        return sprintf(buffer, "xen\n");
+}
+
+HYPERVISOR_ATTR_RO(type);
+
+static int __init xen_sysfs_type_init(void)
+{
+        return sysfs_create_file(hypervisor_kobj, &type_attr.attr);
+}
+
+static void xen_sysfs_type_destroy(void)
+{
+        sysfs_remove_file(hypervisor_kobj, &type_attr.attr);
+}
+
+/* xen version attributes */
+static ssize_t major_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        int version = HYPERVISOR_xen_version(XENVER_version, NULL);
+        if (version)
+                return sprintf(buffer, "%d\n", version >> 16);
+        return -ENODEV;
+}
+
+HYPERVISOR_ATTR_RO(major);
+
+static ssize_t minor_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        int version = HYPERVISOR_xen_version(XENVER_version, NULL);
+        if (version)
+                return sprintf(buffer, "%d\n", version & 0xff);
+        return -ENODEV;
+}
+
+HYPERVISOR_ATTR_RO(minor);
+
+static ssize_t extra_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        int ret = -ENOMEM;
+        char *extra;
+
+        extra = kmalloc(XEN_EXTRAVERSION_LEN, GFP_KERNEL);
+        if (extra) {
+                ret = HYPERVISOR_xen_version(XENVER_extraversion, extra);
+                if (!ret)
+                        ret = sprintf(buffer, "%s\n", extra);
+                kfree(extra);
+        }
+
+        return ret;
+}
+
+HYPERVISOR_ATTR_RO(extra);
+
+static struct attribute *version_attrs[] = {
+        &major_attr.attr,
+        &minor_attr.attr,
+        &extra_attr.attr,
+        NULL
+};
+
+static struct attribute_group version_group = {
+        .name = "version",
+        .attrs = version_attrs,
+};
+
+static int __init xen_sysfs_version_init(void)
+{
+        return sysfs_create_group(hypervisor_kobj, &version_group);
+}
+
+static void xen_sysfs_version_destroy(void)
+{
+        sysfs_remove_group(hypervisor_kobj, &version_group);
+}
+
+/* UUID */
+
+static ssize_t uuid_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        char *vm, *val;
+        int ret;
+        extern int xenstored_ready;
+
+        if (!xenstored_ready)
+                return -EBUSY;
+
+        vm = xenbus_read(XBT_NIL, "vm", "", NULL);
+        if (IS_ERR(vm))
+                return PTR_ERR(vm);
+        val = xenbus_read(XBT_NIL, vm, "uuid", NULL);
+        kfree(vm);
+        if (IS_ERR(val))
+                return PTR_ERR(val);
+        ret = sprintf(buffer, "%s\n", val);
+        kfree(val);
+        return ret;
+}
+
+HYPERVISOR_ATTR_RO(uuid);
+
+static int __init xen_sysfs_uuid_init(void)
+{
+        return sysfs_create_file(hypervisor_kobj, &uuid_attr.attr);
+}
+
+static void xen_sysfs_uuid_destroy(void)
+{
+        sysfs_remove_file(hypervisor_kobj, &uuid_attr.attr);
+}
+
+/* xen compilation attributes */
+
+static ssize_t compiler_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        int ret = -ENOMEM;
+        struct xen_compile_info *info;
+
+        info = kmalloc(sizeof(struct xen_compile_info), GFP_KERNEL);
+        if (info) {
+                ret = HYPERVISOR_xen_version(XENVER_compile_info, info);
+                if (!ret)
+                        ret = sprintf(buffer, "%s\n", info->compiler);
+                kfree(info);
+        }
+
+        return ret;
+}
+
+HYPERVISOR_ATTR_RO(compiler);
+
+static ssize_t compiled_by_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        int ret = -ENOMEM;
+        struct xen_compile_info *info;
+
+        info = kmalloc(sizeof(struct xen_compile_info), GFP_KERNEL);
+        if (info) {
+                ret = HYPERVISOR_xen_version(XENVER_compile_info, info);
+                if (!ret)
+                        ret = sprintf(buffer, "%s\n", info->compile_by);
+                kfree(info);
+        }
+
+        return ret;
+}
+
+HYPERVISOR_ATTR_RO(compiled_by);
+
+static ssize_t compile_date_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        int ret = -ENOMEM;
+        struct xen_compile_info *info;
+
+        info = kmalloc(sizeof(struct xen_compile_info), GFP_KERNEL);
+        if (info) {
+                ret = HYPERVISOR_xen_version(XENVER_compile_info, info);
+                if (!ret)
+                        ret = sprintf(buffer, "%s\n", info->compile_date);
+                kfree(info);
+        }
+
+        return ret;
+}
+
+HYPERVISOR_ATTR_RO(compile_date);
+
+static struct attribute *xen_compile_attrs[] = {
+        &compiler_attr.attr,
+        &compiled_by_attr.attr,
+        &compile_date_attr.attr,
+        NULL
+};
+
+static struct attribute_group xen_compilation_group = {
+        .name = "compilation",
+        .attrs = xen_compile_attrs,
+};
+
+int __init static xen_compilation_init(void)
+{
+        return sysfs_create_group(hypervisor_kobj, &xen_compilation_group);
+}
+
+static void xen_compilation_destroy(void)
+{
+        sysfs_remove_group(hypervisor_kobj, &xen_compilation_group);
+}
+
+/* xen properties info */
+
+static ssize_t capabilities_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        int ret = -ENOMEM;
+        char *caps;
+
+        caps = kmalloc(XEN_CAPABILITIES_INFO_LEN, GFP_KERNEL);
+        if (caps) {
+                ret = HYPERVISOR_xen_version(XENVER_capabilities, caps);
+                if (!ret)
+                        ret = sprintf(buffer, "%s\n", caps);
+                kfree(caps);
+        }
+
+        return ret;
+}
+
+HYPERVISOR_ATTR_RO(capabilities);
+
+static ssize_t changeset_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        int ret = -ENOMEM;
+        char *cset;
+
+        cset = kmalloc(XEN_CHANGESET_INFO_LEN, GFP_KERNEL);
+        if (cset) {
+                ret = HYPERVISOR_xen_version(XENVER_changeset, cset);
+                if (!ret)
+                        ret = sprintf(buffer, "%s\n", cset);
+                kfree(cset);
+        }
+
+        return ret;
+}
+
+HYPERVISOR_ATTR_RO(changeset);
+
+static ssize_t virtual_start_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        int ret = -ENOMEM;
+        struct xen_platform_parameters *parms;
+
+        parms = kmalloc(sizeof(struct xen_platform_parameters), GFP_KERNEL);
+        if (parms) {
+                ret = HYPERVISOR_xen_version(XENVER_platform_parameters,
+                                             parms);
+                if (!ret)
+                        ret = sprintf(buffer, "%lx\n", parms->virt_start);
+                kfree(parms);
+        }
+
+        return ret;
+}
+
+HYPERVISOR_ATTR_RO(virtual_start);
+
+static ssize_t pagesize_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        int ret;
+
+        ret = HYPERVISOR_xen_version(XENVER_pagesize, NULL);
+        if (ret > 0)
+                ret = sprintf(buffer, "%x\n", ret);
+
+        return ret;
+}
+
+HYPERVISOR_ATTR_RO(pagesize);
+
+static ssize_t xen_feature_show(int index, char *buffer)
+{
+        ssize_t ret;
+        struct xen_feature_info info;
+
+        info.submap_idx = index;
+        ret = HYPERVISOR_xen_version(XENVER_get_features, &info);
+        if (!ret)
+                ret = sprintf(buffer, "%08x", info.submap);
+
+        return ret;
+}
+
+static ssize_t features_show(struct hyp_sysfs_attr *attr, char *buffer)
+{
+        ssize_t len;
+        int i;
+
+        len = 0;
+        for (i = XENFEAT_NR_SUBMAPS-1; i >= 0; i--) {
+                int ret = xen_feature_show(i, buffer + len);
+                if (ret < 0) {
+                        if (len == 0)
+                                len = ret;
+                        break;
+                }
+                len += ret;
+        }
+        if (len > 0)
+                buffer[len++] = '\n';
+
+        return len;
+}
+
+HYPERVISOR_ATTR_RO(features);
+
+static struct attribute *xen_properties_attrs[] = {
+        &capabilities_attr.attr,
+        &changeset_attr.attr,
+        &virtual_start_attr.attr,
+        &pagesize_attr.attr,
+        &features_attr.attr,
+        NULL
+};
+
+static struct attribute_group xen_properties_group = {
+        .name = "properties",
+        .attrs = xen_properties_attrs,
+};
+
+static int __init xen_properties_init(void)
+{
+        return sysfs_create_group(hypervisor_kobj, &xen_properties_group);
+}
+
+static void xen_properties_destroy(void)
+{
+        sysfs_remove_group(hypervisor_kobj, &xen_properties_group);
+}
+
+static int __init hyper_sysfs_init(void)
+{
+        int ret;
+
+        if (!xen_domain())
+                return -ENODEV;
+
+        ret = xen_sysfs_type_init();
+        if (ret)
+                goto out;
+        ret = xen_sysfs_version_init();
+        if (ret)
+                goto version_out;
+        ret = xen_compilation_init();
+        if (ret)
+                goto comp_out;
+        ret = xen_sysfs_uuid_init();
+        if (ret)
+                goto uuid_out;
+        ret = xen_properties_init();
+        if (ret)
+                goto prop_out;
+
+        goto out;
+
+prop_out:
+        xen_sysfs_uuid_destroy();
+uuid_out:
+        xen_compilation_destroy();
+comp_out:
+        xen_sysfs_version_destroy();
+version_out:
+        xen_sysfs_type_destroy();
+out:
+        return ret;
+}
+
+static void __exit hyper_sysfs_exit(void)
+{
+        xen_properties_destroy();
+        xen_compilation_destroy();
+        xen_sysfs_uuid_destroy();
+        xen_sysfs_version_destroy();
+        xen_sysfs_type_destroy();
+
+}
+module_init(hyper_sysfs_init);
+module_exit(hyper_sysfs_exit);
+
+static ssize_t hyp_sysfs_show(struct kobject *kobj,
+                              struct attribute *attr,
+                              char *buffer)
+{
+        struct hyp_sysfs_attr *hyp_attr;
+        hyp_attr = container_of(attr, struct hyp_sysfs_attr, attr);
+        if (hyp_attr->show)
+                return hyp_attr->show(hyp_attr, buffer);
+        return 0;
+}
+
+static ssize_t hyp_sysfs_store(struct kobject *kobj,
+                               struct attribute *attr,
+                               const char *buffer,
+                               size_t len)
+{
+        struct hyp_sysfs_attr *hyp_attr;
+        hyp_attr = container_of(attr, struct hyp_sysfs_attr, attr);
+        if (hyp_attr->store)
+                return hyp_attr->store(hyp_attr, buffer, len);
+        return 0;
+}
+
+static struct sysfs_ops hyp_sysfs_ops = {
+        .show = hyp_sysfs_show,
+        .store = hyp_sysfs_store,
+};
+
+static struct kobj_type hyp_sysfs_kobj_type = {
+        .sysfs_ops = &hyp_sysfs_ops,
+};
+
+static int __init hypervisor_subsys_init(void)
+{
+        if (!xen_domain())
+                return -ENODEV;
+
+        hypervisor_kobj->ktype = &hyp_sysfs_kobj_type;
+        return 0;
+}
+device_initcall(hypervisor_subsys_init);
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 773d1cf23283..d42e25d5968d 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -71,6 +71,9 @@ static int xenbus_probe_frontend(const char *type, const char *name);
 
 static void xenbus_dev_shutdown(struct device *_dev);
 
+static int xenbus_dev_suspend(struct device *dev, pm_message_t state);
+static int xenbus_dev_resume(struct device *dev);
+
 /* If something in array of ids matches this device, return it. */
 static const struct xenbus_device_id *
 match_device(const struct xenbus_device_id *arr, struct xenbus_device *dev)
@@ -188,6 +191,9 @@ static struct xen_bus_type xenbus_frontend = {
                 .remove    = xenbus_dev_remove,
                 .shutdown  = xenbus_dev_shutdown,
                 .dev_attrs = xenbus_dev_attrs,
+
+                .suspend   = xenbus_dev_suspend,
+                .resume    = xenbus_dev_resume,
         },
 };
 
@@ -654,6 +660,7 @@ void xenbus_dev_changed(const char *node, struct xen_bus_type *bus)
 
         kfree(root);
 }
+EXPORT_SYMBOL_GPL(xenbus_dev_changed);
 
 static void frontend_changed(struct xenbus_watch *watch,
                              const char **vec, unsigned int len)
@@ -669,7 +676,7 @@ static struct xenbus_watch fe_watch = {
         .callback = frontend_changed,
 };
 
-static int suspend_dev(struct device *dev, void *data)
+static int xenbus_dev_suspend(struct device *dev, pm_message_t state)
 {
         int err = 0;
         struct xenbus_driver *drv;
@@ -682,35 +689,14 @@ static int suspend_dev(struct device *dev, void *data)
         drv = to_xenbus_driver(dev->driver);
         xdev = container_of(dev, struct xenbus_device, dev);
         if (drv->suspend)
-                err = drv->suspend(xdev);
+                err = drv->suspend(xdev, state);
         if (err)
                 printk(KERN_WARNING
                        "xenbus: suspend %s failed: %i\n", dev_name(dev), err);
         return 0;
 }
 
-static int suspend_cancel_dev(struct device *dev, void *data)
-{
-        int err = 0;
-        struct xenbus_driver *drv;
-        struct xenbus_device *xdev;
-
-        DPRINTK("");
-
-        if (dev->driver == NULL)
-                return 0;
-        drv = to_xenbus_driver(dev->driver);
-        xdev = container_of(dev, struct xenbus_device, dev);
-        if (drv->suspend_cancel)
-                err = drv->suspend_cancel(xdev);
-        if (err)
-                printk(KERN_WARNING
-                       "xenbus: suspend_cancel %s failed: %i\n",
-                       dev_name(dev), err);
-        return 0;
-}
-
-static int resume_dev(struct device *dev, void *data)
+static int xenbus_dev_resume(struct device *dev)
 {
         int err;
         struct xenbus_driver *drv;
@@ -755,33 +741,6 @@ static int resume_dev(struct device *dev, void *data)
         return 0;
 }
 
-void xenbus_suspend(void)
-{
-        DPRINTK("");
-
-        bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, suspend_dev);
-        xenbus_backend_suspend(suspend_dev);
-        xs_suspend();
-}
-EXPORT_SYMBOL_GPL(xenbus_suspend);
-
-void xenbus_resume(void)
-{
-        xb_init_comms();
-        xs_resume();
-        bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, resume_dev);
-        xenbus_backend_resume(resume_dev);
-}
-EXPORT_SYMBOL_GPL(xenbus_resume);
-
-void xenbus_suspend_cancel(void)
-{
-        xs_suspend_cancel();
-        bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, suspend_cancel_dev);
-        xenbus_backend_resume(suspend_cancel_dev);
-}
-EXPORT_SYMBOL_GPL(xenbus_suspend_cancel);
-
 /* A flag to determine if xenstored is 'ready' (i.e. has started) */
 int xenstored_ready = 0;
 
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
index e325eab4724d..eab33f1dbdf7 100644
--- a/drivers/xen/xenbus/xenbus_xs.c
+++ b/drivers/xen/xenbus/xenbus_xs.c
@@ -673,6 +673,8 @@ void xs_resume(void)
         struct xenbus_watch *watch;
         char token[sizeof(watch) * 2 + 1];
 
+        xb_init_comms();
+
         mutex_unlock(&xs_state.response_mutex);
         mutex_unlock(&xs_state.request_mutex);
         up_write(&xs_state.transaction_mutex);
diff --git a/drivers/xen/xenfs/super.c b/drivers/xen/xenfs/super.c
index 515741a8e6b8..6559e0c752ce 100644
--- a/drivers/xen/xenfs/super.c
+++ b/drivers/xen/xenfs/super.c
@@ -20,10 +20,27 @@
 MODULE_DESCRIPTION("Xen filesystem");
 MODULE_LICENSE("GPL");
 
+static ssize_t capabilities_read(struct file *file, char __user *buf,
+                                 size_t size, loff_t *off)
+{
+        char *tmp = "";
+
+        if (xen_initial_domain())
+                tmp = "control_d\n";
+
+        return simple_read_from_buffer(buf, size, off, tmp, strlen(tmp));
+}
+
+static const struct file_operations capabilities_file_ops = {
+        .read = capabilities_read,
+};
+
 static int xenfs_fill_super(struct super_block *sb, void *data, int silent)
 {
         static struct tree_descr xenfs_files[] = {
-                [2] = {"xenbus", &xenbus_file_ops, S_IRUSR|S_IWUSR},
+                [1] = {},
+                { "xenbus", &xenbus_file_ops, S_IRUSR|S_IWUSR },
+                { "capabilities", &capabilities_file_ops, S_IRUGO },
                 {""},
         };
 
diff --git a/include/xen/interface/version.h b/include/xen/interface/version.h
index 453235e923f0..e8b6519d47e9 100644
--- a/include/xen/interface/version.h
+++ b/include/xen/interface/version.h
@@ -57,4 +57,7 @@ struct xen_feature_info {
 /* Declares the features reported by XENVER_get_features. */
 #include "features.h"
 
+/* arg == NULL; returns host memory page size. */
+#define XENVER_pagesize 7
+
 #endif /* __XEN_PUBLIC_VERSION_H__ */
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
index f87f9614844d..b9763badbd77 100644
--- a/include/xen/xenbus.h
+++ b/include/xen/xenbus.h
@@ -91,8 +91,7 @@ struct xenbus_driver {
         void (*otherend_changed)(struct xenbus_device *dev,
                                  enum xenbus_state backend_state);
         int (*remove)(struct xenbus_device *dev);
-        int (*suspend)(struct xenbus_device *dev);
-        int (*suspend_cancel)(struct xenbus_device *dev);
+        int (*suspend)(struct xenbus_device *dev, pm_message_t state);
         int (*resume)(struct xenbus_device *dev);
         int (*uevent)(struct xenbus_device *, char **, int, char *, int);
         struct device_driver driver;