diff options
| author | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2019-07-14 21:31:22 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-14 12:15:28 -0700 |
| commit | 6e3d1bbbba55265d327e44a2d14de70462232853 (patch) | |
| tree | 5c99611881e99bb1f6bcc313c72310ba45af6b87 | |
| parent | 14b4c48bb1ce6ff429a9288c9579cc984193ebaf (diff) | |
| download | linux-6e3d1bbbba55265d327e44a2d14de70462232853.tar.gz linux-6e3d1bbbba55265d327e44a2d14de70462232853.tar.bz2 linux-6e3d1bbbba55265d327e44a2d14de70462232853.zip | |
sit: use dst_cache in ipip6_tunnel_xmit
Same as other ip tunnel, use dst_cache in xmit action to avoid
unnecessary fib lookups.
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/sit.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 80610899a323..b2ccbc473127 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -900,12 +900,17 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, RT_TOS(tos), RT_SCOPE_UNIVERSE, IPPROTO_IPV6, 0, dst, tiph->saddr, 0, 0, sock_net_uid(tunnel->net, NULL)); - rt = ip_route_output_flow(tunnel->net, &fl4, NULL); - if (IS_ERR(rt)) { - dev->stats.tx_carrier_errors++; - goto tx_error_icmp; + rt = dst_cache_get_ip4(&tunnel->dst_cache, &fl4.saddr); + if (!rt) { + rt = ip_route_output_flow(tunnel->net, &fl4, NULL); + if (IS_ERR(rt)) { + dev->stats.tx_carrier_errors++; + goto tx_error_icmp; + } + dst_cache_set_ip4(&tunnel->dst_cache, &rt->dst, fl4.saddr); } + if (rt->rt_type != RTN_UNICAST) { ip_rt_put(rt); dev->stats.tx_carrier_errors++; |