Re: [PATCH 2/3] lockdep: consolidate by new validate_held_lock()

Path	csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From	Peter Zijlstra <peterz@infradead.org>
Newsgroups	linux.kernel
Subject	Re: [PATCH 2/3] lockdep: consolidate by new validate_held_lock()
Date	Tue, 14 Feb 2017 13:10:01 +0100
Message-ID	<taK5H-1IO-3@gated-at.bofh.it> (permalink)
References	<t5JWG-33f-15@gated-at.bofh.it> <t6sK5-6rG-3@gated-at.bofh.it> <t6sK5-6rG-11@gated-at.bofh.it>
Dkim-Signature	v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=7kRVDT6JadD6Remhr3RBadMt65PvBeK8bMUiStwdcm8=; b=sSZLU8nIq4VzovnwX9J0ypJ5p 3L+ZVK+pvT+YFWLqgF5XeKbnDYMkGAi7HzOj+Tcwb50zzucPpQVifvX3lfsWAhodQOhdQ5TO/IxGp TyDLMjbrdMDa9v8uBrbfZBI9qmNfGkRyl4x1bK+KIRzrMYuJAuDSVhB4PtDCRJlVvL7NTQufh6oqh 6EQrPHn8V09WPqHE9gcj19M/cbhdaSBfBtmUndsLx7vfdisgjQnjdtSMop49hCZ3mW+ZXGDzF+n6i mZVXZkRQAi9WWja0hQRYe5e9ekVPlIXYs+L+XXZj1i6ig+tBFVHE2Yqii1QALx75Z+CWqh4gNZ3Jq RIdovhkyg==;
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
User-Agent	Mutt/1.5.23.1 (2014-03-12)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	39
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org
X-Original-Date	Tue, 14 Feb 2017 13:09:06 +0100
X-Original-Message-ID	<20170214120906.GT6515@twins.programming.kicks-ass.net>
X-Original-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>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1580499

Show key headers only | View raw

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 <hooanon05g@gmail.com>
> ---
>  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.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Q: lockdep_assert_held_read() after downgrade_write() "J. R. Okajima" <hooanon05g@gmail.com> - 2017-01-30 22:30 +0100
  Re: Q: lockdep_assert_held_read() after downgrade_write() Peter Zijlstra <peterz@infradead.org> - 2017-01-31 12:10 +0100
    Re: Q: lockdep_assert_held_read() after downgrade_write() Peter Zijlstra <peterz@infradead.org> - 2017-01-31 15:00 +0100
      Re: Q: lockdep_assert_held_read() after downgrade_write() Waiman Long <longman@redhat.com> - 2017-01-31 15:30 +0100
        Re: Q: lockdep_assert_held_read() after downgrade_write() Peter Zijlstra <peterz@infradead.org> - 2017-01-31 15:30 +0100
  Re: Q: lockdep_assert_held_read() after downgrade_write() "J. R. Okajima" <hooanon05g@gmail.com> - 2017-01-31 16:50 +0100
    Re: Q: lockdep_assert_held_read() after downgrade_write() Peter Zijlstra <peterz@infradead.org> - 2017-01-31 18:00 +0100
      Re: Q: lockdep_assert_held_read() after downgrade_write() "J. R. Okajima" <hooanon05g@gmail.com> - 2017-02-02 17:40 +0100
      [PATCH 1/3] lockdep: consolidate by new find_held_lock() "J. R. Okajima" <hooanon05g@gmail.com> - 2017-02-02 17:50 +0100
        [PATCH 3/3] lockdep: new annotation lock_downgrade() "J. R. Okajima" <hooanon05g@gmail.com> - 2017-02-02 17:50 +0100
          Re: [PATCH 3/3] lockdep: new annotation lock_downgrade() kbuild test robot <lkp@intel.com> - 2017-02-02 19:10 +0100
            Re: [PATCH 3/3] lockdep: new annotation lock_downgrade() Peter Zijlstra <peterz@infradead.org> - 2017-02-02 19:50 +0100
              Re: [PATCH 3/3] lockdep: new annotation lock_downgrade() "J. R. Okajima" <hooanon05g@gmail.com> - 2017-02-02 22:10 +0100
                Re: [PATCH 3/3] lockdep: new annotation lock_downgrade() Peter Zijlstra <peterz@infradead.org> - 2017-02-14 13:20 +0100
        [PATCH 2/3] lockdep: consolidate by new validate_held_lock() "J. R. Okajima" <hooanon05g@gmail.com> - 2017-02-02 17:50 +0100
          Re: [PATCH 2/3] lockdep: consolidate by new validate_held_lock() Peter Zijlstra <peterz@infradead.org> - 2017-02-14 13:10 +0100

csiph-web