mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 11:32:04 +00:00
5a0e3ad6af
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>
266 lines
6.1 KiB
C
266 lines
6.1 KiB
C
/*
|
|
* net/sched/mirred.c packet mirroring and redirect actions
|
|
*
|
|
* 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 (2002-4)
|
|
*
|
|
* TODO: Add ingress support (and socket redirect support)
|
|
*
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/rtnetlink.h>
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/gfp.h>
|
|
#include <net/net_namespace.h>
|
|
#include <net/netlink.h>
|
|
#include <net/pkt_sched.h>
|
|
#include <linux/tc_act/tc_mirred.h>
|
|
#include <net/tc_act/tc_mirred.h>
|
|
|
|
#include <linux/if_arp.h>
|
|
|
|
#define MIRRED_TAB_MASK 7
|
|
static struct tcf_common *tcf_mirred_ht[MIRRED_TAB_MASK + 1];
|
|
static u32 mirred_idx_gen;
|
|
static DEFINE_RWLOCK(mirred_lock);
|
|
|
|
static struct tcf_hashinfo mirred_hash_info = {
|
|
.htab = tcf_mirred_ht,
|
|
.hmask = MIRRED_TAB_MASK,
|
|
.lock = &mirred_lock,
|
|
};
|
|
|
|
static inline int tcf_mirred_release(struct tcf_mirred *m, int bind)
|
|
{
|
|
if (m) {
|
|
if (bind)
|
|
m->tcf_bindcnt--;
|
|
m->tcf_refcnt--;
|
|
if(!m->tcf_bindcnt && m->tcf_refcnt <= 0) {
|
|
dev_put(m->tcfm_dev);
|
|
tcf_hash_destroy(&m->common, &mirred_hash_info);
|
|
return 1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static const struct nla_policy mirred_policy[TCA_MIRRED_MAX + 1] = {
|
|
[TCA_MIRRED_PARMS] = { .len = sizeof(struct tc_mirred) },
|
|
};
|
|
|
|
static int tcf_mirred_init(struct nlattr *nla, struct nlattr *est,
|
|
struct tc_action *a, int ovr, int bind)
|
|
{
|
|
struct nlattr *tb[TCA_MIRRED_MAX + 1];
|
|
struct tc_mirred *parm;
|
|
struct tcf_mirred *m;
|
|
struct tcf_common *pc;
|
|
struct net_device *dev;
|
|
int ret, ok_push = 0;
|
|
|
|
if (nla == NULL)
|
|
return -EINVAL;
|
|
ret = nla_parse_nested(tb, TCA_MIRRED_MAX, nla, mirred_policy);
|
|
if (ret < 0)
|
|
return ret;
|
|
if (tb[TCA_MIRRED_PARMS] == NULL)
|
|
return -EINVAL;
|
|
parm = nla_data(tb[TCA_MIRRED_PARMS]);
|
|
switch (parm->eaction) {
|
|
case TCA_EGRESS_MIRROR:
|
|
case TCA_EGRESS_REDIR:
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
if (parm->ifindex) {
|
|
dev = __dev_get_by_index(&init_net, parm->ifindex);
|
|
if (dev == NULL)
|
|
return -ENODEV;
|
|
switch (dev->type) {
|
|
case ARPHRD_TUNNEL:
|
|
case ARPHRD_TUNNEL6:
|
|
case ARPHRD_SIT:
|
|
case ARPHRD_IPGRE:
|
|
case ARPHRD_VOID:
|
|
case ARPHRD_NONE:
|
|
ok_push = 0;
|
|
break;
|
|
default:
|
|
ok_push = 1;
|
|
break;
|
|
}
|
|
} else {
|
|
dev = NULL;
|
|
}
|
|
|
|
pc = tcf_hash_check(parm->index, a, bind, &mirred_hash_info);
|
|
if (!pc) {
|
|
if (dev == NULL)
|
|
return -EINVAL;
|
|
pc = tcf_hash_create(parm->index, est, a, sizeof(*m), bind,
|
|
&mirred_idx_gen, &mirred_hash_info);
|
|
if (IS_ERR(pc))
|
|
return PTR_ERR(pc);
|
|
ret = ACT_P_CREATED;
|
|
} else {
|
|
if (!ovr) {
|
|
tcf_mirred_release(to_mirred(pc), bind);
|
|
return -EEXIST;
|
|
}
|
|
}
|
|
m = to_mirred(pc);
|
|
|
|
spin_lock_bh(&m->tcf_lock);
|
|
m->tcf_action = parm->action;
|
|
m->tcfm_eaction = parm->eaction;
|
|
if (dev != NULL) {
|
|
m->tcfm_ifindex = parm->ifindex;
|
|
if (ret != ACT_P_CREATED)
|
|
dev_put(m->tcfm_dev);
|
|
dev_hold(dev);
|
|
m->tcfm_dev = dev;
|
|
m->tcfm_ok_push = ok_push;
|
|
}
|
|
spin_unlock_bh(&m->tcf_lock);
|
|
if (ret == ACT_P_CREATED)
|
|
tcf_hash_insert(pc, &mirred_hash_info);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int tcf_mirred_cleanup(struct tc_action *a, int bind)
|
|
{
|
|
struct tcf_mirred *m = a->priv;
|
|
|
|
if (m)
|
|
return tcf_mirred_release(m, bind);
|
|
return 0;
|
|
}
|
|
|
|
static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
|
|
struct tcf_result *res)
|
|
{
|
|
struct tcf_mirred *m = a->priv;
|
|
struct net_device *dev;
|
|
struct sk_buff *skb2;
|
|
u32 at;
|
|
int retval, err = 1;
|
|
|
|
spin_lock(&m->tcf_lock);
|
|
m->tcf_tm.lastuse = jiffies;
|
|
|
|
dev = m->tcfm_dev;
|
|
if (!(dev->flags & IFF_UP)) {
|
|
if (net_ratelimit())
|
|
printk("mirred to Houston: device %s is gone!\n",
|
|
dev->name);
|
|
goto out;
|
|
}
|
|
|
|
skb2 = skb_act_clone(skb, GFP_ATOMIC);
|
|
if (skb2 == NULL)
|
|
goto out;
|
|
|
|
m->tcf_bstats.bytes += qdisc_pkt_len(skb2);
|
|
m->tcf_bstats.packets++;
|
|
at = G_TC_AT(skb->tc_verd);
|
|
if (!(at & AT_EGRESS)) {
|
|
if (m->tcfm_ok_push)
|
|
skb_push(skb2, skb2->dev->hard_header_len);
|
|
}
|
|
|
|
/* mirror is always swallowed */
|
|
if (m->tcfm_eaction != TCA_EGRESS_MIRROR)
|
|
skb2->tc_verd = SET_TC_FROM(skb2->tc_verd, at);
|
|
|
|
skb2->dev = dev;
|
|
skb2->skb_iif = skb->dev->ifindex;
|
|
dev_queue_xmit(skb2);
|
|
err = 0;
|
|
|
|
out:
|
|
if (err) {
|
|
m->tcf_qstats.overlimits++;
|
|
m->tcf_bstats.bytes += qdisc_pkt_len(skb);
|
|
m->tcf_bstats.packets++;
|
|
/* should we be asking for packet to be dropped?
|
|
* may make sense for redirect case only
|
|
*/
|
|
retval = TC_ACT_SHOT;
|
|
} else {
|
|
retval = m->tcf_action;
|
|
}
|
|
spin_unlock(&m->tcf_lock);
|
|
|
|
return retval;
|
|
}
|
|
|
|
static int tcf_mirred_dump(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
|
|
{
|
|
unsigned char *b = skb_tail_pointer(skb);
|
|
struct tcf_mirred *m = a->priv;
|
|
struct tc_mirred opt;
|
|
struct tcf_t t;
|
|
|
|
opt.index = m->tcf_index;
|
|
opt.action = m->tcf_action;
|
|
opt.refcnt = m->tcf_refcnt - ref;
|
|
opt.bindcnt = m->tcf_bindcnt - bind;
|
|
opt.eaction = m->tcfm_eaction;
|
|
opt.ifindex = m->tcfm_ifindex;
|
|
NLA_PUT(skb, TCA_MIRRED_PARMS, sizeof(opt), &opt);
|
|
t.install = jiffies_to_clock_t(jiffies - m->tcf_tm.install);
|
|
t.lastuse = jiffies_to_clock_t(jiffies - m->tcf_tm.lastuse);
|
|
t.expires = jiffies_to_clock_t(m->tcf_tm.expires);
|
|
NLA_PUT(skb, TCA_MIRRED_TM, sizeof(t), &t);
|
|
return skb->len;
|
|
|
|
nla_put_failure:
|
|
nlmsg_trim(skb, b);
|
|
return -1;
|
|
}
|
|
|
|
static struct tc_action_ops act_mirred_ops = {
|
|
.kind = "mirred",
|
|
.hinfo = &mirred_hash_info,
|
|
.type = TCA_ACT_MIRRED,
|
|
.capab = TCA_CAP_NONE,
|
|
.owner = THIS_MODULE,
|
|
.act = tcf_mirred,
|
|
.dump = tcf_mirred_dump,
|
|
.cleanup = tcf_mirred_cleanup,
|
|
.lookup = tcf_hash_search,
|
|
.init = tcf_mirred_init,
|
|
.walk = tcf_generic_walker
|
|
};
|
|
|
|
MODULE_AUTHOR("Jamal Hadi Salim(2002)");
|
|
MODULE_DESCRIPTION("Device Mirror/redirect actions");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
static int __init mirred_init_module(void)
|
|
{
|
|
printk("Mirror/redirect action on\n");
|
|
return tcf_register_action(&act_mirred_ops);
|
|
}
|
|
|
|
static void __exit mirred_cleanup_module(void)
|
|
{
|
|
tcf_unregister_action(&act_mirred_ops);
|
|
}
|
|
|
|
module_init(mirred_init_module);
|
|
module_exit(mirred_cleanup_module);
|