fd78a76aef
This cleans up the irqflags tracing code quite a bit and ties it in to various missing callsites that caused an imbalance when CONFIG_PROVE_LOCKING was enabled. Previously this was catching on: 987 #ifdef CONFIG_PROVE_LOCKING 988 DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled); 989 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); 990 #endif 991 retval = -EAGAIN; with hardirqs being doubly enabled, and subsequently bailing out with the following call trace: Call trace: [<88035224>] __lock_acquire+0x616/0x6a6 [<88015a8c>] do_fork+0xf8/0x2b0 [<880331ec>] trace_hardirqs_on_caller+0xd4/0x114 [<88241074>] _spin_unlock_irq+0x20/0x64 [<88035224>] __lock_acquire+0x616/0x6a6 [<8800386c>] kernel_thread+0x48/0x70 [<88024ecc>] ____call_usermodehelper+0x0/0x110 [<88024ecc>] ____call_usermodehelper+0x0/0x110 [<88003894>] kernel_thread_helper+0x0/0x14 [<88024bac>] __call_usermodehelper+0x38/0x70 [<88025dc0>] worker_thread+0x150/0x274 [<88035b9c>] lock_release+0x0/0x198 [<88024b74>] __call_usermodehelper+0x0/0x70 [<88028cf0>] autoremove_wake_function+0x0/0x30 [<88028bf2>] kthread+0x3e/0x70 [<88025c70>] worker_thread+0x0/0x274 [<8800389c>] kernel_thread_helper+0x8/0x14 [<88028bb4>] kthread+0x0/0x70 [<88003894>] kernel_thread_helper+0x0/0x14 Reported-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Stuart Menefy <stuart.menefy@st.com> Signed-off-by: Matt Fleming <matt@console-pimps.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
110 lines
1.5 KiB
ArmAsm
110 lines
1.5 KiB
ArmAsm
! entry.S macro define
|
|
|
|
.macro cli
|
|
stc sr, r0
|
|
or #0xf0, r0
|
|
ldc r0, sr
|
|
.endm
|
|
|
|
.macro sti
|
|
mov #0xf0, r11
|
|
extu.b r11, r11
|
|
not r11, r11
|
|
stc sr, r10
|
|
and r11, r10
|
|
#ifdef CONFIG_CPU_HAS_SR_RB
|
|
stc k_g_imask, r11
|
|
or r11, r10
|
|
#endif
|
|
ldc r10, sr
|
|
.endm
|
|
|
|
.macro get_current_thread_info, ti, tmp
|
|
#ifdef CONFIG_CPU_HAS_SR_RB
|
|
stc r7_bank, \ti
|
|
#else
|
|
mov #((THREAD_SIZE - 1) >> 10) ^ 0xff, \tmp
|
|
shll8 \tmp
|
|
shll2 \tmp
|
|
mov r15, \ti
|
|
and \tmp, \ti
|
|
#endif
|
|
.endm
|
|
|
|
#ifdef CONFIG_TRACE_IRQFLAGS
|
|
|
|
.macro TRACE_IRQS_ON
|
|
mov.l r0, @-r15
|
|
mov.l r1, @-r15
|
|
mov.l r2, @-r15
|
|
mov.l r3, @-r15
|
|
mov.l r4, @-r15
|
|
mov.l r5, @-r15
|
|
mov.l r6, @-r15
|
|
mov.l r7, @-r15
|
|
|
|
mov.l 7834f, r0
|
|
jsr @r0
|
|
nop
|
|
|
|
mov.l @r15+, r7
|
|
mov.l @r15+, r6
|
|
mov.l @r15+, r5
|
|
mov.l @r15+, r4
|
|
mov.l @r15+, r3
|
|
mov.l @r15+, r2
|
|
mov.l @r15+, r1
|
|
mov.l @r15+, r0
|
|
mov.l 7834f, r0
|
|
|
|
bra 7835f
|
|
nop
|
|
.balign 4
|
|
7834: .long trace_hardirqs_on
|
|
7835:
|
|
.endm
|
|
.macro TRACE_IRQS_OFF
|
|
|
|
mov.l r0, @-r15
|
|
mov.l r1, @-r15
|
|
mov.l r2, @-r15
|
|
mov.l r3, @-r15
|
|
mov.l r4, @-r15
|
|
mov.l r5, @-r15
|
|
mov.l r6, @-r15
|
|
mov.l r7, @-r15
|
|
|
|
mov.l 7834f, r0
|
|
jsr @r0
|
|
nop
|
|
|
|
mov.l @r15+, r7
|
|
mov.l @r15+, r6
|
|
mov.l @r15+, r5
|
|
mov.l @r15+, r4
|
|
mov.l @r15+, r3
|
|
mov.l @r15+, r2
|
|
mov.l @r15+, r1
|
|
mov.l @r15+, r0
|
|
mov.l 7834f, r0
|
|
|
|
bra 7835f
|
|
nop
|
|
.balign 4
|
|
7834: .long trace_hardirqs_off
|
|
7835:
|
|
.endm
|
|
|
|
#else
|
|
.macro TRACE_IRQS_ON
|
|
.endm
|
|
|
|
.macro TRACE_IRQS_OFF
|
|
.endm
|
|
#endif
|
|
|
|
#if defined(CONFIG_CPU_SH2A) || defined(CONFIG_CPU_SH4)
|
|
# define PREF(x) pref @x
|
|
#else
|
|
# define PREF(x) nop
|
|
#endif
|