From 85c102245a7c19586b9f2eff2a331e2b31697f25 Mon Sep 17 00:00:00 2001
From: Marco Elver <elver@google.com>
Date: Tue, 9 Nov 2021 16:30:35 +0100
Subject: dashboard/config/linux: refactor lockdep configs into lockdep.yml

All of lockdep comes with a number of config options, so let's refactor
it into a separate lockdep.yml, which makes it easier to disable
selectively.
---
 dashboard/config/linux/bits/debug.yml   | 17 -----------------
 dashboard/config/linux/bits/lockdep.yml | 21 +++++++++++++++++++++
 dashboard/config/linux/main.yml         |  1 +
 3 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 dashboard/config/linux/bits/lockdep.yml

(limited to 'dashboard')

diff --git a/dashboard/config/linux/bits/debug.yml b/dashboard/config/linux/bits/debug.yml
index 5f75b30a6..099c02be2 100644
--- a/dashboard/config/linux/bits/debug.yml
+++ b/dashboard/config/linux/bits/debug.yml
@@ -6,23 +6,6 @@
 config:
  # Instances that use nonoise also ignore WARNINGs, so they don't want panic_on_warn.
  - CMDLINE: [append, "panic_on_warn=1"]
- - LOCKDEP
- - LOCKDEP_BITS: [16, v5.13]
- - LOCKDEP_CHAINS_BITS: [17, v5.13]
- - LOCKDEP_STACK_TRACE_BITS: [20, v5.13]
- - LOCKDEP_STACK_TRACE_HASH_BITS: [14, v5.13]
- - LOCKDEP_CIRCULAR_QUEUE_BITS: [12, v5.13]
- - PROVE_LOCKING
- - DEBUG_ATOMIC_SLEEP
- - PROVE_RCU
- - RCU_EQS_DEBUG
- - DEBUG_LOCK_ALLOC
- - DEBUG_RT_MUTEXES
- - DEBUG_SPINLOCK
- - DEBUG_MUTEXES
- - DEBUG_WW_MUTEX_SLOWPATH
- - DEBUG_RWSEMS: [v4.16]
- - DEBUG_IRQFLAGS: [v5.12]
 
  - DEBUG_VM
  - DEBUG_VM_RB
diff --git a/dashboard/config/linux/bits/lockdep.yml b/dashboard/config/linux/bits/lockdep.yml
new file mode 100644
index 000000000..be271b294
--- /dev/null
+++ b/dashboard/config/linux/bits/lockdep.yml
@@ -0,0 +1,21 @@
+# Copyright 2021 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+config:
+ - LOCKDEP
+ - LOCKDEP_BITS: [16, v5.13]
+ - LOCKDEP_CHAINS_BITS: [17, v5.13]
+ - LOCKDEP_STACK_TRACE_BITS: [20, v5.13]
+ - LOCKDEP_STACK_TRACE_HASH_BITS: [14, v5.13]
+ - LOCKDEP_CIRCULAR_QUEUE_BITS: [12, v5.13]
+ - PROVE_LOCKING
+ - DEBUG_ATOMIC_SLEEP
+ - PROVE_RCU
+ - RCU_EQS_DEBUG
+ - DEBUG_LOCK_ALLOC
+ - DEBUG_RT_MUTEXES
+ - DEBUG_SPINLOCK
+ - DEBUG_MUTEXES
+ - DEBUG_WW_MUTEX_SLOWPATH
+ - DEBUG_RWSEMS: [v4.16]
+ - DEBUG_IRQFLAGS: [v5.12]
diff --git a/dashboard/config/linux/main.yml b/dashboard/config/linux/main.yml
index 3dbe15cdd..b82ea3791 100644
--- a/dashboard/config/linux/main.yml
+++ b/dashboard/config/linux/main.yml
@@ -53,6 +53,7 @@ includes:
  - smack.yml: [smack]
  - slab.yml: [slab]
  - debug.yml: [-nonoise, -kmsan, -kcsan, -kmemleak]
+ - lockdep.yml: [-nonoise, -kmsan, -kcsan, -kmemleak]
  - kmemleak.yml: [kmemleak]
  - kasan.yml: [kasan]
  - mte.yml: [mte]
-- 
cgit mrf-deployment