From patchwork Fri Aug 17 07:11:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amerigo Wang X-Patchwork-Id: 178149 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 4BCC42C0040 for ; Fri, 17 Aug 2012 17:12:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754959Ab2HQHMD (ORCPT ); Fri, 17 Aug 2012 03:12:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7234 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752202Ab2HQHMB (ORCPT ); Fri, 17 Aug 2012 03:12:01 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7H7BuNT025642 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 17 Aug 2012 03:11:56 -0400 Received: from cr0.redhat.com (vpn1-113-139.nay.redhat.com [10.66.113.139]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7H7BpOS002804; Fri, 17 Aug 2012 03:11:52 -0400 From: Cong Wang To: netdev@vger.kernel.org Cc: Cong Wang , "Banerjee, Debabrata" , "David S. Miller" , Hideaki YOSHIFUJI , Patrick McHardy Subject: [PATCH 1/2] ipv6: do not hold route table lock when send ndisc probe Date: Fri, 17 Aug 2012 15:11:38 +0800 Message-Id: <1345187499-16929-1-git-send-email-amwang@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In rt6_probe(), we call ndisc_send_ns() with root->rwlock, but this is not necessary, so we can drop it before calling ndisc_send_ns(). This could probably fix the deadlock reported by Debabrata: https://lkml.org/lkml/2012/8/16/432 Reported-by: "Banerjee, Debabrata" Cc: "Banerjee, Debabrata" Cc: "David S. Miller" Cc: Hideaki YOSHIFUJI Cc: Patrick McHardy Signed-off-by: Cong Wang --- net/ipv6/route.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 0ddf2d1..7a36df2 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -460,13 +460,18 @@ static void rt6_probe(struct rt6_info *rt) time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) { struct in6_addr mcaddr; struct in6_addr *target; + struct net_device *dev = rt->dst.dev; + struct fib6_table *table = rt->rt6i_table; neigh->updated = jiffies; read_unlock_bh(&neigh->lock); + read_unlock_bh(&table->tb6_lock); target = (struct in6_addr *)&neigh->primary_key; addrconf_addr_solict_mult(target, &mcaddr); - ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL); + ndisc_send_ns(dev, NULL, target, &mcaddr, NULL); + + read_lock_bh(&table->tb6_lock); } else { read_unlock_bh(&neigh->lock); }