2019-05-27 13:55:01 +07:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* net/sched/cls_basic.c Basic Packet Classifier.
|
|
|
|
*
|
|
|
|
* Authors: Thomas Graf <tgraf@suug.ch>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#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/rtnetlink.h>
|
|
|
|
#include <linux/skbuff.h>
|
2017-09-26 00:13:50 +07:00
|
|
|
#include <linux/idr.h>
|
2019-01-18 08:14:01 +07:00
|
|
|
#include <linux/percpu.h>
|
2007-03-26 13:06:12 +07:00
|
|
|
#include <net/netlink.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <net/act_api.h>
|
|
|
|
#include <net/pkt_cls.h>
|
|
|
|
|
2011-01-20 02:26:56 +07:00
|
|
|
struct basic_head {
|
2005-04-17 05:20:36 +07:00
|
|
|
struct list_head flist;
|
2017-09-26 00:13:50 +07:00
|
|
|
struct idr handle_idr;
|
2014-09-13 10:05:59 +07:00
|
|
|
struct rcu_head rcu;
|
2005-04-17 05:20:36 +07:00
|
|
|
};
|
|
|
|
|
2011-01-20 02:26:56 +07:00
|
|
|
struct basic_filter {
|
2005-04-17 05:20:36 +07:00
|
|
|
u32 handle;
|
|
|
|
struct tcf_exts exts;
|
|
|
|
struct tcf_ematch_tree ematches;
|
|
|
|
struct tcf_result res;
|
2014-09-13 10:05:59 +07:00
|
|
|
struct tcf_proto *tp;
|
2005-04-17 05:20:36 +07:00
|
|
|
struct list_head link;
|
2019-01-18 08:14:01 +07:00
|
|
|
struct tc_basic_pcnt __percpu *pf;
|
2018-05-24 05:26:53 +07:00
|
|
|
struct rcu_work rwork;
|
2005-04-17 05:20:36 +07:00
|
|
|
};
|
|
|
|
|
2011-07-06 06:25:42 +07:00
|
|
|
static int basic_classify(struct sk_buff *skb, const struct tcf_proto *tp,
|
2005-04-17 05:20:36 +07:00
|
|
|
struct tcf_result *res)
|
|
|
|
{
|
|
|
|
int r;
|
2014-09-13 10:05:59 +07:00
|
|
|
struct basic_head *head = rcu_dereference_bh(tp->root);
|
2005-04-17 05:20:36 +07:00
|
|
|
struct basic_filter *f;
|
|
|
|
|
2014-09-13 10:05:59 +07:00
|
|
|
list_for_each_entry_rcu(f, &head->flist, link) {
|
2019-01-18 08:14:01 +07:00
|
|
|
__this_cpu_inc(f->pf->rcnt);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (!tcf_em_tree_match(skb, &f->ematches, NULL))
|
|
|
|
continue;
|
2019-01-18 08:14:01 +07:00
|
|
|
__this_cpu_inc(f->pf->rhit);
|
2005-04-17 05:20:36 +07:00
|
|
|
*res = f->res;
|
|
|
|
r = tcf_exts_exec(skb, &f->exts, res);
|
|
|
|
if (r < 0)
|
|
|
|
continue;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2017-08-05 11:31:43 +07:00
|
|
|
static void *basic_get(struct tcf_proto *tp, u32 handle)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2014-09-13 10:05:59 +07:00
|
|
|
struct basic_head *head = rtnl_dereference(tp->root);
|
2005-04-17 05:20:36 +07:00
|
|
|
struct basic_filter *f;
|
|
|
|
|
2015-01-22 16:58:18 +07:00
|
|
|
list_for_each_entry(f, &head->flist, link) {
|
|
|
|
if (f->handle == handle) {
|
2017-08-05 11:31:43 +07:00
|
|
|
return f;
|
2015-01-22 16:58:18 +07:00
|
|
|
}
|
|
|
|
}
|
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 basic_init(struct tcf_proto *tp)
|
|
|
|
{
|
2007-03-25 12:13:06 +07:00
|
|
|
struct basic_head *head;
|
|
|
|
|
|
|
|
head = kzalloc(sizeof(*head), GFP_KERNEL);
|
|
|
|
if (head == NULL)
|
|
|
|
return -ENOBUFS;
|
|
|
|
INIT_LIST_HEAD(&head->flist);
|
2017-09-26 00:13:50 +07:00
|
|
|
idr_init(&head->handle_idr);
|
2014-09-13 10:05:59 +07:00
|
|
|
rcu_assign_pointer(tp->root, head);
|
2005-04-17 05:20:36 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-11-07 04:47:20 +07:00
|
|
|
static void __basic_delete_filter(struct basic_filter *f)
|
|
|
|
{
|
|
|
|
tcf_exts_destroy(&f->exts);
|
|
|
|
tcf_em_tree_destroy(&f->ematches);
|
|
|
|
tcf_exts_put_net(&f->exts);
|
2019-01-18 08:14:01 +07:00
|
|
|
free_percpu(f->pf);
|
2017-11-07 04:47:20 +07:00
|
|
|
kfree(f);
|
|
|
|
}
|
|
|
|
|
2017-10-27 08:24:29 +07:00
|
|
|
static void basic_delete_filter_work(struct work_struct *work)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2018-05-24 05:26:53 +07:00
|
|
|
struct basic_filter *f = container_of(to_rcu_work(work),
|
|
|
|
struct basic_filter,
|
|
|
|
rwork);
|
2017-10-27 08:24:29 +07:00
|
|
|
rtnl_lock();
|
2017-11-07 04:47:20 +07:00
|
|
|
__basic_delete_filter(f);
|
2017-10-27 08:24:29 +07:00
|
|
|
rtnl_unlock();
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2019-02-11 15:55:45 +07:00
|
|
|
static void basic_destroy(struct tcf_proto *tp, bool rtnl_held,
|
|
|
|
struct netlink_ext_ack *extack)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2014-09-13 10:05:59 +07:00
|
|
|
struct basic_head *head = rtnl_dereference(tp->root);
|
2005-04-17 05:20:36 +07:00
|
|
|
struct basic_filter *f, *n;
|
2007-02-09 21:25:16 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
list_for_each_entry_safe(f, n, &head->flist, link) {
|
2014-09-13 10:05:59 +07:00
|
|
|
list_del_rcu(&f->link);
|
2014-10-06 11:28:52 +07:00
|
|
|
tcf_unbind_filter(tp, &f->res);
|
2017-11-28 21:48:43 +07:00
|
|
|
idr_remove(&head->handle_idr, f->handle);
|
2017-11-07 04:47:20 +07:00
|
|
|
if (tcf_exts_get_net(&f->exts))
|
2018-05-24 05:26:53 +07:00
|
|
|
tcf_queue_work(&f->rwork, basic_delete_filter_work);
|
2017-11-07 04:47:20 +07:00
|
|
|
else
|
|
|
|
__basic_delete_filter(f);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2017-09-26 00:13:50 +07:00
|
|
|
idr_destroy(&head->handle_idr);
|
2014-09-13 10:05:59 +07:00
|
|
|
kfree_rcu(head, rcu);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2018-01-18 23:20:53 +07:00
|
|
|
static int basic_delete(struct tcf_proto *tp, void *arg, bool *last,
|
2019-02-11 15:55:45 +07:00
|
|
|
bool rtnl_held, struct netlink_ext_ack *extack)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2017-04-20 04:21:21 +07:00
|
|
|
struct basic_head *head = rtnl_dereference(tp->root);
|
2017-08-05 11:31:43 +07:00
|
|
|
struct basic_filter *f = arg;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2014-12-03 00:00:31 +07:00
|
|
|
list_del_rcu(&f->link);
|
|
|
|
tcf_unbind_filter(tp, &f->res);
|
2017-11-28 21:48:43 +07:00
|
|
|
idr_remove(&head->handle_idr, f->handle);
|
2017-11-07 04:47:20 +07:00
|
|
|
tcf_exts_get_net(&f->exts);
|
2018-05-24 05:26:53 +07:00
|
|
|
tcf_queue_work(&f->rwork, basic_delete_filter_work);
|
2017-04-20 04:21:21 +07:00
|
|
|
*last = list_empty(&head->flist);
|
2014-12-03 00:00:31 +07:00
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2008-01-24 11:36:12 +07:00
|
|
|
static const struct nla_policy basic_policy[TCA_BASIC_MAX + 1] = {
|
|
|
|
[TCA_BASIC_CLASSID] = { .type = NLA_U32 },
|
|
|
|
[TCA_BASIC_EMATCHES] = { .type = NLA_NESTED },
|
|
|
|
};
|
|
|
|
|
2013-01-14 12:15:39 +07:00
|
|
|
static int basic_set_parms(struct net *net, struct tcf_proto *tp,
|
|
|
|
struct basic_filter *f, unsigned long base,
|
|
|
|
struct nlattr **tb,
|
2018-01-18 23:20:52 +07:00
|
|
|
struct nlattr *est, bool ovr,
|
|
|
|
struct netlink_ext_ack *extack)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2013-09-27 07:42:16 +07:00
|
|
|
int err;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2019-02-11 15:55:43 +07:00
|
|
|
err = tcf_exts_validate(net, tp, tb, est, &f->exts, ovr, true, extack);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2017-08-04 19:28:57 +07:00
|
|
|
err = tcf_em_tree_validate(tp, tb[TCA_BASIC_EMATCHES], &f->ematches);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (err < 0)
|
2017-08-04 19:29:09 +07:00
|
|
|
return err;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-01-23 13:11:33 +07:00
|
|
|
if (tb[TCA_BASIC_CLASSID]) {
|
2008-01-24 11:35:03 +07:00
|
|
|
f->res.classid = nla_get_u32(tb[TCA_BASIC_CLASSID]);
|
2005-04-17 05:20:36 +07:00
|
|
|
tcf_bind_filter(tp, &f->res, base);
|
|
|
|
}
|
|
|
|
|
2014-09-13 10:05:59 +07:00
|
|
|
f->tp = tp;
|
2005-04-17 05:20:36 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-14 12:15:39 +07:00
|
|
|
static int basic_change(struct net *net, struct sk_buff *in_skb,
|
2012-05-26 02:42:45 +07:00
|
|
|
struct tcf_proto *tp, unsigned long base, u32 handle,
|
2018-01-18 23:20:51 +07:00
|
|
|
struct nlattr **tca, void **arg, bool ovr,
|
2019-02-11 15:55:45 +07:00
|
|
|
bool rtnl_held, struct netlink_ext_ack *extack)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2008-01-24 11:33:32 +07:00
|
|
|
int err;
|
2014-09-13 10:05:59 +07:00
|
|
|
struct basic_head *head = rtnl_dereference(tp->root);
|
2008-01-23 13:11:33 +07:00
|
|
|
struct nlattr *tb[TCA_BASIC_MAX + 1];
|
2014-09-13 10:05:59 +07:00
|
|
|
struct basic_filter *fold = (struct basic_filter *) *arg;
|
|
|
|
struct basic_filter *fnew;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-01-23 13:11:33 +07:00
|
|
|
if (tca[TCA_OPTIONS] == NULL)
|
2005-04-17 05:20:36 +07:00
|
|
|
return -EINVAL;
|
|
|
|
|
netlink: make validation more configurable for future strictness
We currently have two levels of strict validation:
1) liberal (default)
- undefined (type >= max) & NLA_UNSPEC attributes accepted
- attribute length >= expected accepted
- garbage at end of message accepted
2) strict (opt-in)
- NLA_UNSPEC attributes accepted
- attribute length >= expected accepted
Split out parsing strictness into four different options:
* TRAILING - check that there's no trailing data after parsing
attributes (in message or nested)
* MAXTYPE - reject attrs > max known type
* UNSPEC - reject attributes with NLA_UNSPEC policy entries
* STRICT_ATTRS - strictly validate attribute size
The default for future things should be *everything*.
The current *_strict() is a combination of TRAILING and MAXTYPE,
and is renamed to _deprecated_strict().
The current regular parsing has none of this, and is renamed to
*_parse_deprecated().
Additionally it allows us to selectively set one of the new flags
even on old policies. Notably, the UNSPEC flag could be useful in
this case, since it can be arranged (by filling in the policy) to
not be an incompatible userspace ABI change, but would then going
forward prevent forgetting attribute entries. Similar can apply
to the POLICY flag.
We end up with the following renames:
* nla_parse -> nla_parse_deprecated
* nla_parse_strict -> nla_parse_deprecated_strict
* nlmsg_parse -> nlmsg_parse_deprecated
* nlmsg_parse_strict -> nlmsg_parse_deprecated_strict
* nla_parse_nested -> nla_parse_nested_deprecated
* nla_validate_nested -> nla_validate_nested_deprecated
Using spatch, of course:
@@
expression TB, MAX, HEAD, LEN, POL, EXT;
@@
-nla_parse(TB, MAX, HEAD, LEN, POL, EXT)
+nla_parse_deprecated(TB, MAX, HEAD, LEN, POL, EXT)
@@
expression NLH, HDRLEN, TB, MAX, POL, EXT;
@@
-nlmsg_parse(NLH, HDRLEN, TB, MAX, POL, EXT)
+nlmsg_parse_deprecated(NLH, HDRLEN, TB, MAX, POL, EXT)
@@
expression NLH, HDRLEN, TB, MAX, POL, EXT;
@@
-nlmsg_parse_strict(NLH, HDRLEN, TB, MAX, POL, EXT)
+nlmsg_parse_deprecated_strict(NLH, HDRLEN, TB, MAX, POL, EXT)
@@
expression TB, MAX, NLA, POL, EXT;
@@
-nla_parse_nested(TB, MAX, NLA, POL, EXT)
+nla_parse_nested_deprecated(TB, MAX, NLA, POL, EXT)
@@
expression START, MAX, POL, EXT;
@@
-nla_validate_nested(START, MAX, POL, EXT)
+nla_validate_nested_deprecated(START, MAX, POL, EXT)
@@
expression NLH, HDRLEN, MAX, POL, EXT;
@@
-nlmsg_validate(NLH, HDRLEN, MAX, POL, EXT)
+nlmsg_validate_deprecated(NLH, HDRLEN, MAX, POL, EXT)
For this patch, don't actually add the strict, non-renamed versions
yet so that it breaks compile if I get it wrong.
Also, while at it, make nla_validate and nla_parse go down to a
common __nla_validate_parse() function to avoid code duplication.
Ultimately, this allows us to have very strict validation for every
new caller of nla_parse()/nlmsg_parse() etc as re-introduced in the
next patch, while existing things will continue to work as is.
In effect then, this adds fully strict validation for any new command.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-26 19:07:28 +07:00
|
|
|
err = nla_parse_nested_deprecated(tb, TCA_BASIC_MAX, tca[TCA_OPTIONS],
|
|
|
|
basic_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:05:59 +07:00
|
|
|
if (fold != NULL) {
|
|
|
|
if (handle && fold->handle != handle)
|
2005-04-17 05:20:36 +07:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2014-09-13 10:05:59 +07:00
|
|
|
fnew = kzalloc(sizeof(*fnew), GFP_KERNEL);
|
2014-12-05 21:50:22 +07:00
|
|
|
if (!fnew)
|
|
|
|
return -ENOBUFS;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2019-02-21 12:37:42 +07:00
|
|
|
err = tcf_exts_init(&fnew->exts, net, TCA_BASIC_ACT, TCA_BASIC_POLICE);
|
2016-08-20 02:36:54 +07:00
|
|
|
if (err < 0)
|
|
|
|
goto errout;
|
|
|
|
|
2017-11-28 22:36:09 +07:00
|
|
|
if (!handle) {
|
|
|
|
handle = 1;
|
|
|
|
err = idr_alloc_u32(&head->handle_idr, fnew, &handle,
|
|
|
|
INT_MAX, GFP_KERNEL);
|
|
|
|
} else if (!fold) {
|
|
|
|
err = idr_alloc_u32(&head->handle_idr, fnew, &handle,
|
|
|
|
handle, GFP_KERNEL);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2017-11-28 22:36:09 +07:00
|
|
|
if (err)
|
|
|
|
goto errout;
|
|
|
|
fnew->handle = handle;
|
2019-01-18 08:14:01 +07:00
|
|
|
fnew->pf = alloc_percpu(struct tc_basic_pcnt);
|
|
|
|
if (!fnew->pf) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto errout;
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2018-01-18 23:20:52 +07:00
|
|
|
err = basic_set_parms(net, tp, fnew, base, tb, tca[TCA_RATE], ovr,
|
|
|
|
extack);
|
2017-09-26 00:13:50 +07:00
|
|
|
if (err < 0) {
|
|
|
|
if (!fold)
|
2017-11-28 21:48:43 +07:00
|
|
|
idr_remove(&head->handle_idr, fnew->handle);
|
2005-04-17 05:20:36 +07:00
|
|
|
goto errout;
|
2017-09-26 00:13:50 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2017-08-05 11:31:43 +07:00
|
|
|
*arg = fnew;
|
2014-09-13 10:05:59 +07:00
|
|
|
|
|
|
|
if (fold) {
|
2017-11-28 21:56:36 +07:00
|
|
|
idr_replace(&head->handle_idr, fnew, fnew->handle);
|
2014-09-13 10:05:59 +07:00
|
|
|
list_replace_rcu(&fold->link, &fnew->link);
|
2014-10-06 11:28:52 +07:00
|
|
|
tcf_unbind_filter(tp, &fold->res);
|
2017-11-07 04:47:20 +07:00
|
|
|
tcf_exts_get_net(&fold->exts);
|
2018-05-24 05:26:53 +07:00
|
|
|
tcf_queue_work(&fold->rwork, basic_delete_filter_work);
|
2014-09-13 10:05:59 +07:00
|
|
|
} else {
|
|
|
|
list_add_rcu(&fnew->link, &head->flist);
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
errout:
|
2019-01-18 08:14:01 +07:00
|
|
|
free_percpu(fnew->pf);
|
2016-08-20 02:36:54 +07:00
|
|
|
tcf_exts_destroy(&fnew->exts);
|
2014-09-13 10:05:59 +07:00
|
|
|
kfree(fnew);
|
2005-04-17 05:20:36 +07:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2019-02-11 15:55:45 +07:00
|
|
|
static void basic_walk(struct tcf_proto *tp, struct tcf_walker *arg,
|
|
|
|
bool rtnl_held)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2014-09-13 10:05:59 +07:00
|
|
|
struct basic_head *head = rtnl_dereference(tp->root);
|
2005-04-17 05:20:36 +07:00
|
|
|
struct basic_filter *f;
|
|
|
|
|
|
|
|
list_for_each_entry(f, &head->flist, link) {
|
|
|
|
if (arg->count < arg->skip)
|
|
|
|
goto skip;
|
|
|
|
|
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;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
skip:
|
|
|
|
arg->count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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 basic_bind_class(void *fh, u32 classid, unsigned long cl)
|
|
|
|
{
|
|
|
|
struct basic_filter *f = fh;
|
|
|
|
|
|
|
|
if (f && f->res.classid == classid)
|
|
|
|
f->res.class = cl;
|
|
|
|
}
|
|
|
|
|
2017-08-05 11:31:43 +07:00
|
|
|
static int basic_dump(struct net *net, struct tcf_proto *tp, void *fh,
|
2019-02-11 15:55:45 +07:00
|
|
|
struct sk_buff *skb, struct tcmsg *t, bool rtnl_held)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2019-01-18 08:14:01 +07:00
|
|
|
struct tc_basic_pcnt gpf = {};
|
2017-08-05 11:31:43 +07:00
|
|
|
struct basic_filter *f = fh;
|
2008-01-24 11:34:11 +07:00
|
|
|
struct nlattr *nest;
|
2019-01-18 08:14:01 +07:00
|
|
|
int cpu;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
if (f == NULL)
|
|
|
|
return skb->len;
|
|
|
|
|
|
|
|
t->tcm_handle = f->handle;
|
|
|
|
|
2019-04-26 16:13:06 +07:00
|
|
|
nest = nla_nest_start_noflag(skb, TCA_OPTIONS);
|
2008-01-24 11:34:11 +07:00
|
|
|
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_BASIC_CLASSID, f->res.classid))
|
|
|
|
goto nla_put_failure;
|
2005-06-09 05:11:02 +07:00
|
|
|
|
2019-01-18 08:14:01 +07:00
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
struct tc_basic_pcnt *pf = per_cpu_ptr(f->pf, cpu);
|
|
|
|
|
|
|
|
gpf.rcnt += pf->rcnt;
|
|
|
|
gpf.rhit += pf->rhit;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nla_put_64bit(skb, TCA_BASIC_PCNT,
|
|
|
|
sizeof(struct tc_basic_pcnt),
|
|
|
|
&gpf, TCA_BASIC_PAD))
|
|
|
|
goto nla_put_failure;
|
|
|
|
|
2013-12-16 11:15:07 +07:00
|
|
|
if (tcf_exts_dump(skb, &f->exts) < 0 ||
|
2005-04-17 05:20:36 +07:00
|
|
|
tcf_em_tree_dump(skb, &f->ematches, TCA_BASIC_EMATCHES) < 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);
|
2010-11-04 18:47:04 +07:00
|
|
|
|
2013-12-16 11:15:07 +07:00
|
|
|
if (tcf_exts_dump_stats(skb, &f->exts) < 0)
|
2010-11-04 18:47:04 +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:
|
2008-01-24 11:34:11 +07:00
|
|
|
nla_nest_cancel(skb, nest);
|
2005-04-17 05:20:36 +07:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-01-23 13:10:42 +07:00
|
|
|
static struct tcf_proto_ops cls_basic_ops __read_mostly = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.kind = "basic",
|
|
|
|
.classify = basic_classify,
|
|
|
|
.init = basic_init,
|
|
|
|
.destroy = basic_destroy,
|
|
|
|
.get = basic_get,
|
|
|
|
.change = basic_change,
|
|
|
|
.delete = basic_delete,
|
|
|
|
.walk = basic_walk,
|
|
|
|
.dump = basic_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 = basic_bind_class,
|
2005-04-17 05:20:36 +07:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init init_basic(void)
|
|
|
|
{
|
|
|
|
return register_tcf_proto_ops(&cls_basic_ops);
|
|
|
|
}
|
|
|
|
|
2007-02-09 21:25:16 +07:00
|
|
|
static void __exit exit_basic(void)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
unregister_tcf_proto_ops(&cls_basic_ops);
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(init_basic)
|
|
|
|
module_exit(exit_basic)
|
|
|
|
MODULE_LICENSE("GPL");
|