![Tejun Heo](/assets/img/avatar_default.png)
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
157 lines
4.1 KiB
C
157 lines
4.1 KiB
C
/*
|
|
* 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,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.
|
|
*
|
|
* Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/kernel_stat.h>
|
|
#include <linux/netdevice.h>
|
|
#include <net/net_namespace.h>
|
|
|
|
#include "appldata.h"
|
|
|
|
|
|
/*
|
|
* 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
|
|
*/
|
|
static 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 */
|
|
} __attribute__((packed)) appldata_net_sum_data;
|
|
|
|
|
|
/*
|
|
* 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;
|
|
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;
|
|
|
|
rcu_read_lock();
|
|
for_each_netdev_rcu(&init_net, dev) {
|
|
const struct net_device_stats *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++;
|
|
}
|
|
rcu_read_unlock();
|
|
|
|
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++;
|
|
}
|
|
|
|
|
|
static struct appldata_ops ops = {
|
|
.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,
|
|
.mod_lvl = {0xF0, 0xF0}, /* EBCDIC "00" */
|
|
};
|
|
|
|
|
|
/*
|
|
* appldata_net_init()
|
|
*
|
|
* init data, register ops
|
|
*/
|
|
static int __init appldata_net_init(void)
|
|
{
|
|
return appldata_register_ops(&ops);
|
|
}
|
|
|
|
/*
|
|
* appldata_net_exit()
|
|
*
|
|
* unregister ops
|
|
*/
|
|
static void __exit appldata_net_exit(void)
|
|
{
|
|
appldata_unregister_ops(&ops);
|
|
}
|
|
|
|
|
|
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");
|