[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1428717576-1040383-6-git-send-email-kafai@fb.com>
Date: Fri, 10 Apr 2015 18:59:31 -0700
From: Martin KaFai Lau <kafai@...com>
To: <netdev@...r.kernel.org>
CC: Hannes Frederic Sowa <hannes@...essinduktion.org>,
<kernel-team@...com>
Subject: [RFC PATCH net-next 05/10] ipv6: Allow pmtu update on /128 via gateway route
Consider there is a permanent /128 via gateway route (DST_HOST) in
the route table. When there is a pmtu update, the pmtu DST_HOST route is
updated and the RTF_EXPIRES is set. The permanent DST_HOST route will be
removed after expiration.
Since we are at it, the patch is trying to simplify some checking cases in
ip6_rt_update_pmtu().
1. !(rt6->rt6i_flags & RTF_CACHE) is used to decide when
a RTF_CACHE route needs to be created for pmtu update.
2. Remove the rt6->rt6i_dst.plen == 128 check since RTF_CACHE route will
be created (if it is needed) before updating the mtu.
3. Add a check to ensure no pmtu update on RTF_LOCAL route
Signed-off-by: Martin KaFai Lau <kafai@...com>
Reviewed-by: Hannes Frederic Sowa <hannes@...essinduktion.org>
---
net/ipv6/route.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 1b57bc9..75f3b5d 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1105,15 +1105,17 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
struct sk_buff *skb, u32 mtu)
{
struct rt6_info *rt6 = (struct rt6_info *)dst;
+ struct net *net;
+
+ if (rt6->rt6i_flags & RTF_LOCAL)
+ return;
dst_confirm(dst);
mtu = max_t(u32, mtu, IPV6_MIN_MTU);
if (mtu >= dst_mtu(dst))
return;
- if (!(rt6->rt6i_flags & RTF_CACHE) &&
- (!(rt6->rt6i_flags & (RTF_NONEXTHOP | RTF_GATEWAY)) ||
- !(rt6->dst.flags & DST_HOST))) {
+ if (!(rt6->rt6i_flags & RTF_CACHE)) {
const struct in6_addr *daddr, *saddr;
struct rt6_info *nrt6;
@@ -1146,13 +1148,10 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
rt6 = (struct rt6_info *)dst;
}
- if (rt6->rt6i_dst.plen == 128) {
- struct net *net = dev_net(dst->dev);
-
- rt6->rt6i_flags |= RTF_MODIFIED;
- dst_metric_set(dst, RTAX_MTU, mtu);
- rt6_update_expires(rt6, net->ipv6.sysctl.ip6_rt_mtu_expires);
- }
+ net = dev_net(rt6->dst.dev);
+ rt6->rt6i_flags |= RTF_MODIFIED;
+ dst_metric_set(dst, RTAX_MTU, mtu);
+ rt6_update_expires(rt6, net->ipv6.sysctl.ip6_rt_mtu_expires);
}
void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,
--
1.8.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists