2008-09-13 06:30:20 +07:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2008, Intel Corporation.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms and conditions of the GNU General Public License,
|
|
|
|
* version 2, as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
|
|
* more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along with
|
2013-12-07 00:13:44 +07:00
|
|
|
* this program; if not, see <http://www.gnu.org/licenses/>.
|
2008-09-13 06:30:20 +07:00
|
|
|
*
|
|
|
|
* Author: Alexander Duyck <alexander.h.duyck@intel.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/rtnetlink.h>
|
|
|
|
#include <net/netlink.h>
|
|
|
|
#include <net/pkt_sched.h>
|
|
|
|
|
|
|
|
#include <linux/tc_act/tc_skbedit.h>
|
|
|
|
#include <net/tc_act/tc_skbedit.h>
|
|
|
|
|
|
|
|
#define SKBEDIT_TAB_MASK 15
|
|
|
|
|
netns: make struct pernet_operations::id unsigned int
Make struct pernet_operations::id unsigned.
There are 2 reasons to do so:
1)
This field is really an index into an zero based array and
thus is unsigned entity. Using negative value is out-of-bound
access by definition.
2)
On x86_64 unsigned 32-bit data which are mixed with pointers
via array indexing or offsets added or subtracted to pointers
are preffered to signed 32-bit data.
"int" being used as an array index needs to be sign-extended
to 64-bit before being used.
void f(long *p, int i)
{
g(p[i]);
}
roughly translates to
movsx rsi, esi
mov rdi, [rsi+...]
call g
MOVSX is 3 byte instruction which isn't necessary if the variable is
unsigned because x86_64 is zero extending by default.
Now, there is net_generic() function which, you guessed it right, uses
"int" as an array index:
static inline void *net_generic(const struct net *net, int id)
{
...
ptr = ng->ptr[id - 1];
...
}
And this function is used a lot, so those sign extensions add up.
Patch snipes ~1730 bytes on allyesconfig kernel (without all junk
messing with code generation):
add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
Unfortunately some functions actually grow bigger.
This is a semmingly random artefact of code generation with register
allocator being used differently. gcc decides that some variable
needs to live in new r8+ registers and every access now requires REX
prefix. Or it is shifted into r12, so [r12+0] addressing mode has to be
used which is longer than [r8]
However, overall balance is in negative direction:
add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
function old new delta
nfsd4_lock 3886 3959 +73
tipc_link_build_proto_msg 1096 1140 +44
mac80211_hwsim_new_radio 2776 2808 +32
tipc_mon_rcv 1032 1058 +26
svcauth_gss_legacy_init 1413 1429 +16
tipc_bcbase_select_primary 379 392 +13
nfsd4_exchange_id 1247 1260 +13
nfsd4_setclientid_confirm 782 793 +11
...
put_client_renew_locked 494 480 -14
ip_set_sockfn_get 730 716 -14
geneve_sock_add 829 813 -16
nfsd4_sequence_done 721 703 -18
nlmclnt_lookup_host 708 686 -22
nfsd4_lockt 1085 1063 -22
nfs_get_client 1077 1050 -27
tcf_bpf_init 1106 1076 -30
nfsd4_encode_fattr 5997 5930 -67
Total: Before=154856051, After=154854321, chg -0.00%
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-11-17 08:58:21 +07:00
|
|
|
static unsigned int skbedit_net_id;
|
2016-07-26 06:09:41 +07:00
|
|
|
static struct tc_action_ops act_skbedit_ops;
|
2016-02-23 06:57:53 +07:00
|
|
|
|
2011-07-06 06:25:42 +07:00
|
|
|
static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a,
|
2008-09-13 06:30:20 +07:00
|
|
|
struct tcf_result *res)
|
|
|
|
{
|
2016-07-26 06:09:41 +07:00
|
|
|
struct tcf_skbedit *d = to_skbedit(a);
|
2008-09-13 06:30:20 +07:00
|
|
|
|
|
|
|
spin_lock(&d->tcf_lock);
|
2016-06-06 17:32:53 +07:00
|
|
|
tcf_lastuse_update(&d->tcf_tm);
|
2011-01-09 15:30:54 +07:00
|
|
|
bstats_update(&d->tcf_bstats, skb);
|
2008-09-13 06:30:20 +07:00
|
|
|
|
|
|
|
if (d->flags & SKBEDIT_F_PRIORITY)
|
|
|
|
skb->priority = d->priority;
|
|
|
|
if (d->flags & SKBEDIT_F_QUEUE_MAPPING &&
|
|
|
|
skb->dev->real_num_tx_queues > d->queue_mapping)
|
|
|
|
skb_set_queue_mapping(skb, d->queue_mapping);
|
2016-10-24 19:32:57 +07:00
|
|
|
if (d->flags & SKBEDIT_F_MARK) {
|
|
|
|
skb->mark &= ~d->mask;
|
|
|
|
skb->mark |= d->mark & d->mask;
|
|
|
|
}
|
2016-07-02 17:43:15 +07:00
|
|
|
if (d->flags & SKBEDIT_F_PTYPE)
|
|
|
|
skb->pkt_type = d->ptype;
|
2008-09-13 06:30:20 +07:00
|
|
|
|
|
|
|
spin_unlock(&d->tcf_lock);
|
|
|
|
return d->tcf_action;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct nla_policy skbedit_policy[TCA_SKBEDIT_MAX + 1] = {
|
|
|
|
[TCA_SKBEDIT_PARMS] = { .len = sizeof(struct tc_skbedit) },
|
|
|
|
[TCA_SKBEDIT_PRIORITY] = { .len = sizeof(u32) },
|
|
|
|
[TCA_SKBEDIT_QUEUE_MAPPING] = { .len = sizeof(u16) },
|
2009-10-15 10:09:18 +07:00
|
|
|
[TCA_SKBEDIT_MARK] = { .len = sizeof(u32) },
|
2016-07-02 17:43:15 +07:00
|
|
|
[TCA_SKBEDIT_PTYPE] = { .len = sizeof(u16) },
|
2016-10-24 19:32:57 +07:00
|
|
|
[TCA_SKBEDIT_MASK] = { .len = sizeof(u32) },
|
2008-09-13 06:30:20 +07:00
|
|
|
};
|
|
|
|
|
2013-01-14 12:15:39 +07:00
|
|
|
static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
|
2016-07-26 06:09:41 +07:00
|
|
|
struct nlattr *est, struct tc_action **a,
|
2013-01-14 12:15:39 +07:00
|
|
|
int ovr, int bind)
|
2008-09-13 06:30:20 +07:00
|
|
|
{
|
2016-02-23 06:57:53 +07:00
|
|
|
struct tc_action_net *tn = net_generic(net, skbedit_net_id);
|
2008-09-13 06:30:20 +07:00
|
|
|
struct nlattr *tb[TCA_SKBEDIT_MAX + 1];
|
|
|
|
struct tc_skbedit *parm;
|
|
|
|
struct tcf_skbedit *d;
|
2016-10-24 19:32:57 +07:00
|
|
|
u32 flags = 0, *priority = NULL, *mark = NULL, *mask = NULL;
|
2016-07-02 17:43:15 +07:00
|
|
|
u16 *queue_mapping = NULL, *ptype = NULL;
|
2016-06-14 03:46:28 +07:00
|
|
|
bool exists = false;
|
|
|
|
int ret = 0, err;
|
2008-09-13 06:30:20 +07:00
|
|
|
|
|
|
|
if (nla == NULL)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2017-04-12 19:34:07 +07:00
|
|
|
err = nla_parse_nested(tb, TCA_SKBEDIT_MAX, nla, skbedit_policy, NULL);
|
2008-09-13 06:30:20 +07:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
if (tb[TCA_SKBEDIT_PARMS] == NULL)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (tb[TCA_SKBEDIT_PRIORITY] != NULL) {
|
|
|
|
flags |= SKBEDIT_F_PRIORITY;
|
|
|
|
priority = nla_data(tb[TCA_SKBEDIT_PRIORITY]);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tb[TCA_SKBEDIT_QUEUE_MAPPING] != NULL) {
|
|
|
|
flags |= SKBEDIT_F_QUEUE_MAPPING;
|
|
|
|
queue_mapping = nla_data(tb[TCA_SKBEDIT_QUEUE_MAPPING]);
|
|
|
|
}
|
2009-10-15 10:09:18 +07:00
|
|
|
|
2016-07-02 17:43:15 +07:00
|
|
|
if (tb[TCA_SKBEDIT_PTYPE] != NULL) {
|
|
|
|
ptype = nla_data(tb[TCA_SKBEDIT_PTYPE]);
|
|
|
|
if (!skb_pkt_type_ok(*ptype))
|
|
|
|
return -EINVAL;
|
|
|
|
flags |= SKBEDIT_F_PTYPE;
|
|
|
|
}
|
|
|
|
|
2009-10-15 10:09:18 +07:00
|
|
|
if (tb[TCA_SKBEDIT_MARK] != NULL) {
|
|
|
|
flags |= SKBEDIT_F_MARK;
|
|
|
|
mark = nla_data(tb[TCA_SKBEDIT_MARK]);
|
|
|
|
}
|
|
|
|
|
2016-10-24 19:32:57 +07:00
|
|
|
if (tb[TCA_SKBEDIT_MASK] != NULL) {
|
|
|
|
flags |= SKBEDIT_F_MASK;
|
|
|
|
mask = nla_data(tb[TCA_SKBEDIT_MASK]);
|
|
|
|
}
|
|
|
|
|
2008-09-13 06:30:20 +07:00
|
|
|
parm = nla_data(tb[TCA_SKBEDIT_PARMS]);
|
|
|
|
|
2016-05-11 03:49:30 +07:00
|
|
|
exists = tcf_hash_check(tn, parm->index, a, bind);
|
|
|
|
if (exists && bind)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!flags) {
|
2016-07-26 06:09:41 +07:00
|
|
|
tcf_hash_release(*a, bind);
|
2016-05-11 03:49:30 +07:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!exists) {
|
2016-02-23 06:57:53 +07:00
|
|
|
ret = tcf_hash_create(tn, parm->index, est, a,
|
2016-07-26 06:09:41 +07:00
|
|
|
&act_skbedit_ops, bind, false);
|
2014-02-12 08:07:31 +07:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2008-09-13 06:30:20 +07:00
|
|
|
|
2016-07-26 06:09:41 +07:00
|
|
|
d = to_skbedit(*a);
|
2008-09-13 06:30:20 +07:00
|
|
|
ret = ACT_P_CREATED;
|
|
|
|
} else {
|
2016-07-26 06:09:41 +07:00
|
|
|
d = to_skbedit(*a);
|
|
|
|
tcf_hash_release(*a, bind);
|
2013-12-23 20:02:11 +07:00
|
|
|
if (!ovr)
|
2008-09-13 06:30:20 +07:00
|
|
|
return -EEXIST;
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_lock_bh(&d->tcf_lock);
|
|
|
|
|
|
|
|
d->flags = flags;
|
|
|
|
if (flags & SKBEDIT_F_PRIORITY)
|
|
|
|
d->priority = *priority;
|
|
|
|
if (flags & SKBEDIT_F_QUEUE_MAPPING)
|
|
|
|
d->queue_mapping = *queue_mapping;
|
2009-10-15 10:09:18 +07:00
|
|
|
if (flags & SKBEDIT_F_MARK)
|
|
|
|
d->mark = *mark;
|
2016-07-02 17:43:15 +07:00
|
|
|
if (flags & SKBEDIT_F_PTYPE)
|
|
|
|
d->ptype = *ptype;
|
2016-10-24 19:32:57 +07:00
|
|
|
/* default behaviour is to use all the bits */
|
|
|
|
d->mask = 0xffffffff;
|
|
|
|
if (flags & SKBEDIT_F_MASK)
|
|
|
|
d->mask = *mask;
|
2009-10-15 10:09:18 +07:00
|
|
|
|
2008-09-13 06:30:20 +07:00
|
|
|
d->tcf_action = parm->action;
|
|
|
|
|
|
|
|
spin_unlock_bh(&d->tcf_lock);
|
|
|
|
|
|
|
|
if (ret == ACT_P_CREATED)
|
2016-07-26 06:09:41 +07:00
|
|
|
tcf_hash_insert(tn, *a);
|
2008-09-13 06:30:20 +07:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-01-20 02:26:56 +07:00
|
|
|
static int tcf_skbedit_dump(struct sk_buff *skb, struct tc_action *a,
|
|
|
|
int bind, int ref)
|
2008-09-13 06:30:20 +07:00
|
|
|
{
|
|
|
|
unsigned char *b = skb_tail_pointer(skb);
|
2016-07-26 06:09:41 +07:00
|
|
|
struct tcf_skbedit *d = to_skbedit(a);
|
2010-08-17 03:04:22 +07:00
|
|
|
struct tc_skbedit opt = {
|
|
|
|
.index = d->tcf_index,
|
|
|
|
.refcnt = d->tcf_refcnt - ref,
|
|
|
|
.bindcnt = d->tcf_bindcnt - bind,
|
|
|
|
.action = d->tcf_action,
|
|
|
|
};
|
2008-09-13 06:30:20 +07:00
|
|
|
struct tcf_t t;
|
|
|
|
|
2012-03-29 16:11:39 +07:00
|
|
|
if (nla_put(skb, TCA_SKBEDIT_PARMS, sizeof(opt), &opt))
|
|
|
|
goto nla_put_failure;
|
|
|
|
if ((d->flags & SKBEDIT_F_PRIORITY) &&
|
2016-07-02 17:43:16 +07:00
|
|
|
nla_put_u32(skb, TCA_SKBEDIT_PRIORITY, d->priority))
|
2012-03-29 16:11:39 +07:00
|
|
|
goto nla_put_failure;
|
|
|
|
if ((d->flags & SKBEDIT_F_QUEUE_MAPPING) &&
|
2016-07-02 17:43:16 +07:00
|
|
|
nla_put_u16(skb, TCA_SKBEDIT_QUEUE_MAPPING, d->queue_mapping))
|
2012-03-29 16:11:39 +07:00
|
|
|
goto nla_put_failure;
|
|
|
|
if ((d->flags & SKBEDIT_F_MARK) &&
|
2016-07-02 17:43:16 +07:00
|
|
|
nla_put_u32(skb, TCA_SKBEDIT_MARK, d->mark))
|
2012-03-29 16:11:39 +07:00
|
|
|
goto nla_put_failure;
|
2016-07-02 17:43:15 +07:00
|
|
|
if ((d->flags & SKBEDIT_F_PTYPE) &&
|
2016-07-02 17:43:16 +07:00
|
|
|
nla_put_u16(skb, TCA_SKBEDIT_PTYPE, d->ptype))
|
2016-07-02 17:43:15 +07:00
|
|
|
goto nla_put_failure;
|
2016-10-24 19:32:57 +07:00
|
|
|
if ((d->flags & SKBEDIT_F_MASK) &&
|
|
|
|
nla_put_u32(skb, TCA_SKBEDIT_MASK, d->mask))
|
|
|
|
goto nla_put_failure;
|
2016-06-06 17:32:55 +07:00
|
|
|
|
|
|
|
tcf_tm_dump(&t, &d->tcf_tm);
|
2016-04-26 15:06:18 +07:00
|
|
|
if (nla_put_64bit(skb, TCA_SKBEDIT_TM, sizeof(t), &t, TCA_SKBEDIT_PAD))
|
2012-03-29 16:11:39 +07:00
|
|
|
goto nla_put_failure;
|
2008-09-13 06:30:20 +07:00
|
|
|
return skb->len;
|
|
|
|
|
|
|
|
nla_put_failure:
|
|
|
|
nlmsg_trim(skb, b);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2016-02-23 06:57:53 +07:00
|
|
|
static int tcf_skbedit_walker(struct net *net, struct sk_buff *skb,
|
|
|
|
struct netlink_callback *cb, int type,
|
2016-07-26 06:09:41 +07:00
|
|
|
const struct tc_action_ops *ops)
|
2016-02-23 06:57:53 +07:00
|
|
|
{
|
|
|
|
struct tc_action_net *tn = net_generic(net, skbedit_net_id);
|
|
|
|
|
2016-07-26 06:09:41 +07:00
|
|
|
return tcf_generic_walker(tn, skb, cb, type, ops);
|
2016-02-23 06:57:53 +07:00
|
|
|
}
|
|
|
|
|
2016-07-26 06:09:41 +07:00
|
|
|
static int tcf_skbedit_search(struct net *net, struct tc_action **a, u32 index)
|
2016-02-23 06:57:53 +07:00
|
|
|
{
|
|
|
|
struct tc_action_net *tn = net_generic(net, skbedit_net_id);
|
|
|
|
|
|
|
|
return tcf_hash_search(tn, a, index);
|
|
|
|
}
|
|
|
|
|
2008-09-13 06:30:20 +07:00
|
|
|
static struct tc_action_ops act_skbedit_ops = {
|
|
|
|
.kind = "skbedit",
|
|
|
|
.type = TCA_ACT_SKBEDIT,
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.act = tcf_skbedit,
|
|
|
|
.dump = tcf_skbedit_dump,
|
|
|
|
.init = tcf_skbedit_init,
|
2016-02-23 06:57:53 +07:00
|
|
|
.walk = tcf_skbedit_walker,
|
|
|
|
.lookup = tcf_skbedit_search,
|
2016-07-26 06:09:41 +07:00
|
|
|
.size = sizeof(struct tcf_skbedit),
|
2016-02-23 06:57:53 +07:00
|
|
|
};
|
|
|
|
|
|
|
|
static __net_init int skbedit_init_net(struct net *net)
|
|
|
|
{
|
|
|
|
struct tc_action_net *tn = net_generic(net, skbedit_net_id);
|
|
|
|
|
|
|
|
return tc_action_net_init(tn, &act_skbedit_ops, SKBEDIT_TAB_MASK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __net_exit skbedit_exit_net(struct net *net)
|
|
|
|
{
|
|
|
|
struct tc_action_net *tn = net_generic(net, skbedit_net_id);
|
|
|
|
|
|
|
|
tc_action_net_exit(tn);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct pernet_operations skbedit_net_ops = {
|
|
|
|
.init = skbedit_init_net,
|
|
|
|
.exit = skbedit_exit_net,
|
|
|
|
.id = &skbedit_net_id,
|
|
|
|
.size = sizeof(struct tc_action_net),
|
2008-09-13 06:30:20 +07:00
|
|
|
};
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Alexander Duyck, <alexander.h.duyck@intel.com>");
|
|
|
|
MODULE_DESCRIPTION("SKB Editing");
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
|
|
|
static int __init skbedit_init_module(void)
|
|
|
|
{
|
2016-02-23 06:57:53 +07:00
|
|
|
return tcf_register_action(&act_skbedit_ops, &skbedit_net_ops);
|
2008-09-13 06:30:20 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit skbedit_cleanup_module(void)
|
|
|
|
{
|
2016-02-23 06:57:53 +07:00
|
|
|
tcf_unregister_action(&act_skbedit_ops, &skbedit_net_ops);
|
2008-09-13 06:30:20 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
module_init(skbedit_init_module);
|
|
|
|
module_exit(skbedit_cleanup_module);
|