From patchwork Sun Dec 27 12:33:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pekka Enberg X-Patchwork-Id: 41844 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 848DAB7BF4 for ; Sun, 27 Dec 2009 23:33:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751739AbZL0MdR (ORCPT ); Sun, 27 Dec 2009 07:33:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751649AbZL0MdR (ORCPT ); Sun, 27 Dec 2009 07:33:17 -0500 Received: from courier.cs.helsinki.fi ([128.214.9.1]:42526 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751559AbZL0MdQ (ORCPT ); Sun, 27 Dec 2009 07:33:16 -0500 Received: from [10.0.1.4] (cs181035003.pp.htv.fi [82.181.35.3]) (AUTH: PLAIN penberg, SSL: TLSv1/SSLv3,256bits,AES256-SHA) by mail.cs.helsinki.fi with esmtp; Sun, 27 Dec 2009 14:33:14 +0200 id 00093DFA.4B37540A.00004FEA Subject: Re: lockdep possible recursive lock in slab parent->list->rlock in rc2 From: Pekka Enberg To: Andi Kleen Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, paulmck@linux.vnet.ibm.com, a.p.zijlstra@chello.nl, cl@linux-foundation.org, Heiko Carstens In-Reply-To: <20091227120622.GA480@basil.fritz.box> References: <20091227120622.GA480@basil.fritz.box> Date: Sun, 27 Dec 2009 14:33:14 +0200 Message-Id: <1261917194.5933.2.camel@penberg-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Andi, On Sun, 2009-12-27 at 13:06 +0100, Andi Kleen wrote: > Get this on a NFS root system while booting > This must be a recent change in the last week, > I didn't see it in a post rc1 git* from last week > (I haven't done a exact bisect) > > It's triggered by the r8169 driver close function, > but looks more like a slab problem? > > I haven't checked it in detail if the locks are > really different or just lockdep not knowing > enough classes. I broke the lockdep annotations in commit ce79ddc8e2376a9a93c7d42daf89bfcbb9187e62 ("SLAB: Fix lockdep annotations for CPU hotplug"). Does this fix things for you? Heiko, the following patch should fix it for you too. Pekka --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/mm/slab.c b/mm/slab.c index 7d41f15..7451bda 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -654,7 +654,7 @@ static void init_node_lock_keys(int q) l3 = s->cs_cachep->nodelists[q]; if (!l3 || OFF_SLAB(s->cs_cachep)) - return; + continue; lockdep_set_class(&l3->list_lock, &on_slab_l3_key); alc = l3->alien; /* @@ -665,7 +665,7 @@ static void init_node_lock_keys(int q) * for alloc_alien_cache, */ if (!alc || (unsigned long)alc == BAD_ALIEN_MAGIC) - return; + continue; for_each_node(r) { if (alc[r]) lockdep_set_class(&alc[r]->lock,