Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19f5ee27 authored by Oleg Nesterov's avatar Oleg Nesterov
Browse files

uprobes: Kill arch_uprobe_enable/disable_step() hooks 



Kill arch_uprobe_enable/disable_step() hooks, they do nothing and
nobody needs them.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
parent 4dc316c6

include/linux/uprobes.h

+0 −2
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ extern void uprobe_dup_mmap(struct mm_struct *oldmm, struct mm_struct *newmm); 
extern void uprobe_free_utask(struct task_struct *t);

extern void uprobe_copy_process(struct task_struct *t);

extern unsigned long __weak uprobe_get_swbp_addr(struct pt_regs *regs);

extern void __weak arch_uprobe_enable_step(struct arch_uprobe *arch);

extern void __weak arch_uprobe_disable_step(struct arch_uprobe *arch);

extern int uprobe_post_sstep_notifier(struct pt_regs *regs);

extern int uprobe_pre_sstep_notifier(struct pt_regs *regs);

extern void uprobe_notify_resume(struct pt_regs *regs);

kernel/events/uprobes.c

+0 −10
Original line number Diff line number Diff line
@@ -1430,14 +1430,6 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp) 
	return uprobe;

}



void __weak arch_uprobe_enable_step(struct arch_uprobe *arch)

{

}



void __weak arch_uprobe_disable_step(struct arch_uprobe *arch)

{

}



/*

 * Run handler and ask thread to singlestep.

 * Ensure all non-fatal signals cannot interrupt thread while it singlesteps.
@@ -1491,7 +1483,6 @@ static void handle_swbp(struct pt_regs *regs) 
		goto out;



	if (!pre_ssout(uprobe, regs, bp_vaddr)) {

		arch_uprobe_enable_step(&uprobe->arch);

		utask->active_uprobe = uprobe;

		utask->state = UTASK_SSTEP;

		return;
@@ -1523,7 +1514,6 @@ static void handle_singlestep(struct uprobe_task *utask, struct pt_regs *regs) 
	else

		WARN_ON_ONCE(1);



	arch_uprobe_disable_step(&uprobe->arch);

	put_uprobe(uprobe);

	utask->active_uprobe = NULL;

	utask->state = UTASK_RUNNING;