datapath: Add support for lwtunnel

[cascardo/ovs.git] / datapath / linux / compat / include / net / udp_tunnel.h

diff --git a/datapath/linux/compat/include/net/udp_tunnel.h b/datapath/linux/compat/include/net/udp_tunnel.h
index d334746..85aed98 100644 (file)
--- a/datapath/linux/compat/include/net/udp_tunnel.h
+++ b/datapath/linux/compat/include/net/udp_tunnel.h
@@ -4,12 +4,14 @@
 #include <linux/version.h>
 #include <linux/kconfig.h>
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
+#include <net/dst_metadata.h>
+#include <linux/netdev_features.h>
+#ifdef HAVE_UDP_TUNNEL_IPV6
 #include_next <net/udp_tunnel.h>
 
 static inline struct sk_buff *
 rpl_udp_tunnel_handle_offloads(struct sk_buff *skb, bool udp_csum,
-                              bool is_vxlan)
+               int type, bool is_vxlan)
 {
        if (skb_is_gso(skb) && skb_is_encapsulated(skb)) {
                kfree_skb(skb);
@@ -19,18 +21,6 @@ rpl_udp_tunnel_handle_offloads(struct sk_buff *skb, bool udp_csum,
 }
 #define udp_tunnel_handle_offloads rpl_udp_tunnel_handle_offloads
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
-static inline int rpl_udp_tunnel_xmit_skb(struct rtable *rt,
-                                         struct sock *sk, struct sk_buff *skb,
-                                         __be32 src, __be32 dst, __u8 tos, __u8 ttl,
-                                         __be16 df, __be16 src_port, __be16 dst_port,
-                                         bool xnet, bool nocheck)
-{
-       return udp_tunnel_xmit_skb(rt, skb, src, dst, tos, ttl, df, src_port,
-                                  dst_port, xnet, nocheck);
-}
-#define udp_tunnel_xmit_skb rpl_udp_tunnel_xmit_skb
-#endif
 #else
 
 #include <net/ip_tunnels.h>
@@ -58,7 +48,8 @@ struct udp_port_cfg {
        __be16                  peer_udp_port;
        unsigned int            use_udp_checksums:1,
                                use_udp6_tx_checksums:1,
-                               use_udp6_rx_checksums:1;
+                               use_udp6_rx_checksums:1,
+                               ipv6_v6only:1;
 };
 
 #define udp_sock_create rpl_udp_sock_create
@@ -96,13 +87,20 @@ void rpl_udp_tunnel_sock_release(struct socket *sock);
 void ovs_udp_gso(struct sk_buff *skb);
 void ovs_udp_csum_gso(struct sk_buff *skb);
 
+#define udp_tunnel_encap_enable(sock) udp_encap_enable()
 static inline struct sk_buff *udp_tunnel_handle_offloads(struct sk_buff *skb,
                                                          bool udp_csum,
+                                                        int type,
                                                         bool is_vxlan)
 {
-       int type = udp_csum ? SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL;
        void (*fix_segment)(struct sk_buff *);
 
+       if (skb_is_gso(skb) && skb_is_encapsulated(skb)) {
+               kfree_skb(skb);
+               return ERR_PTR(-ENOSYS);
+       }
+
+       type |= udp_csum ? SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL;
        if (!udp_csum)
                fix_segment = ovs_udp_gso;
        else
@@ -116,7 +114,38 @@ static inline struct sk_buff *udp_tunnel_handle_offloads(struct sk_buff *skb,
        return ovs_iptunnel_handle_offloads(skb, udp_csum, type, fix_segment);
 }
 
-#define udp_tunnel_encap_enable(sock) udp_encap_enable()
+#if IS_ENABLED(CONFIG_IPV6)
+#define udp_tunnel6_xmit_skb rpl_udp_tunnel6_xmit_skb
+int rpl_udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,
+                        struct sk_buff *skb,
+                        struct net_device *dev, struct in6_addr *saddr,
+                        struct in6_addr *daddr,
+                        __u8 prio, __u8 ttl, __be16 src_port,
+                        __be16 dst_port, bool nocheck);
+#endif
+
+static inline void udp_tunnel_gro_complete(struct sk_buff *skb, int nhoff)
+{
+       struct udphdr *uh;
+
+       uh = (struct udphdr *)(skb->data + nhoff - sizeof(struct udphdr));
+       skb_shinfo(skb)->gso_type |= uh->check ?
+               SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL;
+}
+#endif
+
+static inline void ovs_udp_tun_rx_dst(struct ip_tunnel_info *info,
+                                 struct sk_buff *skb,
+                                 unsigned short family,
+                                 __be16 flags, __be64 tunnel_id, int md_size)
+{
+       if (family == AF_INET)
+               ovs_ip_tun_rx_dst(info, skb, flags, tunnel_id, md_size);
+
+       info->key.tp_src = udp_hdr(skb)->source;
+       info->key.tp_dst = udp_hdr(skb)->dest;
+       if (udp_hdr(skb)->check)
+               info->key.tun_flags |= TUNNEL_CSUM;
+}
 
-#endif /* Linux version < 4.0 */
 #endif