[Intel-gfx] [PATCH] Revert hardcoded lockdep values.

Daniel Vetter daniel.vetter at ffwll.ch
Wed May 12 09:36:12 UTC 2021


For CI testing, config should be updated now.

Revert "lockdep: Bump MAX_STACK_TRACE_ENTRIES"
This reverts commit 8733308e6c3929b28fdf4bda6b4629f094f6547d.
Revert "lockdep: Up MAX_LOCKDEP_CHAINS"
This reverts commit 39eca5b925699687a7d638a866f74e79f48f73a9.

Once CI approves we can drop the above two commits from the CI fixup
branch.

Cc: Jani Nikula <jani.nikula at intel.com>
Cc: Tomi Sarvela <tomi.p.sarvela at intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
---
 kernel/locking/lockdep_internals.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
index 1ec5dd9282f9..ecb8662e7a4e 100644
--- a/kernel/locking/lockdep_internals.h
+++ b/kernel/locking/lockdep_internals.h
@@ -101,16 +101,14 @@ static const unsigned long LOCKF_USED_IN_IRQ_READ =
 #else
 #define MAX_LOCKDEP_ENTRIES	(1UL << CONFIG_LOCKDEP_BITS)
 
-/* FIXME: This can now be tuned in .config with CONFIG_LOCKDEP_CHAINS_BITS */
-#define MAX_LOCKDEP_CHAINS_BITS	17
+#define MAX_LOCKDEP_CHAINS_BITS	CONFIG_LOCKDEP_CHAINS_BITS
 
 /*
  * Stack-trace: tightly packed array of stack backtrace
  * addresses. Protected by the hash_lock.
  */
-/* FIXME: These can now be tuned by .config too */
-#define MAX_STACK_TRACE_ENTRIES	1048576UL
-#define STACK_TRACE_HASH_SIZE	16384
+#define MAX_STACK_TRACE_ENTRIES	(1UL << CONFIG_LOCKDEP_STACK_TRACE_BITS)
+#define STACK_TRACE_HASH_SIZE	(1 << CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS)
 #endif
 
 /*
-- 
2.31.0



More information about the Intel-gfx mailing list