From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vlad Yasevich Subject: Re: [PATCH net-next v2 3/4] ipv6: use net->rt_genid to check dst validity Date: Mon, 10 Sep 2012 10:29:36 -0400 Message-ID: <504DF950.4010401@gmail.com> References: <20120907.144828.97793990734588625.davem@davemloft.net> <1347283338-4249-1-git-send-email-nicolas.dichtel@6wind.com> <1347283338-4249-4-git-send-email-nicolas.dichtel@6wind.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: davem@davemloft.net, eric.dumazet@gmail.com, sri@us.ibm.com, linux-sctp@vger.kernel.org, netdev@vger.kernel.org To: Nicolas Dichtel Return-path: Received: from mail-pb0-f46.google.com ([209.85.160.46]:52365 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751257Ab2IJO3j (ORCPT ); Mon, 10 Sep 2012 10:29:39 -0400 In-Reply-To: <1347283338-4249-4-git-send-email-nicolas.dichtel@6wind.com> Sender: netdev-owner@vger.kernel.org List-ID: On 09/10/2012 09:22 AM, Nicolas Dichtel wrote: > IPv6 dst should take care of rt_genid too. When a xfrm policy is inserted or > deleted, all dst should be invalidated. > To force the validation, dst entries should be created with ->obsolete set to > DST_OBSOLETE_FORCE_CHK. This was already the case for all functions calling > ip6_dst_alloc(), except for ip6_rt_copy(). > > As a consequence, we can remove the specific code in inet6_connection_sock. > > Signed-off-by: Nicolas Dichtel > --- > include/net/ip6_fib.h | 2 +- > net/ipv6/inet6_connection_sock.c | 23 +---------------------- > net/ipv6/route.c | 17 +++++++++++++---- > 3 files changed, 15 insertions(+), 27 deletions(-) > > diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h > index cd64cf3..5eb93f4 100644 > --- a/include/net/ip6_fib.h > +++ b/include/net/ip6_fib.h > @@ -113,7 +113,7 @@ struct rt6_info { > unsigned long _rt6i_peer; > > #ifdef CONFIG_XFRM > - u32 rt6i_flow_cache_genid; > + u32 rt6i_genid; > #endif > /* more non-fragment space at head required */ > unsigned short rt6i_nfheader_len; > diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c > index 0251a60..c4f9341 100644 > --- a/net/ipv6/inet6_connection_sock.c > +++ b/net/ipv6/inet6_connection_sock.c > @@ -175,33 +175,12 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst, > const struct in6_addr *saddr) > { > __ip6_dst_store(sk, dst, daddr, saddr); > - > -#ifdef CONFIG_XFRM > - { > - struct rt6_info *rt = (struct rt6_info *)dst; > - rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid); > - } > -#endif > } > > static inline > struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie) > { > - struct dst_entry *dst; > - > - dst = __sk_dst_check(sk, cookie); > - > -#ifdef CONFIG_XFRM > - if (dst) { > - struct rt6_info *rt = (struct rt6_info *)dst; > - if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) { > - __sk_dst_reset(sk); > - dst = NULL; > - } > - } > -#endif > - > - return dst; > + return __sk_dst_check(sk, cookie); > } > > static struct dst_entry *inet6_csk_route_socket(struct sock *sk, > diff --git a/net/ipv6/route.c b/net/ipv6/route.c > index 339d921..db7b78f 100644 > --- a/net/ipv6/route.c > +++ b/net/ipv6/route.c > @@ -281,13 +281,16 @@ static inline struct rt6_info *ip6_dst_alloc(struct net *net, > struct fib6_table *table) > { > struct rt6_info *rt = dst_alloc(&net->ipv6.ip6_dst_ops, dev, > - 0, DST_OBSOLETE_NONE, flags); > + 0, DST_OBSOLETE_FORCE_CHK, flags); > > if (rt) { > struct dst_entry *dst = &rt->dst; > > memset(dst + 1, 0, sizeof(*rt) - sizeof(*dst)); > rt6_init_peer(rt, table ? &table->tb6_peers : net->ipv6.peers); > +#ifdef CONFIG_XFRM > + rt->rt6i_genid = rt_genid(net); > +#endif This isn't XFRM dependent any more, is it? -vlad > } > return rt; > } > @@ -1031,6 +1034,15 @@ static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie) > > rt = (struct rt6_info *) dst; > > + /* All IPV6 dsts are created with ->obsolete set to the value > + * DST_OBSOLETE_FORCE_CHK which forces validation calls down > + * into this function always. > + */ > +#ifdef CONFIG_XFRM > + if (rt->rt6i_genid != rt_genid(dev_net(rt->dst.dev))) > + return NULL; > +#endif > + > if (rt->rt6i_node && (rt->rt6i_node->fn_sernum == cookie)) { > if (rt->rt6i_peer_genid != rt6_peer_genid()) { > if (!rt6_has_peer(rt)) > @@ -1397,8 +1409,6 @@ int ip6_route_add(struct fib6_config *cfg) > goto out; > } > > - rt->dst.obsolete = -1; > - > if (cfg->fc_flags & RTF_EXPIRES) > rt6_set_expires(rt, jiffies + > clock_t_to_jiffies(cfg->fc_expires)); > @@ -2093,7 +2103,6 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, > rt->dst.input = ip6_input; > rt->dst.output = ip6_output; > rt->rt6i_idev = idev; > - rt->dst.obsolete = -1; > > rt->rt6i_flags = RTF_UP | RTF_NONEXTHOP; > if (anycast) >