riscv: Enable LOCKDEP
Subsystems (2)
[email protected]
maintainercover riscv: Enable LOCKDEP
From: Guo Ren <[email protected]>
Lockdep is needed by proving the spinlocks and rwlocks. To suupport it, we need fixup TRACE_IRQFLAGS_SUPPORT in kernel/entry.S. This patch follow Documentation/irqflags-tracing.txt.
And there are 2 bugs block the lockdep implementation.
Guo Ren (2):
riscv: Fixup static_obj() fail
riscv: Enable LOCKDEP_SUPPORT & fixup TRACE_IRQFLAGS_SUPPORT
Zong Li (1):
riscv: Fixup lockdep_assert_held with wrong param cpu_running
arch/riscv/Kconfig | 3 +++ arch/riscv/kernel/entry.S | 41 ++++++++++++++++++++++++++++++++++++++++- arch/riscv/kernel/smpboot.c | 1 - arch/riscv/kernel/vmlinux.lds.S | 2 +- 4 files changed, 44 insertions(+), 3 deletions(-)
Signature · 1 line
2.7.4
[email protected]
maintainerPATCH 1/3 riscv: Fixup static_obj() fail
From: Guo Ren <[email protected]>
When enable LOCKDEP, static_obj() will cause error. Because some __initdata static variables is before _stext:
static int static_obj(const void *obj)
{
unsigned long start = (unsigned long) &_stext,
end = (unsigned long) &_end,
addr = (unsigned long) obj;
/*
* static variable?
*/
if ((addr >= start) && (addr < end))
return 1;[ 0.067192] INFO: trying to register non-static key. [ 0.067325] the code is fine but needs lockdep annotation. [ 0.067449] turning off the locking correctness validator. [ 0.067718] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc7-dirty #44 [ 0.067945] Call Trace: [ 0.068369] [<ffffffe00020323c>] walk_stackframe+0x0/0xa4 [ 0.068506] [<ffffffe000203422>] show_stack+0x2a/0x34 [ 0.068631] [<ffffffe000521e4e>] dump_stack+0x94/0xca [ 0.068757] [<ffffffe000255a4e>] register_lock_class+0x5b8/0x5bc [ 0.068969] [<ffffffe000255abe>] __lock_acquire+0x6c/0x1d5c [ 0.069101] [<ffffffe0002550fe>] lock_acquire+0xae/0x312 [ 0.069228] [<ffffffe000989a8e>] _raw_spin_lock_irqsave+0x40/0x5a [ 0.069357] [<ffffffe000247c64>] complete+0x1e/0x50 [ 0.069479] [<ffffffe000984c38>] rest_init+0x1b0/0x28a [ 0.069660] [<ffffffe0000016a2>] 0xffffffe0000016a2 [ 0.069779] [<ffffffe000001b84>] 0xffffffe000001b84 [ 0.069953] [<ffffffe000001092>] 0xffffffe000001092
static __initdata DECLARE_COMPLETION(kthreadd_done);
noinline void __ref rest_init(void)
{
...
complete(&kthreadd_done);--- arch/riscv/kernel/vmlinux.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/vmlinux.lds.S +1 -1
@@ -22,6 +22,7 @@ SECTIONS /* Beginning of code and text segment */ . = LOAD_OFFSET; _start = .; + _stext = .; HEAD_TEXT_SECTION . = ALIGN(PAGE_SIZE);
@@ -49,7 +50,6 @@ SECTIONS . = ALIGN(SECTION_ALIGN); .text : { _text = .; - _stext = .; TEXT_TEXT SCHED_TEXT CPUIDLE_TEXT
Signature · 1 line
2.7.4
[email protected]
maintainerPATCH 2/3 riscv: Fixup lockdep_assert_held with wrong param cpu_running
In reply to [email protected]From: Zong Li <[email protected]>
The cpu_running is not a lock-class, it lacks the dep_map member in completion. It causes the error as follow:
arch/riscv/kernel/smpboot.c: In function '__cpu_up':./include/linux/lockdep.h:364:52: error: 'struct completion' has no member named 'dep_map'
364 | #define lockdep_is_held(lock) lock_is_held(&(lock)->dep_map)
| ^~./include/asm-generic/bug.h:113:25: note: in definition of macro 'WARN_ON'
113 | int __ret_warn_on = !!(condition); \
| ^~~~~~~~~
./include/linux/lockdep.h:390:27: note: in expansion of macro 'lockdep_is_held'
390 | WARN_ON(debug_locks && !lockdep_is_held(l)); \
| ^~~~~~~~~~~~~~~arch/riscv/kernel/smpboot.c:118:2: note: in expansion of macro 'lockdep_assert_held'
118 | lockdep_assert_held(&cpu_running);
There are a lot of archs which use cpu_running in smpboot.c (arm, arm64, openrisc, xtensa, s390, x86, mips), but none of them try lockdep_assert_held(&cpu_running.wait.lock). So Just remove it.
--- arch/riscv/kernel/smpboot.c | 1 - 1 file changed, 1 deletion(-)
arch/riscv/kernel/smpboot.c +0 -1
@@ -121,7 +121,6 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) ret =start_secondary_cpu (cpu, tidle);if (!ret) { -lockdep_assert_held (&cpu_running);wait_for_completion_timeout (&cpu_running,msecs_to_jiffies (1000 ));
Signature · 1 line
2.7.4
[email protected]
maintainerPATCH 3/3 riscv: Enable LOCKDEP_SUPPORT & fixup TRACE_IRQFLAGS_SUPPORT
In reply to [email protected]From: Guo Ren <[email protected]>
Lockdep is needed by proving the spinlocks and rwlocks. To suupport it, we need fixup TRACE_IRQFLAGS_SUPPORT in kernel/entry.S. This patch follow Documentation/irqflags-tracing.txt.
--- arch/riscv/Kconfig | 3 +++ arch/riscv/kernel/entry.S | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-)
arch/riscv/Kconfig +3 -0
@@ -170,6 +170,9 @@ config PGTABLE_LEVELS default 3 if 64BIT default 2 +config LOCKDEP_SUPPORT + def_bool y + source "arch/riscv/Kconfig.socs" menu "Platform type"
arch/riscv/kernel/entry.S +40 -1
83 lines not on this page · raw message
Signature · 1 line
2.7.4