Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <79aeb83a288051bd3a2a3f15e5ac42e06f154d48.camel@sipsolutions.net>
Subject: Re: [PATCH 1/2] lockdep: add lockdep_assert_not_held()
From:   Johannes Berg <johannes@sipsolutions.net>
To:     Peter Zijlstra <peterz@infradead.org>,
        Shuah Khan <skhan@linuxfoundation.org>
Cc:     mingo@redhat.com, will@kernel.org, kvalo@codeaurora.org,
        davem@davemloft.net, kuba@kernel.org, ath10k@lists.infradead.org,
        linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Date:   Mon, 15 Feb 2021 14:12:30 +0100
In-Reply-To: <20210215104402.GC4507@worktop.programming.kicks-ass.net> (sfid-20210215_114645_090502_64B4A89D)
References: <cover.1613171185.git.skhan@linuxfoundation.org>
         <37a29c383bff2fb1605241ee6c7c9be3784fb3c6.1613171185.git.skhan@linuxfoundation.org>
         <YCljfeNr4m5mZa4N@hirez.programming.kicks-ass.net>
         <20210215104402.GC4507@worktop.programming.kicks-ass.net>
         (sfid-20210215_114645_090502_64B4A89D)
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.36.5 (3.36.5-2.fc32) 
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Mon, 2021-02-15 at 11:44 +0100, Peter Zijlstra wrote:
> 
> I think something like so will work, but please double check.

Yeah, that looks better.

> +++ b/include/linux/lockdep.h
> @@ -294,11 +294,15 @@ extern void lock_unpin_lock(struct lockdep_map *lock, struct pin_cookie);
>  
>  #define lockdep_depth(tsk)	(debug_locks ? (tsk)->lockdep_depth : 0)
>  
> -#define lockdep_assert_held(l)	do {				\
> -		WARN_ON(debug_locks && !lockdep_is_held(l));	\
> +#define lockdep_assert_held(l)	do {					\
> +		WARN_ON(debug_locks && lockdep_is_held(l) == 0));	\
>  	} while (0)

That doesn't really need to change? It's the same.

> -#define lockdep_assert_held_write(l)	do {			\
> +#define lockdep_assert_not_held(l)	do {				\
> +		WARN_ON(debug_locks && lockdep_is_held(l) == 1));	\
> +	} while (0)
> +
> +#define lockdep_assert_held_write(l)	do {				\
>  		WARN_ON(debug_locks && !lockdep_is_held_type(l, 0));	\
>  	} while (0)
>  
> diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
> index c1418b47f625..983ba206f7b2 100644
> --- a/kernel/locking/lockdep.
> +++ b/kernel/locking/lockdep.c
> @@ -5467,7 +5467,7 @@ noinstr int lock_is_held_type(const struct lockdep_map *lock, int read)
>  	int ret = 0;
>  
>  	if (unlikely(!lockdep_enabled()))
> -		return 1; /* avoid false negative lockdep_assert_held() */
> +		return -1; /* avoid false negative lockdep_assert_held() */

Maybe add lockdep_assert_not_held() to the comment, to explain the -1
(vs non-zero)?

johannes