From: Benjamin LaHaise <[email protected]> Date: Tue, 16 Oct 2012 16:41:04 -0400
> From: Timo Teras <[email protected]> > commit d11a4dc18bf41719c9f0d7ed494d295dd2973b92 > Author: Timo Teräs <[email protected]> > Date: Thu Mar 18 23:20:20 2010 +0000 > > ipv4: check rt_genid in dst_check > > Xfrm_dst keeps a reference to ipv4 rtable entries on each > cached bundle. The only way to renew xfrm_dst when the underlying > route has changed, is to implement dst_check for this. This is > what ipv6 side does too. > > The problems started after 87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9 > ("ipsec: Fix bogus bundle flowi") which fixed a bug causing xfrm_dst > to not get reused, until that all lookups always generated new > xfrm_dst with new route reference and path mtu worked. But after the > fix, the old routes started to get reused even after they were expired > causing pmtu to break (well it would occationally work if the rtable > gc had run recently and marked the route obsolete causing dst_check to > get called). > > Signed-off-by: Timo Teras <[email protected]> > Acked-by: Herbert Xu <[email protected]> > Signed-off-by: David S. Miller <[email protected]> > --- > Hi Willy, > > Can you please consider applying d11a4dc18bf41719c9f0d7ed494d295dd2973b92 > to 2.6.32.y? This fixes an issue with cached IPv4 routes never being > invalidated. For more details of the problem this causes, see > http://marc.info/?l=linux-netdev&m=135015076708950&w=2 . Thanks! This is only a partial fix. Only recently did this issue get resolved completely. See commits surrounding: >From b42664f898c976247f7f609b8bb9c94d7475ca10 Mon Sep 17 00:00:00 2001 From: Nicolas Dichtel <[email protected]> Date: Mon, 10 Sep 2012 22:09:44 +0000 Subject: [PATCH] netns: move net->ipv4.rt_genid to net->rt_genid This commit prepares the use of rt_genid by both IPv4 and IPv6. Initialization is left in IPv4 part. Signed-off-by: Nicolas Dichtel <[email protected]> Signed-off-by: David S. Miller <[email protected]> --- include/net/net_namespace.h | 10 ++++++++++ include/net/netns/ipv4.h | 1 - net/ipv4/route.c | 9 ++------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index ae1cd6c..fd87963 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -102,6 +102,7 @@ struct net { #endif struct netns_ipvs *ipvs; struct sock *diag_nlsk; + atomic_t rt_genid; }; @@ -300,5 +301,14 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header) } #endif +static inline int rt_genid(struct net *net) +{ + return atomic_read(&net->rt_genid); +} + +static inline void rt_genid_bump(struct net *net) +{ + atomic_inc(&net->rt_genid); +} #endif /* __NET_NET_NAMESPACE_H */ diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 1474dd6..eb24dbc 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -65,7 +65,6 @@ struct netns_ipv4 { unsigned int sysctl_ping_group_range[2]; long sysctl_tcp_mem[3]; - atomic_t rt_genid; atomic_t dev_addr_genid; #ifdef CONFIG_IP_MROUTE diff --git a/net/ipv4/route.c b/net/ipv4/route.c index be27cfa9..fd9af60 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -202,11 +202,6 @@ EXPORT_SYMBOL(ip_tos2prio); static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat); #define RT_CACHE_STAT_INC(field) __this_cpu_inc(rt_cache_stat.field) -static inline int rt_genid(struct net *net) -{ - return atomic_read(&net->ipv4.rt_genid); -} - #ifdef CONFIG_PROC_FS static void *rt_cache_seq_start(struct seq_file *seq, loff_t *pos) { @@ -449,7 +444,7 @@ static inline bool rt_is_expired(const struct rtable *rth) void rt_cache_flush(struct net *net) { - atomic_inc(&net->ipv4.rt_genid); + rt_genid_bump(net); } static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst, @@ -2506,7 +2501,7 @@ static __net_initdata struct pernet_operations sysctl_route_ops = { static __net_init int rt_genid_init(struct net *net) { - atomic_set(&net->ipv4.rt_genid, 0); + atomic_set(&net->rt_genid, 0); get_random_bytes(&net->ipv4.dev_addr_genid, sizeof(net->ipv4.dev_addr_genid)); return 0; -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
