net: sched: add vxlan option support to act_tunnel_key

[linux-2.6-microblaze.git] / net / sched / act_tunnel_key.c

diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
index cb34e5d..ff0909b 100644 (file)
--- a/net/sched/act_tunnel_key.c
+++ b/net/sched/act_tunnel_key.c
@@ -10,6 +10,7 @@
 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
 #include <net/geneve.h>
+#include <net/vxlan.h>
 #include <net/netlink.h>
 #include <net/pkt_sched.h>
 #include <net/dst.h>
@@ -53,7 +54,10 @@ static int tunnel_key_act(struct sk_buff *skb, const struct tc_action *a,
 
 static const struct nla_policy
 enc_opts_policy[TCA_TUNNEL_KEY_ENC_OPTS_MAX + 1] = {
+       [TCA_TUNNEL_KEY_ENC_OPTS_UNSPEC]        = {
+               .strict_start_type = TCA_TUNNEL_KEY_ENC_OPTS_VXLAN },
        [TCA_TUNNEL_KEY_ENC_OPTS_GENEVE]        = { .type = NLA_NESTED },
+       [TCA_TUNNEL_KEY_ENC_OPTS_VXLAN]         = { .type = NLA_NESTED },
 };
 
 static const struct nla_policy
@@ -64,6 +68,11 @@ geneve_opt_policy[TCA_TUNNEL_KEY_ENC_OPT_GENEVE_MAX + 1] = {
                                                       .len = 128 },
 };
 
+static const struct nla_policy
+vxlan_opt_policy[TCA_TUNNEL_KEY_ENC_OPT_VXLAN_MAX + 1] = {
+       [TCA_TUNNEL_KEY_ENC_OPT_VXLAN_GBP]         = { .type = NLA_U32 },
+};
+
 static int
 tunnel_key_copy_geneve_opt(const struct nlattr *nla, void *dst, int dst_len,
                           struct netlink_ext_ack *extack)
@@ -116,10 +125,36 @@ tunnel_key_copy_geneve_opt(const struct nlattr *nla, void *dst, int dst_len,
        return opt_len;
 }
 
+static int
+tunnel_key_copy_vxlan_opt(const struct nlattr *nla, void *dst, int dst_len,
+                         struct netlink_ext_ack *extack)
+{
+       struct nlattr *tb[TCA_TUNNEL_KEY_ENC_OPT_VXLAN_MAX + 1];
+       int err;
+
+       err = nla_parse_nested(tb, TCA_TUNNEL_KEY_ENC_OPT_VXLAN_MAX, nla,
+                              vxlan_opt_policy, extack);
+       if (err < 0)
+               return err;
+
+       if (!tb[TCA_TUNNEL_KEY_ENC_OPT_VXLAN_GBP]) {
+               NL_SET_ERR_MSG(extack, "Missing tunnel key vxlan option gbp");
+               return -EINVAL;
+       }
+
+       if (dst) {
+               struct vxlan_metadata *md = dst;
+
+               md->gbp = nla_get_u32(tb[TCA_TUNNEL_KEY_ENC_OPT_VXLAN_GBP]);
+       }
+
+       return sizeof(struct vxlan_metadata);
+}
+
 static int tunnel_key_copy_opts(const struct nlattr *nla, u8 *dst,
                                int dst_len, struct netlink_ext_ack *extack)
 {
-       int err, rem, opt_len, len = nla_len(nla), opts_len = 0;
+       int err, rem, opt_len, len = nla_len(nla), opts_len = 0, type = 0;
        const struct nlattr *attr, *head = nla_data(nla);
 
        err = nla_validate_deprecated(head, len, TCA_TUNNEL_KEY_ENC_OPTS_MAX,
@@ -130,6 +165,10 @@ static int tunnel_key_copy_opts(const struct nlattr *nla, u8 *dst,
        nla_for_each_attr(attr, head, len, rem) {
                switch (nla_type(attr)) {
                case TCA_TUNNEL_KEY_ENC_OPTS_GENEVE:
+                       if (type && type != TUNNEL_GENEVE_OPT) {
+                               NL_SET_ERR_MSG(extack, "Duplicate type for geneve options");
+                               return -EINVAL;
+                       }
                        opt_len = tunnel_key_copy_geneve_opt(attr, dst,
                                                             dst_len, extack);
                        if (opt_len < 0)
@@ -139,6 +178,19 @@ static int tunnel_key_copy_opts(const struct nlattr *nla, u8 *dst,
                                dst_len -= opt_len;
                                dst += opt_len;
                        }
+                       type = TUNNEL_GENEVE_OPT;
+                       break;
+               case TCA_TUNNEL_KEY_ENC_OPTS_VXLAN:
+                       if (type) {
+                               NL_SET_ERR_MSG(extack, "Duplicate type for vxlan options");
+                               return -EINVAL;
+                       }
+                       opt_len = tunnel_key_copy_vxlan_opt(attr, dst,
+                                                           dst_len, extack);
+                       if (opt_len < 0)
+                               return opt_len;
+                       opts_len += opt_len;
+                       type = TUNNEL_VXLAN_OPT;
                        break;
                }
        }
@@ -174,6 +226,14 @@ static int tunnel_key_opts_set(struct nlattr *nla, struct ip_tunnel_info *info,
                                            opts_len, extack);
 #else
                return -EAFNOSUPPORT;
+#endif
+       case TCA_TUNNEL_KEY_ENC_OPTS_VXLAN:
+#if IS_ENABLED(CONFIG_INET)
+               info->key.tun_flags |= TUNNEL_VXLAN_OPT;
+               return tunnel_key_copy_opts(nla, ip_tunnel_info_opts(info),
+                                           opts_len, extack);
+#else
+               return -EAFNOSUPPORT;
 #endif
        default:
                NL_SET_ERR_MSG(extack, "Cannot set tunnel options for unknown tunnel type");
@@ -451,6 +511,25 @@ static int tunnel_key_geneve_opts_dump(struct sk_buff *skb,
        return 0;
 }
 
+static int tunnel_key_vxlan_opts_dump(struct sk_buff *skb,
+                                     const struct ip_tunnel_info *info)
+{
+       struct vxlan_metadata *md = (struct vxlan_metadata *)(info + 1);
+       struct nlattr *start;
+
+       start = nla_nest_start_noflag(skb, TCA_TUNNEL_KEY_ENC_OPTS_VXLAN);
+       if (!start)
+               return -EMSGSIZE;
+
+       if (nla_put_u32(skb, TCA_TUNNEL_KEY_ENC_OPT_VXLAN_GBP, md->gbp)) {
+               nla_nest_cancel(skb, start);
+               return -EMSGSIZE;
+       }
+
+       nla_nest_end(skb, start);
+       return 0;
+}
+
 static int tunnel_key_opts_dump(struct sk_buff *skb,
                                const struct ip_tunnel_info *info)
 {
@@ -468,6 +547,10 @@ static int tunnel_key_opts_dump(struct sk_buff *skb,
                err = tunnel_key_geneve_opts_dump(skb, info);
                if (err)
                        goto err_out;
+       } else if (info->key.tun_flags & TUNNEL_VXLAN_OPT) {
+               err = tunnel_key_vxlan_opts_dump(skb, info);
+               if (err)
+                       goto err_out;
        } else {
 err_out:
                nla_nest_cancel(skb, start);