From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753459AbdBNMJW (ORCPT ); Tue, 14 Feb 2017 07:09:22 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:34740 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753396AbdBNMJG (ORCPT ); Tue, 14 Feb 2017 07:09:06 -0500 Date: Tue, 14 Feb 2017 13:09:06 +0100 From: Peter Zijlstra To: "J. R. Okajima" Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/3] lockdep: consolidate by new validate_held_lock() Message-ID: <20170214120906.GT6515@twins.programming.kicks-ass.net> References: <20170131163253.GQ6515@twins.programming.kicks-ass.net> <1486053497-9948-1-git-send-email-hooanon05g@gmail.com> <1486053497-9948-2-git-send-email-hooanon05g@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1486053497-9948-2-git-send-email-hooanon05g@gmail.com> User-Agent: Mutt/1.5.23.1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 03, 2017 at 01:38:16AM +0900, J. R. Okajima wrote: > A simple consolidataion. The behaviour should not change. > > Signed-off-by: J. R. Okajima > --- > kernel/locking/lockdep.c | 39 +++++++++++++++++++++------------------ > 1 file changed, 21 insertions(+), 18 deletions(-) > > diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c > index b7a2001..7dc8f8e 100644 > --- a/kernel/locking/lockdep.c > +++ b/kernel/locking/lockdep.c > @@ -3464,6 +3464,23 @@ static struct held_lock *find_held_lock(struct task_struct *curr, > return ret; > } > > +static int validate_held_lock(struct task_struct *curr, unsigned int depth, > + int idx) > +{ > + struct held_lock *hlock; > + > + for (hlock = curr->held_locks + idx; idx < depth; idx++, hlock++) > + if (!__lock_acquire(hlock->instance, > + hlock_class(hlock)->subclass, > + hlock->trylock, > + hlock->read, hlock->check, > + hlock->hardirqs_off, > + hlock->nest_lock, hlock->acquire_ip, > + hlock->references, hlock->pin_count)) > + return 1; > + return 0; > +} I added the extra { } required by coding style and renamed the function to reacquire_held_locks(). Plural because it has the loop, and reacquire because that is what it does. Alternatively 'rebuild' is also possible if someone really doesn't like reacquire.