From patchwork Thu Jan 17 22:53:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?WU9TSElGVUpJIEhpZGVha2kgLyDlkInol6Toi7HmmI4=?= X-Patchwork-Id: 213400 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 737FD2C0085 for ; Fri, 18 Jan 2013 09:53:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754680Ab3AQWxp (ORCPT ); Thu, 17 Jan 2013 17:53:45 -0500 Received: from 94.43.138.210.xn.2iij.net ([210.138.43.94]:44771 "EHLO mail.st-paulia.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754284Ab3AQWxo (ORCPT ); Thu, 17 Jan 2013 17:53:44 -0500 Received: from [192.168.2.160] (unknown [192.168.2.160]) by mail.st-paulia.net (Postfix) with ESMTPSA id 06D491BDBF; Fri, 18 Jan 2013 07:53:44 +0900 (JST) Message-ID: <50F880F7.8070608@linux-ipv6.org> Date: Fri, 18 Jan 2013 07:53:43 +0900 From: YOSHIFUJI Hideaki Organization: USAGI Project User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: davem@davemloft.net, netdev@vger.kernel.org CC: yoshfuji@linux-ipv6.org, xiyou.wangcong@gmail.com Subject: [PATCH net-next (V4) 07/11] ipv6: Do not depend on rt->n in rt6_probe(). Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: YOSHIFUJI Hideaki --- net/ipv6/route.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index c7bcd77..afc8386 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -498,28 +498,34 @@ static void rt6_probe(struct rt6_info *rt) * Router Reachability Probe MUST be rate-limited * to no more than one per minute. */ - neigh = rt ? rt->n : NULL; - if (!neigh) - return; - write_lock_bh(&neigh->lock); - if (neigh->nud_state & NUD_VALID) { - write_unlock_bh(&neigh->lock); + if (!rt || !(rt->rt6i_flags & RTF_GATEWAY)) return; + rcu_read_lock_bh(); + neigh = __ipv6_neigh_lookup_noref(rt->dst.dev, &rt->rt6i_gateway); + if (neigh) { + write_lock(&neigh->lock); + if (neigh->nud_state & NUD_VALID) + goto out; } - if (!(neigh->nud_state & NUD_VALID) && + + if (!neigh || time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) { struct in6_addr mcaddr; struct in6_addr *target; neigh->updated = jiffies; - write_unlock_bh(&neigh->lock); - target = (struct in6_addr *)&neigh->primary_key; + if (neigh) + write_unlock(&neigh->lock); + + target = (struct in6_addr *)&rt->rt6i_gateway; addrconf_addr_solict_mult(target, &mcaddr); ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL); } else { - write_unlock_bh(&neigh->lock); +out: + write_unlock(&neigh->lock); } + rcu_read_unlock_bh(); } #else static inline void rt6_probe(struct rt6_info *rt)