| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAK+XE=kDEu5RubWxFpR+wO79JpyGpskwN6GzbEKcZq_yQArWaA@mail.gmail.com>
Date: Thu, 13 Jun 2019 14:38:32 +0100
From: John Hurley <john.hurley@...ronome.com>
To: Marcelo Ricardo Leitner <marcelo.leitner@...il.com>
Cc: Linux Netdev List <netdev@...r.kernel.org>,
David Miller <davem@...emloft.net>,
Jiri Pirko <jiri@...lanox.com>,
Cong Wang <xiyou.wangcong@...il.com>,
Simon Horman <simon.horman@...ronome.com>,
Jakub Kicinski <jakub.kicinski@...ronome.com>,
oss-drivers@...ronome.com
Subject: Re: [PATCH net-next 1/3] net: sched: add mpls manipulation actions to TC
On Wed, Jun 12, 2019 at 7:03 PM Marcelo Ricardo Leitner
<marcelo.leitner@...il.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@...ronome.com>
> > Reviewed-by: Jakub Kicinski <jakub.kicinski@...ronome.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
Powered by blists - more mailing lists