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

Commit 5a6cf77f authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

kprobes: Remove jprobe API implementation 



Remove functionally empty jprobe API implementations and test cases.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-arch@vger.kernel.org
Link: https://lore.kernel.org/lkml/152942430705.15209.2307050500995264322.stgit@devbox


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent bc8c9da5

include/linux/kprobes.h

+0 −3
Original line number Diff line number Diff line
@@ -389,9 +389,6 @@ int register_kprobe(struct kprobe *p); 
void unregister_kprobe(struct kprobe *p);

int register_kprobes(struct kprobe **kps, int num);

void unregister_kprobes(struct kprobe **kps, int num);

int setjmp_pre_handler(struct kprobe *, struct pt_regs *);

int longjmp_break_handler(struct kprobe *, struct pt_regs *);

void jprobe_return(void);

unsigned long arch_deref_entry_point(void *);



int register_kretprobe(struct kretprobe *rp);

kernel/kprobes.c

+1 −77
Original line number Diff line number Diff line
@@ -1272,7 +1272,7 @@ NOKPROBE_SYMBOL(cleanup_rp_inst); 


/*

* Add the new probe to ap->list. Fail if this is the

* second jprobe at the address - two jprobes can't coexist

* second break_handler at the address

*/

static int add_new_kprobe(struct kprobe *ap, struct kprobe *p)

{
@@ -1812,77 +1812,6 @@ unsigned long __weak arch_deref_entry_point(void *entry) 
	return (unsigned long)entry;

}



#if 0

int register_jprobes(struct jprobe **jps, int num)

{

	int ret = 0, i;



	if (num <= 0)

		return -EINVAL;



	for (i = 0; i < num; i++) {

		ret = register_jprobe(jps[i]);



		if (ret < 0) {

			if (i > 0)

				unregister_jprobes(jps, i);

			break;

		}

	}



	return ret;

}

EXPORT_SYMBOL_GPL(register_jprobes);



int register_jprobe(struct jprobe *jp)

{

	unsigned long addr, offset;

	struct kprobe *kp = &jp->kp;



	/*

	 * Verify probepoint as well as the jprobe handler are

	 * valid function entry points.

	 */

	addr = arch_deref_entry_point(jp->entry);



	if (kallsyms_lookup_size_offset(addr, NULL, &offset) && offset == 0 &&

	    kprobe_on_func_entry(kp->addr, kp->symbol_name, kp->offset)) {

		kp->pre_handler = setjmp_pre_handler;

		kp->break_handler = longjmp_break_handler;

		return register_kprobe(kp);

	}



	return -EINVAL;

}

EXPORT_SYMBOL_GPL(register_jprobe);



void unregister_jprobe(struct jprobe *jp)

{

	unregister_jprobes(&jp, 1);

}

EXPORT_SYMBOL_GPL(unregister_jprobe);



void unregister_jprobes(struct jprobe **jps, int num)

{

	int i;



	if (num <= 0)

		return;

	mutex_lock(&kprobe_mutex);

	for (i = 0; i < num; i++)

		if (__unregister_kprobe_top(&jps[i]->kp) < 0)

			jps[i]->kp.addr = NULL;

	mutex_unlock(&kprobe_mutex);



	synchronize_sched();

	for (i = 0; i < num; i++) {

		if (jps[i]->kp.addr)

			__unregister_kprobe_bottom(&jps[i]->kp);

	}

}

EXPORT_SYMBOL_GPL(unregister_jprobes);

#endif



#ifdef CONFIG_KRETPROBES

/*

 * This kprobe pre_handler is registered with every kretprobe. When probe
@@ -2329,8 +2258,6 @@ static void report_probe(struct seq_file *pi, struct kprobe *p, 


	if (p->pre_handler == pre_handler_kretprobe)

		kprobe_type = "r";

	else if (p->pre_handler == setjmp_pre_handler)

		kprobe_type = "j";

	else

		kprobe_type = "k";
@@ -2637,6 +2564,3 @@ late_initcall(debugfs_kprobe_init); 
#endif /* CONFIG_DEBUG_FS */



module_init(init_kprobes);
 


/* defined in arch/.../kernel/kprobes.c */

EXPORT_SYMBOL_GPL(jprobe_return);

kernel/test_kprobes.c

+0 −94
Original line number Diff line number Diff line
@@ -162,90 +162,6 @@ static int test_kprobes(void) 


}



#if 0

static u32 jph_val;



static u32 j_kprobe_target(u32 value)

{

	if (preemptible()) {

		handler_errors++;

		pr_err("jprobe-handler is preemptible\n");

	}

	if (value != rand1) {

		handler_errors++;

		pr_err("incorrect value in jprobe handler\n");

	}



	jph_val = rand1;

	jprobe_return();

	return 0;

}



static struct jprobe jp = {

	.entry		= j_kprobe_target,

	.kp.symbol_name = "kprobe_target"

};



static int test_jprobe(void)

{

	int ret;



	ret = register_jprobe(&jp);

	if (ret < 0) {

		pr_err("register_jprobe returned %d\n", ret);

		return ret;

	}



	ret = target(rand1);

	unregister_jprobe(&jp);

	if (jph_val == 0) {

		pr_err("jprobe handler not called\n");

		handler_errors++;

	}



	return 0;

}



static struct jprobe jp2 = {

	.entry          = j_kprobe_target,

	.kp.symbol_name = "kprobe_target2"

};



static int test_jprobes(void)

{

	int ret;

	struct jprobe *jps[2] = {&jp, &jp2};



	/* addr and flags should be cleard for reusing kprobe. */

	jp.kp.addr = NULL;

	jp.kp.flags = 0;

	ret = register_jprobes(jps, 2);

	if (ret < 0) {

		pr_err("register_jprobes returned %d\n", ret);

		return ret;

	}



	jph_val = 0;

	ret = target(rand1);

	if (jph_val == 0) {

		pr_err("jprobe handler not called\n");

		handler_errors++;

	}



	jph_val = 0;

	ret = target2(rand1);

	if (jph_val == 0) {

		pr_err("jprobe handler2 not called\n");

		handler_errors++;

	}

	unregister_jprobes(jps, 2);



	return 0;

}

#else

#define test_jprobe() (0)

#define test_jprobes() (0)

#endif

#ifdef CONFIG_KRETPROBES

static u32 krph_val;
@@ -383,16 +299,6 @@ int init_test_probes(void) 
	if (ret < 0)

		errors++;



	num_tests++;

	ret = test_jprobe();

	if (ret < 0)

		errors++;



	num_tests++;

	ret = test_jprobes();

	if (ret < 0)

		errors++;



#ifdef CONFIG_KRETPROBES

	num_tests++;

	ret = test_kretprobe();

lib/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -1718,7 +1718,7 @@ config KPROBES_SANITY_TEST 
	default n

	help

	  This option provides for testing basic kprobes functionality on

	  boot. A sample kprobe, jprobe and kretprobe are inserted and

	  boot. Samples of kprobe and kretprobe are inserted and

	  verified for functionality.



	  Say N if you are unsure.