19fbcb36a3
Implement TCA_VLAN_ACT_POP_ETH and TCA_VLAN_ACT_PUSH_ETH, to respectively pop and push a base Ethernet header at the beginning of a frame. POP_ETH is just a matter of pulling ETH_HLEN bytes. VLAN tags, if any, must be stripped before calling POP_ETH. PUSH_ETH is restricted to skbs with no mac_header, and only the MAC addresses can be configured. The Ethertype is automatically set from skb->protocol. These restrictions ensure that all skb's fields remain consistent, so that this action can't confuse other part of the networking stack (like GSO). Since openvswitch already had these actions, consolidate the code in skbuff.c (like for vlan and mpls push/pop). Signed-off-by: Guillaume Nault <gnault@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
420 lines
10 KiB
C
420 lines
10 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/rtnetlink.h>
|
|
#include <linux/if_vlan.h>
|
|
#include <net/netlink.h>
|
|
#include <net/pkt_sched.h>
|
|
#include <net/pkt_cls.h>
|
|
|
|
#include <linux/tc_act/tc_vlan.h>
|
|
#include <net/tc_act/tc_vlan.h>
|
|
|
|
static unsigned int vlan_net_id;
|
|
static struct tc_action_ops act_vlan_ops;
|
|
|
|
static int tcf_vlan_act(struct sk_buff *skb, const struct tc_action *a,
|
|
struct tcf_result *res)
|
|
{
|
|
struct tcf_vlan *v = to_vlan(a);
|
|
struct tcf_vlan_params *p;
|
|
int action;
|
|
int err;
|
|
u16 tci;
|
|
|
|
tcf_lastuse_update(&v->tcf_tm);
|
|
tcf_action_update_bstats(&v->common, skb);
|
|
|
|
/* Ensure 'data' points at mac_header prior calling vlan manipulating
|
|
* functions.
|
|
*/
|
|
if (skb_at_tc_ingress(skb))
|
|
skb_push_rcsum(skb, skb->mac_len);
|
|
|
|
action = READ_ONCE(v->tcf_action);
|
|
|
|
p = rcu_dereference_bh(v->vlan_p);
|
|
|
|
switch (p->tcfv_action) {
|
|
case TCA_VLAN_ACT_POP:
|
|
err = skb_vlan_pop(skb);
|
|
if (err)
|
|
goto drop;
|
|
break;
|
|
case TCA_VLAN_ACT_PUSH:
|
|
err = skb_vlan_push(skb, p->tcfv_push_proto, p->tcfv_push_vid |
|
|
(p->tcfv_push_prio << VLAN_PRIO_SHIFT));
|
|
if (err)
|
|
goto drop;
|
|
break;
|
|
case TCA_VLAN_ACT_MODIFY:
|
|
/* No-op if no vlan tag (either hw-accel or in-payload) */
|
|
if (!skb_vlan_tagged(skb))
|
|
goto out;
|
|
/* extract existing tag (and guarantee no hw-accel tag) */
|
|
if (skb_vlan_tag_present(skb)) {
|
|
tci = skb_vlan_tag_get(skb);
|
|
__vlan_hwaccel_clear_tag(skb);
|
|
} else {
|
|
/* in-payload vlan tag, pop it */
|
|
err = __skb_vlan_pop(skb, &tci);
|
|
if (err)
|
|
goto drop;
|
|
}
|
|
/* replace the vid */
|
|
tci = (tci & ~VLAN_VID_MASK) | p->tcfv_push_vid;
|
|
/* replace prio bits, if tcfv_push_prio specified */
|
|
if (p->tcfv_push_prio) {
|
|
tci &= ~VLAN_PRIO_MASK;
|
|
tci |= p->tcfv_push_prio << VLAN_PRIO_SHIFT;
|
|
}
|
|
/* put updated tci as hwaccel tag */
|
|
__vlan_hwaccel_put_tag(skb, p->tcfv_push_proto, tci);
|
|
break;
|
|
case TCA_VLAN_ACT_POP_ETH:
|
|
err = skb_eth_pop(skb);
|
|
if (err)
|
|
goto drop;
|
|
break;
|
|
case TCA_VLAN_ACT_PUSH_ETH:
|
|
err = skb_eth_push(skb, p->tcfv_push_dst, p->tcfv_push_src);
|
|
if (err)
|
|
goto drop;
|
|
break;
|
|
default:
|
|
BUG();
|
|
}
|
|
|
|
out:
|
|
if (skb_at_tc_ingress(skb))
|
|
skb_pull_rcsum(skb, skb->mac_len);
|
|
|
|
return action;
|
|
|
|
drop:
|
|
tcf_action_inc_drop_qstats(&v->common);
|
|
return TC_ACT_SHOT;
|
|
}
|
|
|
|
static const struct nla_policy vlan_policy[TCA_VLAN_MAX + 1] = {
|
|
[TCA_VLAN_UNSPEC] = { .strict_start_type = TCA_VLAN_PUSH_ETH_DST },
|
|
[TCA_VLAN_PARMS] = { .len = sizeof(struct tc_vlan) },
|
|
[TCA_VLAN_PUSH_VLAN_ID] = { .type = NLA_U16 },
|
|
[TCA_VLAN_PUSH_VLAN_PROTOCOL] = { .type = NLA_U16 },
|
|
[TCA_VLAN_PUSH_VLAN_PRIORITY] = { .type = NLA_U8 },
|
|
[TCA_VLAN_PUSH_ETH_DST] = NLA_POLICY_ETH_ADDR,
|
|
[TCA_VLAN_PUSH_ETH_SRC] = NLA_POLICY_ETH_ADDR,
|
|
};
|
|
|
|
static int tcf_vlan_init(struct net *net, struct nlattr *nla,
|
|
struct nlattr *est, struct tc_action **a,
|
|
int ovr, int bind, bool rtnl_held,
|
|
struct tcf_proto *tp, u32 flags,
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, vlan_net_id);
|
|
struct nlattr *tb[TCA_VLAN_MAX + 1];
|
|
struct tcf_chain *goto_ch = NULL;
|
|
struct tcf_vlan_params *p;
|
|
struct tc_vlan *parm;
|
|
struct tcf_vlan *v;
|
|
int action;
|
|
u16 push_vid = 0;
|
|
__be16 push_proto = 0;
|
|
u8 push_prio = 0;
|
|
bool exists = false;
|
|
int ret = 0, err;
|
|
u32 index;
|
|
|
|
if (!nla)
|
|
return -EINVAL;
|
|
|
|
err = nla_parse_nested_deprecated(tb, TCA_VLAN_MAX, nla, vlan_policy,
|
|
NULL);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
if (!tb[TCA_VLAN_PARMS])
|
|
return -EINVAL;
|
|
parm = nla_data(tb[TCA_VLAN_PARMS]);
|
|
index = parm->index;
|
|
err = tcf_idr_check_alloc(tn, &index, a, bind);
|
|
if (err < 0)
|
|
return err;
|
|
exists = err;
|
|
if (exists && bind)
|
|
return 0;
|
|
|
|
switch (parm->v_action) {
|
|
case TCA_VLAN_ACT_POP:
|
|
break;
|
|
case TCA_VLAN_ACT_PUSH:
|
|
case TCA_VLAN_ACT_MODIFY:
|
|
if (!tb[TCA_VLAN_PUSH_VLAN_ID]) {
|
|
if (exists)
|
|
tcf_idr_release(*a, bind);
|
|
else
|
|
tcf_idr_cleanup(tn, index);
|
|
return -EINVAL;
|
|
}
|
|
push_vid = nla_get_u16(tb[TCA_VLAN_PUSH_VLAN_ID]);
|
|
if (push_vid >= VLAN_VID_MASK) {
|
|
if (exists)
|
|
tcf_idr_release(*a, bind);
|
|
else
|
|
tcf_idr_cleanup(tn, index);
|
|
return -ERANGE;
|
|
}
|
|
|
|
if (tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]) {
|
|
push_proto = nla_get_be16(tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]);
|
|
switch (push_proto) {
|
|
case htons(ETH_P_8021Q):
|
|
case htons(ETH_P_8021AD):
|
|
break;
|
|
default:
|
|
if (exists)
|
|
tcf_idr_release(*a, bind);
|
|
else
|
|
tcf_idr_cleanup(tn, index);
|
|
return -EPROTONOSUPPORT;
|
|
}
|
|
} else {
|
|
push_proto = htons(ETH_P_8021Q);
|
|
}
|
|
|
|
if (tb[TCA_VLAN_PUSH_VLAN_PRIORITY])
|
|
push_prio = nla_get_u8(tb[TCA_VLAN_PUSH_VLAN_PRIORITY]);
|
|
break;
|
|
case TCA_VLAN_ACT_POP_ETH:
|
|
break;
|
|
case TCA_VLAN_ACT_PUSH_ETH:
|
|
if (!tb[TCA_VLAN_PUSH_ETH_DST] || !tb[TCA_VLAN_PUSH_ETH_SRC]) {
|
|
if (exists)
|
|
tcf_idr_release(*a, bind);
|
|
else
|
|
tcf_idr_cleanup(tn, index);
|
|
return -EINVAL;
|
|
}
|
|
break;
|
|
default:
|
|
if (exists)
|
|
tcf_idr_release(*a, bind);
|
|
else
|
|
tcf_idr_cleanup(tn, index);
|
|
return -EINVAL;
|
|
}
|
|
action = parm->v_action;
|
|
|
|
if (!exists) {
|
|
ret = tcf_idr_create_from_flags(tn, index, est, a,
|
|
&act_vlan_ops, bind, flags);
|
|
if (ret) {
|
|
tcf_idr_cleanup(tn, index);
|
|
return ret;
|
|
}
|
|
|
|
ret = ACT_P_CREATED;
|
|
} else if (!ovr) {
|
|
tcf_idr_release(*a, bind);
|
|
return -EEXIST;
|
|
}
|
|
|
|
err = tcf_action_check_ctrlact(parm->action, tp, &goto_ch, extack);
|
|
if (err < 0)
|
|
goto release_idr;
|
|
|
|
v = to_vlan(*a);
|
|
|
|
p = kzalloc(sizeof(*p), GFP_KERNEL);
|
|
if (!p) {
|
|
err = -ENOMEM;
|
|
goto put_chain;
|
|
}
|
|
|
|
p->tcfv_action = action;
|
|
p->tcfv_push_vid = push_vid;
|
|
p->tcfv_push_prio = push_prio;
|
|
p->tcfv_push_proto = push_proto;
|
|
|
|
if (action == TCA_VLAN_ACT_PUSH_ETH) {
|
|
nla_memcpy(&p->tcfv_push_dst, tb[TCA_VLAN_PUSH_ETH_DST],
|
|
ETH_ALEN);
|
|
nla_memcpy(&p->tcfv_push_src, tb[TCA_VLAN_PUSH_ETH_SRC],
|
|
ETH_ALEN);
|
|
}
|
|
|
|
spin_lock_bh(&v->tcf_lock);
|
|
goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch);
|
|
p = rcu_replace_pointer(v->vlan_p, p, lockdep_is_held(&v->tcf_lock));
|
|
spin_unlock_bh(&v->tcf_lock);
|
|
|
|
if (goto_ch)
|
|
tcf_chain_put_by_act(goto_ch);
|
|
if (p)
|
|
kfree_rcu(p, rcu);
|
|
|
|
if (ret == ACT_P_CREATED)
|
|
tcf_idr_insert(tn, *a);
|
|
return ret;
|
|
put_chain:
|
|
if (goto_ch)
|
|
tcf_chain_put_by_act(goto_ch);
|
|
release_idr:
|
|
tcf_idr_release(*a, bind);
|
|
return err;
|
|
}
|
|
|
|
static void tcf_vlan_cleanup(struct tc_action *a)
|
|
{
|
|
struct tcf_vlan *v = to_vlan(a);
|
|
struct tcf_vlan_params *p;
|
|
|
|
p = rcu_dereference_protected(v->vlan_p, 1);
|
|
if (p)
|
|
kfree_rcu(p, rcu);
|
|
}
|
|
|
|
static int tcf_vlan_dump(struct sk_buff *skb, struct tc_action *a,
|
|
int bind, int ref)
|
|
{
|
|
unsigned char *b = skb_tail_pointer(skb);
|
|
struct tcf_vlan *v = to_vlan(a);
|
|
struct tcf_vlan_params *p;
|
|
struct tc_vlan opt = {
|
|
.index = v->tcf_index,
|
|
.refcnt = refcount_read(&v->tcf_refcnt) - ref,
|
|
.bindcnt = atomic_read(&v->tcf_bindcnt) - bind,
|
|
};
|
|
struct tcf_t t;
|
|
|
|
spin_lock_bh(&v->tcf_lock);
|
|
opt.action = v->tcf_action;
|
|
p = rcu_dereference_protected(v->vlan_p, lockdep_is_held(&v->tcf_lock));
|
|
opt.v_action = p->tcfv_action;
|
|
if (nla_put(skb, TCA_VLAN_PARMS, sizeof(opt), &opt))
|
|
goto nla_put_failure;
|
|
|
|
if ((p->tcfv_action == TCA_VLAN_ACT_PUSH ||
|
|
p->tcfv_action == TCA_VLAN_ACT_MODIFY) &&
|
|
(nla_put_u16(skb, TCA_VLAN_PUSH_VLAN_ID, p->tcfv_push_vid) ||
|
|
nla_put_be16(skb, TCA_VLAN_PUSH_VLAN_PROTOCOL,
|
|
p->tcfv_push_proto) ||
|
|
(nla_put_u8(skb, TCA_VLAN_PUSH_VLAN_PRIORITY,
|
|
p->tcfv_push_prio))))
|
|
goto nla_put_failure;
|
|
|
|
if (p->tcfv_action == TCA_VLAN_ACT_PUSH_ETH) {
|
|
if (nla_put(skb, TCA_VLAN_PUSH_ETH_DST, ETH_ALEN,
|
|
p->tcfv_push_dst))
|
|
goto nla_put_failure;
|
|
if (nla_put(skb, TCA_VLAN_PUSH_ETH_SRC, ETH_ALEN,
|
|
p->tcfv_push_src))
|
|
goto nla_put_failure;
|
|
}
|
|
|
|
tcf_tm_dump(&t, &v->tcf_tm);
|
|
if (nla_put_64bit(skb, TCA_VLAN_TM, sizeof(t), &t, TCA_VLAN_PAD))
|
|
goto nla_put_failure;
|
|
spin_unlock_bh(&v->tcf_lock);
|
|
|
|
return skb->len;
|
|
|
|
nla_put_failure:
|
|
spin_unlock_bh(&v->tcf_lock);
|
|
nlmsg_trim(skb, b);
|
|
return -1;
|
|
}
|
|
|
|
static int tcf_vlan_walker(struct net *net, struct sk_buff *skb,
|
|
struct netlink_callback *cb, int type,
|
|
const struct tc_action_ops *ops,
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, vlan_net_id);
|
|
|
|
return tcf_generic_walker(tn, skb, cb, type, ops, extack);
|
|
}
|
|
|
|
static void tcf_vlan_stats_update(struct tc_action *a, u64 bytes, u64 packets,
|
|
u64 drops, u64 lastuse, bool hw)
|
|
{
|
|
struct tcf_vlan *v = to_vlan(a);
|
|
struct tcf_t *tm = &v->tcf_tm;
|
|
|
|
tcf_action_update_stats(a, bytes, packets, drops, hw);
|
|
tm->lastuse = max_t(u64, tm->lastuse, lastuse);
|
|
}
|
|
|
|
static int tcf_vlan_search(struct net *net, struct tc_action **a, u32 index)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, vlan_net_id);
|
|
|
|
return tcf_idr_search(tn, a, index);
|
|
}
|
|
|
|
static size_t tcf_vlan_get_fill_size(const struct tc_action *act)
|
|
{
|
|
return nla_total_size(sizeof(struct tc_vlan))
|
|
+ nla_total_size(sizeof(u16)) /* TCA_VLAN_PUSH_VLAN_ID */
|
|
+ nla_total_size(sizeof(u16)) /* TCA_VLAN_PUSH_VLAN_PROTOCOL */
|
|
+ nla_total_size(sizeof(u8)); /* TCA_VLAN_PUSH_VLAN_PRIORITY */
|
|
}
|
|
|
|
static struct tc_action_ops act_vlan_ops = {
|
|
.kind = "vlan",
|
|
.id = TCA_ID_VLAN,
|
|
.owner = THIS_MODULE,
|
|
.act = tcf_vlan_act,
|
|
.dump = tcf_vlan_dump,
|
|
.init = tcf_vlan_init,
|
|
.cleanup = tcf_vlan_cleanup,
|
|
.walk = tcf_vlan_walker,
|
|
.stats_update = tcf_vlan_stats_update,
|
|
.get_fill_size = tcf_vlan_get_fill_size,
|
|
.lookup = tcf_vlan_search,
|
|
.size = sizeof(struct tcf_vlan),
|
|
};
|
|
|
|
static __net_init int vlan_init_net(struct net *net)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, vlan_net_id);
|
|
|
|
return tc_action_net_init(net, tn, &act_vlan_ops);
|
|
}
|
|
|
|
static void __net_exit vlan_exit_net(struct list_head *net_list)
|
|
{
|
|
tc_action_net_exit(net_list, vlan_net_id);
|
|
}
|
|
|
|
static struct pernet_operations vlan_net_ops = {
|
|
.init = vlan_init_net,
|
|
.exit_batch = vlan_exit_net,
|
|
.id = &vlan_net_id,
|
|
.size = sizeof(struct tc_action_net),
|
|
};
|
|
|
|
static int __init vlan_init_module(void)
|
|
{
|
|
return tcf_register_action(&act_vlan_ops, &vlan_net_ops);
|
|
}
|
|
|
|
static void __exit vlan_cleanup_module(void)
|
|
{
|
|
tcf_unregister_action(&act_vlan_ops, &vlan_net_ops);
|
|
}
|
|
|
|
module_init(vlan_init_module);
|
|
module_exit(vlan_cleanup_module);
|
|
|
|
MODULE_AUTHOR("Jiri Pirko <jiri@resnulli.us>");
|
|
MODULE_DESCRIPTION("vlan manipulation actions");
|
|
MODULE_LICENSE("GPL v2");
|