Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 195 insertions, 0 deletions

diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
new file mode 100644
index 000000000000..462ee9a84e76
--- /dev/null
+++ b/arch/s390/appldata/appldata_mem.c
@@ -0,0 +1,195 @@
+/*
+ * arch/s390/appldata/appldata_mem.c
+ *
+ * Data gathering module for Linux-VM Monitor Stream, Stage 1.
+ * Collects data related to memory management.
+ *
+ * Copyright (C) 2003 IBM Corporation, IBM Deutschland Entwicklung GmbH.
+ *
+ * Author: Gerald Schaefer <geraldsc@de.ibm.com>
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/kernel_stat.h>
+#include <asm/io.h>
+#include <linux/pagemap.h>
+#include <linux/swap.h>
+
+#include "appldata.h"
+
+
+#define MY_PRINT_NAME "appldata_mem"            /* for debug messages, etc. */
+#define P2K(x) ((x) << (PAGE_SHIFT - 10))       /* Converts #Pages to KB */
+
+/*
+ * Memory data
+ *
+ * This is accessed as binary data by z/VM. If changes to it can't be avoided,
+ * the structure version (product ID, see appldata_base.c) needs to be changed
+ * as well and all documentation and z/VM applications using it must be
+ * updated.
+ *
+ * The record layout is documented in the Linux for zSeries Device Drivers
+ * book:
+ * http://oss.software.ibm.com/developerworks/opensource/linux390/index.shtml
+ */
+struct appldata_mem_data {
+        u64 timestamp;
+        u32 sync_count_1;       /* after VM collected the record data, */
+        u32 sync_count_2;       /* sync_count_1 and sync_count_2 should be the
+                                   same. If not, the record has been updated on
+                                   the Linux side while VM was collecting the
+                                   (possibly corrupt) data */
+
+        u64 pgpgin;             /* data read from disk  */
+        u64 pgpgout;            /* data written to disk */
+        u64 pswpin;             /* pages swapped in  */
+        u64 pswpout;            /* pages swapped out */
+
+        u64 sharedram;          /* sharedram is currently set to 0 */
+
+        u64 totalram;           /* total main memory size */
+        u64 freeram;            /* free main memory size  */
+        u64 totalhigh;          /* total high memory size */
+        u64 freehigh;           /* free high memory size  */
+
+        u64 bufferram;          /* memory reserved for buffers, free cache */
+        u64 cached;             /* size of (used) cache, w/o buffers */
+        u64 totalswap;          /* total swap space size */
+        u64 freeswap;           /* free swap space */
+
+// New in 2.6 -->
+        u64 pgalloc;            /* page allocations */
+        u64 pgfault;            /* page faults (major+minor) */
+        u64 pgmajfault;         /* page faults (major only) */
+// <-- New in 2.6
+
+} appldata_mem_data;
+
+
+static inline void appldata_debug_print(struct appldata_mem_data *mem_data)
+{
+        P_DEBUG("--- MEM - RECORD ---\n");
+        P_DEBUG("pgpgin     = %8lu KB\n", mem_data->pgpgin);
+        P_DEBUG("pgpgout    = %8lu KB\n", mem_data->pgpgout);
+        P_DEBUG("pswpin     = %8lu Pages\n", mem_data->pswpin);
+        P_DEBUG("pswpout    = %8lu Pages\n", mem_data->pswpout);
+        P_DEBUG("pgalloc    = %8lu \n", mem_data->pgalloc);
+        P_DEBUG("pgfault    = %8lu \n", mem_data->pgfault);
+        P_DEBUG("pgmajfault = %8lu \n", mem_data->pgmajfault);
+        P_DEBUG("sharedram  = %8lu KB\n", mem_data->sharedram);
+        P_DEBUG("totalram   = %8lu KB\n", mem_data->totalram);
+        P_DEBUG("freeram    = %8lu KB\n", mem_data->freeram);
+        P_DEBUG("totalhigh  = %8lu KB\n", mem_data->totalhigh);
+        P_DEBUG("freehigh   = %8lu KB\n", mem_data->freehigh);
+        P_DEBUG("bufferram  = %8lu KB\n", mem_data->bufferram);
+        P_DEBUG("cached     = %8lu KB\n", mem_data->cached);
+        P_DEBUG("totalswap  = %8lu KB\n", mem_data->totalswap);
+        P_DEBUG("freeswap   = %8lu KB\n", mem_data->freeswap);
+        P_DEBUG("sync_count_1 = %u\n", mem_data->sync_count_1);
+        P_DEBUG("sync_count_2 = %u\n", mem_data->sync_count_2);
+        P_DEBUG("timestamp    = %lX\n", mem_data->timestamp);
+}
+
+/*
+ * appldata_get_mem_data()
+ *
+ * gather memory data
+ */
+static void appldata_get_mem_data(void *data)
+{
+        /*
+         * don't put large structures on the stack, we are
+         * serialized through the appldata_ops_lock and can use static
+         */
+        static struct sysinfo val;
+        static struct page_state ps;
+        struct appldata_mem_data *mem_data;
+
+        mem_data = data;
+        mem_data->sync_count_1++;
+
+        get_full_page_state(&ps);
+        mem_data->pgpgin     = ps.pgpgin >> 1;
+        mem_data->pgpgout    = ps.pgpgout >> 1;
+        mem_data->pswpin     = ps.pswpin;
+        mem_data->pswpout    = ps.pswpout;
+        mem_data->pgalloc    = ps.pgalloc_high + ps.pgalloc_normal +
+                               ps.pgalloc_dma;
+        mem_data->pgfault    = ps.pgfault;
+        mem_data->pgmajfault = ps.pgmajfault;
+
+        si_meminfo(&val);
+        mem_data->sharedram = val.sharedram;
+        mem_data->totalram  = P2K(val.totalram);
+        mem_data->freeram   = P2K(val.freeram);
+        mem_data->totalhigh = P2K(val.totalhigh);
+        mem_data->freehigh  = P2K(val.freehigh);
+        mem_data->bufferram = P2K(val.bufferram);
+        mem_data->cached    = P2K(atomic_read(&nr_pagecache) - val.bufferram);
+
+        si_swapinfo(&val);
+        mem_data->totalswap = P2K(val.totalswap);
+        mem_data->freeswap  = P2K(val.freeswap);
+
+        mem_data->timestamp = get_clock();
+        mem_data->sync_count_2++;
+#ifdef APPLDATA_DEBUG
+        appldata_debug_print(mem_data);
+#endif
+}
+
+
+static struct appldata_ops ops = {
+        .ctl_nr    = CTL_APPLDATA_MEM,
+        .name      = "mem",
+        .record_nr = APPLDATA_RECORD_MEM_ID,
+        .size      = sizeof(struct appldata_mem_data),
+        .callback  = &appldata_get_mem_data,
+        .data      = &appldata_mem_data,
+        .owner     = THIS_MODULE,
+};
+
+
+/*
+ * appldata_mem_init()
+ *
+ * init_data, register ops
+ */
+static int __init appldata_mem_init(void)
+{
+        int rc;
+
+        P_DEBUG("sizeof(mem) = %lu\n", sizeof(struct appldata_mem_data));
+
+        rc = appldata_register_ops(&ops);
+        if (rc != 0) {
+                P_ERROR("Error registering ops, rc = %i\n", rc);
+        } else {
+                P_DEBUG("%s-ops registered!\n", ops.name);
+        }
+        return rc;
+}
+
+/*
+ * appldata_mem_exit()
+ *
+ * unregister ops
+ */
+static void __exit appldata_mem_exit(void)
+{
+        appldata_unregister_ops(&ops);
+        P_DEBUG("%s-ops unregistered!\n", ops.name);
+}
+
+
+module_init(appldata_mem_init);
+module_exit(appldata_mem_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Gerald Schaefer");
+MODULE_DESCRIPTION("Linux-VM Monitor Stream, MEMORY statistics");