Skip to content

Commit 143cf26

Browse files
Yang Shisashalevin
authored andcommitted
arm64: replace read_lock to rcu lock in call_step_hook
[ Upstream commit cf0a254 ] BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:917 in_atomic(): 1, irqs_disabled(): 128, pid: 383, name: sh Preemption disabled at:[<ffff800000124c18>] kgdb_cpu_enter+0x158/0x6b8 CPU: 3 PID: 383 Comm: sh Tainted: G W 4.1.13-rt13 #2 Hardware name: Freescale Layerscape 2085a RDB Board (DT) Call trace: [<ffff8000000885e8>] dump_backtrace+0x0/0x128 [<ffff800000088734>] show_stack+0x24/0x30 [<ffff80000079a7c4>] dump_stack+0x80/0xa0 [<ffff8000000bd324>] ___might_sleep+0x18c/0x1a0 [<ffff8000007a20ac>] __rt_spin_lock+0x2c/0x40 [<ffff8000007a2268>] rt_read_lock+0x40/0x58 [<ffff800000085328>] single_step_handler+0x38/0xd8 [<ffff800000082368>] do_debug_exception+0x58/0xb8 Exception stack(0xffff80834a1e7c80 to 0xffff80834a1e7da0) 7c80: ffffff9c ffffffff 92c23ba0 0000ffff 4a1e7e40 ffff8083 001bfcc4 ffff8000 7ca0: f2000400 00000000 00000000 00000000 4a1e7d80 ffff8083 0049501c ffff8000 7cc0: 00005402 00000000 00aaa210 ffff8000 4a1e7ea0 ffff8083 000833f4 ffff8000 7ce0: ffffff9c ffffffff 92c23ba0 0000ffff 4a1e7ea0 ffff8083 001bfcc0 ffff8000 7d00: 4a0fc400 ffff8083 00005402 00000000 4a1e7d40 ffff8083 00490324 ffff8000 7d20: ffffff9c 00000000 92c23ba0 0000ffff 000a0000 00000000 00000000 00000000 7d40: 00000008 00000000 00080000 00000000 92c23b8b 0000ffff 92c23b8e 0000ffff 7d60: 00000038 00000000 00001cb2 00000000 00000005 00000000 92d7b498 0000ffff 7d80: 01010101 01010101 92be9000 0000ffff 00000000 00000000 00000030 00000000 [<ffff8000000833f4>] el1_dbg+0x18/0x6c This issue is similar with 62c6c61("arm64: replace read_lock to rcu lock in call_break_hook"), but comes to single_step_handler. This also solves kgdbts boot test silent hang issue on 4.4 -rt kernel. Signed-off-by: Yang Shi <[email protected]> Acked-by: Will Deacon <[email protected]> Signed-off-by: Catalin Marinas <[email protected]> Signed-off-by: He Kuang <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 1a138f3 commit 143cf26

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

arch/arm64/kernel/debug-monitors.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -184,20 +184,21 @@ static void clear_regs_spsr_ss(struct pt_regs *regs)
184184

185185
/* EL1 Single Step Handler hooks */
186186
static LIST_HEAD(step_hook);
187-
static DEFINE_RWLOCK(step_hook_lock);
187+
static DEFINE_SPINLOCK(step_hook_lock);
188188

189189
void register_step_hook(struct step_hook *hook)
190190
{
191-
write_lock(&step_hook_lock);
192-
list_add(&hook->node, &step_hook);
193-
write_unlock(&step_hook_lock);
191+
spin_lock(&step_hook_lock);
192+
list_add_rcu(&hook->node, &step_hook);
193+
spin_unlock(&step_hook_lock);
194194
}
195195

196196
void unregister_step_hook(struct step_hook *hook)
197197
{
198-
write_lock(&step_hook_lock);
199-
list_del(&hook->node);
200-
write_unlock(&step_hook_lock);
198+
spin_lock(&step_hook_lock);
199+
list_del_rcu(&hook->node);
200+
spin_unlock(&step_hook_lock);
201+
synchronize_rcu();
201202
}
202203

203204
/*
@@ -211,15 +212,15 @@ static int call_step_hook(struct pt_regs *regs, unsigned int esr)
211212
struct step_hook *hook;
212213
int retval = DBG_HOOK_ERROR;
213214

214-
read_lock(&step_hook_lock);
215+
rcu_read_lock();
215216

216-
list_for_each_entry(hook, &step_hook, node) {
217+
list_for_each_entry_rcu(hook, &step_hook, node) {
217218
retval = hook->fn(regs, esr);
218219
if (retval == DBG_HOOK_HANDLED)
219220
break;
220221
}
221222

222-
read_unlock(&step_hook_lock);
223+
rcu_read_unlock();
223224

224225
return retval;
225226
}

0 commit comments

Comments
 (0)