diff mbox

[net-next] ila: Don't use dest cache when gateway is set

Message ID 20161017042535.2167680-1-tom@herbertland.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Tom Herbert Oct. 17, 2016, 4:25 a.m. UTC 
If the gateway is set on an ILA route we don't need to bother with using
the destination cache in the ILA route. Translation does not change the
routing in this case so we can stick with orig_output in the lwstate
output function.

Tested: Ran netperf with and without gateway for LWT route.

Signed-off-by: Tom Herbert <tom@herbertland.com>
---
 net/ipv6/ila/ila_lwt.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

David Miller Oct. 17, 2016, 2:30 p.m. UTC | #1 
From: Tom Herbert <tom@herbertland.com>
Date: Sun, 16 Oct 2016 21:25:35 -0700

> If the gateway is set on an ILA route we don't need to bother with using
> the destination cache in the ILA route. Translation does not change the
> routing in this case so we can stick with orig_output in the lwstate
> output function.
> 
> Tested: Ran netperf with and without gateway for LWT route.
> 
> Signed-off-by: Tom Herbert <tom@herbertland.com>

Applied, thanks Tom.
diff mbox

Patch

diff --git a/net/ipv6/ila/ila_lwt.c b/net/ipv6/ila/ila_lwt.c
index d0a98d9..9fafba6 100644
--- a/net/ipv6/ila/ila_lwt.c
+++ b/net/ipv6/ila/ila_lwt.c
@@ -36,6 +36,7 @@  static inline struct ila_params *ila_params_lwtunnel(
 static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb)
 {
 	struct dst_entry *orig_dst = skb_dst(skb);
+	struct rt6_info *rt = (struct rt6_info *)orig_dst;
 	struct ila_lwt *ilwt = ila_lwt_lwtunnel(orig_dst->lwtstate);
 	struct dst_entry *dst;
 	int err = -EINVAL;
@@ -46,6 +47,13 @@  static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb)
 	ila_update_ipv6_locator(skb, ila_params_lwtunnel(orig_dst->lwtstate),
 				true);
 
+	if (rt->rt6i_flags & (RTF_GATEWAY | RTF_CACHE)) {
+		/* Already have a next hop address in route, no need for
+		 * dest cache route.
+		 */
+		return orig_dst->lwtstate->orig_output(net, sk, skb);
+	}
+
 	dst = dst_cache_get(&ilwt->dst_cache);
 	if (unlikely(!dst)) {
 		struct ipv6hdr *ip6h = ipv6_hdr(skb);