Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07a557f4 authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/sched: tunnel_key: Allow to set tos and ttl for tc based ip tunnels 



Allow user-space to provide tos and ttl to be set for the tunnel headers.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3bc950c3

include/uapi/linux/tc_act/tc_tunnel_key.h

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ enum { 
	TCA_TUNNEL_KEY_ENC_OPTS,	/* Nested TCA_TUNNEL_KEY_ENC_OPTS_

					 * attributes

					 */

	TCA_TUNNEL_KEY_ENC_TOS,		/* u8 */

	TCA_TUNNEL_KEY_ENC_TTL,		/* u8 */

	__TCA_TUNNEL_KEY_MAX,

};

net/sched/act_tunnel_key.c

+18 −2
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ static const struct nla_policy tunnel_key_policy[TCA_TUNNEL_KEY_MAX + 1] = { 
	[TCA_TUNNEL_KEY_ENC_DST_PORT] = {.type = NLA_U16},

	[TCA_TUNNEL_KEY_NO_CSUM]      = { .type = NLA_U8 },

	[TCA_TUNNEL_KEY_ENC_OPTS]     = { .type = NLA_NESTED },

	[TCA_TUNNEL_KEY_ENC_TOS]      = { .type = NLA_U8 },

	[TCA_TUNNEL_KEY_ENC_TTL]      = { .type = NLA_U8 },

};



static int tunnel_key_init(struct net *net, struct nlattr *nla,
@@ -216,6 +218,7 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla, 
	int opts_len = 0;

	__be64 key_id;

	__be16 flags;

	u8 tos, ttl;

	int ret = 0;

	int err;
@@ -273,6 +276,13 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla, 
			}

		}



		tos = 0;

		if (tb[TCA_TUNNEL_KEY_ENC_TOS])

			tos = nla_get_u8(tb[TCA_TUNNEL_KEY_ENC_TOS]);

		ttl = 0;

		if (tb[TCA_TUNNEL_KEY_ENC_TTL])

			ttl = nla_get_u8(tb[TCA_TUNNEL_KEY_ENC_TTL]);



		if (tb[TCA_TUNNEL_KEY_ENC_IPV4_SRC] &&

		    tb[TCA_TUNNEL_KEY_ENC_IPV4_DST]) {

			__be32 saddr;
@@ -281,7 +291,7 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla, 
			saddr = nla_get_in_addr(tb[TCA_TUNNEL_KEY_ENC_IPV4_SRC]);

			daddr = nla_get_in_addr(tb[TCA_TUNNEL_KEY_ENC_IPV4_DST]);



			metadata = __ip_tun_set_dst(saddr, daddr, 0, 0,

			metadata = __ip_tun_set_dst(saddr, daddr, tos, ttl,

						    dst_port, flags,

						    key_id, opts_len);

		} else if (tb[TCA_TUNNEL_KEY_ENC_IPV6_SRC] &&
@@ -292,7 +302,7 @@ static int tunnel_key_init(struct net *net, struct nlattr *nla, 
			saddr = nla_get_in6_addr(tb[TCA_TUNNEL_KEY_ENC_IPV6_SRC]);

			daddr = nla_get_in6_addr(tb[TCA_TUNNEL_KEY_ENC_IPV6_DST]);



			metadata = __ipv6_tun_set_dst(&saddr, &daddr, 0, 0, dst_port,

			metadata = __ipv6_tun_set_dst(&saddr, &daddr, tos, ttl, dst_port,

						      0, flags,

						      key_id, 0);

		} else {
@@ -504,6 +514,12 @@ static int tunnel_key_dump(struct sk_buff *skb, struct tc_action *a, 
			       !(key->tun_flags & TUNNEL_CSUM)) ||

		    tunnel_key_opts_dump(skb, info))

			goto nla_put_failure;



		if (key->tos && nla_put_u8(skb, TCA_TUNNEL_KEY_ENC_TOS, key->tos))

			goto nla_put_failure;



		if (key->ttl && nla_put_u8(skb, TCA_TUNNEL_KEY_ENC_TTL, key->ttl))

			goto nla_put_failure;

	}



	tcf_tm_dump(&tm, &t->tcf_tm);