[PATCH] lockdep: Make LOCKDEP_CROSSRELEASE part of PROVE_LOCKING

[PATCH] lockdep: Make LOCKDEP_CROSSRELEASE part of PROVE_LOCKING

[Byungchul Park]

I am not sure if I did as Ingo suggested. Is this what you intended?

----->8-----
>From 64c705bfedf45b2c56a0d2f4c65a998a1b730310 Mon Sep 17 00:00:00 2001
From: Byungchul Park <byungchul.park@lge.com>
Date: Thu, 17 Aug 2017 09:12:18 +0900
Subject: [PATCH] lockdep: Make LOCKDEP_CROSSRELEASE part of PROVE_LOCKING

Crossrelease added the following two configs in Kconfig:

   LOCKDEP_CROSSRELEASE depending on PROVE_LOCKING
   LOCKDEP_COMPLETE depending on PROVE_LOCKING

Remove the dependencies and make them all part of PROVE_LOCKING, like
most of the other lock debugging bits.

Signed-off-by: Byungchul Park <byungchul.park@lge.com>
---
 lib/Kconfig.debug | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index ee9e534..43ab713 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1084,6 +1084,8 @@ config PROVE_LOCKING
 	select DEBUG_MUTEXES
 	select DEBUG_RT_MUTEXES if RT_MUTEXES
 	select DEBUG_LOCK_ALLOC
+	select LOCKDEP_CROSSRELEASE
+	select LOCKDEP_COMPLETE
 	select TRACE_IRQFLAGS
 	default n
 	help
@@ -1155,7 +1157,7 @@ config LOCK_STAT
 
 config LOCKDEP_CROSSRELEASE
 	bool "Lock debugging: make lockdep work for crosslocks"
-	depends on PROVE_LOCKING
+	depends on DEBUG_KERNEL
 	default n
 	help
 	 This makes lockdep work for crosslock which is a lock allowed to
@@ -1167,7 +1169,7 @@ config LOCKDEP_CROSSRELEASE
 
 config LOCKDEP_COMPLETE
 	bool "Lock debugging: allow completions to use deadlock detector"
-	depends on PROVE_LOCKING
+	depends on DEBUG_KERNEL
 	select LOCKDEP_CROSSRELEASE
 	default n
 	help
-- 
1.9.1

Re: [PATCH] lockdep: Make LOCKDEP_CROSSRELEASE part of PROVE_LOCKING

[Ingo Molnar]

* Byungchul Park <byungchul.park@lge.com> wrote:

> I am not sure if I did as Ingo suggested. Is this what you intended?
> 
> ----->8-----
> From 64c705bfedf45b2c56a0d2f4c65a998a1b730310 Mon Sep 17 00:00:00 2001
> From: Byungchul Park <byungchul.park@lge.com>
> Date: Thu, 17 Aug 2017 09:12:18 +0900
> Subject: [PATCH] lockdep: Make LOCKDEP_CROSSRELEASE part of PROVE_LOCKING
> 
> Crossrelease added the following two configs in Kconfig:
> 
>    LOCKDEP_CROSSRELEASE depending on PROVE_LOCKING
>    LOCKDEP_COMPLETE depending on PROVE_LOCKING
> 
> Remove the dependencies and make them all part of PROVE_LOCKING, like
> most of the other lock debugging bits.
> 
> Signed-off-by: Byungchul Park <byungchul.park@lge.com>
> ---
>  lib/Kconfig.debug | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
> index ee9e534..43ab713 100644
> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@ -1084,6 +1084,8 @@ config PROVE_LOCKING
>  	select DEBUG_MUTEXES
>  	select DEBUG_RT_MUTEXES if RT_MUTEXES
>  	select DEBUG_LOCK_ALLOC
> +	select LOCKDEP_CROSSRELEASE
> +	select LOCKDEP_COMPLETE
>  	select TRACE_IRQFLAGS
>  	default n
>  	help
> @@ -1155,7 +1157,7 @@ config LOCK_STAT
>  
>  config LOCKDEP_CROSSRELEASE
>  	bool "Lock debugging: make lockdep work for crosslocks"
> -	depends on PROVE_LOCKING
> +	depends on DEBUG_KERNEL

This should be a non-interactive option - it makes little sense to enable it when 
lockdep is disabled.

>  	default n
>  	help
>  	 This makes lockdep work for crosslock which is a lock allowed to
> @@ -1167,7 +1169,7 @@ config LOCKDEP_CROSSRELEASE
>  
>  config LOCKDEP_COMPLETE
>  	bool "Lock debugging: allow completions to use deadlock detector"
> -	depends on PROVE_LOCKING
> +	depends on DEBUG_KERNEL
>  	select LOCKDEP_CROSSRELEASE

Ditto.

Thanks,

	Ingo