ip_tunnel: add support for setting flow label via collect metadata

This patch extends udp_tunnel6_xmit_skb() to pass in the IPv6 flow label
from call sites. Currently, there's no such option and it's always set to
zero when writing ip6_flow_hdr(). Add a label member to ip_tunnel_key, so
that flow-based tunnels via collect metadata frontends can make use of it.
vxlan and geneve will be converted to add flow label support separately.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 1 deletions

diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index 0acd80fadb32..5dc2e454f866 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -48,6 +48,7 @@ struct ip_tunnel_key {
         __be16                  tun_flags;
         u8                      tos;            /* TOS for IPv4, TC for IPv6 */
         u8                      ttl;            /* TTL for IPv4, HL for IPv6 */
+        __be32                  label;          /* Flow Label for IPv6 */
         __be16                  tp_src;
         __be16                  tp_dst;
 };
@@ -181,7 +182,7 @@ int ip_tunnel_encap_del_ops(const struct ip_tunnel_encap_ops *op,
 
 static inline void ip_tunnel_key_init(struct ip_tunnel_key *key,
                                       __be32 saddr, __be32 daddr,
-                                      u8 tos, u8 ttl,
+                                      u8 tos, u8 ttl, __be32 label,
                                       __be16 tp_src, __be16 tp_dst,
                                       __be64 tun_id, __be16 tun_flags)
 {
@@ -192,6 +193,7 @@ static inline void ip_tunnel_key_init(struct ip_tunnel_key *key,
                0, IP_TUNNEL_KEY_IPV4_PAD_LEN);
         key->tos = tos;
         key->ttl = ttl;
+        key->label = label;
         key->tun_flags = tun_flags;
 
         /* For the tunnel types on the top of IPsec, the tp_src and tp_dst of