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

Commit 4c4308cb authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

kprobes: kretprobes simplifications 



 - consolidate duplicate code in all arch_prepare_kretprobe instances
   into common code
 - replace various odd helpers that use hlist_for_each_entry to get
   the first elemenet of a list with either a hlist_for_each_entry_save
   or an opencoded access to the first element in the caller
 - inline add_rp_inst into it's only remaining caller
 - use kretprobe_inst_table_head instead of opencoding it

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Prasanna S Panchamukhi <prasanna@in.ibm.com>
Acked-by: default avatarAnanth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6f716acd

arch/i386/kernel/kprobes.c

+4 −13
Original line number Diff line number Diff line
@@ -226,24 +226,15 @@ static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs) 
}



/* Called with kretprobe_lock held */

void __kprobes arch_prepare_kretprobe(struct kretprobe *rp,

void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,

				      struct pt_regs *regs)

{

	unsigned long *sara = (unsigned long *)&regs->esp;



	struct kretprobe_instance *ri;



	if ((ri = get_free_rp_inst(rp)) != NULL) {

		ri->rp = rp;

		ri->task = current;

	ri->ret_addr = (kprobe_opcode_t *) *sara;



	/* Replace the return addr with trampoline addr */

	*sara = (unsigned long) &kretprobe_trampoline;

		add_rp_inst(ri);

	} else {

		rp->nmissed++;

	}

}



/*

arch/ia64/kernel/kprobes.c

+4 −14
Original line number Diff line number Diff line
@@ -465,23 +465,13 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) 
}



/* Called with kretprobe_lock held */

void __kprobes arch_prepare_kretprobe(struct kretprobe *rp,

void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,

				      struct pt_regs *regs)

{

	struct kretprobe_instance *ri;



	if ((ri = get_free_rp_inst(rp)) != NULL) {

		ri->rp = rp;

		ri->task = current;

	ri->ret_addr = (kprobe_opcode_t *)regs->b0;



	/* Replace the return addr with trampoline addr */

	regs->b0 = ((struct fnptr *)kretprobe_trampoline)->ip;



		add_rp_inst(ri);

	} else {

		rp->nmissed++;

	}

}



int __kprobes arch_prepare_kprobe(struct kprobe *p)

arch/powerpc/kernel/kprobes.c

+5 −14
Original line number Diff line number Diff line
@@ -126,22 +126,13 @@ static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs, 
}



/* Called with kretprobe_lock held */

void __kprobes arch_prepare_kretprobe(struct kretprobe *rp,

void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,

				      struct pt_regs *regs)

{

	struct kretprobe_instance *ri;



	if ((ri = get_free_rp_inst(rp)) != NULL) {

		ri->rp = rp;

		ri->task = current;

	ri->ret_addr = (kprobe_opcode_t *)regs->link;



	/* Replace the return addr with trampoline addr */

	regs->link = (unsigned long)kretprobe_trampoline;

		add_rp_inst(ri);

	} else {

		rp->nmissed++;

	}

}



static int __kprobes kprobe_handler(struct pt_regs *regs)

arch/s390/kernel/kprobes.c

+4 −14
Original line number Diff line number Diff line
@@ -271,23 +271,13 @@ static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs, 
}



/* Called with kretprobe_lock held */

void __kprobes arch_prepare_kretprobe(struct kretprobe *rp,

void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,

					struct pt_regs *regs)

{

	struct kretprobe_instance *ri;



	if ((ri = get_free_rp_inst(rp)) != NULL) {

		ri->rp = rp;

		ri->task = current;

	ri->ret_addr = (kprobe_opcode_t *) regs->gprs[14];



	/* Replace the return addr with trampoline addr */

	regs->gprs[14] = (unsigned long)&kretprobe_trampoline;



		add_rp_inst(ri);

	} else {

		rp->nmissed++;

	}

}



static int __kprobes kprobe_handler(struct pt_regs *regs)

arch/x86_64/kernel/kprobes.c

+4 −13
Original line number Diff line number Diff line
@@ -266,23 +266,14 @@ static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs) 
}



/* Called with kretprobe_lock held */

void __kprobes arch_prepare_kretprobe(struct kretprobe *rp,

void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,

				      struct pt_regs *regs)

{

	unsigned long *sara = (unsigned long *)regs->rsp;

	struct kretprobe_instance *ri;



	if ((ri = get_free_rp_inst(rp)) != NULL) {

		ri->rp = rp;

		ri->task = current;

	ri->ret_addr = (kprobe_opcode_t *) *sara;



	/* Replace the return addr with trampoline addr */

	*sara = (unsigned long) &kretprobe_trampoline;

		add_rp_inst(ri);

	} else {

		rp->nmissed++;

	}

}



int __kprobes kprobe_handler(struct pt_regs *regs)