litmus-rt.git - The LITMUS^RT kernel.

diff options

author	Tejun Heo <tj@kernel.org>	2010-03-24 04:04:11 -0400
committer	Tejun Heo <tj@kernel.org>	2010-03-30 09:02:32 -0400
commit	5a0e3ad6af8660be21ca98a971cd00f331318c05 (patch)
tree	5bfb7be11a03176a87296a43ac6647975c00a1d1 /arch/powerpc/kernel/pci-common.c
parent	ed391f4ebf8f701d3566423ce8f17e614cde9806 (diff)

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

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>

Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')

-rw-r--r--

arch/powerpc/kernel/pci-common.c

1 files changed, 1 insertions, 0 deletions


diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index f3c42ce516e7..0c0567e58409 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c
@@ -26,6 +26,7 @@
26	#include <linux/syscalls.h>	26	#include <linux/syscalls.h>
27	#include <linux/irq.h>	27	#include <linux/irq.h>
28	#include <linux/vmalloc.h>	28	#include <linux/vmalloc.h>
		29	#include <linux/slab.h>
29		30
30	#include <asm/processor.h>	31	#include <asm/processor.h>
31	#include <asm/io.h>	32	#include <asm/io.h>

/* drivers/net/ifb.c: The purpose of this driver is to provide a device that allows for sharing of resources: 1) qdiscs/policies that are per device as opposed to system wide. ifb allows for a device which can be redirected to thus providing an impression of sharing. 2) Allows for queueing incoming traffic for shaping instead of dropping. The original concept is based on what is known as the IMQ driver initially written by Martin Devera, later rewritten by Patrick McHardy and then maintained by Andre Correa. You need the tc action mirror or redirect to feed this device packets. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. Authors: Jamal Hadi Salim (2005) */ #include <linux/module.h> #include <linux/kernel.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/init.h> #include <linux/moduleparam.h> #include <net/pkt_sched.h> #define TX_TIMEOUT (2*HZ) #define TX_Q_LIMIT 32 struct ifb_private { struct net_device_stats stats; struct tasklet_struct ifb_tasklet; int tasklet_pending; /* mostly debug stats leave in for now */ unsigned long st_task_enter; /* tasklet entered */ unsigned long st_txq_refl_try; /* transmit queue refill attempt */ unsigned long st_rxq_enter; /* receive queue entered */ unsigned long st_rx2tx_tran; /* receive to trasmit transfers */ unsigned long st_rxq_notenter; /*receiveQ not entered, resched */ unsigned long st_rx_frm_egr; /* received from egress path */ unsigned long st_rx_frm_ing; /* received from ingress path */ unsigned long st_rxq_check; unsigned long st_rxq_rsch; struct sk_buff_head rq; struct sk_buff_head tq; }; static int numifbs = 2; static void ri_tasklet(unsigned long dev); static int ifb_xmit(struct sk_buff *skb, struct net_device *dev); static struct net_device_stats *ifb_get_stats(struct net_device *dev); static int ifb_open(struct net_device *dev); static int ifb_close(struct net_device *dev); static void ri_tasklet(unsigned long dev) { struct net_device *_dev = (struct net_device *)dev; struct ifb_private *dp = netdev_priv(_dev); struct net_device_stats *stats = &dp->stats; struct sk_buff *skb; dp->st_task_enter++; if ((skb = skb_peek(&dp->tq)) == NULL) { dp->st_txq_refl_try++; if (netif_tx_trylock(_dev)) { dp->st_rxq_enter++; while ((skb = skb_dequeue(&dp->rq)) != NULL) { skb_queue_tail(&dp->tq, skb); dp->st_rx2tx_tran++; } netif_tx_unlock(_dev); } else { /* reschedule */ dp->st_rxq_notenter++; goto resched; } } while ((skb = skb_dequeue(&dp->tq)) != NULL) { u32 from = G_TC_FROM(skb->tc_verd); skb->tc_verd = 0; skb->tc_verd = SET_TC_NCLS(skb->tc_verd); stats->tx_packets++; stats->tx_bytes +=skb->len; if (from & AT_EGRESS) { dp->st_rx_frm_egr++; dev_queue_xmit(skb); } else if (from & AT_INGRESS) { dp->st_rx_frm_ing++; netif_rx(skb); } else { dev_kfree_skb(skb); stats->tx_dropped++; } } if (netif_tx_trylock(_dev)) { dp->st_rxq_check++; if ((skb = skb_peek(&dp->rq)) == NULL) { dp->tasklet_pending = 0; if (netif_queue_stopped(_dev)) netif_wake_queue(_dev); } else { dp->st_rxq_rsch++; netif_tx_unlock(_dev); goto resched; } netif_tx_unlock(_dev); } else { resched: dp->tasklet_pending = 1; tasklet_schedule(&dp->ifb_tasklet); } } static void __init ifb_setup(struct net_device *dev) { /* Initialize the device structure. */ dev->get_stats = ifb_get_stats; dev->hard_start_xmit = ifb_xmit; dev->open = &ifb_open; dev->stop = &ifb_close; /* Fill in device structure with ethernet-generic values. */ ether_setup(dev); dev->tx_queue_len = TX_Q_LIMIT; dev->change_mtu = NULL; dev->flags |= IFF_NOARP; dev->flags &= ~IFF_MULTICAST; SET_MODULE_OWNER(dev); random_ether_addr(dev->dev_addr); } static int ifb_xmit(struct sk_buff *skb, struct net_device *dev) { struct ifb_private *dp = netdev_priv(dev); struct net_device_stats *stats = &dp->stats; int ret = 0; u32 from = G_TC_FROM(skb->tc_verd); stats->tx_packets++; stats->tx_bytes+=skb->len; if (!from || !skb->input_dev) { dropped: dev_kfree_skb(skb); stats->rx_dropped++; return ret; } else { /* * note we could be going * ingress -> egress or * egress -> ingress */ skb->dev = skb->input_dev; skb->input_dev = dev; if (from & AT_INGRESS) { skb_pull(skb, skb->dev->hard_header_len); } else { if (!(from & AT_EGRESS)) { goto dropped; } } } if (skb_queue_len(&dp->rq) >= dev->tx_queue_len) { netif_stop_queue(dev); } dev->trans_start = jiffies; skb_queue_tail(&dp->rq, skb); if (!dp->tasklet_pending) { dp->tasklet_pending = 1; tasklet_schedule(&dp->ifb_tasklet); } return ret; } static struct net_device_stats *ifb_get_stats(struct net_device *dev) { struct ifb_private *dp = netdev_priv(dev); struct net_device_stats *stats = &dp->stats; pr_debug("tasklets stats %ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld \n", dp->st_task_enter, dp->st_txq_refl_try, dp->st_rxq_enter, dp->st_rx2tx_tran, dp->st_rxq_notenter, dp->st_rx_frm_egr, dp->st_rx_frm_ing, dp->st_rxq_check, dp->st_rxq_rsch); return stats; } static struct net_device **ifbs; /* Number of ifb devices to be set up by this module. */ module_param(numifbs, int, 0); MODULE_PARM_DESC(numifbs, "Number of ifb devices"); static int ifb_close(struct net_device *dev) { struct ifb_private *dp = netdev_priv(dev); tasklet_kill(&dp->ifb_tasklet); netif_stop_queue(dev); skb_queue_purge(&dp->rq); skb_queue_purge(&dp->tq); return 0; } static int ifb_open(struct net_device *dev) { struct ifb_private *dp = netdev_priv(dev); tasklet_init(&dp->ifb_tasklet, ri_tasklet, (unsigned long)dev); skb_queue_head_init(&dp->rq); skb_queue_head_init(&dp->tq); netif_start_queue(dev); return 0; } static int __init ifb_init_one(int index) { struct net_device *dev_ifb; int err; dev_ifb = alloc_netdev(sizeof(struct ifb_private), "ifb%d", ifb_setup); if (!dev_ifb) return -ENOMEM; if ((err = register_netdev(dev_ifb))) { free_netdev(dev_ifb); dev_ifb = NULL; } else { ifbs[index] = dev_ifb; } return err; } static void ifb_free_one(int index) { unregister_netdev(ifbs[index]); free_netdev(ifbs[index]); } static int __init ifb_init_module(void) { int i, err = 0; ifbs = kmalloc(numifbs * sizeof(void *), GFP_KERNEL); if (!ifbs) return -ENOMEM; for (i = 0; i < numifbs && !err; i++) err = ifb_init_one(i); if (err) { i--; while (--i >= 0) ifb_free_one(i); } return err; } static void __exit ifb_cleanup_module(void) { int i; for (i = 0; i < numifbs; i++) ifb_free_one(i); kfree(ifbs); } module_init(ifb_init_module); module_exit(ifb_cleanup_module); MODULE_LICENSE("GPL");


context:
space:
mode: