Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753458AbaAMR3C (ORCPT ); Mon, 13 Jan 2014 12:29:02 -0500 Received: from merlin.infradead.org ([205.233.59.134]:34942 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752687AbaAMR25 (ORCPT ); Mon, 13 Jan 2014 12:28:57 -0500 Date: Mon, 13 Jan 2014 18:28:33 +0100 From: Peter Zijlstra To: Oleg Nesterov Cc: Ingo Molnar , linux-kernel@vger.kernel.org, Thomas Gleixner , Steven Rostedt , Paul McKenney , Linus Torvalds Subject: Re: [PATCH 1/1] lockdep: Kill held_lock->check and "int check" arg of __lock_acquire() Message-ID: <20140113172833.GT31570@twins.programming.kicks-ass.net> References: <20140109111516.GE7572@laptop.programming.kicks-ass.net> <20140109163120.GA8038@redhat.com> <20140109170823.GF7572@laptop.programming.kicks-ass.net> <20140112094041.GB31809@gmail.com> <20140112174532.GA12147@redhat.com> <20140112174554.GB12147@redhat.com> <20140113170609.GA9873@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140113170609.GA9873@redhat.com> User-Agent: Mutt/1.5.21 (2012-12-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 13, 2014 at 06:06:09PM +0100, Oleg Nesterov wrote: > On 01/12, Oleg Nesterov wrote: > > > > The "int check" argument of lock_acquire() and held_lock->check > > are misleading and unneeded. This is only used as a boolean, 2 > > denotes "true", everything else is "false". And this boolean is > > always equal to prove_locking. > > > > The only exception is __lockdep_no_validate__ which should make > > this condition "false" in validate_chain(). > > And I missed mark_irqflags(), > > > @@ -3136,7 +3130,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass, > > hlock->holdtime_stamp = lockstat_clock(); > > #endif > > > > - if (check == 2 && !mark_irqflags(curr, hlock)) > > + if (prove_locking && !mark_irqflags(curr, hlock)) > > return 0; > > This change is not right, at least it is not equivalent. > > And I just realized that rcu_lock_acquire() does lock_acquire(check => 1). > Probably we can mark rcu_lock_map's as __lockdep_no_validate__. Can't, RCU needs its own classes. Otherwise it cannot tell which version of the RCU read lock its holding at just that moment. > Anything else I missed? Nothing springs to mind, but then, I totally missed the RCU thing too. At the very least we can reduce check to a single bit. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/