tunnel: introduce udp_tun_rx_dst()

Introduce function udp_tun_rx_dst() to initialize tunnel dst on
receive path.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Reviewed-by: Jesse Gross <jesse@nicira.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 61b457b..5b4cf66 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1264,36 +1264,13 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
        }
 
        if (vxlan_collect_metadata(vs)) {
-               tun_dst = metadata_dst_alloc(sizeof(*md), GFP_ATOMIC);
+               tun_dst = udp_tun_rx_dst(skb, vxlan_get_sk_family(vs), TUNNEL_KEY,
+                                        cpu_to_be64(vni >> 8), sizeof(*md));
+
                if (!tun_dst)
                        goto drop;
 
                info = &tun_dst->u.tun_info;
-               if (vxlan_get_sk_family(vs) == AF_INET) {
-                       const struct iphdr *iph = ip_hdr(skb);
-
-                       info->key.u.ipv4.src = iph->saddr;
-                       info->key.u.ipv4.dst = iph->daddr;
-                       info->key.tos = iph->tos;
-                       info->key.ttl = iph->ttl;
-               } else {
-                       const struct ipv6hdr *ip6h = ipv6_hdr(skb);
-
-                       info->key.u.ipv6.src = ip6h->saddr;
-                       info->key.u.ipv6.dst = ip6h->daddr;
-                       info->key.tos = ipv6_get_dsfield(ip6h);
-                       info->key.ttl = ip6h->hop_limit;
-               }
-
-               info->key.tp_src = udp_hdr(skb)->source;
-               info->key.tp_dst = udp_hdr(skb)->dest;
-
-               info->mode = IP_TUNNEL_INFO_RX;
-               info->key.tun_flags = TUNNEL_KEY;
-               info->key.tun_id = cpu_to_be64(vni >> 8);
-               if (udp_hdr(skb)->check != 0)
-                       info->key.tun_flags |= TUNNEL_CSUM;
-
                md = ip_tunnel_info_opts(info, sizeof(*md));
        } else {
                memset(md, 0, sizeof(*md));

diff --git a/include/net/dst_metadata.h b/include/net/dst_metadata.h
index 2cb52d5..60c0332 100644 (file)
--- a/include/net/dst_metadata.h
+++ b/include/net/dst_metadata.h
@@ -48,4 +48,65 @@ static inline bool skb_valid_dst(const struct sk_buff *skb)
 struct metadata_dst *metadata_dst_alloc(u8 optslen, gfp_t flags);
 struct metadata_dst __percpu *metadata_dst_alloc_percpu(u8 optslen, gfp_t flags);
 
+static inline struct metadata_dst *tun_rx_dst(__be16 flags,
+                                             __be64 tunnel_id, int md_size)
+{
+       struct metadata_dst *tun_dst;
+       struct ip_tunnel_info *info;
+
+       tun_dst = metadata_dst_alloc(md_size, GFP_ATOMIC);
+       if (!tun_dst)
+               return NULL;
+
+       info = &tun_dst->u.tun_info;
+       info->mode = IP_TUNNEL_INFO_RX;
+       info->key.tun_flags = flags;
+       info->key.tun_id = tunnel_id;
+       info->key.tp_src = 0;
+       info->key.tp_dst = 0;
+       return tun_dst;
+}
+
+static inline struct metadata_dst *ip_tun_rx_dst(struct sk_buff *skb,
+                                                __be16 flags,
+                                                __be64 tunnel_id,
+                                                int md_size)
+{
+       const struct iphdr *iph = ip_hdr(skb);
+       struct metadata_dst *tun_dst;
+       struct ip_tunnel_info *info;
+
+       tun_dst = tun_rx_dst(flags, tunnel_id, md_size);
+       if (!tun_dst)
+               return NULL;
+
+       info = &tun_dst->u.tun_info;
+       info->key.u.ipv4.src = iph->saddr;
+       info->key.u.ipv4.dst = iph->daddr;
+       info->key.tos = iph->tos;
+       info->key.ttl = iph->ttl;
+       return tun_dst;
+}
+
+static inline struct metadata_dst *ipv6_tun_rx_dst(struct sk_buff *skb,
+                                                __be16 flags,
+                                                __be64 tunnel_id,
+                                                int md_size)
+{
+       const struct ipv6hdr *ip6h = ipv6_hdr(skb);
+       struct metadata_dst *tun_dst;
+       struct ip_tunnel_info *info;
+
+       tun_dst = tun_rx_dst(flags, tunnel_id, md_size);
+       if (!tun_dst)
+               return NULL;
+
+       info = &tun_dst->u.tun_info;
+       info->key.u.ipv6.src = ip6h->saddr;
+       info->key.u.ipv6.dst = ip6h->daddr;
+       info->key.tos = ipv6_get_dsfield(ip6h);
+       info->key.ttl = ip6h->hop_limit;
+       return tun_dst;
+}
+
 #endif /* __NET_DST_METADATA_H */

diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h
index c491c12..35041d0 100644 (file)
--- a/include/net/udp_tunnel.h
+++ b/include/net/udp_tunnel.h
@@ -93,6 +93,10 @@ int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,
 
 void udp_tunnel_sock_release(struct socket *sock);
 
+struct metadata_dst *udp_tun_rx_dst(struct sk_buff *skb, unsigned short family,
+                                   __be16 flags, __be64 tunnel_id,
+                                   int md_size);
+
 static inline struct sk_buff *udp_tunnel_handle_offloads(struct sk_buff *skb,
                                                         bool udp_csum)
 {

diff --cc net/ipv4/ip_gre.c
Simple merge

diff --cc net/ipv4/udp_tunnel.c
Simple merge