net/sched: act_tunnel_key: add support for "don't fragment"

extend "act_tunnel_key" to allow specifying TUNNEL_DONT_FRAGMENT.

Suggested-by: Ilya Maximets <i.maximets@ovn.org>
Reviewed-by: Pedro Tammela <pctammela@mojatatu.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/uapi/linux/tc_act/tc_tunnel_key.h b/include/uapi/linux/tc_act/tc_tunnel_key.h
index 49ad4033951bf0feb3ddebba78a85feda2119234..37c6f612f1617430d0ffe081f992573513848c14 100644 (file)
--- a/include/uapi/linux/tc_act/tc_tunnel_key.h
+++ b/include/uapi/linux/tc_act/tc_tunnel_key.h
@@ -34,6 +34,7 @@ enum {
                                         */
        TCA_TUNNEL_KEY_ENC_TOS,         /* u8 */
        TCA_TUNNEL_KEY_ENC_TTL,         /* u8 */
+       TCA_TUNNEL_KEY_NO_FRAG,         /* flag */
        __TCA_TUNNEL_KEY_MAX,
 };
 

diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
index 2d12d2626415333fe223e50128dab637b9a678ce..0c8aa7e686eab0cb3f9d8d27faf5996e80ec293f 100644 (file)
--- a/net/sched/act_tunnel_key.c
+++ b/net/sched/act_tunnel_key.c
@@ -420,6 +420,9 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla,
                    nla_get_u8(tb[TCA_TUNNEL_KEY_NO_CSUM]))
                        flags &= ~TUNNEL_CSUM;
 
+               if (nla_get_flag(tb[TCA_TUNNEL_KEY_NO_FRAG]))
+                       flags |= TUNNEL_DONT_FRAGMENT;
+
                if (tb[TCA_TUNNEL_KEY_ENC_DST_PORT])
                        dst_port = nla_get_be16(tb[TCA_TUNNEL_KEY_ENC_DST_PORT]);
 
@@ -747,6 +750,8 @@ static int tunnel_key_dump(struct sk_buff *skb, struct tc_action *a,
                                   key->tp_dst)) ||
                    nla_put_u8(skb, TCA_TUNNEL_KEY_NO_CSUM,
                               !(key->tun_flags & TUNNEL_CSUM)) ||
+                   ((key->tun_flags & TUNNEL_DONT_FRAGMENT) &&
+                    nla_put_flag(skb, TCA_TUNNEL_KEY_NO_FRAG)) ||
                    tunnel_key_opts_dump(skb, info))
                        goto nla_put_failure;