Skip to content

Commit d4e0b12

Browse files
Ada Couprie Diazwilldeacon
authored andcommitted
arm64: debug: remove break/step handler registration infrastructure
Remove all infrastructure for the dynamic registration previously used by software breakpoints and stepping handlers. Signed-off-by: Ada Couprie Diaz <[email protected]> Tested-by: Luis Claudio R. Goncalves <[email protected]> Reviewed-by: Anshuman Khandual <[email protected]> Reviewed-by: Will Deacon <[email protected]> Acked-by: Mark Rutland <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 403b48a commit d4e0b12

File tree

2 files changed

+0
-87
lines changed

2 files changed

+0
-87
lines changed

arch/arm64/include/asm/debug-monitors.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,30 +62,6 @@ struct task_struct;
6262
#define DBG_HOOK_HANDLED 0
6363
#define DBG_HOOK_ERROR 1
6464

65-
struct step_hook {
66-
struct list_head node;
67-
int (*fn)(struct pt_regs *regs, unsigned long esr);
68-
};
69-
70-
void register_user_step_hook(struct step_hook *hook);
71-
void unregister_user_step_hook(struct step_hook *hook);
72-
73-
void register_kernel_step_hook(struct step_hook *hook);
74-
void unregister_kernel_step_hook(struct step_hook *hook);
75-
76-
struct break_hook {
77-
struct list_head node;
78-
int (*fn)(struct pt_regs *regs, unsigned long esr);
79-
u16 imm;
80-
u16 mask; /* These bits are ignored when comparing with imm */
81-
};
82-
83-
void register_user_break_hook(struct break_hook *hook);
84-
void unregister_user_break_hook(struct break_hook *hook);
85-
86-
void register_kernel_break_hook(struct break_hook *hook);
87-
void unregister_kernel_break_hook(struct break_hook *hook);
88-
8965
u8 debug_monitors_arch(void);
9066

9167
enum dbg_active_el {

arch/arm64/kernel/debug-monitors.c

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -159,46 +159,6 @@ NOKPROBE_SYMBOL(clear_user_regs_spsr_ss);
159159
#define set_regs_spsr_ss(r) set_user_regs_spsr_ss(&(r)->user_regs)
160160
#define clear_regs_spsr_ss(r) clear_user_regs_spsr_ss(&(r)->user_regs)
161161

162-
static DEFINE_SPINLOCK(debug_hook_lock);
163-
static LIST_HEAD(user_step_hook);
164-
static LIST_HEAD(kernel_step_hook);
165-
166-
static void register_debug_hook(struct list_head *node, struct list_head *list)
167-
{
168-
spin_lock(&debug_hook_lock);
169-
list_add_rcu(node, list);
170-
spin_unlock(&debug_hook_lock);
171-
172-
}
173-
174-
static void unregister_debug_hook(struct list_head *node)
175-
{
176-
spin_lock(&debug_hook_lock);
177-
list_del_rcu(node);
178-
spin_unlock(&debug_hook_lock);
179-
synchronize_rcu();
180-
}
181-
182-
void register_user_step_hook(struct step_hook *hook)
183-
{
184-
register_debug_hook(&hook->node, &user_step_hook);
185-
}
186-
187-
void unregister_user_step_hook(struct step_hook *hook)
188-
{
189-
unregister_debug_hook(&hook->node);
190-
}
191-
192-
void register_kernel_step_hook(struct step_hook *hook)
193-
{
194-
register_debug_hook(&hook->node, &kernel_step_hook);
195-
}
196-
197-
void unregister_kernel_step_hook(struct step_hook *hook)
198-
{
199-
unregister_debug_hook(&hook->node);
200-
}
201-
202162
/*
203163
* Call single step handlers
204164
* There is no Syndrome info to check for determining the handler.
@@ -264,29 +224,6 @@ static int single_step_handler(unsigned long unused, unsigned long esr,
264224
}
265225
NOKPROBE_SYMBOL(single_step_handler);
266226

267-
static LIST_HEAD(user_break_hook);
268-
static LIST_HEAD(kernel_break_hook);
269-
270-
void register_user_break_hook(struct break_hook *hook)
271-
{
272-
register_debug_hook(&hook->node, &user_break_hook);
273-
}
274-
275-
void unregister_user_break_hook(struct break_hook *hook)
276-
{
277-
unregister_debug_hook(&hook->node);
278-
}
279-
280-
void register_kernel_break_hook(struct break_hook *hook)
281-
{
282-
register_debug_hook(&hook->node, &kernel_break_hook);
283-
}
284-
285-
void unregister_kernel_break_hook(struct break_hook *hook)
286-
{
287-
unregister_debug_hook(&hook->node);
288-
}
289-
290227
static int call_break_hook(struct pt_regs *regs, unsigned long esr)
291228
{
292229
if (user_mode(regs)) {

0 commit comments

Comments
 (0)