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_net_sum.c b/arch/s390/appldata/appldata_net_sum.c
new file mode 100644
index 000000000000..dd61638d3027
--- /dev/null
+++ b/arch/s390/appldata/appldata_net_sum.c
@@ -0,0 +1,195 @@
+/*
+ * arch/s390/appldata/appldata_net_sum.c
+ *
+ * Data gathering module for Linux-VM Monitor Stream, Stage 1.
+ * Collects accumulated network statistics (Packets received/transmitted,
+ * dropped, errors, ...).
+ *
+ * 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 <linux/netdevice.h>
+
+#include "appldata.h"
+
+
+#define MY_PRINT_NAME   "appldata_net_sum"      /* for debug messages, etc. */
+
+
+/*
+ * Network 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_net_sum_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 */
+
+        u32 nr_interfaces;      /* nr. of network interfaces being monitored */
+
+        u32 padding;            /* next value is 64-bit aligned, so these */
+                                /* 4 byte would be padded out by compiler */
+
+        u64 rx_packets;         /* total packets received        */
+        u64 tx_packets;         /* total packets transmitted     */
+        u64 rx_bytes;           /* total bytes received          */
+        u64 tx_bytes;           /* total bytes transmitted       */
+        u64 rx_errors;          /* bad packets received          */
+        u64 tx_errors;          /* packet transmit problems      */
+        u64 rx_dropped;         /* no space in linux buffers     */
+        u64 tx_dropped;         /* no space available in linux   */
+        u64 collisions;         /* collisions while transmitting */
+} appldata_net_sum_data;
+
+
+static inline void appldata_print_debug(struct appldata_net_sum_data *net_data)
+{
+        P_DEBUG("--- NET - RECORD ---\n");
+
+        P_DEBUG("nr_interfaces = %u\n", net_data->nr_interfaces);
+        P_DEBUG("rx_packets    = %8lu\n", net_data->rx_packets);
+        P_DEBUG("tx_packets    = %8lu\n", net_data->tx_packets);
+        P_DEBUG("rx_bytes      = %8lu\n", net_data->rx_bytes);
+        P_DEBUG("tx_bytes      = %8lu\n", net_data->tx_bytes);
+        P_DEBUG("rx_errors     = %8lu\n", net_data->rx_errors);
+        P_DEBUG("tx_errors     = %8lu\n", net_data->tx_errors);
+        P_DEBUG("rx_dropped    = %8lu\n", net_data->rx_dropped);
+        P_DEBUG("tx_dropped    = %8lu\n", net_data->tx_dropped);
+        P_DEBUG("collisions    = %8lu\n", net_data->collisions);
+
+        P_DEBUG("sync_count_1 = %u\n", net_data->sync_count_1);
+        P_DEBUG("sync_count_2 = %u\n", net_data->sync_count_2);
+        P_DEBUG("timestamp    = %lX\n", net_data->timestamp);
+}
+
+/*
+ * appldata_get_net_sum_data()
+ *
+ * gather accumulated network statistics
+ */
+static void appldata_get_net_sum_data(void *data)
+{
+        int i;
+        struct appldata_net_sum_data *net_data;
+        struct net_device *dev;
+        struct net_device_stats *stats;
+        unsigned long rx_packets, tx_packets, rx_bytes, tx_bytes, rx_errors,
+                        tx_errors, rx_dropped, tx_dropped, collisions;
+
+        net_data = data;
+        net_data->sync_count_1++;
+
+        i = 0;
+        rx_packets = 0;
+        tx_packets = 0;
+        rx_bytes   = 0;
+        tx_bytes   = 0;
+        rx_errors  = 0;
+        tx_errors  = 0;
+        rx_dropped = 0;
+        tx_dropped = 0;
+        collisions = 0;
+        read_lock(&dev_base_lock);
+        for (dev = dev_base; dev != NULL; dev = dev->next) {
+                if (dev->get_stats == NULL) {
+                        continue;
+                }
+                stats = dev->get_stats(dev);
+                rx_packets += stats->rx_packets;
+                tx_packets += stats->tx_packets;
+                rx_bytes   += stats->rx_bytes;
+                tx_bytes   += stats->tx_bytes;
+                rx_errors  += stats->rx_errors;
+                tx_errors  += stats->tx_errors;
+                rx_dropped += stats->rx_dropped;
+                tx_dropped += stats->tx_dropped;
+                collisions += stats->collisions;
+                i++;
+        }
+        read_unlock(&dev_base_lock);
+        net_data->nr_interfaces = i;
+        net_data->rx_packets = rx_packets;
+        net_data->tx_packets = tx_packets;
+        net_data->rx_bytes   = rx_bytes;
+        net_data->tx_bytes   = tx_bytes;
+        net_data->rx_errors  = rx_errors;
+        net_data->tx_errors  = tx_errors;
+        net_data->rx_dropped = rx_dropped;
+        net_data->tx_dropped = tx_dropped;
+        net_data->collisions = collisions;
+
+        net_data->timestamp = get_clock();
+        net_data->sync_count_2++;
+#ifdef APPLDATA_DEBUG
+        appldata_print_debug(net_data);
+#endif
+}
+
+
+static struct appldata_ops ops = {
+        .ctl_nr    = CTL_APPLDATA_NET_SUM,
+        .name      = "net_sum",
+        .record_nr = APPLDATA_RECORD_NET_SUM_ID,
+        .size      = sizeof(struct appldata_net_sum_data),
+        .callback  = &appldata_get_net_sum_data,
+        .data      = &appldata_net_sum_data,
+        .owner     = THIS_MODULE,
+};
+
+
+/*
+ * appldata_net_init()
+ *
+ * init data, register ops
+ */
+static int __init appldata_net_init(void)
+{
+        int rc;
+
+        P_DEBUG("sizeof(net) = %lu\n", sizeof(struct appldata_net_sum_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_net_exit()
+ *
+ * unregister ops
+ */
+static void __exit appldata_net_exit(void)
+{
+        appldata_unregister_ops(&ops);
+        P_DEBUG("%s-ops unregistered!\n", ops.name);
+}
+
+
+module_init(appldata_net_init);
+module_exit(appldata_net_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Gerald Schaefer");
+MODULE_DESCRIPTION("Linux-VM Monitor Stream, accumulated network statistics");