From: wenxu <we...@ucloud.cn>

ip l add dev tun type gretap key 1000

Non-tunnel-dst ip tunnel device can send packet through lwtunnel.
This patch provide the tun_info dst cache support for this mode

Signed-off-by: wenxu <we...@ucloud.cn>
---
 net/ipv4/ip_tunnel.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 893f013..874ad58 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -662,6 +662,9 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device 
*dev,
        unsigned int max_headroom;      /* The extra header space needed */
        __be32 dst;
        bool connected;
+       bool use_cache = false;
+       bool md = false;
+       struct ip_tunnel_info *tun_info;
 
        inner_iph = (const struct iphdr *)skb_inner_network_header(skb);
        connected = (tunnel->parms.iph.daddr != 0);
@@ -671,7 +674,6 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device 
*dev,
        dst = tnl_params->daddr;
        if (dst == 0) {
                /* NBMA tunnel */
-               struct ip_tunnel_info *tun_info;
 
                if (!skb_dst(skb)) {
                        dev->stats.tx_fifo_errors++;
@@ -681,8 +683,11 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device 
*dev,
                tun_info = skb_tunnel_info(skb);
                if (tun_info && (tun_info->mode & IP_TUNNEL_INFO_TX) &&
                    ip_tunnel_info_af(tun_info) == AF_INET &&
-                   tun_info->key.u.ipv4.dst)
+                   tun_info->key.u.ipv4.dst) {
                        dst = tun_info->key.u.ipv4.dst;
+                       md = true;
+                       connected = true;
+               }
                else if (skb->protocol == htons(ETH_P_IP)) {
                        rt = skb_rtable(skb);
                        dst = rt_nexthop(rt, inner_iph->daddr);
@@ -721,7 +726,8 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device 
*dev,
                else
                        goto tx_error;
 
-               connected = false;
+               if (!md)
+                       connected = false;
        }
 
        tos = tnl_params->tos;
@@ -743,8 +749,14 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device 
*dev,
        if (ip_tunnel_encap(skb, tunnel, &protocol, &fl4) < 0)
                goto tx_error;
 
-       rt = connected ? dst_cache_get_ip4(&tunnel->dst_cache, &fl4.saddr) :
+       if (connected && md) {
+               use_cache = ip_tunnel_dst_cache_usable(skb, tun_info);
+               if (use_cache)
+                       rt = dst_cache_get_ip4(&tun_info->dst_cache, 
&fl4.saddr);
+       } else {
+               rt = connected ? dst_cache_get_ip4(&tunnel->dst_cache, 
&fl4.saddr) :
                         NULL;
+       }
 
        if (!rt) {
                rt = ip_route_output_key(tunnel->net, &fl4);
@@ -753,7 +765,10 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device 
*dev,
                        dev->stats.tx_carrier_errors++;
                        goto tx_error;
                }
-               if (connected)
+               if (use_cache)
+                       dst_cache_set_ip4(&tun_info->dst_cache, &rt->dst,
+                                         fl4.saddr);
+               else if (!md && connected)
                        dst_cache_set_ip4(&tunnel->dst_cache, &rt->dst,
                                          fl4.saddr);
        }
-- 
1.8.3.1

Reply via email to