2019-05-27 06:55:01 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2016-02-27 13:08:54 +00:00
|
|
|
/*
|
|
|
|
* net/sched/ife.c Inter-FE action based on ForCES WG InterFE LFB
|
|
|
|
*
|
|
|
|
* Refer to:
|
|
|
|
* draft-ietf-forces-interfelfb-03
|
|
|
|
* and
|
|
|
|
* netdev01 paper:
|
|
|
|
* "Distributing Linux Traffic Control Classifier-Action
|
|
|
|
* Subsystem"
|
|
|
|
* Authors: Jamal Hadi Salim and Damascene M. Joachimpillai
|
|
|
|
*
|
|
|
|
* copyright Jamal Hadi Salim (2015)
|
|
|
|
*/
|
|
|
|
|
|
|
|
#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 <net/net_namespace.h>
|
|
|
|
#include <net/netlink.h>
|
|
|
|
#include <net/pkt_sched.h>
|
2019-03-20 14:00:03 +00:00
|
|
|
#include <net/pkt_cls.h>
|
2016-02-27 13:08:54 +00:00
|
|
|
#include <uapi/linux/tc_act/tc_ife.h>
|
|
|
|
#include <net/tc_act/tc_ife.h>
|
|
|
|
#include <linux/etherdevice.h>
|
2017-02-01 13:30:03 +00:00
|
|
|
#include <net/ife.h>
|
2016-02-27 13:08:54 +00:00
|
|
|
|
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 01:58:21 +00:00
|
|
|
static unsigned int ife_net_id;
|
2016-02-27 13:08:54 +00:00
|
|
|
static int max_metacnt = IFE_META_MAX + 1;
|
2016-07-25 23:09:41 +00:00
|
|
|
static struct tc_action_ops act_ife_ops;
|
2016-02-27 13:08:54 +00:00
|
|
|
|
|
|
|
static const struct nla_policy ife_policy[TCA_IFE_MAX + 1] = {
|
|
|
|
[TCA_IFE_PARMS] = { .len = sizeof(struct tc_ife)},
|
|
|
|
[TCA_IFE_DMAC] = { .len = ETH_ALEN},
|
|
|
|
[TCA_IFE_SMAC] = { .len = ETH_ALEN},
|
|
|
|
[TCA_IFE_TYPE] = { .type = NLA_U16},
|
|
|
|
};
|
|
|
|
|
2016-09-18 11:31:42 +00:00
|
|
|
int ife_encode_meta_u16(u16 metaval, void *skbdata, struct tcf_meta_info *mi)
|
|
|
|
{
|
|
|
|
u16 edata = 0;
|
|
|
|
|
|
|
|
if (mi->metaval)
|
|
|
|
edata = *(u16 *)mi->metaval;
|
|
|
|
else if (metaval)
|
|
|
|
edata = metaval;
|
|
|
|
|
|
|
|
if (!edata) /* will not encode */
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
edata = htons(edata);
|
|
|
|
return ife_tlv_meta_encode(skbdata, mi->metaid, 2, &edata);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ife_encode_meta_u16);
|
|
|
|
|
2016-02-27 13:08:54 +00:00
|
|
|
int ife_get_meta_u32(struct sk_buff *skb, struct tcf_meta_info *mi)
|
|
|
|
{
|
|
|
|
if (mi->metaval)
|
|
|
|
return nla_put_u32(skb, mi->metaid, *(u32 *)mi->metaval);
|
|
|
|
else
|
|
|
|
return nla_put(skb, mi->metaid, 0, NULL);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ife_get_meta_u32);
|
|
|
|
|
|
|
|
int ife_check_meta_u32(u32 metaval, struct tcf_meta_info *mi)
|
|
|
|
{
|
|
|
|
if (metaval || mi->metaval)
|
|
|
|
return 8; /* T+L+V == 2+2+4 */
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ife_check_meta_u32);
|
|
|
|
|
2016-09-18 11:31:42 +00:00
|
|
|
int ife_check_meta_u16(u16 metaval, struct tcf_meta_info *mi)
|
|
|
|
{
|
|
|
|
if (metaval || mi->metaval)
|
|
|
|
return 8; /* T+L+(V) == 2+2+(2+2bytepad) */
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ife_check_meta_u16);
|
|
|
|
|
2016-02-27 13:08:54 +00:00
|
|
|
int ife_encode_meta_u32(u32 metaval, void *skbdata, struct tcf_meta_info *mi)
|
|
|
|
{
|
|
|
|
u32 edata = metaval;
|
|
|
|
|
|
|
|
if (mi->metaval)
|
|
|
|
edata = *(u32 *)mi->metaval;
|
|
|
|
else if (metaval)
|
|
|
|
edata = metaval;
|
|
|
|
|
|
|
|
if (!edata) /* will not encode */
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
edata = htonl(edata);
|
|
|
|
return ife_tlv_meta_encode(skbdata, mi->metaid, 4, &edata);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ife_encode_meta_u32);
|
|
|
|
|
|
|
|
int ife_get_meta_u16(struct sk_buff *skb, struct tcf_meta_info *mi)
|
|
|
|
{
|
|
|
|
if (mi->metaval)
|
|
|
|
return nla_put_u16(skb, mi->metaid, *(u16 *)mi->metaval);
|
|
|
|
else
|
|
|
|
return nla_put(skb, mi->metaid, 0, NULL);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ife_get_meta_u16);
|
|
|
|
|
2016-06-20 20:37:18 +00:00
|
|
|
int ife_alloc_meta_u32(struct tcf_meta_info *mi, void *metaval, gfp_t gfp)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
2016-06-20 20:37:18 +00:00
|
|
|
mi->metaval = kmemdup(metaval, sizeof(u32), gfp);
|
2016-02-27 13:08:54 +00:00
|
|
|
if (!mi->metaval)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ife_alloc_meta_u32);
|
|
|
|
|
2016-06-20 20:37:18 +00:00
|
|
|
int ife_alloc_meta_u16(struct tcf_meta_info *mi, void *metaval, gfp_t gfp)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
2016-06-20 20:37:18 +00:00
|
|
|
mi->metaval = kmemdup(metaval, sizeof(u16), gfp);
|
2016-02-27 13:08:54 +00:00
|
|
|
if (!mi->metaval)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ife_alloc_meta_u16);
|
|
|
|
|
|
|
|
void ife_release_meta_gen(struct tcf_meta_info *mi)
|
|
|
|
{
|
|
|
|
kfree(mi->metaval);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ife_release_meta_gen);
|
|
|
|
|
|
|
|
int ife_validate_meta_u32(void *val, int len)
|
|
|
|
{
|
2016-08-22 11:10:20 +00:00
|
|
|
if (len == sizeof(u32))
|
2016-02-27 13:08:54 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ife_validate_meta_u32);
|
|
|
|
|
|
|
|
int ife_validate_meta_u16(void *val, int len)
|
|
|
|
{
|
2016-08-22 11:10:20 +00:00
|
|
|
/* length will not include padding */
|
|
|
|
if (len == sizeof(u16))
|
2016-02-27 13:08:54 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ife_validate_meta_u16);
|
|
|
|
|
|
|
|
static LIST_HEAD(ifeoplist);
|
|
|
|
static DEFINE_RWLOCK(ife_mod_lock);
|
|
|
|
|
|
|
|
static struct tcf_meta_ops *find_ife_oplist(u16 metaid)
|
|
|
|
{
|
|
|
|
struct tcf_meta_ops *o;
|
|
|
|
|
2018-08-19 19:22:11 +00:00
|
|
|
read_lock(&ife_mod_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
list_for_each_entry(o, &ifeoplist, list) {
|
|
|
|
if (o->metaid == metaid) {
|
|
|
|
if (!try_module_get(o->owner))
|
|
|
|
o = NULL;
|
2018-08-19 19:22:11 +00:00
|
|
|
read_unlock(&ife_mod_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
return o;
|
|
|
|
}
|
|
|
|
}
|
2018-08-19 19:22:11 +00:00
|
|
|
read_unlock(&ife_mod_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
int register_ife_op(struct tcf_meta_ops *mops)
|
|
|
|
{
|
|
|
|
struct tcf_meta_ops *m;
|
|
|
|
|
|
|
|
if (!mops->metaid || !mops->metatype || !mops->name ||
|
|
|
|
!mops->check_presence || !mops->encode || !mops->decode ||
|
|
|
|
!mops->get || !mops->alloc)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2018-08-19 19:22:11 +00:00
|
|
|
write_lock(&ife_mod_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
|
|
|
|
list_for_each_entry(m, &ifeoplist, list) {
|
|
|
|
if (m->metaid == mops->metaid ||
|
|
|
|
(strcmp(mops->name, m->name) == 0)) {
|
2018-08-19 19:22:11 +00:00
|
|
|
write_unlock(&ife_mod_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
return -EEXIST;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!mops->release)
|
|
|
|
mops->release = ife_release_meta_gen;
|
|
|
|
|
|
|
|
list_add_tail(&mops->list, &ifeoplist);
|
2018-08-19 19:22:11 +00:00
|
|
|
write_unlock(&ife_mod_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(unregister_ife_op);
|
|
|
|
|
|
|
|
int unregister_ife_op(struct tcf_meta_ops *mops)
|
|
|
|
{
|
|
|
|
struct tcf_meta_ops *m;
|
|
|
|
int err = -ENOENT;
|
|
|
|
|
2018-08-19 19:22:11 +00:00
|
|
|
write_lock(&ife_mod_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
list_for_each_entry(m, &ifeoplist, list) {
|
|
|
|
if (m->metaid == mops->metaid) {
|
|
|
|
list_del(&mops->list);
|
|
|
|
err = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2018-08-19 19:22:11 +00:00
|
|
|
write_unlock(&ife_mod_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(register_ife_op);
|
|
|
|
|
|
|
|
static int ife_validate_metatype(struct tcf_meta_ops *ops, void *val, int len)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
/* XXX: unfortunately cant use nla_policy at this point
|
|
|
|
* because a length of 0 is valid in the case of
|
|
|
|
* "allow". "use" semantics do enforce for proper
|
|
|
|
* length and i couldve use nla_policy but it makes it hard
|
|
|
|
* to use it just for that..
|
|
|
|
*/
|
|
|
|
if (ops->validate)
|
|
|
|
return ops->validate(val, len);
|
|
|
|
|
|
|
|
if (ops->metatype == NLA_U32)
|
|
|
|
ret = ife_validate_meta_u32(val, len);
|
|
|
|
else if (ops->metatype == NLA_U16)
|
|
|
|
ret = ife_validate_meta_u16(val, len);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-10-13 19:58:13 +00:00
|
|
|
#ifdef CONFIG_MODULES
|
2017-10-11 14:50:30 +00:00
|
|
|
static const char *ife_meta_id2name(u32 metaid)
|
|
|
|
{
|
|
|
|
switch (metaid) {
|
|
|
|
case IFE_META_SKBMARK:
|
|
|
|
return "skbmark";
|
|
|
|
case IFE_META_PRIO:
|
|
|
|
return "skbprio";
|
|
|
|
case IFE_META_TCINDEX:
|
|
|
|
return "tcindex";
|
|
|
|
default:
|
|
|
|
return "unknown";
|
|
|
|
}
|
|
|
|
}
|
2017-10-13 19:58:13 +00:00
|
|
|
#endif
|
2017-10-11 14:50:30 +00:00
|
|
|
|
2016-02-27 13:08:54 +00:00
|
|
|
/* called when adding new meta information
|
|
|
|
*/
|
2018-08-19 19:22:12 +00:00
|
|
|
static int load_metaops_and_vet(u32 metaid, void *val, int len, bool rtnl_held)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
|
|
|
struct tcf_meta_ops *ops = find_ife_oplist(metaid);
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (!ops) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
#ifdef CONFIG_MODULES
|
2018-08-10 17:51:44 +00:00
|
|
|
if (rtnl_held)
|
|
|
|
rtnl_unlock();
|
2017-10-11 14:50:30 +00:00
|
|
|
request_module("ife-meta-%s", ife_meta_id2name(metaid));
|
2018-08-10 17:51:44 +00:00
|
|
|
if (rtnl_held)
|
|
|
|
rtnl_lock();
|
2016-02-27 13:08:54 +00:00
|
|
|
ops = find_ife_oplist(metaid);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ops) {
|
|
|
|
ret = 0;
|
|
|
|
if (len)
|
|
|
|
ret = ife_validate_metatype(ops, val, len);
|
|
|
|
|
|
|
|
module_put(ops->owner);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* called when adding new meta information
|
|
|
|
*/
|
2018-08-19 19:22:13 +00:00
|
|
|
static int __add_metainfo(const struct tcf_meta_ops *ops,
|
|
|
|
struct tcf_ife_info *ife, u32 metaid, void *metaval,
|
|
|
|
int len, bool atomic, bool exists)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
|
|
|
struct tcf_meta_info *mi = NULL;
|
|
|
|
int ret = 0;
|
|
|
|
|
2016-06-20 20:37:19 +00:00
|
|
|
mi = kzalloc(sizeof(*mi), atomic ? GFP_ATOMIC : GFP_KERNEL);
|
2018-08-19 19:22:13 +00:00
|
|
|
if (!mi)
|
2016-02-27 13:08:54 +00:00
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
mi->metaid = metaid;
|
|
|
|
mi->ops = ops;
|
|
|
|
if (len > 0) {
|
2016-06-20 20:37:19 +00:00
|
|
|
ret = ops->alloc(mi, metaval, atomic ? GFP_ATOMIC : GFP_KERNEL);
|
2016-02-27 13:08:54 +00:00
|
|
|
if (ret != 0) {
|
|
|
|
kfree(mi);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-19 19:22:12 +00:00
|
|
|
if (exists)
|
|
|
|
spin_lock_bh(&ife->tcf_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
list_add_tail(&mi->metalist, &ife->metalist);
|
2018-08-19 19:22:12 +00:00
|
|
|
if (exists)
|
|
|
|
spin_unlock_bh(&ife->tcf_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-09-03 21:44:42 +00:00
|
|
|
static int add_metainfo_and_get_ops(const struct tcf_meta_ops *ops,
|
|
|
|
struct tcf_ife_info *ife, u32 metaid,
|
|
|
|
bool exists)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!try_module_get(ops->owner))
|
|
|
|
return -ENOENT;
|
|
|
|
ret = __add_metainfo(ops, ife, metaid, NULL, 0, true, exists);
|
|
|
|
if (ret)
|
|
|
|
module_put(ops->owner);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-08-19 19:22:13 +00:00
|
|
|
static int add_metainfo(struct tcf_ife_info *ife, u32 metaid, void *metaval,
|
|
|
|
int len, bool exists)
|
|
|
|
{
|
|
|
|
const struct tcf_meta_ops *ops = find_ife_oplist(metaid);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!ops)
|
|
|
|
return -ENOENT;
|
|
|
|
ret = __add_metainfo(ops, ife, metaid, metaval, len, false, exists);
|
|
|
|
if (ret)
|
|
|
|
/*put back what find_ife_oplist took */
|
|
|
|
module_put(ops->owner);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-08-19 19:22:12 +00:00
|
|
|
static int use_all_metadata(struct tcf_ife_info *ife, bool exists)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
|
|
|
struct tcf_meta_ops *o;
|
|
|
|
int rc = 0;
|
|
|
|
int installed = 0;
|
|
|
|
|
2018-08-19 19:22:11 +00:00
|
|
|
read_lock(&ife_mod_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
list_for_each_entry(o, &ifeoplist, list) {
|
2018-09-03 21:44:42 +00:00
|
|
|
rc = add_metainfo_and_get_ops(o, ife, o->metaid, exists);
|
2016-02-27 13:08:54 +00:00
|
|
|
if (rc == 0)
|
|
|
|
installed += 1;
|
|
|
|
}
|
2018-08-19 19:22:11 +00:00
|
|
|
read_unlock(&ife_mod_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
|
|
|
|
if (installed)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dump_metalist(struct sk_buff *skb, struct tcf_ife_info *ife)
|
|
|
|
{
|
|
|
|
struct tcf_meta_info *e;
|
|
|
|
struct nlattr *nest;
|
|
|
|
unsigned char *b = skb_tail_pointer(skb);
|
|
|
|
int total_encoded = 0;
|
|
|
|
|
|
|
|
/*can only happen on decode */
|
|
|
|
if (list_empty(&ife->metalist))
|
|
|
|
return 0;
|
|
|
|
|
2019-04-26 09:13:06 +00:00
|
|
|
nest = nla_nest_start_noflag(skb, TCA_IFE_METALST);
|
2016-02-27 13:08:54 +00:00
|
|
|
if (!nest)
|
|
|
|
goto out_nlmsg_trim;
|
|
|
|
|
|
|
|
list_for_each_entry(e, &ife->metalist, metalist) {
|
|
|
|
if (!e->ops->get(skb, e))
|
|
|
|
total_encoded += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!total_encoded)
|
|
|
|
goto out_nlmsg_trim;
|
|
|
|
|
|
|
|
nla_nest_end(skb, nest);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
out_nlmsg_trim:
|
|
|
|
nlmsg_trim(skb, b);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* under ife->tcf_lock */
|
2017-12-05 20:53:07 +00:00
|
|
|
static void _tcf_ife_cleanup(struct tc_action *a)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
2016-07-25 23:09:41 +00:00
|
|
|
struct tcf_ife_info *ife = to_ife(a);
|
2016-02-27 13:08:54 +00:00
|
|
|
struct tcf_meta_info *e, *n;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(e, n, &ife->metalist, metalist) {
|
|
|
|
list_del(&e->metalist);
|
|
|
|
if (e->metaval) {
|
|
|
|
if (e->ops->release)
|
|
|
|
e->ops->release(e);
|
|
|
|
else
|
|
|
|
kfree(e->metaval);
|
|
|
|
}
|
2018-09-03 18:08:15 +00:00
|
|
|
module_put(e->ops->owner);
|
2016-02-27 13:08:54 +00:00
|
|
|
kfree(e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-05 20:53:07 +00:00
|
|
|
static void tcf_ife_cleanup(struct tc_action *a)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
2016-07-25 23:09:41 +00:00
|
|
|
struct tcf_ife_info *ife = to_ife(a);
|
2017-10-11 21:16:08 +00:00
|
|
|
struct tcf_ife_params *p;
|
2016-02-27 13:08:54 +00:00
|
|
|
|
|
|
|
spin_lock_bh(&ife->tcf_lock);
|
2017-12-05 20:53:07 +00:00
|
|
|
_tcf_ife_cleanup(a);
|
2016-02-27 13:08:54 +00:00
|
|
|
spin_unlock_bh(&ife->tcf_lock);
|
2017-10-11 21:16:08 +00:00
|
|
|
|
|
|
|
p = rcu_dereference_protected(ife->params, 1);
|
net/sched: act_ife: fix recursive lock and idr leak
a recursive lock warning [1] can be observed with the following script,
# $TC actions add action ife encode allow prio pass index 42
IFE type 0xED3E
# $TC actions replace action ife encode allow tcindex pass index 42
in case the kernel was unable to run the last command (e.g. because of
the impossibility to load 'act_meta_skbtcindex'). For a similar reason,
the kernel can leak idr in the error path of tcf_ife_init(), because
tcf_idr_release() is not called after successful idr reservation:
# $TC actions add action ife encode allow tcindex index 47
IFE type 0xED3E
RTNETLINK answers: No such file or directory
We have an error talking to the kernel
# $TC actions add action ife encode allow tcindex index 47
IFE type 0xED3E
RTNETLINK answers: No space left on device
We have an error talking to the kernel
# $TC actions add action ife encode use mark 7 type 0xfefe pass index 47
IFE type 0xFEFE
RTNETLINK answers: No space left on device
We have an error talking to the kernel
Since tcfa_lock is already taken when the action is being edited, a call
to tcf_idr_release() wrongly makes tcf_idr_cleanup() take the same lock
again. On the other hand, tcf_idr_release() needs to be called in the
error path of tcf_ife_init(), to undo the last tcf_idr_create() invocation.
Fix both problems in tcf_ife_init().
Since the cleanup() routine can now be called when ife->params is NULL,
also add a NULL pointer check to avoid calling kfree_rcu(NULL, rcu).
[1]
============================================
WARNING: possible recursive locking detected
4.17.0-rc4.kasan+ #417 Tainted: G E
--------------------------------------------
tc/3932 is trying to acquire lock:
000000005097c9a6 (&(&p->tcfa_lock)->rlock){+...}, at: tcf_ife_cleanup+0x19/0x80 [act_ife]
but task is already holding lock:
000000005097c9a6 (&(&p->tcfa_lock)->rlock){+...}, at: tcf_ife_init+0xf6d/0x13c0 [act_ife]
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(&(&p->tcfa_lock)->rlock);
lock(&(&p->tcfa_lock)->rlock);
*** DEADLOCK ***
May be due to missing lock nesting notation
2 locks held by tc/3932:
#0: 000000007ca8e990 (rtnl_mutex){+.+.}, at: tcf_ife_init+0xf61/0x13c0 [act_ife]
#1: 000000005097c9a6 (&(&p->tcfa_lock)->rlock){+...}, at: tcf_ife_init+0xf6d/0x13c0 [act_ife]
stack backtrace:
CPU: 3 PID: 3932 Comm: tc Tainted: G E 4.17.0-rc4.kasan+ #417
Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011
Call Trace:
dump_stack+0x9a/0xeb
__lock_acquire+0xf43/0x34a0
? debug_check_no_locks_freed+0x2b0/0x2b0
? debug_check_no_locks_freed+0x2b0/0x2b0
? debug_check_no_locks_freed+0x2b0/0x2b0
? __mutex_lock+0x62f/0x1240
? kvm_sched_clock_read+0x1a/0x30
? sched_clock+0x5/0x10
? sched_clock_cpu+0x18/0x170
? find_held_lock+0x39/0x1d0
? lock_acquire+0x10b/0x330
lock_acquire+0x10b/0x330
? tcf_ife_cleanup+0x19/0x80 [act_ife]
_raw_spin_lock_bh+0x38/0x70
? tcf_ife_cleanup+0x19/0x80 [act_ife]
tcf_ife_cleanup+0x19/0x80 [act_ife]
__tcf_idr_release+0xff/0x350
tcf_ife_init+0xdde/0x13c0 [act_ife]
? ife_exit_net+0x290/0x290 [act_ife]
? __lock_is_held+0xb4/0x140
tcf_action_init_1+0x67b/0xad0
? tcf_action_dump_old+0xa0/0xa0
? sched_clock+0x5/0x10
? sched_clock_cpu+0x18/0x170
? kvm_sched_clock_read+0x1a/0x30
? sched_clock+0x5/0x10
? sched_clock_cpu+0x18/0x170
? memset+0x1f/0x40
tcf_action_init+0x30f/0x590
? tcf_action_init_1+0xad0/0xad0
? memset+0x1f/0x40
tc_ctl_action+0x48e/0x5e0
? mutex_lock_io_nested+0x1160/0x1160
? tca_action_gd+0x990/0x990
? sched_clock+0x5/0x10
? find_held_lock+0x39/0x1d0
rtnetlink_rcv_msg+0x4da/0x990
? validate_linkmsg+0x680/0x680
? sched_clock_cpu+0x18/0x170
? find_held_lock+0x39/0x1d0
netlink_rcv_skb+0x127/0x350
? validate_linkmsg+0x680/0x680
? netlink_ack+0x970/0x970
? __kmalloc_node_track_caller+0x304/0x3a0
netlink_unicast+0x40f/0x5d0
? netlink_attachskb+0x580/0x580
? _copy_from_iter_full+0x187/0x760
? import_iovec+0x90/0x390
netlink_sendmsg+0x67f/0xb50
? netlink_unicast+0x5d0/0x5d0
? copy_msghdr_from_user+0x206/0x340
? netlink_unicast+0x5d0/0x5d0
sock_sendmsg+0xb3/0xf0
___sys_sendmsg+0x60a/0x8b0
? copy_msghdr_from_user+0x340/0x340
? lock_downgrade+0x5e0/0x5e0
? tty_write_lock+0x18/0x50
? kvm_sched_clock_read+0x1a/0x30
? sched_clock+0x5/0x10
? sched_clock_cpu+0x18/0x170
? find_held_lock+0x39/0x1d0
? lock_downgrade+0x5e0/0x5e0
? lock_acquire+0x10b/0x330
? __audit_syscall_entry+0x316/0x690
? current_kernel_time64+0x6b/0xd0
? __fget_light+0x55/0x1f0
? __sys_sendmsg+0xd2/0x170
__sys_sendmsg+0xd2/0x170
? __ia32_sys_shutdown+0x70/0x70
? syscall_trace_enter+0x57a/0xd60
? rcu_read_lock_sched_held+0xdc/0x110
? __bpf_trace_sys_enter+0x10/0x10
? do_syscall_64+0x22/0x480
do_syscall_64+0xa5/0x480
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x7fd646988ba0
RSP: 002b:00007fffc9fab3c8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e
RAX: ffffffffffffffda RBX: 00007fffc9fab4f0 RCX: 00007fd646988ba0
RDX: 0000000000000000 RSI: 00007fffc9fab440 RDI: 0000000000000003
RBP: 000000005b28c8b3 R08: 0000000000000002 R09: 0000000000000000
R10: 00007fffc9faae20 R11: 0000000000000246 R12: 0000000000000000
R13: 00007fffc9fab504 R14: 0000000000000001 R15: 000000000066c100
Fixes: 4e8c86155010 ("net sched: net sched: ife action fix late binding")
Fixes: ef6980b6becb ("introduce IFE action")
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-06-19 13:39:46 +00:00
|
|
|
if (p)
|
|
|
|
kfree_rcu(p, rcu);
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
|
|
|
|
2016-06-20 20:37:18 +00:00
|
|
|
static int populate_metalist(struct tcf_ife_info *ife, struct nlattr **tb,
|
2018-08-10 17:51:44 +00:00
|
|
|
bool exists, bool rtnl_held)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
|
|
|
int len = 0;
|
|
|
|
int rc = 0;
|
|
|
|
int i = 0;
|
|
|
|
void *val;
|
|
|
|
|
|
|
|
for (i = 1; i < max_metacnt; i++) {
|
|
|
|
if (tb[i]) {
|
|
|
|
val = nla_data(tb[i]);
|
|
|
|
len = nla_len(tb[i]);
|
|
|
|
|
2018-08-19 19:22:12 +00:00
|
|
|
rc = load_metaops_and_vet(i, val, len, rtnl_held);
|
2016-02-27 13:08:54 +00:00
|
|
|
if (rc != 0)
|
|
|
|
return rc;
|
|
|
|
|
2018-08-19 19:22:13 +00:00
|
|
|
rc = add_metainfo(ife, i, val, len, exists);
|
2016-02-27 13:08:54 +00:00
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int tcf_ife_init(struct net *net, struct nlattr *nla,
|
2016-07-25 23:09:41 +00:00
|
|
|
struct nlattr *est, struct tc_action **a,
|
2018-07-05 14:24:25 +00:00
|
|
|
int ovr, int bind, bool rtnl_held,
|
2019-10-30 14:09:05 +00:00
|
|
|
struct tcf_proto *tp, u32 flags,
|
|
|
|
struct netlink_ext_ack *extack)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
|
|
|
struct tc_action_net *tn = net_generic(net, ife_net_id);
|
|
|
|
struct nlattr *tb[TCA_IFE_MAX + 1];
|
|
|
|
struct nlattr *tb2[IFE_META_MAX + 1];
|
2019-03-20 14:00:03 +00:00
|
|
|
struct tcf_chain *goto_ch = NULL;
|
2018-08-10 17:51:44 +00:00
|
|
|
struct tcf_ife_params *p;
|
2016-02-27 13:08:54 +00:00
|
|
|
struct tcf_ife_info *ife;
|
2017-08-28 19:03:14 +00:00
|
|
|
u16 ife_type = ETH_P_IFE;
|
2016-02-27 13:08:54 +00:00
|
|
|
struct tc_ife *parm;
|
|
|
|
u8 *daddr = NULL;
|
|
|
|
u8 *saddr = NULL;
|
2016-06-13 20:46:28 +00:00
|
|
|
bool exists = false;
|
|
|
|
int ret = 0;
|
2019-08-01 13:02:51 +00:00
|
|
|
u32 index;
|
2016-02-27 13:08:54 +00:00
|
|
|
int err;
|
|
|
|
|
2019-07-23 04:43:00 +00:00
|
|
|
if (!nla) {
|
|
|
|
NL_SET_ERR_MSG_MOD(extack, "IFE requires attributes to be passed");
|
|
|
|
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 12:07:28 +00:00
|
|
|
err = nla_parse_nested_deprecated(tb, TCA_IFE_MAX, nla, ife_policy,
|
|
|
|
NULL);
|
2016-02-27 13:08:54 +00:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
if (!tb[TCA_IFE_PARMS])
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
parm = nla_data(tb[TCA_IFE_PARMS]);
|
|
|
|
|
2017-10-11 21:16:06 +00:00
|
|
|
/* IFE_DECODE is 0 and indicates the opposite of IFE_ENCODE because
|
|
|
|
* they cannot run as the same time. Check on all other values which
|
|
|
|
* are not supported right now.
|
|
|
|
*/
|
|
|
|
if (parm->flags & ~IFE_ENCODE)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2017-10-11 21:16:08 +00:00
|
|
|
p = kzalloc(sizeof(*p), GFP_KERNEL);
|
|
|
|
if (!p)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2019-08-01 13:02:51 +00:00
|
|
|
index = parm->index;
|
|
|
|
err = tcf_idr_check_alloc(tn, &index, a, bind);
|
2018-07-09 11:33:26 +00:00
|
|
|
if (err < 0) {
|
|
|
|
kfree(p);
|
2018-07-05 14:24:32 +00:00
|
|
|
return err;
|
2018-07-09 11:33:26 +00:00
|
|
|
}
|
2018-07-05 14:24:32 +00:00
|
|
|
exists = err;
|
2017-10-11 21:16:08 +00:00
|
|
|
if (exists && bind) {
|
|
|
|
kfree(p);
|
2016-05-10 20:49:31 +00:00
|
|
|
return 0;
|
2017-10-11 21:16:08 +00:00
|
|
|
}
|
2016-05-10 20:49:31 +00:00
|
|
|
|
|
|
|
if (!exists) {
|
2019-08-01 13:02:51 +00:00
|
|
|
ret = tcf_idr_create(tn, index, est, a, &act_ife_ops,
|
2019-10-30 14:09:06 +00:00
|
|
|
bind, true, 0);
|
2017-10-11 21:16:08 +00:00
|
|
|
if (ret) {
|
2019-08-01 13:02:51 +00:00
|
|
|
tcf_idr_cleanup(tn, index);
|
2017-10-11 21:16:08 +00:00
|
|
|
kfree(p);
|
2016-02-27 13:08:54 +00:00
|
|
|
return ret;
|
2017-10-11 21:16:08 +00:00
|
|
|
}
|
2016-02-27 13:08:54 +00:00
|
|
|
ret = ACT_P_CREATED;
|
2018-07-05 14:24:30 +00:00
|
|
|
} else if (!ovr) {
|
2017-08-30 06:31:59 +00:00
|
|
|
tcf_idr_release(*a, bind);
|
2018-07-05 14:24:30 +00:00
|
|
|
kfree(p);
|
|
|
|
return -EEXIST;
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
|
|
|
|
2016-07-25 23:09:41 +00:00
|
|
|
ife = to_ife(*a);
|
2020-01-15 16:20:39 +00:00
|
|
|
if (ret == ACT_P_CREATED)
|
|
|
|
INIT_LIST_HEAD(&ife->metalist);
|
|
|
|
|
2019-03-20 14:00:03 +00:00
|
|
|
err = tcf_action_check_ctrlact(parm->action, tp, &goto_ch, extack);
|
|
|
|
if (err < 0)
|
|
|
|
goto release_idr;
|
|
|
|
|
2017-10-11 21:16:08 +00:00
|
|
|
p->flags = parm->flags;
|
2016-02-27 13:08:54 +00:00
|
|
|
|
|
|
|
if (parm->flags & IFE_ENCODE) {
|
2017-08-28 19:03:14 +00:00
|
|
|
if (tb[TCA_IFE_TYPE])
|
|
|
|
ife_type = nla_get_u16(tb[TCA_IFE_TYPE]);
|
2016-02-27 13:08:54 +00:00
|
|
|
if (tb[TCA_IFE_DMAC])
|
|
|
|
daddr = nla_data(tb[TCA_IFE_DMAC]);
|
|
|
|
if (tb[TCA_IFE_SMAC])
|
|
|
|
saddr = nla_data(tb[TCA_IFE_SMAC]);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (parm->flags & IFE_ENCODE) {
|
|
|
|
if (daddr)
|
2017-10-11 21:16:08 +00:00
|
|
|
ether_addr_copy(p->eth_dst, daddr);
|
2016-02-27 13:08:54 +00:00
|
|
|
else
|
2017-10-11 21:16:08 +00:00
|
|
|
eth_zero_addr(p->eth_dst);
|
2016-02-27 13:08:54 +00:00
|
|
|
|
|
|
|
if (saddr)
|
2017-10-11 21:16:08 +00:00
|
|
|
ether_addr_copy(p->eth_src, saddr);
|
2016-02-27 13:08:54 +00:00
|
|
|
else
|
2017-10-11 21:16:08 +00:00
|
|
|
eth_zero_addr(p->eth_src);
|
2016-02-27 13:08:54 +00:00
|
|
|
|
2017-10-11 21:16:08 +00:00
|
|
|
p->eth_type = ife_type;
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (tb[TCA_IFE_METALST]) {
|
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 12:07:28 +00:00
|
|
|
err = nla_parse_nested_deprecated(tb2, IFE_META_MAX,
|
|
|
|
tb[TCA_IFE_METALST], NULL,
|
|
|
|
NULL);
|
2019-03-20 14:00:03 +00:00
|
|
|
if (err)
|
|
|
|
goto metadata_parse_err;
|
2018-08-10 17:51:44 +00:00
|
|
|
err = populate_metalist(ife, tb2, exists, rtnl_held);
|
2016-02-27 13:08:54 +00:00
|
|
|
if (err)
|
|
|
|
goto metadata_parse_err;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
/* if no passed metadata allow list or passed allow-all
|
|
|
|
* then here we process by adding as many supported metadatum
|
|
|
|
* as we can. You better have at least one else we are
|
|
|
|
* going to bail out
|
|
|
|
*/
|
2018-08-19 19:22:12 +00:00
|
|
|
err = use_all_metadata(ife, exists);
|
2019-03-20 14:00:03 +00:00
|
|
|
if (err)
|
|
|
|
goto metadata_parse_err;
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
|
|
|
|
2018-08-19 19:22:12 +00:00
|
|
|
if (exists)
|
|
|
|
spin_lock_bh(&ife->tcf_lock);
|
2018-08-10 17:51:44 +00:00
|
|
|
/* protected by tcf_lock when modifying existing action */
|
2019-03-20 14:00:03 +00:00
|
|
|
goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch);
|
2019-09-23 23:09:18 +00:00
|
|
|
p = rcu_replace_pointer(ife->params, p, 1);
|
2018-08-10 17:51:44 +00:00
|
|
|
|
2016-06-20 20:37:18 +00:00
|
|
|
if (exists)
|
|
|
|
spin_unlock_bh(&ife->tcf_lock);
|
2019-03-20 14:00:03 +00:00
|
|
|
if (goto_ch)
|
|
|
|
tcf_chain_put_by_act(goto_ch);
|
2018-08-10 17:51:44 +00:00
|
|
|
if (p)
|
|
|
|
kfree_rcu(p, rcu);
|
2017-10-11 21:16:08 +00:00
|
|
|
|
2016-02-27 13:08:54 +00:00
|
|
|
if (ret == ACT_P_CREATED)
|
2017-08-30 06:31:59 +00:00
|
|
|
tcf_idr_insert(tn, *a);
|
2016-02-27 13:08:54 +00:00
|
|
|
|
|
|
|
return ret;
|
2019-03-20 14:00:03 +00:00
|
|
|
metadata_parse_err:
|
|
|
|
if (goto_ch)
|
|
|
|
tcf_chain_put_by_act(goto_ch);
|
|
|
|
release_idr:
|
|
|
|
kfree(p);
|
|
|
|
tcf_idr_release(*a, bind);
|
|
|
|
return err;
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int tcf_ife_dump(struct sk_buff *skb, struct tc_action *a, int bind,
|
|
|
|
int ref)
|
|
|
|
{
|
|
|
|
unsigned char *b = skb_tail_pointer(skb);
|
2016-07-25 23:09:41 +00:00
|
|
|
struct tcf_ife_info *ife = to_ife(a);
|
2018-08-10 17:51:44 +00:00
|
|
|
struct tcf_ife_params *p;
|
2016-02-27 13:08:54 +00:00
|
|
|
struct tc_ife opt = {
|
|
|
|
.index = ife->tcf_index,
|
2018-07-05 14:24:24 +00:00
|
|
|
.refcnt = refcount_read(&ife->tcf_refcnt) - ref,
|
|
|
|
.bindcnt = atomic_read(&ife->tcf_bindcnt) - bind,
|
2016-02-27 13:08:54 +00:00
|
|
|
};
|
|
|
|
struct tcf_t t;
|
|
|
|
|
2018-08-10 17:51:44 +00:00
|
|
|
spin_lock_bh(&ife->tcf_lock);
|
|
|
|
opt.action = ife->tcf_action;
|
|
|
|
p = rcu_dereference_protected(ife->params,
|
|
|
|
lockdep_is_held(&ife->tcf_lock));
|
|
|
|
opt.flags = p->flags;
|
|
|
|
|
2016-02-27 13:08:54 +00:00
|
|
|
if (nla_put(skb, TCA_IFE_PARMS, sizeof(opt), &opt))
|
|
|
|
goto nla_put_failure;
|
|
|
|
|
2016-06-06 10:32:55 +00:00
|
|
|
tcf_tm_dump(&t, &ife->tcf_tm);
|
2016-04-26 08:06:18 +00:00
|
|
|
if (nla_put_64bit(skb, TCA_IFE_TM, sizeof(t), &t, TCA_IFE_PAD))
|
2016-02-27 13:08:54 +00:00
|
|
|
goto nla_put_failure;
|
|
|
|
|
2017-10-11 21:16:08 +00:00
|
|
|
if (!is_zero_ether_addr(p->eth_dst)) {
|
|
|
|
if (nla_put(skb, TCA_IFE_DMAC, ETH_ALEN, p->eth_dst))
|
2016-02-27 13:08:54 +00:00
|
|
|
goto nla_put_failure;
|
|
|
|
}
|
|
|
|
|
2017-10-11 21:16:08 +00:00
|
|
|
if (!is_zero_ether_addr(p->eth_src)) {
|
|
|
|
if (nla_put(skb, TCA_IFE_SMAC, ETH_ALEN, p->eth_src))
|
2016-02-27 13:08:54 +00:00
|
|
|
goto nla_put_failure;
|
|
|
|
}
|
|
|
|
|
2017-10-11 21:16:08 +00:00
|
|
|
if (nla_put(skb, TCA_IFE_TYPE, 2, &p->eth_type))
|
2016-02-27 13:08:54 +00:00
|
|
|
goto nla_put_failure;
|
|
|
|
|
|
|
|
if (dump_metalist(skb, ife)) {
|
|
|
|
/*ignore failure to dump metalist */
|
|
|
|
pr_info("Failed to dump metalist\n");
|
|
|
|
}
|
|
|
|
|
2018-08-10 17:51:44 +00:00
|
|
|
spin_unlock_bh(&ife->tcf_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
return skb->len;
|
|
|
|
|
|
|
|
nla_put_failure:
|
2018-08-10 17:51:44 +00:00
|
|
|
spin_unlock_bh(&ife->tcf_lock);
|
2016-02-27 13:08:54 +00:00
|
|
|
nlmsg_trim(skb, b);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2017-03-16 10:53:41 +00:00
|
|
|
static int find_decode_metaid(struct sk_buff *skb, struct tcf_ife_info *ife,
|
|
|
|
u16 metaid, u16 mlen, void *mdata)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
|
|
|
struct tcf_meta_info *e;
|
|
|
|
|
|
|
|
/* XXX: use hash to speed up */
|
|
|
|
list_for_each_entry(e, &ife->metalist, metalist) {
|
|
|
|
if (metaid == e->metaid) {
|
|
|
|
if (e->ops) {
|
|
|
|
/* We check for decode presence already */
|
|
|
|
return e->ops->decode(skb, mdata, mlen);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-20 19:15:03 +00:00
|
|
|
return -ENOENT;
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int tcf_ife_decode(struct sk_buff *skb, const struct tc_action *a,
|
|
|
|
struct tcf_result *res)
|
|
|
|
{
|
2016-07-25 23:09:41 +00:00
|
|
|
struct tcf_ife_info *ife = to_ife(a);
|
2016-02-27 13:08:54 +00:00
|
|
|
int action = ife->tcf_action;
|
2017-02-01 13:30:03 +00:00
|
|
|
u8 *ifehdr_end;
|
|
|
|
u8 *tlv_data;
|
|
|
|
u16 metalen;
|
2016-02-27 13:08:54 +00:00
|
|
|
|
2017-10-11 21:16:07 +00:00
|
|
|
bstats_cpu_update(this_cpu_ptr(ife->common.cpu_bstats), skb);
|
2016-06-06 10:32:53 +00:00
|
|
|
tcf_lastuse_update(&ife->tcf_tm);
|
2016-02-27 13:08:54 +00:00
|
|
|
|
2017-02-01 13:30:03 +00:00
|
|
|
if (skb_at_tc_ingress(skb))
|
|
|
|
skb_push(skb, skb->dev->hard_header_len);
|
|
|
|
|
|
|
|
tlv_data = ife_decode(skb, &metalen);
|
|
|
|
if (unlikely(!tlv_data)) {
|
2017-10-11 21:16:07 +00:00
|
|
|
qstats_drop_inc(this_cpu_ptr(ife->common.cpu_qstats));
|
2016-02-27 13:08:54 +00:00
|
|
|
return TC_ACT_SHOT;
|
|
|
|
}
|
|
|
|
|
2017-02-01 13:30:03 +00:00
|
|
|
ifehdr_end = tlv_data + metalen;
|
|
|
|
for (; tlv_data < ifehdr_end; tlv_data = ife_tlv_meta_next(tlv_data)) {
|
|
|
|
u8 *curr_data;
|
|
|
|
u16 mtype;
|
|
|
|
u16 dlen;
|
2016-02-27 13:08:54 +00:00
|
|
|
|
2018-04-20 19:15:04 +00:00
|
|
|
curr_data = ife_tlv_meta_decode(tlv_data, ifehdr_end, &mtype,
|
|
|
|
&dlen, NULL);
|
|
|
|
if (!curr_data) {
|
|
|
|
qstats_drop_inc(this_cpu_ptr(ife->common.cpu_qstats));
|
|
|
|
return TC_ACT_SHOT;
|
|
|
|
}
|
2016-02-27 13:08:54 +00:00
|
|
|
|
2017-02-01 13:30:03 +00:00
|
|
|
if (find_decode_metaid(skb, ife, mtype, dlen, curr_data)) {
|
2016-02-27 13:08:54 +00:00
|
|
|
/* abuse overlimits to count when we receive metadata
|
|
|
|
* but dont have an ops for it
|
|
|
|
*/
|
2017-02-01 13:30:03 +00:00
|
|
|
pr_info_ratelimited("Unknown metaid %d dlen %d\n",
|
|
|
|
mtype, dlen);
|
2017-10-11 21:16:07 +00:00
|
|
|
qstats_overlimit_inc(this_cpu_ptr(ife->common.cpu_qstats));
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
2017-02-01 13:30:03 +00:00
|
|
|
}
|
2016-02-27 13:08:54 +00:00
|
|
|
|
2017-02-01 13:30:03 +00:00
|
|
|
if (WARN_ON(tlv_data != ifehdr_end)) {
|
2017-10-11 21:16:07 +00:00
|
|
|
qstats_drop_inc(this_cpu_ptr(ife->common.cpu_qstats));
|
2017-02-01 13:30:03 +00:00
|
|
|
return TC_ACT_SHOT;
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
|
|
|
|
2017-02-01 13:30:03 +00:00
|
|
|
skb->protocol = eth_type_trans(skb, skb->dev);
|
2016-02-27 13:08:54 +00:00
|
|
|
skb_reset_network_header(skb);
|
2017-02-01 13:30:03 +00:00
|
|
|
|
2016-02-27 13:08:54 +00:00
|
|
|
return action;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*XXX: check if we can do this at install time instead of current
|
|
|
|
* send data path
|
|
|
|
**/
|
|
|
|
static int ife_get_sz(struct sk_buff *skb, struct tcf_ife_info *ife)
|
|
|
|
{
|
|
|
|
struct tcf_meta_info *e, *n;
|
|
|
|
int tot_run_sz = 0, run_sz = 0;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(e, n, &ife->metalist, metalist) {
|
|
|
|
if (e->ops->check_presence) {
|
|
|
|
run_sz = e->ops->check_presence(skb, e);
|
|
|
|
tot_run_sz += run_sz;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return tot_run_sz;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int tcf_ife_encode(struct sk_buff *skb, const struct tc_action *a,
|
2017-10-11 21:16:08 +00:00
|
|
|
struct tcf_result *res, struct tcf_ife_params *p)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
2016-07-25 23:09:41 +00:00
|
|
|
struct tcf_ife_info *ife = to_ife(a);
|
2016-02-27 13:08:54 +00:00
|
|
|
int action = ife->tcf_action;
|
|
|
|
struct ethhdr *oethh; /* outer ether header */
|
|
|
|
struct tcf_meta_info *e;
|
|
|
|
/*
|
|
|
|
OUTERHDR:TOTMETALEN:{TLVHDR:Metadatum:TLVHDR..}:ORIGDATA
|
|
|
|
where ORIGDATA = original ethernet header ...
|
|
|
|
*/
|
|
|
|
u16 metalen = ife_get_sz(skb, ife);
|
|
|
|
int hdrm = metalen + skb->dev->hard_header_len + IFE_METAHDRLEN;
|
2017-02-01 13:30:03 +00:00
|
|
|
unsigned int skboff = 0;
|
2016-02-27 13:08:54 +00:00
|
|
|
int new_len = skb->len + hdrm;
|
|
|
|
bool exceed_mtu = false;
|
2017-02-01 13:30:03 +00:00
|
|
|
void *ife_meta;
|
|
|
|
int err = 0;
|
2016-02-27 13:08:54 +00:00
|
|
|
|
2017-01-07 22:06:36 +00:00
|
|
|
if (!skb_at_tc_ingress(skb)) {
|
2016-02-27 13:08:54 +00:00
|
|
|
if (new_len > skb->dev->mtu)
|
|
|
|
exceed_mtu = true;
|
|
|
|
}
|
|
|
|
|
2017-10-11 21:16:07 +00:00
|
|
|
bstats_cpu_update(this_cpu_ptr(ife->common.cpu_bstats), skb);
|
2016-06-06 10:32:53 +00:00
|
|
|
tcf_lastuse_update(&ife->tcf_tm);
|
2016-02-27 13:08:54 +00:00
|
|
|
|
|
|
|
if (!metalen) { /* no metadata to send */
|
|
|
|
/* abuse overlimits to count when we allow packet
|
|
|
|
* with no metadata
|
|
|
|
*/
|
2017-10-11 21:16:07 +00:00
|
|
|
qstats_overlimit_inc(this_cpu_ptr(ife->common.cpu_qstats));
|
2016-02-27 13:08:54 +00:00
|
|
|
return action;
|
|
|
|
}
|
|
|
|
/* could be stupid policy setup or mtu config
|
|
|
|
* so lets be conservative.. */
|
|
|
|
if ((action == TC_ACT_SHOT) || exceed_mtu) {
|
2017-10-11 21:16:07 +00:00
|
|
|
qstats_drop_inc(this_cpu_ptr(ife->common.cpu_qstats));
|
2016-02-27 13:08:54 +00:00
|
|
|
return TC_ACT_SHOT;
|
|
|
|
}
|
|
|
|
|
2017-01-07 22:06:36 +00:00
|
|
|
if (skb_at_tc_ingress(skb))
|
2016-02-27 13:08:54 +00:00
|
|
|
skb_push(skb, skb->dev->hard_header_len);
|
|
|
|
|
2017-02-01 13:30:03 +00:00
|
|
|
ife_meta = ife_encode(skb, metalen);
|
2016-02-27 13:08:54 +00:00
|
|
|
|
2017-10-11 21:16:07 +00:00
|
|
|
spin_lock(&ife->tcf_lock);
|
|
|
|
|
2016-02-27 13:08:54 +00:00
|
|
|
/* XXX: we dont have a clever way of telling encode to
|
|
|
|
* not repeat some of the computations that are done by
|
|
|
|
* ops->presence_check...
|
|
|
|
*/
|
|
|
|
list_for_each_entry(e, &ife->metalist, metalist) {
|
|
|
|
if (e->ops->encode) {
|
2017-02-01 13:30:03 +00:00
|
|
|
err = e->ops->encode(skb, (void *)(ife_meta + skboff),
|
2016-02-27 13:08:54 +00:00
|
|
|
e);
|
|
|
|
}
|
|
|
|
if (err < 0) {
|
|
|
|
/* too corrupt to keep around if overwritten */
|
|
|
|
spin_unlock(&ife->tcf_lock);
|
2017-10-11 21:16:07 +00:00
|
|
|
qstats_drop_inc(this_cpu_ptr(ife->common.cpu_qstats));
|
2016-02-27 13:08:54 +00:00
|
|
|
return TC_ACT_SHOT;
|
|
|
|
}
|
|
|
|
skboff += err;
|
|
|
|
}
|
2017-10-11 21:16:08 +00:00
|
|
|
spin_unlock(&ife->tcf_lock);
|
2017-02-01 13:30:03 +00:00
|
|
|
oethh = (struct ethhdr *)skb->data;
|
2016-02-27 13:08:54 +00:00
|
|
|
|
2017-10-11 21:16:08 +00:00
|
|
|
if (!is_zero_ether_addr(p->eth_src))
|
|
|
|
ether_addr_copy(oethh->h_source, p->eth_src);
|
|
|
|
if (!is_zero_ether_addr(p->eth_dst))
|
|
|
|
ether_addr_copy(oethh->h_dest, p->eth_dst);
|
|
|
|
oethh->h_proto = htons(p->eth_type);
|
2016-02-27 13:08:54 +00:00
|
|
|
|
2017-01-07 22:06:36 +00:00
|
|
|
if (skb_at_tc_ingress(skb))
|
2016-02-27 13:08:54 +00:00
|
|
|
skb_pull(skb, skb->dev->hard_header_len);
|
|
|
|
|
|
|
|
return action;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int tcf_ife_act(struct sk_buff *skb, const struct tc_action *a,
|
|
|
|
struct tcf_result *res)
|
|
|
|
{
|
2016-07-25 23:09:41 +00:00
|
|
|
struct tcf_ife_info *ife = to_ife(a);
|
2017-10-11 21:16:08 +00:00
|
|
|
struct tcf_ife_params *p;
|
|
|
|
int ret;
|
|
|
|
|
2018-07-30 12:30:43 +00:00
|
|
|
p = rcu_dereference_bh(ife->params);
|
2017-10-11 21:16:08 +00:00
|
|
|
if (p->flags & IFE_ENCODE) {
|
|
|
|
ret = tcf_ife_encode(skb, a, res, p);
|
|
|
|
return ret;
|
|
|
|
}
|
2016-02-27 13:08:54 +00:00
|
|
|
|
2017-10-11 21:16:06 +00:00
|
|
|
return tcf_ife_decode(skb, a, res);
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int tcf_ife_walker(struct net *net, struct sk_buff *skb,
|
|
|
|
struct netlink_callback *cb, int type,
|
2018-02-15 15:54:58 +00:00
|
|
|
const struct tc_action_ops *ops,
|
|
|
|
struct netlink_ext_ack *extack)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
|
|
|
struct tc_action_net *tn = net_generic(net, ife_net_id);
|
|
|
|
|
2018-02-15 15:54:59 +00:00
|
|
|
return tcf_generic_walker(tn, skb, cb, type, ops, extack);
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
|
|
|
|
2018-08-29 17:15:35 +00:00
|
|
|
static int tcf_ife_search(struct net *net, struct tc_action **a, u32 index)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
|
|
|
struct tc_action_net *tn = net_generic(net, ife_net_id);
|
|
|
|
|
2017-08-30 06:31:59 +00:00
|
|
|
return tcf_idr_search(tn, a, index);
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct tc_action_ops act_ife_ops = {
|
|
|
|
.kind = "ife",
|
2019-02-10 12:25:00 +00:00
|
|
|
.id = TCA_ID_IFE,
|
2016-02-27 13:08:54 +00:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.act = tcf_ife_act,
|
|
|
|
.dump = tcf_ife_dump,
|
|
|
|
.cleanup = tcf_ife_cleanup,
|
|
|
|
.init = tcf_ife_init,
|
|
|
|
.walk = tcf_ife_walker,
|
|
|
|
.lookup = tcf_ife_search,
|
2016-07-25 23:09:41 +00:00
|
|
|
.size = sizeof(struct tcf_ife_info),
|
2016-02-27 13:08:54 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static __net_init int ife_init_net(struct net *net)
|
|
|
|
{
|
|
|
|
struct tc_action_net *tn = net_generic(net, ife_net_id);
|
|
|
|
|
2019-08-25 17:01:32 +00:00
|
|
|
return tc_action_net_init(net, tn, &act_ife_ops);
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
|
|
|
|
2017-12-11 23:35:03 +00:00
|
|
|
static void __net_exit ife_exit_net(struct list_head *net_list)
|
2016-02-27 13:08:54 +00:00
|
|
|
{
|
2017-12-11 23:35:03 +00:00
|
|
|
tc_action_net_exit(net_list, ife_net_id);
|
2016-02-27 13:08:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct pernet_operations ife_net_ops = {
|
|
|
|
.init = ife_init_net,
|
2017-12-11 23:35:03 +00:00
|
|
|
.exit_batch = ife_exit_net,
|
2016-02-27 13:08:54 +00:00
|
|
|
.id = &ife_net_id,
|
|
|
|
.size = sizeof(struct tc_action_net),
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init ife_init_module(void)
|
|
|
|
{
|
|
|
|
return tcf_register_action(&act_ife_ops, &ife_net_ops);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit ife_cleanup_module(void)
|
|
|
|
{
|
|
|
|
tcf_unregister_action(&act_ife_ops, &ife_net_ops);
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(ife_init_module);
|
|
|
|
module_exit(ife_cleanup_module);
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Jamal Hadi Salim(2015)");
|
|
|
|
MODULE_DESCRIPTION("Inter-FE LFB action");
|
|
|
|
MODULE_LICENSE("GPL");
|