* [PATCH net-next 0/3] Add MPLS actions to TC
@ 2019-06-12 12:51 John Hurley
2019-06-12 12:51 ` [PATCH net-next 1/3] net: sched: add mpls manipulation " John Hurley
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: John Hurley @ 2019-06-12 12:51 UTC (permalink / raw)
To: netdev
Cc: davem, jiri, xiyou.wangcong, simon.horman, jakub.kicinski,
oss-drivers, John Hurley
This patchset introduces a new TC action module that allows the
manipulation of the MPLS headers of packets. The code impliments
functionality including push, pop, and modify.
Also included is a update to the IR action preparation code to allow the
new MPLS actions to be offloaded to HW.
John Hurley (3):
net: sched: add mpls manipulation actions to TC
net: sched: include mpls actions in hardware intermediate
representation
selftests: tc-tests: actions: add MPLS tests
include/net/flow_offload.h | 10 +
include/net/tc_act/tc_mpls.h | 91 +++
include/uapi/linux/pkt_cls.h | 2 +
include/uapi/linux/tc_act/tc_mpls.h | 32 +
net/sched/Kconfig | 11 +
net/sched/Makefile | 1 +
net/sched/act_mpls.c | 450 +++++++++++++
net/sched/cls_api.c | 26 +
.../tc-testing/tc-tests/actions/mpls.json | 744 +++++++++++++++++++++
9 files changed, 1367 insertions(+)
create mode 100644 include/net/tc_act/tc_mpls.h
create mode 100644 include/uapi/linux/tc_act/tc_mpls.h
create mode 100644 net/sched/act_mpls.c
create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/mpls.json
--
2.7.4
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH net-next 1/3] net: sched: add mpls manipulation actions to TC 2019-06-12 12:51 [PATCH net-next 0/3] Add MPLS actions to TC John Hurley @ 2019-06-12 12:51 ` John Hurley 2019-06-12 18:03 ` Marcelo Ricardo Leitner 2019-06-13 13:20 ` Davide Caratti 2019-06-12 12:51 ` [PATCH net-next 2/3] net: sched: include mpls actions in hardware intermediate representation John Hurley 2019-06-12 12:51 ` [PATCH net-next 3/3] selftests: tc-tests: actions: add MPLS tests John Hurley 2 siblings, 2 replies; 8+ messages in thread From: John Hurley @ 2019-06-12 12:51 UTC (permalink / raw) To: netdev Cc: davem, jiri, xiyou.wangcong, simon.horman, jakub.kicinski, oss-drivers, John Hurley Currently, TC offers the ability to match on the MPLS fields of a packet through the use of the flow_dissector_key_mpls struct. However, as yet, TC actions do not allow the modification or manipulation of such fields. Add a new module that registers TC action ops to allow manipulation of MPLS. This includes the ability to push and pop headers as well as modify the contents of new or existing headers. A further action to decrement the TTL field of an MPLS header is also provided. Signed-off-by: John Hurley <john.hurley@netronome.com> Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com> --- include/net/tc_act/tc_mpls.h | 27 +++ include/uapi/linux/pkt_cls.h | 2 + include/uapi/linux/tc_act/tc_mpls.h | 32 +++ net/sched/Kconfig | 11 + net/sched/Makefile | 1 + net/sched/act_mpls.c | 450 ++++++++++++++++++++++++++++++++++++ 6 files changed, 523 insertions(+) create mode 100644 include/net/tc_act/tc_mpls.h create mode 100644 include/uapi/linux/tc_act/tc_mpls.h create mode 100644 net/sched/act_mpls.c diff --git a/include/net/tc_act/tc_mpls.h b/include/net/tc_act/tc_mpls.h new file mode 100644 index 0000000..ca7393a --- /dev/null +++ b/include/net/tc_act/tc_mpls.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +/* Copyright (C) 2019 Netronome Systems, Inc. */ + +#ifndef __NET_TC_MPLS_H +#define __NET_TC_MPLS_H + +#include <linux/tc_act/tc_mpls.h> +#include <net/act_api.h> + +struct tcf_mpls_params { + int tcfm_action; + u32 tcfm_label; + u8 tcfm_tc; + u8 tcfm_ttl; + __be16 tcfm_proto; + struct rcu_head rcu; +}; + +#define ACT_MPLS_TC_NOT_SET 0xff + +struct tcf_mpls { + struct tc_action common; + struct tcf_mpls_params __rcu *mpls_p; +}; +#define to_mpls(a) ((struct tcf_mpls *)a) + +#endif /* __NET_TC_MPLS_H */ diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index a93680f..197621a 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h @@ -83,6 +83,7 @@ enum { #define TCA_ACT_SIMP 22 #define TCA_ACT_IFE 25 #define TCA_ACT_SAMPLE 26 +#define TCA_ACT_MPLS 27 /* Action type identifiers*/ enum tca_id { @@ -104,6 +105,7 @@ enum tca_id { TCA_ID_SIMP = TCA_ACT_SIMP, TCA_ID_IFE = TCA_ACT_IFE, TCA_ID_SAMPLE = TCA_ACT_SAMPLE, + TCA_ID_MPLS = TCA_ACT_MPLS, /* other actions go here */ TCA_ID_CTINFO, __TCA_ID_MAX = 255 diff --git a/include/uapi/linux/tc_act/tc_mpls.h b/include/uapi/linux/tc_act/tc_mpls.h new file mode 100644 index 0000000..6e8907b --- /dev/null +++ b/include/uapi/linux/tc_act/tc_mpls.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* Copyright (C) 2019 Netronome Systems, Inc. */ + +#ifndef __LINUX_TC_MPLS_H +#define __LINUX_TC_MPLS_H + +#include <linux/pkt_cls.h> + +#define TCA_MPLS_ACT_POP 1 +#define TCA_MPLS_ACT_PUSH 2 +#define TCA_MPLS_ACT_MODIFY 3 +#define TCA_MPLS_ACT_DEC_TTL 4 + +struct tc_mpls { + tc_gen; + int m_action; +}; + +enum { + TCA_MPLS_UNSPEC, + TCA_MPLS_TM, + TCA_MPLS_PARMS, + TCA_MPLS_PAD, + TCA_MPLS_PROTO, + TCA_MPLS_LABEL, + TCA_MPLS_TC, + TCA_MPLS_TTL, + __TCA_MPLS_MAX, +}; +#define TCA_MPLS_MAX (__TCA_MPLS_MAX - 1) + +#endif diff --git a/net/sched/Kconfig b/net/sched/Kconfig index d104f7e..a34dcd3 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -842,6 +842,17 @@ config NET_ACT_CSUM To compile this code as a module, choose M here: the module will be called act_csum. +config NET_ACT_MPLS + tristate "MPLS manipulation" + depends on NET_CLS_ACT + help + Say Y here to push or pop MPLS headers. + + If unsure, say N. + + To compile this code as a module, choose M here: the + module will be called act_mpls. + config NET_ACT_VLAN tristate "Vlan manipulation" depends on NET_CLS_ACT diff --git a/net/sched/Makefile b/net/sched/Makefile index d54bfcb..c266036 100644 --- a/net/sched/Makefile +++ b/net/sched/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit.o obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o obj-$(CONFIG_NET_ACT_SKBEDIT) += act_skbedit.o obj-$(CONFIG_NET_ACT_CSUM) += act_csum.o +obj-$(CONFIG_NET_ACT_MPLS) += act_mpls.o obj-$(CONFIG_NET_ACT_VLAN) += act_vlan.o obj-$(CONFIG_NET_ACT_BPF) += act_bpf.o obj-$(CONFIG_NET_ACT_CONNMARK) += act_connmark.o diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c new file mode 100644 index 0000000..ff56ada --- /dev/null +++ b/net/sched/act_mpls.c @@ -0,0 +1,450 @@ +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +/* Copyright (C) 2019 Netronome Systems, Inc. */ + +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/mpls.h> +#include <linux/rtnetlink.h> +#include <linux/skbuff.h> +#include <linux/tc_act/tc_mpls.h> +#include <net/mpls.h> +#include <net/netlink.h> +#include <net/pkt_sched.h> +#include <net/pkt_cls.h> +#include <net/tc_act/tc_mpls.h> + +static unsigned int mpls_net_id; +static struct tc_action_ops act_mpls_ops; + +#define ACT_MPLS_TTL_DEFAULT 255 + +static void tcf_mpls_mod_lse(struct mpls_shim_hdr *lse, + struct tcf_mpls_params *p, bool set_bos) +{ + u32 new_lse = be32_to_cpu(lse->label_stack_entry); + + if (p->tcfm_label) { + new_lse &= ~MPLS_LS_LABEL_MASK; + new_lse |= p->tcfm_label << MPLS_LS_LABEL_SHIFT; + } + if (p->tcfm_ttl) { + new_lse &= ~MPLS_LS_TTL_MASK; + new_lse |= p->tcfm_ttl << MPLS_LS_TTL_SHIFT; + } + if (p->tcfm_tc != ACT_MPLS_TC_NOT_SET) { + new_lse &= ~MPLS_LS_TC_MASK; + new_lse |= p->tcfm_tc << MPLS_LS_TC_SHIFT; + } + if (set_bos) + new_lse |= 1 << MPLS_LS_S_SHIFT; + + lse->label_stack_entry = cpu_to_be32(new_lse); +} + +static inline void tcf_mpls_set_eth_type(struct sk_buff *skb, __be16 ethertype) +{ + struct ethhdr *hdr = eth_hdr(skb); + + skb_postpull_rcsum(skb, &hdr->h_proto, ETH_TLEN); + hdr->h_proto = ethertype; + skb_postpush_rcsum(skb, &hdr->h_proto, ETH_TLEN); +} + +static int tcf_mpls_act(struct sk_buff *skb, const struct tc_action *a, + struct tcf_result *res) +{ + struct tcf_mpls *m = to_mpls(a); + struct mpls_shim_hdr *lse; + struct tcf_mpls_params *p; + u32 temp_lse; + int ret; + u8 ttl; + + tcf_lastuse_update(&m->tcf_tm); + bstats_cpu_update(this_cpu_ptr(m->common.cpu_bstats), skb); + + /* Ensure 'data' points at mac_header prior calling mpls manipulating + * functions. + */ + if (skb_at_tc_ingress(skb)) + skb_push_rcsum(skb, skb->mac_len); + + ret = READ_ONCE(m->tcf_action); + + p = rcu_dereference_bh(m->mpls_p); + + switch (p->tcfm_action) { + case TCA_MPLS_ACT_POP: + if (unlikely(!eth_p_mpls(skb->protocol))) + goto out; + + if (unlikely(skb_ensure_writable(skb, ETH_HLEN + MPLS_HLEN))) + goto drop; + + skb_postpull_rcsum(skb, mpls_hdr(skb), MPLS_HLEN); + memmove(skb->data + MPLS_HLEN, skb->data, ETH_HLEN); + + __skb_pull(skb, MPLS_HLEN); + skb_reset_mac_header(skb); + skb_set_network_header(skb, ETH_HLEN); + + tcf_mpls_set_eth_type(skb, p->tcfm_proto); + skb->protocol = p->tcfm_proto; + break; + case TCA_MPLS_ACT_PUSH: + if (unlikely(skb_cow_head(skb, MPLS_HLEN))) + goto drop; + + skb_push(skb, MPLS_HLEN); + memmove(skb->data, skb->data + MPLS_HLEN, ETH_HLEN); + skb_reset_mac_header(skb); + skb_set_network_header(skb, ETH_HLEN); + + lse = mpls_hdr(skb); + lse->label_stack_entry = 0; + tcf_mpls_mod_lse(lse, p, !eth_p_mpls(skb->protocol)); + skb_postpush_rcsum(skb, lse, MPLS_HLEN); + + tcf_mpls_set_eth_type(skb, p->tcfm_proto); + skb->protocol = p->tcfm_proto; + break; + case TCA_MPLS_ACT_MODIFY: + if (unlikely(!eth_p_mpls(skb->protocol))) + goto out; + + if (unlikely(skb_ensure_writable(skb, ETH_HLEN + MPLS_HLEN))) + goto drop; + + lse = mpls_hdr(skb); + skb_postpull_rcsum(skb, lse, MPLS_HLEN); + tcf_mpls_mod_lse(lse, p, false); + skb_postpush_rcsum(skb, lse, MPLS_HLEN); + break; + case TCA_MPLS_ACT_DEC_TTL: + if (unlikely(!eth_p_mpls(skb->protocol))) + goto out; + + if (unlikely(skb_ensure_writable(skb, ETH_HLEN + MPLS_HLEN))) + goto drop; + + lse = mpls_hdr(skb); + temp_lse = be32_to_cpu(lse->label_stack_entry); + ttl = (temp_lse & MPLS_LS_TTL_MASK) >> MPLS_LS_TTL_SHIFT; + if (!--ttl) + goto drop; + + temp_lse &= ~MPLS_LS_TTL_MASK; + temp_lse |= ttl << MPLS_LS_TTL_SHIFT; + skb_postpull_rcsum(skb, lse, MPLS_HLEN); + lse->label_stack_entry = cpu_to_be32(temp_lse); + skb_postpush_rcsum(skb, lse, MPLS_HLEN); + break; + default: + WARN_ONCE(1, "Invalid MPLS action\n"); + } + +out: + if (skb_at_tc_ingress(skb)) + skb_pull_rcsum(skb, skb->mac_len); + + return ret; + +drop: + qstats_drop_inc(this_cpu_ptr(m->common.cpu_qstats)); + return TC_ACT_SHOT; +} + +static int valid_label(const struct nlattr *attr, + struct netlink_ext_ack *extack) +{ + const u32 *label = nla_data(attr); + + if (!*label || *label & ~MPLS_LABEL_MASK) { + NL_SET_ERR_MSG_MOD(extack, "MPLS label out of range"); + return -EINVAL; + } + + return 0; +} + +static const struct nla_policy mpls_policy[TCA_MPLS_MAX + 1] = { + [TCA_MPLS_PARMS] = NLA_POLICY_EXACT_LEN(sizeof(struct tc_mpls)), + [TCA_MPLS_PROTO] = { .type = NLA_U16 }, + [TCA_MPLS_LABEL] = NLA_POLICY_VALIDATE_FN(NLA_U32, valid_label), + [TCA_MPLS_TC] = NLA_POLICY_RANGE(NLA_U8, 0, 7), + [TCA_MPLS_TTL] = NLA_POLICY_MIN(NLA_U8, 1), +}; + +static int tcf_mpls_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, struct netlink_ext_ack *extack) +{ + struct tc_action_net *tn = net_generic(net, mpls_net_id); + struct nlattr *tb[TCA_MPLS_MAX + 1]; + struct tcf_chain *goto_ch = NULL; + struct tcf_mpls_params *p; + struct tc_mpls *parm; + bool exists = false; + struct tcf_mpls *m; + int ret = 0, err; + u8 mpls_ttl = 0; + + if (!nla) { + NL_SET_ERR_MSG_MOD(extack, "missing netlink attributes"); + return -EINVAL; + } + + err = nla_parse_nested(tb, TCA_MPLS_MAX, nla, mpls_policy, extack); + if (err < 0) + return err; + + if (!tb[TCA_MPLS_PARMS]) { + NL_SET_ERR_MSG_MOD(extack, "no MPLS params"); + return -EINVAL; + } + parm = nla_data(tb[TCA_MPLS_PARMS]); + + /* Verify parameters against action type. */ + switch (parm->m_action) { + case TCA_MPLS_ACT_POP: + if (!tb[TCA_MPLS_PROTO] || + !eth_proto_is_802_3(nla_get_be16(tb[TCA_MPLS_PROTO]))) { + NL_SET_ERR_MSG_MOD(extack, "MPLS POP: invalid proto"); + return -EINVAL; + } + if (tb[TCA_MPLS_LABEL] || tb[TCA_MPLS_TTL] || tb[TCA_MPLS_TC]) { + NL_SET_ERR_MSG_MOD(extack, + "MPLS POP: unsupported attrs"); + return -EINVAL; + } + break; + case TCA_MPLS_ACT_DEC_TTL: + if (tb[TCA_MPLS_PROTO] || tb[TCA_MPLS_LABEL] || + tb[TCA_MPLS_TTL] || tb[TCA_MPLS_TC]) { + NL_SET_ERR_MSG_MOD(extack, + "MPLS DEC TTL: unsupported attrs"); + return -EINVAL; + } + break; + case TCA_MPLS_ACT_PUSH: + if (!tb[TCA_MPLS_LABEL]) { + NL_SET_ERR_MSG_MOD(extack, "MPLS PUSH: missing label"); + return -EINVAL; + } + if (tb[TCA_MPLS_PROTO] && + !eth_p_mpls(nla_get_be16(tb[TCA_MPLS_PROTO]))) { + NL_SET_ERR_MSG_MOD(extack, "MPLS PUSH: invalid proto"); + return -EPROTONOSUPPORT; + } + /* Push needs a TTL - if not specified, set a default value. */ + if (!tb[TCA_MPLS_TTL]) { +#if IS_ENABLED(CONFIG_MPLS) + mpls_ttl = net->mpls.default_ttl ? + net->mpls.default_ttl : ACT_MPLS_TTL_DEFAULT; +#else + mpls_ttl = ACT_MPLS_TTL_DEFAULT; +#endif + } + break; + case TCA_MPLS_ACT_MODIFY: + if (tb[TCA_MPLS_PROTO]) { + NL_SET_ERR_MSG_MOD(extack, + "MPLS MOD: unsupported attrs"); + return -EINVAL; + } + break; + default: + NL_SET_ERR_MSG_MOD(extack, "MPLS: unknown action"); + return -EINVAL; + } + + err = tcf_idr_check_alloc(tn, &parm->index, a, bind); + if (err < 0) + return err; + exists = err; + if (exists && bind) + return 0; + + if (!exists) { + ret = tcf_idr_create(tn, parm->index, est, a, + &act_mpls_ops, bind, true); + if (ret) { + tcf_idr_cleanup(tn, parm->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; + + m = to_mpls(*a); + + p = kzalloc(sizeof(*p), GFP_KERNEL); + if (!p) { + err = -ENOMEM; + goto put_chain; + } + + p->tcfm_action = parm->m_action; + p->tcfm_label = tb[TCA_MPLS_LABEL] ? nla_get_u32(tb[TCA_MPLS_LABEL]) : + 0; + p->tcfm_tc = tb[TCA_MPLS_TC] ? nla_get_u8(tb[TCA_MPLS_TC]) : + ACT_MPLS_TC_NOT_SET; + p->tcfm_ttl = tb[TCA_MPLS_TTL] ? nla_get_u8(tb[TCA_MPLS_TTL]) : + mpls_ttl; + p->tcfm_proto = tb[TCA_MPLS_PROTO] ? nla_get_be16(tb[TCA_MPLS_PROTO]) : + htons(ETH_P_MPLS_UC); + + spin_lock_bh(&m->tcf_lock); + goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch); + rcu_swap_protected(m->mpls_p, p, lockdep_is_held(&m->tcf_lock)); + spin_unlock_bh(&m->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_mpls_cleanup(struct tc_action *a) +{ + struct tcf_mpls *m = to_mpls(a); + struct tcf_mpls_params *p; + + p = rcu_dereference_protected(m->mpls_p, 1); + if (p) + kfree_rcu(p, rcu); +} + +static int tcf_mpls_dump(struct sk_buff *skb, struct tc_action *a, + int bind, int ref) +{ + unsigned char *b = skb_tail_pointer(skb); + struct tcf_mpls *m = to_mpls(a); + struct tcf_mpls_params *p; + struct tc_mpls opt = { + .index = m->tcf_index, + .refcnt = refcount_read(&m->tcf_refcnt) - ref, + .bindcnt = atomic_read(&m->tcf_bindcnt) - bind, + }; + struct tcf_t t; + + spin_lock_bh(&m->tcf_lock); + opt.action = m->tcf_action; + p = rcu_dereference_protected(m->mpls_p, lockdep_is_held(&m->tcf_lock)); + opt.m_action = p->tcfm_action; + + if (nla_put(skb, TCA_MPLS_PARMS, sizeof(opt), &opt)) + goto nla_put_failure; + + if (p->tcfm_label && nla_put_u32(skb, TCA_MPLS_LABEL, p->tcfm_label)) + goto nla_put_failure; + + if (p->tcfm_tc != ACT_MPLS_TC_NOT_SET && + nla_put_u8(skb, TCA_MPLS_TC, p->tcfm_tc)) + goto nla_put_failure; + + if (p->tcfm_ttl && nla_put_u8(skb, TCA_MPLS_TTL, p->tcfm_ttl)) + goto nla_put_failure; + + if (nla_put_be16(skb, TCA_MPLS_PROTO, p->tcfm_proto)) + goto nla_put_failure; + + tcf_tm_dump(&t, &m->tcf_tm); + + if (nla_put_64bit(skb, TCA_MPLS_TM, sizeof(t), &t, TCA_MPLS_PAD)) + goto nla_put_failure; + + spin_unlock_bh(&m->tcf_lock); + + return skb->len; + +nla_put_failure: + spin_unlock_bh(&m->tcf_lock); + nlmsg_trim(skb, b); + return -EMSGSIZE; +} + +static int tcf_mpls_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, mpls_net_id); + + return tcf_generic_walker(tn, skb, cb, type, ops, extack); +} + +static int tcf_mpls_search(struct net *net, struct tc_action **a, u32 index) +{ + struct tc_action_net *tn = net_generic(net, mpls_net_id); + + return tcf_idr_search(tn, a, index); +} + +static struct tc_action_ops act_mpls_ops = { + .kind = "mpls", + .id = TCA_ID_MPLS, + .owner = THIS_MODULE, + .act = tcf_mpls_act, + .dump = tcf_mpls_dump, + .init = tcf_mpls_init, + .cleanup = tcf_mpls_cleanup, + .walk = tcf_mpls_walker, + .lookup = tcf_mpls_search, + .size = sizeof(struct tcf_mpls), +}; + +static __net_init int mpls_init_net(struct net *net) +{ + struct tc_action_net *tn = net_generic(net, mpls_net_id); + + return tc_action_net_init(tn, &act_mpls_ops); +} + +static void __net_exit mpls_exit_net(struct list_head *net_list) +{ + tc_action_net_exit(net_list, mpls_net_id); +} + +static struct pernet_operations mpls_net_ops = { + .init = mpls_init_net, + .exit_batch = mpls_exit_net, + .id = &mpls_net_id, + .size = sizeof(struct tc_action_net), +}; + +static int __init mpls_init_module(void) +{ + return tcf_register_action(&act_mpls_ops, &mpls_net_ops); +} + +static void __exit mpls_cleanup_module(void) +{ + tcf_unregister_action(&act_mpls_ops, &mpls_net_ops); +} + +module_init(mpls_init_module); +module_exit(mpls_cleanup_module); + +MODULE_AUTHOR("Netronome Systems <oss-drivers@netronome.com>"); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPLS manipulation actions"); -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 1/3] net: sched: add mpls manipulation actions to TC 2019-06-12 12:51 ` [PATCH net-next 1/3] net: sched: add mpls manipulation " John Hurley @ 2019-06-12 18:03 ` Marcelo Ricardo Leitner 2019-06-13 13:38 ` John Hurley 2019-06-13 13:20 ` Davide Caratti 1 sibling, 1 reply; 8+ messages in thread From: Marcelo Ricardo Leitner @ 2019-06-12 18:03 UTC (permalink / raw) To: John Hurley Cc: netdev, davem, jiri, xiyou.wangcong, simon.horman, jakub.kicinski, oss-drivers On Wed, Jun 12, 2019 at 01:51:44PM +0100, John Hurley wrote: > Currently, TC offers the ability to match on the MPLS fields of a packet > through the use of the flow_dissector_key_mpls struct. However, as yet, TC > actions do not allow the modification or manipulation of such fields. > > Add a new module that registers TC action ops to allow manipulation of > MPLS. This includes the ability to push and pop headers as well as modify > the contents of new or existing headers. A further action to decrement the > TTL field of an MPLS header is also provided. > > Signed-off-by: John Hurley <john.hurley@netronome.com> > Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com> > --- > include/net/tc_act/tc_mpls.h | 27 +++ > include/uapi/linux/pkt_cls.h | 2 + > include/uapi/linux/tc_act/tc_mpls.h | 32 +++ > net/sched/Kconfig | 11 + > net/sched/Makefile | 1 + > net/sched/act_mpls.c | 450 ++++++++++++++++++++++++++++++++++++ > 6 files changed, 523 insertions(+) > create mode 100644 include/net/tc_act/tc_mpls.h > create mode 100644 include/uapi/linux/tc_act/tc_mpls.h > create mode 100644 net/sched/act_mpls.c > > diff --git a/include/net/tc_act/tc_mpls.h b/include/net/tc_act/tc_mpls.h > new file mode 100644 > index 0000000..ca7393a > --- /dev/null > +++ b/include/net/tc_act/tc_mpls.h > @@ -0,0 +1,27 @@ > +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ > +/* Copyright (C) 2019 Netronome Systems, Inc. */ > + > +#ifndef __NET_TC_MPLS_H > +#define __NET_TC_MPLS_H > + > +#include <linux/tc_act/tc_mpls.h> > +#include <net/act_api.h> > + > +struct tcf_mpls_params { > + int tcfm_action; > + u32 tcfm_label; > + u8 tcfm_tc; > + u8 tcfm_ttl; > + __be16 tcfm_proto; > + struct rcu_head rcu; > +}; > + > +#define ACT_MPLS_TC_NOT_SET 0xff > + > +struct tcf_mpls { > + struct tc_action common; > + struct tcf_mpls_params __rcu *mpls_p; > +}; > +#define to_mpls(a) ((struct tcf_mpls *)a) > + > +#endif /* __NET_TC_MPLS_H */ > diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h > index a93680f..197621a 100644 > --- a/include/uapi/linux/pkt_cls.h > +++ b/include/uapi/linux/pkt_cls.h > @@ -83,6 +83,7 @@ enum { > #define TCA_ACT_SIMP 22 > #define TCA_ACT_IFE 25 > #define TCA_ACT_SAMPLE 26 > +#define TCA_ACT_MPLS 27 > > /* Action type identifiers*/ > enum tca_id { > @@ -104,6 +105,7 @@ enum tca_id { > TCA_ID_SIMP = TCA_ACT_SIMP, > TCA_ID_IFE = TCA_ACT_IFE, > TCA_ID_SAMPLE = TCA_ACT_SAMPLE, > + TCA_ID_MPLS = TCA_ACT_MPLS, > /* other actions go here */ > TCA_ID_CTINFO, > __TCA_ID_MAX = 255 > diff --git a/include/uapi/linux/tc_act/tc_mpls.h b/include/uapi/linux/tc_act/tc_mpls.h > new file mode 100644 > index 0000000..6e8907b > --- /dev/null > +++ b/include/uapi/linux/tc_act/tc_mpls.h > @@ -0,0 +1,32 @@ > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > +/* Copyright (C) 2019 Netronome Systems, Inc. */ > + > +#ifndef __LINUX_TC_MPLS_H > +#define __LINUX_TC_MPLS_H > + > +#include <linux/pkt_cls.h> > + > +#define TCA_MPLS_ACT_POP 1 > +#define TCA_MPLS_ACT_PUSH 2 > +#define TCA_MPLS_ACT_MODIFY 3 > +#define TCA_MPLS_ACT_DEC_TTL 4 > + > +struct tc_mpls { > + tc_gen; > + int m_action; > +}; > + > +enum { > + TCA_MPLS_UNSPEC, > + TCA_MPLS_TM, > + TCA_MPLS_PARMS, > + TCA_MPLS_PAD, > + TCA_MPLS_PROTO, > + TCA_MPLS_LABEL, > + TCA_MPLS_TC, > + TCA_MPLS_TTL, > + __TCA_MPLS_MAX, > +}; > +#define TCA_MPLS_MAX (__TCA_MPLS_MAX - 1) > + > +#endif > diff --git a/net/sched/Kconfig b/net/sched/Kconfig > index d104f7e..a34dcd3 100644 > --- a/net/sched/Kconfig > +++ b/net/sched/Kconfig > @@ -842,6 +842,17 @@ config NET_ACT_CSUM > To compile this code as a module, choose M here: the > module will be called act_csum. > > +config NET_ACT_MPLS > + tristate "MPLS manipulation" > + depends on NET_CLS_ACT > + help > + Say Y here to push or pop MPLS headers. > + > + If unsure, say N. > + > + To compile this code as a module, choose M here: the > + module will be called act_mpls. > + > config NET_ACT_VLAN > tristate "Vlan manipulation" > depends on NET_CLS_ACT > diff --git a/net/sched/Makefile b/net/sched/Makefile > index d54bfcb..c266036 100644 > --- a/net/sched/Makefile > +++ b/net/sched/Makefile > @@ -18,6 +18,7 @@ obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit.o > obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o > obj-$(CONFIG_NET_ACT_SKBEDIT) += act_skbedit.o > obj-$(CONFIG_NET_ACT_CSUM) += act_csum.o > +obj-$(CONFIG_NET_ACT_MPLS) += act_mpls.o > obj-$(CONFIG_NET_ACT_VLAN) += act_vlan.o > obj-$(CONFIG_NET_ACT_BPF) += act_bpf.o > obj-$(CONFIG_NET_ACT_CONNMARK) += act_connmark.o > diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c > new file mode 100644 > index 0000000..ff56ada > --- /dev/null > +++ b/net/sched/act_mpls.c > @@ -0,0 +1,450 @@ > +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +/* Copyright (C) 2019 Netronome Systems, Inc. */ > + > +#include <linux/init.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/mpls.h> > +#include <linux/rtnetlink.h> > +#include <linux/skbuff.h> > +#include <linux/tc_act/tc_mpls.h> > +#include <net/mpls.h> > +#include <net/netlink.h> > +#include <net/pkt_sched.h> > +#include <net/pkt_cls.h> > +#include <net/tc_act/tc_mpls.h> > + > +static unsigned int mpls_net_id; > +static struct tc_action_ops act_mpls_ops; > + > +#define ACT_MPLS_TTL_DEFAULT 255 > + > +static void tcf_mpls_mod_lse(struct mpls_shim_hdr *lse, > + struct tcf_mpls_params *p, bool set_bos) > +{ > + u32 new_lse = be32_to_cpu(lse->label_stack_entry); > + > + if (p->tcfm_label) { > + new_lse &= ~MPLS_LS_LABEL_MASK; > + new_lse |= p->tcfm_label << MPLS_LS_LABEL_SHIFT; > + } > + if (p->tcfm_ttl) { > + new_lse &= ~MPLS_LS_TTL_MASK; > + new_lse |= p->tcfm_ttl << MPLS_LS_TTL_SHIFT; > + } > + if (p->tcfm_tc != ACT_MPLS_TC_NOT_SET) { > + new_lse &= ~MPLS_LS_TC_MASK; > + new_lse |= p->tcfm_tc << MPLS_LS_TC_SHIFT; > + } > + if (set_bos) > + new_lse |= 1 << MPLS_LS_S_SHIFT; > + > + lse->label_stack_entry = cpu_to_be32(new_lse); > +} > + > +static inline void tcf_mpls_set_eth_type(struct sk_buff *skb, __be16 ethertype) > +{ > + struct ethhdr *hdr = eth_hdr(skb); > + > + skb_postpull_rcsum(skb, &hdr->h_proto, ETH_TLEN); > + hdr->h_proto = ethertype; > + skb_postpush_rcsum(skb, &hdr->h_proto, ETH_TLEN); > +} > + > +static int tcf_mpls_act(struct sk_buff *skb, const struct tc_action *a, > + struct tcf_result *res) > +{ > + struct tcf_mpls *m = to_mpls(a); > + struct mpls_shim_hdr *lse; > + struct tcf_mpls_params *p; > + u32 temp_lse; > + int ret; > + u8 ttl; > + > + tcf_lastuse_update(&m->tcf_tm); > + bstats_cpu_update(this_cpu_ptr(m->common.cpu_bstats), skb); > + > + /* Ensure 'data' points at mac_header prior calling mpls manipulating > + * functions. > + */ > + if (skb_at_tc_ingress(skb)) > + skb_push_rcsum(skb, skb->mac_len); > + > + ret = READ_ONCE(m->tcf_action); > + > + p = rcu_dereference_bh(m->mpls_p); > + > + switch (p->tcfm_action) { > + case TCA_MPLS_ACT_POP: > + if (unlikely(!eth_p_mpls(skb->protocol))) > + goto out; > + > + if (unlikely(skb_ensure_writable(skb, ETH_HLEN + MPLS_HLEN))) > + goto drop; > + > + skb_postpull_rcsum(skb, mpls_hdr(skb), MPLS_HLEN); > + memmove(skb->data + MPLS_HLEN, skb->data, ETH_HLEN); > + > + __skb_pull(skb, MPLS_HLEN); > + skb_reset_mac_header(skb); > + skb_set_network_header(skb, ETH_HLEN); > + > + tcf_mpls_set_eth_type(skb, p->tcfm_proto); > + skb->protocol = p->tcfm_proto; > + break; > + case TCA_MPLS_ACT_PUSH: > + if (unlikely(skb_cow_head(skb, MPLS_HLEN))) > + goto drop; > + > + skb_push(skb, MPLS_HLEN); > + memmove(skb->data, skb->data + MPLS_HLEN, ETH_HLEN); > + skb_reset_mac_header(skb); > + skb_set_network_header(skb, ETH_HLEN); > + > + lse = mpls_hdr(skb); > + lse->label_stack_entry = 0; > + tcf_mpls_mod_lse(lse, p, !eth_p_mpls(skb->protocol)); > + skb_postpush_rcsum(skb, lse, MPLS_HLEN); > + > + tcf_mpls_set_eth_type(skb, p->tcfm_proto); > + skb->protocol = p->tcfm_proto; > + break; > + case TCA_MPLS_ACT_MODIFY: > + if (unlikely(!eth_p_mpls(skb->protocol))) > + goto out; > + > + if (unlikely(skb_ensure_writable(skb, ETH_HLEN + MPLS_HLEN))) > + goto drop; > + > + lse = mpls_hdr(skb); > + skb_postpull_rcsum(skb, lse, MPLS_HLEN); > + tcf_mpls_mod_lse(lse, p, false); > + skb_postpush_rcsum(skb, lse, MPLS_HLEN); > + break; > + case TCA_MPLS_ACT_DEC_TTL: > + if (unlikely(!eth_p_mpls(skb->protocol))) > + goto out; > + > + if (unlikely(skb_ensure_writable(skb, ETH_HLEN + MPLS_HLEN))) > + goto drop; > + > + lse = mpls_hdr(skb); > + temp_lse = be32_to_cpu(lse->label_stack_entry); > + ttl = (temp_lse & MPLS_LS_TTL_MASK) >> MPLS_LS_TTL_SHIFT; > + if (!--ttl) > + goto drop; > + > + temp_lse &= ~MPLS_LS_TTL_MASK; > + temp_lse |= ttl << MPLS_LS_TTL_SHIFT; > + skb_postpull_rcsum(skb, lse, MPLS_HLEN); > + lse->label_stack_entry = cpu_to_be32(temp_lse); > + skb_postpush_rcsum(skb, lse, MPLS_HLEN); > + break; > + default: > + WARN_ONCE(1, "Invalid MPLS action\n"); > + } > + > +out: > + if (skb_at_tc_ingress(skb)) > + skb_pull_rcsum(skb, skb->mac_len); > + > + return ret; > + > +drop: > + qstats_drop_inc(this_cpu_ptr(m->common.cpu_qstats)); > + return TC_ACT_SHOT; > +} > + > +static int valid_label(const struct nlattr *attr, > + struct netlink_ext_ack *extack) > +{ > + const u32 *label = nla_data(attr); > + > + if (!*label || *label & ~MPLS_LABEL_MASK) { > + NL_SET_ERR_MSG_MOD(extack, "MPLS label out of range"); > + return -EINVAL; > + } > + > + return 0; > +} > + > +static const struct nla_policy mpls_policy[TCA_MPLS_MAX + 1] = { > + [TCA_MPLS_PARMS] = NLA_POLICY_EXACT_LEN(sizeof(struct tc_mpls)), > + [TCA_MPLS_PROTO] = { .type = NLA_U16 }, > + [TCA_MPLS_LABEL] = NLA_POLICY_VALIDATE_FN(NLA_U32, valid_label), > + [TCA_MPLS_TC] = NLA_POLICY_RANGE(NLA_U8, 0, 7), > + [TCA_MPLS_TTL] = NLA_POLICY_MIN(NLA_U8, 1), > +}; > + > +static int tcf_mpls_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, struct netlink_ext_ack *extack) > +{ > + struct tc_action_net *tn = net_generic(net, mpls_net_id); > + struct nlattr *tb[TCA_MPLS_MAX + 1]; > + struct tcf_chain *goto_ch = NULL; > + struct tcf_mpls_params *p; > + struct tc_mpls *parm; > + bool exists = false; > + struct tcf_mpls *m; > + int ret = 0, err; > + u8 mpls_ttl = 0; > + > + if (!nla) { > + NL_SET_ERR_MSG_MOD(extack, "missing netlink attributes"); > + return -EINVAL; > + } > + > + err = nla_parse_nested(tb, TCA_MPLS_MAX, nla, mpls_policy, extack); Please see my reply to [PATCH net-next v6] net: sched: Introduce act_ctinfo action regarding the usage of nla_parse_nested() here. Thanks. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 1/3] net: sched: add mpls manipulation actions to TC 2019-06-12 18:03 ` Marcelo Ricardo Leitner @ 2019-06-13 13:38 ` John Hurley 0 siblings, 0 replies; 8+ messages in thread From: John Hurley @ 2019-06-13 13:38 UTC (permalink / raw) To: Marcelo Ricardo Leitner Cc: Linux Netdev List, David Miller, Jiri Pirko, Cong Wang, Simon Horman, Jakub Kicinski, oss-drivers On Wed, Jun 12, 2019 at 7:03 PM Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> wrote: > > On Wed, Jun 12, 2019 at 01:51:44PM +0100, John Hurley wrote: > > Currently, TC offers the ability to match on the MPLS fields of a packet > > through the use of the flow_dissector_key_mpls struct. However, as yet, TC > > actions do not allow the modification or manipulation of such fields. > > > > Add a new module that registers TC action ops to allow manipulation of > > MPLS. This includes the ability to push and pop headers as well as modify > > the contents of new or existing headers. A further action to decrement the > > TTL field of an MPLS header is also provided. > > > > Signed-off-by: John Hurley <john.hurley@netronome.com> > > Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com> > > --- > > include/net/tc_act/tc_mpls.h | 27 +++ > > include/uapi/linux/pkt_cls.h | 2 + > > include/uapi/linux/tc_act/tc_mpls.h | 32 +++ > > net/sched/Kconfig | 11 + > > net/sched/Makefile | 1 + > > net/sched/act_mpls.c | 450 ++++++++++++++++++++++++++++++++++++ > > 6 files changed, 523 insertions(+) > > create mode 100644 include/net/tc_act/tc_mpls.h > > create mode 100644 include/uapi/linux/tc_act/tc_mpls.h > > create mode 100644 net/sched/act_mpls.c > > > > diff --git a/include/net/tc_act/tc_mpls.h b/include/net/tc_act/tc_mpls.h > > new file mode 100644 > > index 0000000..ca7393a > > --- /dev/null > > +++ b/include/net/tc_act/tc_mpls.h > > @@ -0,0 +1,27 @@ > > +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ > > +/* Copyright (C) 2019 Netronome Systems, Inc. */ > > + > > +#ifndef __NET_TC_MPLS_H > > +#define __NET_TC_MPLS_H > > + > > +#include <linux/tc_act/tc_mpls.h> > > +#include <net/act_api.h> > > + > > +struct tcf_mpls_params { > > + int tcfm_action; > > + u32 tcfm_label; > > + u8 tcfm_tc; > > + u8 tcfm_ttl; > > + __be16 tcfm_proto; > > + struct rcu_head rcu; > > +}; > > + > > +#define ACT_MPLS_TC_NOT_SET 0xff > > + > > +struct tcf_mpls { > > + struct tc_action common; > > + struct tcf_mpls_params __rcu *mpls_p; > > +}; > > +#define to_mpls(a) ((struct tcf_mpls *)a) > > + > > +#endif /* __NET_TC_MPLS_H */ > > diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h > > index a93680f..197621a 100644 > > --- a/include/uapi/linux/pkt_cls.h > > +++ b/include/uapi/linux/pkt_cls.h > > @@ -83,6 +83,7 @@ enum { > > #define TCA_ACT_SIMP 22 > > #define TCA_ACT_IFE 25 > > #define TCA_ACT_SAMPLE 26 > > +#define TCA_ACT_MPLS 27 > > > > /* Action type identifiers*/ > > enum tca_id { > > @@ -104,6 +105,7 @@ enum tca_id { > > TCA_ID_SIMP = TCA_ACT_SIMP, > > TCA_ID_IFE = TCA_ACT_IFE, > > TCA_ID_SAMPLE = TCA_ACT_SAMPLE, > > + TCA_ID_MPLS = TCA_ACT_MPLS, > > /* other actions go here */ > > TCA_ID_CTINFO, > > __TCA_ID_MAX = 255 > > diff --git a/include/uapi/linux/tc_act/tc_mpls.h b/include/uapi/linux/tc_act/tc_mpls.h > > new file mode 100644 > > index 0000000..6e8907b > > --- /dev/null > > +++ b/include/uapi/linux/tc_act/tc_mpls.h > > @@ -0,0 +1,32 @@ > > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > > +/* Copyright (C) 2019 Netronome Systems, Inc. */ > > + > > +#ifndef __LINUX_TC_MPLS_H > > +#define __LINUX_TC_MPLS_H > > + > > +#include <linux/pkt_cls.h> > > + > > +#define TCA_MPLS_ACT_POP 1 > > +#define TCA_MPLS_ACT_PUSH 2 > > +#define TCA_MPLS_ACT_MODIFY 3 > > +#define TCA_MPLS_ACT_DEC_TTL 4 > > + > > +struct tc_mpls { > > + tc_gen; > > + int m_action; > > +}; > > + > > +enum { > > + TCA_MPLS_UNSPEC, > > + TCA_MPLS_TM, > > + TCA_MPLS_PARMS, > > + TCA_MPLS_PAD, > > + TCA_MPLS_PROTO, > > + TCA_MPLS_LABEL, > > + TCA_MPLS_TC, > > + TCA_MPLS_TTL, > > + __TCA_MPLS_MAX, > > +}; > > +#define TCA_MPLS_MAX (__TCA_MPLS_MAX - 1) > > + > > +#endif > > diff --git a/net/sched/Kconfig b/net/sched/Kconfig > > index d104f7e..a34dcd3 100644 > > --- a/net/sched/Kconfig > > +++ b/net/sched/Kconfig > > @@ -842,6 +842,17 @@ config NET_ACT_CSUM > > To compile this code as a module, choose M here: the > > module will be called act_csum. > > > > +config NET_ACT_MPLS > > + tristate "MPLS manipulation" > > + depends on NET_CLS_ACT > > + help > > + Say Y here to push or pop MPLS headers. > > + > > + If unsure, say N. > > + > > + To compile this code as a module, choose M here: the > > + module will be called act_mpls. > > + > > config NET_ACT_VLAN > > tristate "Vlan manipulation" > > depends on NET_CLS_ACT > > diff --git a/net/sched/Makefile b/net/sched/Makefile > > index d54bfcb..c266036 100644 > > --- a/net/sched/Makefile > > +++ b/net/sched/Makefile > > @@ -18,6 +18,7 @@ obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit.o > > obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o > > obj-$(CONFIG_NET_ACT_SKBEDIT) += act_skbedit.o > > obj-$(CONFIG_NET_ACT_CSUM) += act_csum.o > > +obj-$(CONFIG_NET_ACT_MPLS) += act_mpls.o > > obj-$(CONFIG_NET_ACT_VLAN) += act_vlan.o > > obj-$(CONFIG_NET_ACT_BPF) += act_bpf.o > > obj-$(CONFIG_NET_ACT_CONNMARK) += act_connmark.o > > diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c > > new file mode 100644 > > index 0000000..ff56ada > > --- /dev/null > > +++ b/net/sched/act_mpls.c > > @@ -0,0 +1,450 @@ > > +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > > +/* Copyright (C) 2019 Netronome Systems, Inc. */ > > + > > +#include <linux/init.h> > > +#include <linux/kernel.h> > > +#include <linux/module.h> > > +#include <linux/mpls.h> > > +#include <linux/rtnetlink.h> > > +#include <linux/skbuff.h> > > +#include <linux/tc_act/tc_mpls.h> > > +#include <net/mpls.h> > > +#include <net/netlink.h> > > +#include <net/pkt_sched.h> > > +#include <net/pkt_cls.h> > > +#include <net/tc_act/tc_mpls.h> > > + > > +static unsigned int mpls_net_id; > > +static struct tc_action_ops act_mpls_ops; > > + > > +#define ACT_MPLS_TTL_DEFAULT 255 > > + > > +static void tcf_mpls_mod_lse(struct mpls_shim_hdr *lse, > > + struct tcf_mpls_params *p, bool set_bos) > > +{ > > + u32 new_lse = be32_to_cpu(lse->label_stack_entry); > > + > > + if (p->tcfm_label) { > > + new_lse &= ~MPLS_LS_LABEL_MASK; > > + new_lse |= p->tcfm_label << MPLS_LS_LABEL_SHIFT; > > + } > > + if (p->tcfm_ttl) { > > + new_lse &= ~MPLS_LS_TTL_MASK; > > + new_lse |= p->tcfm_ttl << MPLS_LS_TTL_SHIFT; > > + } > > + if (p->tcfm_tc != ACT_MPLS_TC_NOT_SET) { > > + new_lse &= ~MPLS_LS_TC_MASK; > > + new_lse |= p->tcfm_tc << MPLS_LS_TC_SHIFT; > > + } > > + if (set_bos) > > + new_lse |= 1 << MPLS_LS_S_SHIFT; > > + > > + lse->label_stack_entry = cpu_to_be32(new_lse); > > +} > > + > > +static inline void tcf_mpls_set_eth_type(struct sk_buff *skb, __be16 ethertype) > > +{ > > + struct ethhdr *hdr = eth_hdr(skb); > > + > > + skb_postpull_rcsum(skb, &hdr->h_proto, ETH_TLEN); > > + hdr->h_proto = ethertype; > > + skb_postpush_rcsum(skb, &hdr->h_proto, ETH_TLEN); > > +} > > + > > +static int tcf_mpls_act(struct sk_buff *skb, const struct tc_action *a, > > + struct tcf_result *res) > > +{ > > + struct tcf_mpls *m = to_mpls(a); > > + struct mpls_shim_hdr *lse; > > + struct tcf_mpls_params *p; > > + u32 temp_lse; > > + int ret; > > + u8 ttl; > > + > > + tcf_lastuse_update(&m->tcf_tm); > > + bstats_cpu_update(this_cpu_ptr(m->common.cpu_bstats), skb); > > + > > + /* Ensure 'data' points at mac_header prior calling mpls manipulating > > + * functions. > > + */ > > + if (skb_at_tc_ingress(skb)) > > + skb_push_rcsum(skb, skb->mac_len); > > + > > + ret = READ_ONCE(m->tcf_action); > > + > > + p = rcu_dereference_bh(m->mpls_p); > > + > > + switch (p->tcfm_action) { > > + case TCA_MPLS_ACT_POP: > > + if (unlikely(!eth_p_mpls(skb->protocol))) > > + goto out; > > + > > + if (unlikely(skb_ensure_writable(skb, ETH_HLEN + MPLS_HLEN))) > > + goto drop; > > + > > + skb_postpull_rcsum(skb, mpls_hdr(skb), MPLS_HLEN); > > + memmove(skb->data + MPLS_HLEN, skb->data, ETH_HLEN); > > + > > + __skb_pull(skb, MPLS_HLEN); > > + skb_reset_mac_header(skb); > > + skb_set_network_header(skb, ETH_HLEN); > > + > > + tcf_mpls_set_eth_type(skb, p->tcfm_proto); > > + skb->protocol = p->tcfm_proto; > > + break; > > + case TCA_MPLS_ACT_PUSH: > > + if (unlikely(skb_cow_head(skb, MPLS_HLEN))) > > + goto drop; > > + > > + skb_push(skb, MPLS_HLEN); > > + memmove(skb->data, skb->data + MPLS_HLEN, ETH_HLEN); > > + skb_reset_mac_header(skb); > > + skb_set_network_header(skb, ETH_HLEN); > > + > > + lse = mpls_hdr(skb); > > + lse->label_stack_entry = 0; > > + tcf_mpls_mod_lse(lse, p, !eth_p_mpls(skb->protocol)); > > + skb_postpush_rcsum(skb, lse, MPLS_HLEN); > > + > > + tcf_mpls_set_eth_type(skb, p->tcfm_proto); > > + skb->protocol = p->tcfm_proto; > > + break; > > + case TCA_MPLS_ACT_MODIFY: > > + if (unlikely(!eth_p_mpls(skb->protocol))) > > + goto out; > > + > > + if (unlikely(skb_ensure_writable(skb, ETH_HLEN + MPLS_HLEN))) > > + goto drop; > > + > > + lse = mpls_hdr(skb); > > + skb_postpull_rcsum(skb, lse, MPLS_HLEN); > > + tcf_mpls_mod_lse(lse, p, false); > > + skb_postpush_rcsum(skb, lse, MPLS_HLEN); > > + break; > > + case TCA_MPLS_ACT_DEC_TTL: > > + if (unlikely(!eth_p_mpls(skb->protocol))) > > + goto out; > > + > > + if (unlikely(skb_ensure_writable(skb, ETH_HLEN + MPLS_HLEN))) > > + goto drop; > > + > > + lse = mpls_hdr(skb); > > + temp_lse = be32_to_cpu(lse->label_stack_entry); > > + ttl = (temp_lse & MPLS_LS_TTL_MASK) >> MPLS_LS_TTL_SHIFT; > > + if (!--ttl) > > + goto drop; > > + > > + temp_lse &= ~MPLS_LS_TTL_MASK; > > + temp_lse |= ttl << MPLS_LS_TTL_SHIFT; > > + skb_postpull_rcsum(skb, lse, MPLS_HLEN); > > + lse->label_stack_entry = cpu_to_be32(temp_lse); > > + skb_postpush_rcsum(skb, lse, MPLS_HLEN); > > + break; > > + default: > > + WARN_ONCE(1, "Invalid MPLS action\n"); > > + } > > + > > +out: > > + if (skb_at_tc_ingress(skb)) > > + skb_pull_rcsum(skb, skb->mac_len); > > + > > + return ret; > > + > > +drop: > > + qstats_drop_inc(this_cpu_ptr(m->common.cpu_qstats)); > > + return TC_ACT_SHOT; > > +} > > + > > +static int valid_label(const struct nlattr *attr, > > + struct netlink_ext_ack *extack) > > +{ > > + const u32 *label = nla_data(attr); > > + > > + if (!*label || *label & ~MPLS_LABEL_MASK) { > > + NL_SET_ERR_MSG_MOD(extack, "MPLS label out of range"); > > + return -EINVAL; > > + } > > + > > + return 0; > > +} > > + > > +static const struct nla_policy mpls_policy[TCA_MPLS_MAX + 1] = { > > + [TCA_MPLS_PARMS] = NLA_POLICY_EXACT_LEN(sizeof(struct tc_mpls)), > > + [TCA_MPLS_PROTO] = { .type = NLA_U16 }, > > + [TCA_MPLS_LABEL] = NLA_POLICY_VALIDATE_FN(NLA_U32, valid_label), > > + [TCA_MPLS_TC] = NLA_POLICY_RANGE(NLA_U8, 0, 7), > > + [TCA_MPLS_TTL] = NLA_POLICY_MIN(NLA_U8, 1), > > +}; > > + > > +static int tcf_mpls_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, struct netlink_ext_ack *extack) > > +{ > > + struct tc_action_net *tn = net_generic(net, mpls_net_id); > > + struct nlattr *tb[TCA_MPLS_MAX + 1]; > > + struct tcf_chain *goto_ch = NULL; > > + struct tcf_mpls_params *p; > > + struct tc_mpls *parm; > > + bool exists = false; > > + struct tcf_mpls *m; > > + int ret = 0, err; > > + u8 mpls_ttl = 0; > > + > > + if (!nla) { > > + NL_SET_ERR_MSG_MOD(extack, "missing netlink attributes"); > > + return -EINVAL; > > + } > > + > > + err = nla_parse_nested(tb, TCA_MPLS_MAX, nla, mpls_policy, extack); > > Please see my reply to > [PATCH net-next v6] net: sched: Introduce act_ctinfo action > regarding the usage of nla_parse_nested() here. Thanks. > Hi Marcelo, I was following that discussion. It seems that we are in consensus that the 'new' nla_parse_nested as used in this patch is ok. Fwiw, in my iproute2 code to test this, i or'd in the NLA_F_NESTED flag in my new m_mpls.c file but we can move it to the main m_action.c file if it doesn't affect older act modules ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 1/3] net: sched: add mpls manipulation actions to TC 2019-06-12 12:51 ` [PATCH net-next 1/3] net: sched: add mpls manipulation " John Hurley 2019-06-12 18:03 ` Marcelo Ricardo Leitner @ 2019-06-13 13:20 ` Davide Caratti 2019-06-13 13:53 ` John Hurley 1 sibling, 1 reply; 8+ messages in thread From: Davide Caratti @ 2019-06-13 13:20 UTC (permalink / raw) To: John Hurley, netdev Cc: davem, jiri, xiyou.wangcong, simon.horman, jakub.kicinski, oss-drivers hello John! On Wed, 2019-06-12 at 13:51 +0100, John Hurley wrote: > Currently, TC offers the ability to match on the MPLS fields of a packet > through the use of the flow_dissector_key_mpls struct. However, as yet, TC > actions do not allow the modification or manipulation of such fields. > > Add a new module that registers TC action ops to allow manipulation of > MPLS. This includes the ability to push and pop headers as well as modify > the contents of new or existing headers. A further action to decrement the > TTL field of an MPLS header is also provided. > > Signed-off-by: John Hurley <john.hurley@netronome.com> > Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com> [...] > index a93680f..197621a 100644 > --- a/include/uapi/linux/pkt_cls.h > +++ b/include/uapi/linux/pkt_cls.h > @@ -83,6 +83,7 @@ enum { > #define TCA_ACT_SIMP 22 > #define TCA_ACT_IFE 25 > #define TCA_ACT_SAMPLE 26 > +#define TCA_ACT_MPLS 27 like I mentioned in my reply to "[PATCH net-next 1/3] net/sched: Introduce action ct", I think that 27 is forbidden on net-next: this number is already used in the uAPI for TCA_ID_CTINFO (see below). Like suggested in the comment above the definition of TCA_ACT_GACT, it's sufficient to add TCA_ID_MPLS in the enum below. > /* Action type identifiers*/ > enum tca_id { > @@ -104,6 +105,7 @@ enum tca_id { > TCA_ID_SIMP = TCA_ACT_SIMP, > TCA_ID_IFE = TCA_ACT_IFE, > TCA_ID_SAMPLE = TCA_ACT_SAMPLE, > + TCA_ID_MPLS = TCA_ACT_MPLS, > /* other actions go here */ > TCA_ID_CTINFO, > __TCA_ID_MAX = 255 and the line that adds TCA_ID_MPLS to enum tca_id should be placed right before __TCA_ID_MAX, so that the uAPI is preserved (i.e. the value of TCA_ID_CTINFO does not change). thanks! -- davide ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 1/3] net: sched: add mpls manipulation actions to TC 2019-06-13 13:20 ` Davide Caratti @ 2019-06-13 13:53 ` John Hurley 0 siblings, 0 replies; 8+ messages in thread From: John Hurley @ 2019-06-13 13:53 UTC (permalink / raw) To: Davide Caratti Cc: Linux Netdev List, David Miller, Jiri Pirko, Cong Wang, Simon Horman, Jakub Kicinski, oss-drivers On Thu, Jun 13, 2019 at 2:20 PM Davide Caratti <dcaratti@redhat.com> wrote: > > hello John! > > On Wed, 2019-06-12 at 13:51 +0100, John Hurley wrote: > > Currently, TC offers the ability to match on the MPLS fields of a packet > > through the use of the flow_dissector_key_mpls struct. However, as yet, TC > > actions do not allow the modification or manipulation of such fields. > > > > Add a new module that registers TC action ops to allow manipulation of > > MPLS. This includes the ability to push and pop headers as well as modify > > the contents of new or existing headers. A further action to decrement the > > TTL field of an MPLS header is also provided. > > > > Signed-off-by: John Hurley <john.hurley@netronome.com> > > Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com> > > [...] > > > index a93680f..197621a 100644 > > --- a/include/uapi/linux/pkt_cls.h > > +++ b/include/uapi/linux/pkt_cls.h > > @@ -83,6 +83,7 @@ enum { > > #define TCA_ACT_SIMP 22 > > #define TCA_ACT_IFE 25 > > #define TCA_ACT_SAMPLE 26 > > +#define TCA_ACT_MPLS 27 > > like I mentioned in my reply to "[PATCH net-next 1/3] net/sched: Introduce > action ct", I think that 27 is forbidden on net-next: this number is > already used in the uAPI for TCA_ID_CTINFO (see below). Like suggested in > the comment above the definition of TCA_ACT_GACT, it's sufficient to add > TCA_ID_MPLS in the enum below. > > > /* Action type identifiers*/ > > enum tca_id { > > @@ -104,6 +105,7 @@ enum tca_id { > > TCA_ID_SIMP = TCA_ACT_SIMP, > > TCA_ID_IFE = TCA_ACT_IFE, > > TCA_ID_SAMPLE = TCA_ACT_SAMPLE, > > + TCA_ID_MPLS = TCA_ACT_MPLS, > > /* other actions go here */ > > TCA_ID_CTINFO, > > __TCA_ID_MAX = 255 > > and the line that adds TCA_ID_MPLS to enum tca_id should be placed right > before __TCA_ID_MAX, so that the uAPI is preserved (i.e. the value of > TCA_ID_CTINFO does not change). > > thanks! > -- > davide > Hi Davide, Thanks for pointing that out. Let me fix > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH net-next 2/3] net: sched: include mpls actions in hardware intermediate representation 2019-06-12 12:51 [PATCH net-next 0/3] Add MPLS actions to TC John Hurley 2019-06-12 12:51 ` [PATCH net-next 1/3] net: sched: add mpls manipulation " John Hurley @ 2019-06-12 12:51 ` John Hurley 2019-06-12 12:51 ` [PATCH net-next 3/3] selftests: tc-tests: actions: add MPLS tests John Hurley 2 siblings, 0 replies; 8+ messages in thread From: John Hurley @ 2019-06-12 12:51 UTC (permalink / raw) To: netdev Cc: davem, jiri, xiyou.wangcong, simon.horman, jakub.kicinski, oss-drivers, John Hurley A recent addition to TC actions is the ability to manipulate the MPLS headers on packets. In preparation to offload such actions to hardware, update the IR code to accept and prepare the new actions. Signed-off-by: John Hurley <john.hurley@netronome.com> Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com> --- include/net/flow_offload.h | 10 +++++++ include/net/tc_act/tc_mpls.h | 64 ++++++++++++++++++++++++++++++++++++++++++++ net/sched/cls_api.c | 26 ++++++++++++++++++ 3 files changed, 100 insertions(+) diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h index 36fdb85..e26ae81 100644 --- a/include/net/flow_offload.h +++ b/include/net/flow_offload.h @@ -123,6 +123,10 @@ enum flow_action_id { FLOW_ACTION_QUEUE, FLOW_ACTION_SAMPLE, FLOW_ACTION_POLICE, + FLOW_ACTION_MPLS_PUSH, + FLOW_ACTION_MPLS_POP, + FLOW_ACTION_MPLS_MANGLE, + FLOW_ACTION_MPLS_DEC_TTL, }; /* This is mirroring enum pedit_header_type definition for easy mapping between @@ -172,6 +176,12 @@ struct flow_action_entry { s64 burst; u64 rate_bytes_ps; } police; + struct { /* FLOW_ACTION_MPLS */ + u32 label; + __be16 proto; + u8 tc; + u8 ttl; + } mpls; }; }; diff --git a/include/net/tc_act/tc_mpls.h b/include/net/tc_act/tc_mpls.h index ca7393a..4320de9 100644 --- a/include/net/tc_act/tc_mpls.h +++ b/include/net/tc_act/tc_mpls.h @@ -24,4 +24,68 @@ struct tcf_mpls { }; #define to_mpls(a) ((struct tcf_mpls *)a) +static inline bool is_tcf_mpls(const struct tc_action *a) +{ +#ifdef CONFIG_NET_CLS_ACT + if (a->ops && a->ops->id == TCA_ACT_MPLS) + return true; +#endif + return false; +} + +static inline u32 tcf_mpls_action(const struct tc_action *a) +{ + u32 tcfm_action; + + rcu_read_lock(); + tcfm_action = rcu_dereference(to_mpls(a)->mpls_p)->tcfm_action; + rcu_read_unlock(); + + return tcfm_action; +} + +static inline u32 tcf_mpls_label(const struct tc_action *a) +{ + u32 tcfm_label; + + rcu_read_lock(); + tcfm_label = rcu_dereference(to_mpls(a)->mpls_p)->tcfm_label; + rcu_read_unlock(); + + return tcfm_label; +} + +static inline u8 tcf_mpls_tc(const struct tc_action *a) +{ + u8 tcfm_tc; + + rcu_read_lock(); + tcfm_tc = rcu_dereference(to_mpls(a)->mpls_p)->tcfm_tc; + rcu_read_unlock(); + + return tcfm_tc; +} + +static inline u8 tcf_mpls_ttl(const struct tc_action *a) +{ + u8 tcfm_ttl; + + rcu_read_lock(); + tcfm_ttl = rcu_dereference(to_mpls(a)->mpls_p)->tcfm_ttl; + rcu_read_unlock(); + + return tcfm_ttl; +} + +static inline __be16 tcf_mpls_proto(const struct tc_action *a) +{ + __be16 tcfm_proto; + + rcu_read_lock(); + tcfm_proto = rcu_dereference(to_mpls(a)->mpls_p)->tcfm_proto; + rcu_read_unlock(); + + return tcfm_proto; +} + #endif /* __NET_TC_MPLS_H */ diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index ad36bbc..d41de2e 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -35,6 +35,7 @@ #include <net/tc_act/tc_police.h> #include <net/tc_act/tc_sample.h> #include <net/tc_act/tc_skbedit.h> +#include <net/tc_act/tc_mpls.h> extern const struct nla_policy rtm_tca_policy[TCA_MAX + 1]; @@ -3266,6 +3267,31 @@ int tc_setup_flow_action(struct flow_action *flow_action, entry->police.burst = tcf_police_tcfp_burst(act); entry->police.rate_bytes_ps = tcf_police_rate_bytes_ps(act); + } else if (is_tcf_mpls(act)) { + switch (tcf_mpls_action(act)) { + case TCA_MPLS_ACT_PUSH: + entry->id = FLOW_ACTION_MPLS_PUSH; + entry->mpls.label = tcf_mpls_label(act); + entry->mpls.proto = tcf_mpls_proto(act); + entry->mpls.tc = tcf_mpls_tc(act); + entry->mpls.ttl = tcf_mpls_ttl(act); + break; + case TCA_MPLS_ACT_POP: + entry->id = FLOW_ACTION_MPLS_POP; + entry->mpls.proto = tcf_mpls_proto(act); + break; + case TCA_MPLS_ACT_MODIFY: + entry->id = FLOW_ACTION_MPLS_MANGLE; + entry->mpls.label = tcf_mpls_label(act); + entry->mpls.tc = tcf_mpls_tc(act); + entry->mpls.ttl = tcf_mpls_ttl(act); + break; + case TCA_MPLS_ACT_DEC_TTL: + entry->id = FLOW_ACTION_MPLS_DEC_TTL; + break; + default: + goto err_out; + } } else { goto err_out; } -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next 3/3] selftests: tc-tests: actions: add MPLS tests 2019-06-12 12:51 [PATCH net-next 0/3] Add MPLS actions to TC John Hurley 2019-06-12 12:51 ` [PATCH net-next 1/3] net: sched: add mpls manipulation " John Hurley 2019-06-12 12:51 ` [PATCH net-next 2/3] net: sched: include mpls actions in hardware intermediate representation John Hurley @ 2019-06-12 12:51 ` John Hurley 2 siblings, 0 replies; 8+ messages in thread From: John Hurley @ 2019-06-12 12:51 UTC (permalink / raw) To: netdev Cc: davem, jiri, xiyou.wangcong, simon.horman, jakub.kicinski, oss-drivers, John Hurley Add a new series of selftests to verify the functionality of act_mpls in TC. Signed-off-by: John Hurley <john.hurley@netronome.com> Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com> --- .../tc-testing/tc-tests/actions/mpls.json | 744 +++++++++++++++++++++ 1 file changed, 744 insertions(+) create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/mpls.json diff --git a/tools/testing/selftests/tc-testing/tc-tests/actions/mpls.json b/tools/testing/selftests/tc-testing/tc-tests/actions/mpls.json new file mode 100644 index 0000000..e1a14f4e0 --- /dev/null +++ b/tools/testing/selftests/tc-testing/tc-tests/actions/mpls.json @@ -0,0 +1,744 @@ +[ + { + "id": "a933", + "name": "Add MPLS dec_ttl action with pipe opcode", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls dec_ttl pipe index 8", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*dec_ttl.*pipe.*index 8 ref", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "08d1", + "name": "Add mpls dec_ttl action with pass opcode", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls dec_ttl pass index 8", + "expExitCode": "0", + "verifyCmd": "$TC actions get action mpls index 8", + "matchPattern": "action order [0-9]+: mpls.*dec_ttl.*pass.*index 8 ref", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "d786", + "name": "Add mpls dec_ttl action with drop opcode", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls dec_ttl drop index 8", + "expExitCode": "0", + "verifyCmd": "$TC actions get action mpls index 8", + "matchPattern": "action order [0-9]+: mpls.*dec_ttl.*drop.*index 8 ref", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "f334", + "name": "Add mpls dec_ttl action with reclassify opcode", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls dec_ttl reclassify index 8", + "expExitCode": "0", + "verifyCmd": "$TC actions get action mpls index 8", + "matchPattern": "action order [0-9]+: mpls.*dec_ttl.*reclassify.*index 8 ref", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "29bd", + "name": "Add mpls dec_ttl action with continue opcode", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls dec_ttl continue index 8", + "expExitCode": "0", + "verifyCmd": "$TC actions get action mpls index 8", + "matchPattern": "action order [0-9]+: mpls.*dec_ttl.*continue.*index 8 ref", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "48df", + "name": "Add mpls dec_ttl action with jump opcode", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls dec_ttl jump 10 index 8", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*jump 10.*index 8 ref", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "62eb", + "name": "Add mpls dec_ttl action with trap opcode", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls dec_ttl trap index 8", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*dec_ttl trap.*index 8 ref", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "9118", + "name": "Add mpls dec_ttl action with invalid opcode", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls dec_ttl foo index 8", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*dec_ttl.*foo.*index 8 ref", + "matchCount": "0", + "teardown": [] + }, + { + "id": "6ce1", + "name": "Add mpls dec_ttl action with label (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls dec_ttl label 20", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*dec_ttl.*label.*20.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "352f", + "name": "Add mpls dec_ttl action with tc (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls dec_ttl tc 3", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*dec_ttl.*tc.*3.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "fa1c", + "name": "Add mpls dec_ttl action with ttl (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls dec_ttl ttl 20", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*dec_ttl.*ttl.*20.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "d4c4", + "name": "Add mpls pop action with ip proto", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls pop protocol ipv4", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*pop.*protocol.*ip.*pipe", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "92fe", + "name": "Add mpls pop action with mpls proto", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls pop protocol mpls_mc", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*pop.*protocol.*mpls_mc.*pipe", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "7e23", + "name": "Add mpls pop action with no protocol (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls pop", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*pop.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "6182", + "name": "Add mpls pop action with label (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls pop protocol ipv4 label 20", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*pop.*label.*20.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "6475", + "name": "Add mpls pop action with tc (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls pop protocol ipv4 tc 3", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*pop.*tc.*3.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "067b", + "name": "Add mpls pop action with ttl (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls pop protocol ipv4 ttl 20", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*pop.*ttl.*20.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "38cc", + "name": "Add mpls push action with label", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls push label 20", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*push.*protocol.*mpls_uc.*label.*20.*ttl.*[0-9]+.*pipe", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "c281", + "name": "Add mpls push action with mpls_mc protocol", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls push protocol mpls_mc label 20", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*push.*protocol.*mpls_mc.*label.*20.*ttl.*[0-9]+.*pipe", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "5db4", + "name": "Add mpls push action with label, tc and ttl", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls push label 20 tc 3 ttl 128", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*push.*protocol.*mpls_uc.*label.*20.*tc.*3.*ttl.*128.*pipe", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "d69d", + "name": "Add mpls push action with no label (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls push", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*push.*protocol.*mpls_uc.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "e8e4", + "name": "Add mpls push action with ipv4 protocol (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls push protocol ipv4 label 20", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*push.*protocol.*mpls_uc.*label.*20.*ttl.*[0-9]+.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "ecd0", + "name": "Add mpls push action with out of range label (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls push label 1048576", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*push.*protocol.*mpls_uc.*label.*1048576.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "d303", + "name": "Add mpls push action with out of range tc (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls push label 20 tc 8", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*push.*protocol.*mpls_uc.*label.*20.*tc.*8.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "fd6e", + "name": "Add mpls push action with ttl of 0 (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls push label 20 ttl 0", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*push.*protocol.*mpls_uc.*label.*20.*ttl.*0.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "19e9", + "name": "Add mpls mod action with mpls label", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls mod label 20", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*modify.*label.*20.*pipe", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "04b5", + "name": "Add mpls mod action with mpls tc", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls mod tc 3", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*modify.*tc.*3.*pipe", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "6ed5", + "name": "Add mpls mod action with mpls label", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls mod ttl 128", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*modify.*ttl.*128.*pipe", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "db7c", + "name": "Add mpls mod action with protocol (invalid)", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action mpls mod protocol ipv4", + "expExitCode": "255", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*modify.*protocol.*ip.*pipe", + "matchCount": "0", + "teardown": [] + }, + { + "id": "b070", + "name": "Replace existing mpls push action with new ID", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ], + "$TC actions add action mpls push label 20 pipe index 12" + ], + "cmdUnderTest": "$TC actions replace action mpls push label 30 pipe index 12", + "expExitCode": "0", + "verifyCmd": "$TC actions get action mpls index 12", + "matchPattern": "action order [0-9]+: mpls.*push.*protocol.*mpls_uc.*label.*30.*pipe.*index 12 ref", + "matchCount": "1", + "teardown": [ + "$TC actions flush action mpls" + ] + }, + { + "id": "6cce", + "name": "Delete mpls pop action", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ], + "$TC actions add action mpls pop protocol ipv4 index 44" + ], + "cmdUnderTest": "$TC actions del action mpls index 44", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*pop.*index 44 ref", + "matchCount": "0", + "teardown": [] + }, + { + "id": "d138", + "name": "Flush mpls actions", + "category": [ + "actions", + "mpls" + ], + "setup": [ + [ + "$TC actions flush action mpls", + 0, + 1, + 255 + ], + "$TC actions add action mpls push label 10 index 10", + "$TC actions add action mpls push label 20 index 20", + "$TC actions add action mpls push label 30 index 30", + "$TC actions add action mpls push label 40 index 40" + ], + "cmdUnderTest": "$TC actions flush action mpls", + "expExitCode": "0", + "verifyCmd": "$TC actions list action mpls", + "matchPattern": "action order [0-9]+: mpls.*push.*", + "matchCount": "0", + "teardown": [] + } +] -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-06-13 15:17 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-06-12 12:51 [PATCH net-next 0/3] Add MPLS actions to TC John Hurley 2019-06-12 12:51 ` [PATCH net-next 1/3] net: sched: add mpls manipulation " John Hurley 2019-06-12 18:03 ` Marcelo Ricardo Leitner 2019-06-13 13:38 ` John Hurley 2019-06-13 13:20 ` Davide Caratti 2019-06-13 13:53 ` John Hurley 2019-06-12 12:51 ` [PATCH net-next 2/3] net: sched: include mpls actions in hardware intermediate representation John Hurley 2019-06-12 12:51 ` [PATCH net-next 3/3] selftests: tc-tests: actions: add MPLS tests John Hurley
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox