2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* net/sched/cls_fw.c Classifier mapping ipchains' fwmark to traffic class.
|
|
|
|
*
|
|
|
|
* 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: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
|
|
|
|
*
|
|
|
|
* Changes:
|
|
|
|
* Karlis Peisenieks <karlis@mt.lv> : 990415 : fw_walk off by one
|
|
|
|
* Karlis Peisenieks <karlis@mt.lv> : 990415 : fw_delete killed all the filter (and kernel).
|
|
|
|
* Alex <alex@pilotsoft.com> : 2004xxyy: Added Action extension
|
|
|
|
*
|
|
|
|
* JHS: We should remove the CONFIG_NET_CLS_IND from here
|
|
|
|
* eventually when the meta match extension is made available
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
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>
2010-03-24 15:04:11 +07:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/skbuff.h>
|
2007-07-03 12:49:07 +07:00
|
|
|
#include <net/netlink.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <net/act_api.h>
|
|
|
|
#include <net/pkt_cls.h>
|
2017-10-13 19:01:03 +07:00
|
|
|
#include <net/sch_generic.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2014-03-18 10:20:49 +07:00
|
|
|
#define HTSIZE 256
|
2005-04-25 10:19:54 +07:00
|
|
|
|
2011-01-20 02:26:56 +07:00
|
|
|
struct fw_head {
|
2014-03-18 10:20:49 +07:00
|
|
|
u32 mask;
|
2014-09-13 10:07:22 +07:00
|
|
|
struct fw_filter __rcu *ht[HTSIZE];
|
|
|
|
struct rcu_head rcu;
|
2005-04-17 05:20:36 +07:00
|
|
|
};
|
|
|
|
|
2011-01-20 02:26:56 +07:00
|
|
|
struct fw_filter {
|
2014-09-13 10:07:22 +07:00
|
|
|
struct fw_filter __rcu *next;
|
2005-04-17 05:20:36 +07:00
|
|
|
u32 id;
|
|
|
|
struct tcf_result res;
|
|
|
|
#ifdef CONFIG_NET_CLS_IND
|
2014-01-10 07:14:02 +07:00
|
|
|
int ifindex;
|
2005-04-17 05:20:36 +07:00
|
|
|
#endif /* CONFIG_NET_CLS_IND */
|
|
|
|
struct tcf_exts exts;
|
2014-09-13 10:07:22 +07:00
|
|
|
struct tcf_proto *tp;
|
2018-05-24 05:26:53 +07:00
|
|
|
struct rcu_work rwork;
|
2005-04-17 05:20:36 +07:00
|
|
|
};
|
|
|
|
|
2014-03-18 10:20:49 +07:00
|
|
|
static u32 fw_hash(u32 handle)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2014-03-18 10:20:49 +07:00
|
|
|
handle ^= (handle >> 16);
|
|
|
|
handle ^= (handle >> 8);
|
|
|
|
return handle % HTSIZE;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2011-07-06 06:25:42 +07:00
|
|
|
static int fw_classify(struct sk_buff *skb, const struct tcf_proto *tp,
|
2016-09-18 19:45:33 +07:00
|
|
|
struct tcf_result *res)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2014-09-13 10:07:22 +07:00
|
|
|
struct fw_head *head = rcu_dereference_bh(tp->root);
|
2005-04-17 05:20:36 +07:00
|
|
|
struct fw_filter *f;
|
|
|
|
int r;
|
2006-12-06 04:46:13 +07:00
|
|
|
u32 id = skb->mark;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
if (head != NULL) {
|
2006-12-06 04:46:13 +07:00
|
|
|
id &= head->mask;
|
2014-09-13 10:07:22 +07:00
|
|
|
|
|
|
|
for (f = rcu_dereference_bh(head->ht[fw_hash(id)]); f;
|
|
|
|
f = rcu_dereference_bh(f->next)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
if (f->id == id) {
|
|
|
|
*res = f->res;
|
|
|
|
#ifdef CONFIG_NET_CLS_IND
|
2014-01-10 07:14:02 +07:00
|
|
|
if (!tcf_match_indev(skb, f->ifindex))
|
2005-04-17 05:20:36 +07:00
|
|
|
continue;
|
|
|
|
#endif /* CONFIG_NET_CLS_IND */
|
|
|
|
r = tcf_exts_exec(skb, &f->exts, res);
|
|
|
|
if (r < 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2017-10-13 19:01:03 +07:00
|
|
|
struct Qdisc *q = tcf_block_q(tp->chain->block);
|
|
|
|
|
2015-09-23 07:01:11 +07:00
|
|
|
/* Old method: classify the packet using its skb mark. */
|
2011-01-20 02:26:56 +07:00
|
|
|
if (id && (TC_H_MAJ(id) == 0 ||
|
2017-10-13 19:01:03 +07:00
|
|
|
!(TC_H_MAJ(id ^ q->handle)))) {
|
2005-04-17 05:20:36 +07:00
|
|
|
res->classid = id;
|
|
|
|
res->class = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2017-08-05 11:31:43 +07:00
|
|
|
static void *fw_get(struct tcf_proto *tp, u32 handle)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2014-09-13 10:07:22 +07:00
|
|
|
struct fw_head *head = rtnl_dereference(tp->root);
|
2005-04-17 05:20:36 +07:00
|
|
|
struct fw_filter *f;
|
|
|
|
|
|
|
|
if (head == NULL)
|
2017-08-05 11:31:43 +07:00
|
|
|
return NULL;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2014-09-13 10:07:22 +07:00
|
|
|
f = rtnl_dereference(head->ht[fw_hash(handle)]);
|
|
|
|
for (; f; f = rtnl_dereference(f->next)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
if (f->id == handle)
|
2017-08-05 11:31:43 +07:00
|
|
|
return f;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2017-08-05 11:31:43 +07:00
|
|
|
return NULL;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int fw_init(struct tcf_proto *tp)
|
|
|
|
{
|
2015-09-23 07:01:11 +07:00
|
|
|
/* We don't allocate fw_head here, because in the old method
|
|
|
|
* we don't need it at all.
|
|
|
|
*/
|
2005-04-17 05:20:36 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-11-07 04:47:25 +07:00
|
|
|
static void __fw_delete_filter(struct fw_filter *f)
|
|
|
|
{
|
|
|
|
tcf_exts_destroy(&f->exts);
|
|
|
|
tcf_exts_put_net(&f->exts);
|
|
|
|
kfree(f);
|
|
|
|
}
|
|
|
|
|
2017-10-27 08:24:34 +07:00
|
|
|
static void fw_delete_filter_work(struct work_struct *work)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2018-05-24 05:26:53 +07:00
|
|
|
struct fw_filter *f = container_of(to_rcu_work(work),
|
|
|
|
struct fw_filter,
|
|
|
|
rwork);
|
2017-10-27 08:24:34 +07:00
|
|
|
rtnl_lock();
|
2017-11-07 04:47:25 +07:00
|
|
|
__fw_delete_filter(f);
|
2017-10-27 08:24:34 +07:00
|
|
|
rtnl_unlock();
|
|
|
|
}
|
|
|
|
|
2018-01-25 03:54:13 +07:00
|
|
|
static void fw_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2014-09-13 10:07:22 +07:00
|
|
|
struct fw_head *head = rtnl_dereference(tp->root);
|
2005-04-17 05:20:36 +07:00
|
|
|
struct fw_filter *f;
|
|
|
|
int h;
|
|
|
|
|
|
|
|
if (head == NULL)
|
2017-04-20 04:21:21 +07:00
|
|
|
return;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-01-20 02:26:56 +07:00
|
|
|
for (h = 0; h < HTSIZE; h++) {
|
2014-09-13 10:07:22 +07:00
|
|
|
while ((f = rtnl_dereference(head->ht[h])) != NULL) {
|
|
|
|
RCU_INIT_POINTER(head->ht[h],
|
|
|
|
rtnl_dereference(f->next));
|
2014-10-06 11:28:52 +07:00
|
|
|
tcf_unbind_filter(tp, &f->res);
|
2017-11-07 04:47:25 +07:00
|
|
|
if (tcf_exts_get_net(&f->exts))
|
2018-05-24 05:26:53 +07:00
|
|
|
tcf_queue_work(&f->rwork, fw_delete_filter_work);
|
2017-11-07 04:47:25 +07:00
|
|
|
else
|
|
|
|
__fw_delete_filter(f);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
}
|
2014-09-13 10:07:22 +07:00
|
|
|
kfree_rcu(head, rcu);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2018-01-18 23:20:53 +07:00
|
|
|
static int fw_delete(struct tcf_proto *tp, void *arg, bool *last,
|
|
|
|
struct netlink_ext_ack *extack)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2014-09-13 10:07:22 +07:00
|
|
|
struct fw_head *head = rtnl_dereference(tp->root);
|
2017-08-05 11:31:43 +07:00
|
|
|
struct fw_filter *f = arg;
|
2014-09-13 10:07:22 +07:00
|
|
|
struct fw_filter __rcu **fp;
|
|
|
|
struct fw_filter *pfp;
|
2017-04-20 04:21:21 +07:00
|
|
|
int ret = -EINVAL;
|
|
|
|
int h;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
if (head == NULL || f == NULL)
|
|
|
|
goto out;
|
|
|
|
|
2014-09-13 10:07:22 +07:00
|
|
|
fp = &head->ht[fw_hash(f->id)];
|
|
|
|
|
|
|
|
for (pfp = rtnl_dereference(*fp); pfp;
|
|
|
|
fp = &pfp->next, pfp = rtnl_dereference(*fp)) {
|
|
|
|
if (pfp == f) {
|
|
|
|
RCU_INIT_POINTER(*fp, rtnl_dereference(f->next));
|
2014-10-06 11:28:52 +07:00
|
|
|
tcf_unbind_filter(tp, &f->res);
|
2017-11-07 04:47:25 +07:00
|
|
|
tcf_exts_get_net(&f->exts);
|
2018-05-24 05:26:53 +07:00
|
|
|
tcf_queue_work(&f->rwork, fw_delete_filter_work);
|
2017-04-20 04:21:21 +07:00
|
|
|
ret = 0;
|
|
|
|
break;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
}
|
2017-04-20 04:21:21 +07:00
|
|
|
|
|
|
|
*last = true;
|
|
|
|
for (h = 0; h < HTSIZE; h++) {
|
|
|
|
if (rcu_access_pointer(head->ht[h])) {
|
|
|
|
*last = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
out:
|
2017-04-20 04:21:21 +07:00
|
|
|
return ret;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2008-01-24 11:36:12 +07:00
|
|
|
static const struct nla_policy fw_policy[TCA_FW_MAX + 1] = {
|
|
|
|
[TCA_FW_CLASSID] = { .type = NLA_U32 },
|
|
|
|
[TCA_FW_INDEV] = { .type = NLA_STRING, .len = IFNAMSIZ },
|
|
|
|
[TCA_FW_MASK] = { .type = NLA_U32 },
|
|
|
|
};
|
|
|
|
|
2017-08-04 19:29:05 +07:00
|
|
|
static int fw_set_parms(struct net *net, struct tcf_proto *tp,
|
|
|
|
struct fw_filter *f, struct nlattr **tb,
|
2018-01-18 23:20:52 +07:00
|
|
|
struct nlattr **tca, unsigned long base, bool ovr,
|
|
|
|
struct netlink_ext_ack *extack)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2014-09-13 10:07:22 +07:00
|
|
|
struct fw_head *head = rtnl_dereference(tp->root);
|
2006-08-26 06:11:42 +07:00
|
|
|
u32 mask;
|
2005-04-17 05:20:36 +07:00
|
|
|
int err;
|
|
|
|
|
2018-01-18 23:20:52 +07:00
|
|
|
err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &f->exts, ovr,
|
|
|
|
extack);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2008-01-23 13:11:33 +07:00
|
|
|
if (tb[TCA_FW_CLASSID]) {
|
2008-01-24 11:35:03 +07:00
|
|
|
f->res.classid = nla_get_u32(tb[TCA_FW_CLASSID]);
|
2005-04-17 05:20:36 +07:00
|
|
|
tcf_bind_filter(tp, &f->res, base);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_NET_CLS_IND
|
2008-01-23 13:11:33 +07:00
|
|
|
if (tb[TCA_FW_INDEV]) {
|
2014-01-10 07:14:02 +07:00
|
|
|
int ret;
|
2018-01-18 23:20:54 +07:00
|
|
|
ret = tcf_change_indev(net, tb[TCA_FW_INDEV], extack);
|
2017-08-04 19:29:07 +07:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2014-01-10 07:14:02 +07:00
|
|
|
f->ifindex = ret;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
#endif /* CONFIG_NET_CLS_IND */
|
|
|
|
|
2013-04-17 23:49:10 +07:00
|
|
|
err = -EINVAL;
|
2008-01-23 13:11:33 +07:00
|
|
|
if (tb[TCA_FW_MASK]) {
|
2008-01-24 11:35:03 +07:00
|
|
|
mask = nla_get_u32(tb[TCA_FW_MASK]);
|
2006-08-26 06:11:42 +07:00
|
|
|
if (mask != head->mask)
|
2017-08-04 19:29:07 +07:00
|
|
|
return err;
|
2006-08-26 06:11:42 +07:00
|
|
|
} else if (head->mask != 0xFFFFFFFF)
|
2017-08-04 19:29:07 +07:00
|
|
|
return err;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-14 12:15:39 +07:00
|
|
|
static int fw_change(struct net *net, struct sk_buff *in_skb,
|
2012-05-26 02:42:45 +07:00
|
|
|
struct tcf_proto *tp, unsigned long base,
|
2017-08-05 11:31:43 +07:00
|
|
|
u32 handle, struct nlattr **tca, void **arg,
|
2018-01-18 23:20:51 +07:00
|
|
|
bool ovr, struct netlink_ext_ack *extack)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2014-09-13 10:07:22 +07:00
|
|
|
struct fw_head *head = rtnl_dereference(tp->root);
|
2017-08-05 11:31:43 +07:00
|
|
|
struct fw_filter *f = *arg;
|
2008-01-23 13:11:33 +07:00
|
|
|
struct nlattr *opt = tca[TCA_OPTIONS];
|
|
|
|
struct nlattr *tb[TCA_FW_MAX + 1];
|
2005-04-17 05:20:36 +07:00
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!opt)
|
2015-09-23 07:01:11 +07:00
|
|
|
return handle ? -EINVAL : 0; /* Succeed if it is old method. */
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2017-04-12 19:34:07 +07:00
|
|
|
err = nla_parse_nested(tb, TCA_FW_MAX, opt, fw_policy, NULL);
|
2008-01-24 11:33:32 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2014-09-13 10:07:22 +07:00
|
|
|
if (f) {
|
|
|
|
struct fw_filter *pfp, *fnew;
|
|
|
|
struct fw_filter __rcu **fp;
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (f->id != handle && handle)
|
|
|
|
return -EINVAL;
|
2014-09-13 10:07:22 +07:00
|
|
|
|
|
|
|
fnew = kzalloc(sizeof(struct fw_filter), GFP_KERNEL);
|
|
|
|
if (!fnew)
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
|
|
|
fnew->id = f->id;
|
|
|
|
fnew->res = f->res;
|
|
|
|
#ifdef CONFIG_NET_CLS_IND
|
|
|
|
fnew->ifindex = f->ifindex;
|
|
|
|
#endif /* CONFIG_NET_CLS_IND */
|
|
|
|
fnew->tp = f->tp;
|
|
|
|
|
2016-08-20 02:36:54 +07:00
|
|
|
err = tcf_exts_init(&fnew->exts, TCA_FW_ACT, TCA_FW_POLICE);
|
|
|
|
if (err < 0) {
|
|
|
|
kfree(fnew);
|
|
|
|
return err;
|
|
|
|
}
|
2014-09-16 13:31:42 +07:00
|
|
|
|
2018-01-18 23:20:52 +07:00
|
|
|
err = fw_set_parms(net, tp, fnew, tb, tca, base, ovr, extack);
|
2014-09-13 10:07:22 +07:00
|
|
|
if (err < 0) {
|
2016-08-20 02:36:54 +07:00
|
|
|
tcf_exts_destroy(&fnew->exts);
|
2014-09-13 10:07:22 +07:00
|
|
|
kfree(fnew);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
fp = &head->ht[fw_hash(fnew->id)];
|
|
|
|
for (pfp = rtnl_dereference(*fp); pfp;
|
|
|
|
fp = &pfp->next, pfp = rtnl_dereference(*fp))
|
|
|
|
if (pfp == f)
|
|
|
|
break;
|
|
|
|
|
|
|
|
RCU_INIT_POINTER(fnew->next, rtnl_dereference(pfp->next));
|
|
|
|
rcu_assign_pointer(*fp, fnew);
|
2014-10-06 11:28:52 +07:00
|
|
|
tcf_unbind_filter(tp, &f->res);
|
2017-11-07 04:47:25 +07:00
|
|
|
tcf_exts_get_net(&f->exts);
|
2018-05-24 05:26:53 +07:00
|
|
|
tcf_queue_work(&f->rwork, fw_delete_filter_work);
|
2014-09-13 10:07:22 +07:00
|
|
|
|
2017-08-05 11:31:43 +07:00
|
|
|
*arg = fnew;
|
2014-09-13 10:07:22 +07:00
|
|
|
return err;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!handle)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2015-09-23 07:01:11 +07:00
|
|
|
if (!head) {
|
|
|
|
u32 mask = 0xFFFFFFFF;
|
2008-01-24 11:36:12 +07:00
|
|
|
if (tb[TCA_FW_MASK])
|
2015-09-23 07:01:11 +07:00
|
|
|
mask = nla_get_u32(tb[TCA_FW_MASK]);
|
|
|
|
|
|
|
|
head = kzalloc(sizeof(*head), GFP_KERNEL);
|
|
|
|
if (!head)
|
|
|
|
return -ENOBUFS;
|
|
|
|
head->mask = mask;
|
|
|
|
|
|
|
|
rcu_assign_pointer(tp->root, head);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2006-07-22 04:51:30 +07:00
|
|
|
f = kzalloc(sizeof(struct fw_filter), GFP_KERNEL);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (f == NULL)
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
2016-08-20 02:36:54 +07:00
|
|
|
err = tcf_exts_init(&f->exts, TCA_FW_ACT, TCA_FW_POLICE);
|
|
|
|
if (err < 0)
|
|
|
|
goto errout;
|
2005-04-17 05:20:36 +07:00
|
|
|
f->id = handle;
|
2014-09-13 10:07:22 +07:00
|
|
|
f->tp = tp;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2018-01-18 23:20:52 +07:00
|
|
|
err = fw_set_parms(net, tp, f, tb, tca, base, ovr, extack);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (err < 0)
|
|
|
|
goto errout;
|
|
|
|
|
2014-09-13 10:07:22 +07:00
|
|
|
RCU_INIT_POINTER(f->next, head->ht[fw_hash(handle)]);
|
|
|
|
rcu_assign_pointer(head->ht[fw_hash(handle)], f);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2017-08-05 11:31:43 +07:00
|
|
|
*arg = f;
|
2005-04-17 05:20:36 +07:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
errout:
|
2016-08-20 02:36:54 +07:00
|
|
|
tcf_exts_destroy(&f->exts);
|
2005-11-09 00:41:34 +07:00
|
|
|
kfree(f);
|
2005-04-17 05:20:36 +07:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void fw_walk(struct tcf_proto *tp, struct tcf_walker *arg)
|
|
|
|
{
|
2014-09-13 10:07:22 +07:00
|
|
|
struct fw_head *head = rtnl_dereference(tp->root);
|
2005-04-17 05:20:36 +07:00
|
|
|
int h;
|
|
|
|
|
|
|
|
if (head == NULL)
|
|
|
|
arg->stop = 1;
|
|
|
|
|
|
|
|
if (arg->stop)
|
|
|
|
return;
|
|
|
|
|
2005-04-25 10:19:54 +07:00
|
|
|
for (h = 0; h < HTSIZE; h++) {
|
2005-04-17 05:20:36 +07:00
|
|
|
struct fw_filter *f;
|
|
|
|
|
2014-09-13 10:07:22 +07:00
|
|
|
for (f = rtnl_dereference(head->ht[h]); f;
|
|
|
|
f = rtnl_dereference(f->next)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
if (arg->count < arg->skip) {
|
|
|
|
arg->count++;
|
|
|
|
continue;
|
|
|
|
}
|
2017-08-05 11:31:43 +07:00
|
|
|
if (arg->fn(tp, f, arg) < 0) {
|
2005-04-17 05:20:36 +07:00
|
|
|
arg->stop = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
arg->count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-05 11:31:43 +07:00
|
|
|
static int fw_dump(struct net *net, struct tcf_proto *tp, void *fh,
|
2005-04-17 05:20:36 +07:00
|
|
|
struct sk_buff *skb, struct tcmsg *t)
|
|
|
|
{
|
2014-09-13 10:07:22 +07:00
|
|
|
struct fw_head *head = rtnl_dereference(tp->root);
|
2017-08-05 11:31:43 +07:00
|
|
|
struct fw_filter *f = fh;
|
2008-01-24 11:34:11 +07:00
|
|
|
struct nlattr *nest;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
if (f == NULL)
|
|
|
|
return skb->len;
|
|
|
|
|
|
|
|
t->tcm_handle = f->id;
|
|
|
|
|
2017-08-04 19:29:00 +07:00
|
|
|
if (!f->res.classid && !tcf_exts_has_actions(&f->exts))
|
2005-04-17 05:20:36 +07:00
|
|
|
return skb->len;
|
|
|
|
|
2008-01-24 11:34:11 +07:00
|
|
|
nest = nla_nest_start(skb, TCA_OPTIONS);
|
|
|
|
if (nest == NULL)
|
|
|
|
goto nla_put_failure;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-03-29 16:11:39 +07:00
|
|
|
if (f->res.classid &&
|
|
|
|
nla_put_u32(skb, TCA_FW_CLASSID, f->res.classid))
|
|
|
|
goto nla_put_failure;
|
2005-04-17 05:20:36 +07:00
|
|
|
#ifdef CONFIG_NET_CLS_IND
|
2014-01-10 07:14:02 +07:00
|
|
|
if (f->ifindex) {
|
|
|
|
struct net_device *dev;
|
|
|
|
dev = __dev_get_by_index(net, f->ifindex);
|
|
|
|
if (dev && nla_put_string(skb, TCA_FW_INDEV, dev->name))
|
|
|
|
goto nla_put_failure;
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
#endif /* CONFIG_NET_CLS_IND */
|
2012-03-29 16:11:39 +07:00
|
|
|
if (head->mask != 0xFFFFFFFF &&
|
|
|
|
nla_put_u32(skb, TCA_FW_MASK, head->mask))
|
|
|
|
goto nla_put_failure;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2013-12-16 11:15:07 +07:00
|
|
|
if (tcf_exts_dump(skb, &f->exts) < 0)
|
2008-01-23 13:11:33 +07:00
|
|
|
goto nla_put_failure;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-01-24 11:34:11 +07:00
|
|
|
nla_nest_end(skb, nest);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2013-12-16 11:15:07 +07:00
|
|
|
if (tcf_exts_dump_stats(skb, &f->exts) < 0)
|
2008-01-23 13:11:33 +07:00
|
|
|
goto nla_put_failure;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
return skb->len;
|
|
|
|
|
2008-01-23 13:11:33 +07:00
|
|
|
nla_put_failure:
|
2014-12-10 04:23:29 +07:00
|
|
|
nla_nest_cancel(skb, nest);
|
2005-04-17 05:20:36 +07:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
net_sched: add reverse binding for tc class
TC filters when used as classifiers are bound to TC classes.
However, there is a hidden difference when adding them in different
orders:
1. If we add tc classes before its filters, everything is fine.
Logically, the classes exist before we specify their ID's in
filters, it is easy to bind them together, just as in the current
code base.
2. If we add tc filters before the tc classes they bind, we have to
do dynamic lookup in fast path. What's worse, this happens all
the time not just once, because on fast path tcf_result is passed
on stack, there is no way to propagate back to the one in tc filters.
This hidden difference hurts performance silently if we have many tc
classes in hierarchy.
This patch intends to close this gap by doing the reverse binding when
we create a new class, in this case we can actually search all the
filters in its parent, match and fixup by classid. And because
tcf_result is specific to each type of tc filter, we have to introduce
a new ops for each filter to tell how to bind the class.
Note, we still can NOT totally get rid of those class lookup in
->enqueue() because cgroup and flow filters have no way to determine
the classid at setup time, they still have to go through dynamic lookup.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-08-31 04:30:36 +07:00
|
|
|
static void fw_bind_class(void *fh, u32 classid, unsigned long cl)
|
|
|
|
{
|
|
|
|
struct fw_filter *f = fh;
|
|
|
|
|
|
|
|
if (f && f->res.classid == classid)
|
|
|
|
f->res.class = cl;
|
|
|
|
}
|
|
|
|
|
2008-01-23 13:10:42 +07:00
|
|
|
static struct tcf_proto_ops cls_fw_ops __read_mostly = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.kind = "fw",
|
|
|
|
.classify = fw_classify,
|
|
|
|
.init = fw_init,
|
|
|
|
.destroy = fw_destroy,
|
|
|
|
.get = fw_get,
|
|
|
|
.change = fw_change,
|
|
|
|
.delete = fw_delete,
|
|
|
|
.walk = fw_walk,
|
|
|
|
.dump = fw_dump,
|
net_sched: add reverse binding for tc class
TC filters when used as classifiers are bound to TC classes.
However, there is a hidden difference when adding them in different
orders:
1. If we add tc classes before its filters, everything is fine.
Logically, the classes exist before we specify their ID's in
filters, it is easy to bind them together, just as in the current
code base.
2. If we add tc filters before the tc classes they bind, we have to
do dynamic lookup in fast path. What's worse, this happens all
the time not just once, because on fast path tcf_result is passed
on stack, there is no way to propagate back to the one in tc filters.
This hidden difference hurts performance silently if we have many tc
classes in hierarchy.
This patch intends to close this gap by doing the reverse binding when
we create a new class, in this case we can actually search all the
filters in its parent, match and fixup by classid. And because
tcf_result is specific to each type of tc filter, we have to introduce
a new ops for each filter to tell how to bind the class.
Note, we still can NOT totally get rid of those class lookup in
->enqueue() because cgroup and flow filters have no way to determine
the classid at setup time, they still have to go through dynamic lookup.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-08-31 04:30:36 +07:00
|
|
|
.bind_class = fw_bind_class,
|
2005-04-17 05:20:36 +07:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init init_fw(void)
|
|
|
|
{
|
|
|
|
return register_tcf_proto_ops(&cls_fw_ops);
|
|
|
|
}
|
|
|
|
|
2007-02-09 21:25:16 +07:00
|
|
|
static void __exit exit_fw(void)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
unregister_tcf_proto_ops(&cls_fw_ops);
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(init_fw)
|
|
|
|
module_exit(exit_fw)
|
|
|
|
MODULE_LICENSE("GPL");
|