Skip to contentSkip to conversation

kprobes: Cleanup jprobe implementation

RFC PATCH Superseded Masami Hiramatsu 3 participants 16 messages Mar 9, 2018 – Mar 11, 2018

Subsystems (5)
Documentation x86 Tracing ftrace +1 more subsystems

v1 of 6 Superseded Latest is v6 →

lore
Share & tools
lore

Masami Hiramatsu

author maintainer
#0 lore raw

cover kprobes: Cleanup jprobe implementation

Hello,

Since we decided to remove jprobe from kernel last year, its APIs are disabled and we worked on moving in-kernel jprobe users to kprobes or trace-events. And now no jprobe users are here anymore.

I think it is good time to get rid of jprobe implementation from the kernel. However, I need other arch developers help to complete it, since jprobe is implemented multi arch wide. I can remove those code, but can not test all of those.

Here is the series of patches to show how to do that. I tried to remove it from x86 tree. Basically we need to do 3 things;

- Remove jprobe functions (register/unregister, setjump/longjump) from generic/arch-dependent code. [1/9][2/9][3/9]
- Remove break_handler related code. [4/9][5/9][6/9]
- Do not disable preemption on exception handler [7/9][8/9][9/9]

The [3/9] and [6/9] are destractive changes except for x86 (means causes build errors) since those arch still have some references of those functions. So we need to write patches similar to [2/9] and [5/9] for each arch before applying those. In this series I sorted it as this order just for review, [3/9] and [6/9] should be applied after all archs have been fixed.

Also, [7/9] is a kind of destractive, which changes required behavior for the pre_handlers which changes regs->ip. So we also need a patch similar to [7/9] for each arch too. Fortunately, current in-tree such user is very limited, both works only on x86. So it is not hurry, but we need to change arch dependent code.

Thank you,

---

Masami Hiramatsu (9):
kprobes: Remove jprobe API implementation
x86: kprobes: Remove jprobe implementation
kprobes: Remove jprobe data structure and interfaces
kprobes: Ignore break_handler
x86: kprobes: Ignore break_handler
kprobes: Remove break_handler from struct kprobe
x86: kprobes: Do not disable preempt on int3 path
error-injection: Fix to not enabling preemption in pre_handler
tracing: kprobes: Fix to not enabling preemption

 Documentation/kprobes.txt        |   13 ++--
 arch/x86/include/asm/kprobes.h   |    3 -
 arch/x86/kernel/kprobes/common.h |   10 ---
 arch/x86/kernel/kprobes/core.c   |  114 ++------------------------------------
 arch/x86/kernel/kprobes/ftrace.c |   21 +------
 arch/x86/kernel/kprobes/opt.c    |    1 
 include/linux/kprobes.h          |   54 ------------------
 kernel/fail_function.c           |    1 
 kernel/kprobes.c                 |  115 ++------------------------------------
 kernel/trace/trace_kprobe.c      |    3 -
 10 files changed, 20 insertions(+), 315 deletions(-)

--
Masami Hiramatsu

author maintainer
#1 lore raw

RFC PATCH 1/9 kprobes: Remove jprobe API implementation

Remove jprobe API implementations which is no more used.

---
 include/linux/kprobes.h |    3 --
 kernel/kprobes.c        |   78 +----------------------------------------------
 2 files changed, 1 insertion(+), 80 deletions(-)
include/linux/kprobes.h +0 -3
index 9440a2fc8893..b520baa65682 100644
@@ -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

99 lines not on this page · raw message

author maintainer
#2 lore raw

RFC PATCH 2/9 x86: kprobes: Remove jprobe implementation

In reply to Masami Hiramatsu

Remove arch dependent setjump/longjump functions
and unused fields in kprobe_ctlblk for jprobes.

---
 arch/x86/include/asm/kprobes.h |    3 -
 arch/x86/kernel/kprobes/core.c |   87 ----------------------------------------
 2 files changed, 90 deletions(-)
arch/x86/include/asm/kprobes.h +0 -3
index 367d99cff426..06782c2efa04 100644
@@ -111,9 +111,6 @@ struct kprobe_ctlblk {
 	unsigned long kprobe_status;
 	unsigned long kprobe_old_flags;
 	unsigned long kprobe_saved_flags;
-	unsigned long *jprobe_saved_sp;
-	struct pt_regs jprobe_saved_regs;
-	kprobe_opcode_t jprobes_stack[MAX_STACK_SIZE];
 	struct prev_kprobe prev_kprobe;
 };
 
arch/x86/kernel/kprobes/core.c +0 -87

93 lines not on this page · raw message

author maintainer
#3 lore raw

RFC PATCH 3/9 kprobes: Remove jprobe data structure and interfaces

In reply to Masami Hiramatsu

Remove all interfaces of jprobe since it is no more used.

---
 include/linux/kprobes.h |   44 --------------------------------------------
 1 file changed, 44 deletions(-)
include/linux/kprobes.h +0 -44
index b520baa65682..f7a6c398b4bf 100644
@@ -155,24 +155,6 @@ static inline int kprobe_ftrace(struct kprobe *p)
 }
 
 /*
- * Special probe type that uses setjmp-longjmp type tricks to resume
- * execution at a specified entry with a matching prototype corresponding
- * to the probed function - a trick to enable arguments to become
- * accessible seamlessly by probe handling logic.
- * Note:
- * Because of the way compilers allocate stack space for local variables
- * etc upfront, regardless of sub-scopes within a function, this mirroring
- * principle currently works only for probes placed on function entry points.
- */
-struct jprobe {
-	struct kprobe kp;
-	void *entry;	/* probe handling code to jump to */
-};
-
-/* For backward compatibility with old code using JPROBE_ENTRY() */
-#define JPROBE_ENTRY(handler)	(handler)
-
-/*
  * Function-return probe -
  * Note:
  * User needs to provide a handler function, and initialize maxactive.
@@ -436,9 +418,6 @@ static inline void unregister_kprobe(struct kprobe *p)
 static inline void unregister_kprobes(struct kprobe **kps, int num)
 {
 }
-static inline void jprobe_return(void)
-{
-}
 static inline int register_kretprobe(struct kretprobe *rp)
 {
 	return -ENOSYS;
@@ -465,20 +444,6 @@ static inline int enable_kprobe(struct kprobe *kp)
 	return -ENOSYS;
 }
 #endif /* CONFIG_KPROBES */
-static inline int register_jprobe(struct jprobe *p)
-{
-	return -ENOSYS;
-}
-static inline int register_jprobes(struct jprobe **jps, int num)
-{
-	return -ENOSYS;
-}
-static inline void unregister_jprobe(struct jprobe *p)
-{
-}
-static inline void unregister_jprobes(struct jprobe **jps, int num)
-{
-}
 static inline int disable_kretprobe(struct kretprobe *rp)
 {
 	return disable_kprobe(&rp->kp);
@@ -487,15 +452,6 @@ static inline int enable_kretprobe(struct kretprobe *rp)
 {
 	return enable_kprobe(&rp->kp);
 }
-static inline int disable_jprobe(struct jprobe *jp)
-{
-	return -ENOSYS;
-}
-static inline int enable_jprobe(struct jprobe *jp)
-{
-	return -ENOSYS;
-}
-
 #ifndef CONFIG_KPROBES
 static inline bool is_kprobe_insn_slot(unsigned long addr)
 {
author maintainer
#4 lore raw

RFC PATCH 4/9 kprobes: Ignore break_handler

In reply to Masami Hiramatsu

Ignore break_handler related code because it was only used by jprobe and jprobe is removed.

---
 Documentation/kprobes.txt |    2 +-
 kernel/kprobes.c          |   39 +++++----------------------------------
 2 files changed, 6 insertions(+), 35 deletions(-)
Documentation/kprobes.txt +1 -1
index 22208bf2386d..94df43224c6c 100644
@@ -262,7 +262,7 @@ is optimized, that modification is ignored.  Thus, if you want to
 tweak the kernel's execution path, you need to suppress optimization,
 using one of the following techniques:
 
-- Specify an empty function for the kprobe's post_handler or break_handler.
+- Specify an empty function for the kprobe's post_handler.
 
 or
 
kernel/kprobes.c +5 -34
index 6d5a7c29cf99..889986ee3d06 100644
@@ -627,8 +627,8 @@ static void optimize_kprobe(struct kprobe *p)
 	    (kprobe_disabled(p) || kprobes_all_disarmed))
 		return;
 
-	/* Both of break_handler and post_handler are not supported. */
-	if (p->break_handler || p->post_handler)
+	/* kprobes with post_handler can not be optimized */
+	if (p->post_handler)
 		return;
 
 	op = container_of(p, struct optimized_kprobe, kp);
@@ -1116,20 +1116,6 @@ static int aggr_fault_handler(struct kprobe *p, struct pt_regs *regs,
 }
 NOKPROBE_SYMBOL(aggr_fault_handler);
 
-static int aggr_break_handler(struct kprobe *p, struct pt_regs *regs)
-{
-	struct kprobe *cur = __this_cpu_read(kprobe_instance);
-	int ret = 0;
-
-	if (cur && cur->break_handler) {
-		if (cur->break_handler(cur, regs))
-			ret = 1;
-	}
-	reset_kprobe_instance();
-	return ret;
-}
-NOKPROBE_SYMBOL(aggr_break_handler);
-
 /* Walks the list and increments nmissed count for multiprobe case */
 void kprobes_inc_nmissed_count(struct kprobe *p)
 {
@@ -1270,24 +1256,15 @@ static void cleanup_rp_inst(struct kretprobe *rp)
 }
 NOKPROBE_SYMBOL(cleanup_rp_inst);
 
-/*
-* Add the new probe to ap->list. Fail if this is the
-* second break_handler at the address
-*/
+/* Add the new probe to ap->list */
 static int add_new_kprobe(struct kprobe *ap, struct kprobe *p)
 {
 	BUG_ON(kprobe_gone(ap) || kprobe_gone(p));
 
-	if (p->break_handler || p->post_handler)
+	if (p->post_handler)
 		unoptimize_kprobe(ap, true);	/* Fall back to normal kprobe */
 
-	if (p->break_handler) {
-		if (ap->break_handler)
-			return -EEXIST;
-		list_add_tail_rcu(&p->list, &ap->list);
-		ap->break_handler = aggr_break_handler;
-	} else
-		list_add_rcu(&p->list, &ap->list);
+	list_add_rcu(&p->list, &ap->list);
 	if (p->post_handler && !ap->post_handler)
 		ap->post_handler = aggr_post_handler;
 
@@ -1310,8 +1287,6 @@ static void init_aggr_kprobe(struct kprobe *ap, struct kprobe *p)
 	/* We don't care the kprobe which has gone. */
 	if (p->post_handler && !kprobe_gone(p))
 		ap->post_handler = aggr_post_handler;
-	if (p->break_handler && !kprobe_gone(p))
-		ap->break_handler = aggr_break_handler;
 
 	INIT_LIST_HEAD(&ap->list);
 	INIT_HLIST_NODE(&ap->hlist);
@@ -1706,8 +1681,6 @@ static int __unregister_kprobe_top(struct kprobe *p)
 		goto disarmed;
 	else {
 		/* If disabling probe has special handlers, update aggrprobe */
-		if (p->break_handler && !kprobe_gone(p))
-			ap->break_handler = NULL;
 		if (p->post_handler && !kprobe_gone(p)) {
 			list_for_each_entry_rcu(list_p, &ap->list, list) {
 				if ((list_p != p) && (list_p->post_handler))
@@ -1911,7 +1884,6 @@ int register_kretprobe(struct kretprobe *rp)
 	rp->kp.pre_handler = pre_handler_kretprobe;
 	rp->kp.post_handler = NULL;
 	rp->kp.fault_handler = NULL;
-	rp->kp.break_handler = NULL;
 
 	/* Pre-allocate memory for max kretprobe instances */
 	if (rp->maxactive <= 0) {
@@ -2034,7 +2006,6 @@ static void kill_kprobe(struct kprobe *p)
 		list_for_each_entry_rcu(kp, &p->list, list)
 			kp->flags |= KPROBE_FLAG_GONE;
 		p->post_handler = NULL;
-		p->break_handler = NULL;
 		kill_optimized_kprobe(p);
 	}
 	/*
author maintainer
#5 lore raw

RFC PATCH 5/9 x86: kprobes: Ignore break_handler

In reply to Masami Hiramatsu

Remove break_handler related code since that was used only for jprobe and jprobe is removed now.

---
 arch/x86/kernel/kprobes/common.h |   10 ----------
 arch/x86/kernel/kprobes/core.c   |   13 ++-----------
 arch/x86/kernel/kprobes/ftrace.c |   16 ++--------------
 3 files changed, 4 insertions(+), 35 deletions(-)
arch/x86/kernel/kprobes/common.h +0 -10
index ae38dccf0c8f..2b949f4fd4d8 100644
@@ -105,14 +105,4 @@ static inline unsigned long __recover_optprobed_insn(kprobe_opcode_t *buf, unsig
 }
 #endif
 
-#ifdef CONFIG_KPROBES_ON_FTRACE
-extern int skip_singlestep(struct kprobe *p, struct pt_regs *regs,
-			   struct kprobe_ctlblk *kcb);
-#else
-static inline int skip_singlestep(struct kprobe *p, struct pt_regs *regs,
-				  struct kprobe_ctlblk *kcb)
-{
-	return 0;
-}
-#endif
 #endif
arch/x86/kernel/kprobes/core.c +2 -11
index f5b09b0850ad..7663f23aa860 100644
@@ -686,10 +686,8 @@ int kprobe_int3_handler(struct pt_regs *regs)
 			/*
 			 * If we have no pre-handler or it returned 0, we
 			 * continue with normal processing.  If we have a
-			 * pre-handler and it returned non-zero, it prepped
-			 * for calling the break_handler below on re-entry
-			 * for jprobe processing, so get out doing nothing
-			 * more here.
+			 * pre-handler and it returned non-zero, it modified
+			 * regs->ip so no singlestep is needed.
 			 */
 			if (!p->pre_handler || !p->pre_handler(p, regs))
 				setup_singlestep(p, regs, kcb, 0);
@@ -708,13 +706,6 @@ int kprobe_int3_handler(struct pt_regs *regs)
 		regs->ip = (unsigned long)addr;
 		preempt_enable_no_resched();
 		return 1;
-	} else if (kprobe_running()) {
-		p = __this_cpu_read(current_kprobe);
-		if (p->break_handler && p->break_handler(p, regs)) {
-			if (!skip_singlestep(p, regs, kcb))
-				setup_singlestep(p, regs, kcb, 0);
-			return 1;
-		}
 	} /* else: not a kprobe fault; let the kernel handle it */
 
 	preempt_enable_no_resched();
arch/x86/kernel/kprobes/ftrace.c +2 -14
index 8dc0161cec8f..c8696f2a583f 100644
@@ -26,7 +26,7 @@
 #include "common.h"
 
 static nokprobe_inline
-void __skip_singlestep(struct kprobe *p, struct pt_regs *regs,
+void skip_singlestep(struct kprobe *p, struct pt_regs *regs,
 		      struct kprobe_ctlblk *kcb, unsigned long orig_ip)
 {
 	/*
@@ -43,18 +43,6 @@ void __skip_singlestep(struct kprobe *p, struct pt_regs *regs,
 		regs->ip = orig_ip;
 }
 
-int skip_singlestep(struct kprobe *p, struct pt_regs *regs,
-		    struct kprobe_ctlblk *kcb)
-{
-	if (kprobe_ftrace(p)) {
-		__skip_singlestep(p, regs, kcb, 0);
-		preempt_enable_no_resched();
-		return 1;
-	}
-	return 0;
-}
-NOKPROBE_SYMBOL(skip_singlestep);
-
 /* Ftrace callback handler for kprobes -- called under preepmt disabed */
 void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
 			   struct ftrace_ops *ops, struct pt_regs *regs)
@@ -80,7 +68,7 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
 		__this_cpu_write(current_kprobe, p);
 		kcb->kprobe_status = KPROBE_HIT_ACTIVE;
 		if (!p->pre_handler || !p->pre_handler(p, regs)) {
-			__skip_singlestep(p, regs, kcb, orig_ip);
+			skip_singlestep(p, regs, kcb, orig_ip);
 			preempt_enable_no_resched();
 		}
 		/*
author maintainer
#6 lore raw

RFC PATCH 6/9 kprobes: Remove break_handler from struct kprobe

In reply to Masami Hiramatsu

Since we already removed all break_handler references, we can remove break_handler safely.

---
 include/linux/kprobes.h |    7 -------
 1 file changed, 7 deletions(-)
include/linux/kprobes.h +0 -7
index f7a6c398b4bf..c15989cd4675 100644
@@ -63,7 +63,6 @@ struct pt_regs;
 struct kretprobe;
 struct kretprobe_instance;
 typedef int (*kprobe_pre_handler_t) (struct kprobe *, struct pt_regs *);
-typedef int (*kprobe_break_handler_t) (struct kprobe *, struct pt_regs *);
 typedef void (*kprobe_post_handler_t) (struct kprobe *, struct pt_regs *,
 				       unsigned long flags);
 typedef int (*kprobe_fault_handler_t) (struct kprobe *, struct pt_regs *,
@@ -101,12 +100,6 @@ struct kprobe {
 	 */
 	kprobe_fault_handler_t fault_handler;
 
-	/*
-	 * ... called if breakpoint trap occurs in probe handler.
-	 * Return 1 if it handled break, otherwise kernel will see it.
-	 */
-	kprobe_break_handler_t break_handler;
-
 	/* Saved opcode (which has been replaced with breakpoint) */
 	kprobe_opcode_t opcode;
 
author maintainer
#7 lore raw

RFC PATCH 7/9 x86: kprobes: Do not disable preempt on int3 path

In reply to Masami Hiramatsu

Since int3 and debug exception(for singlestep) are run with IRQ disabled and while running single stepping we drop IF from regs->flags, that path must not be preemptible. So we can remove the preempt disable/enable calls from that path.

Note that, this changes the behavior of execution path override which is done by modifying regs->ip in pre_handler(). Previously it requires reset_current_kprobe(), enable preempt and return !0.
With this change, preempt count is not changed on int3 path, so user no need to enable preempt. To fit this behavior, this modifies ftrace-based kprobe too. In total, pre_handler() does not need to recover preempt count even if it changes regs->ip.

---
 Documentation/kprobes.txt        |   11 +++++------
 arch/x86/kernel/kprobes/core.c   |   14 +++-----------
 arch/x86/kernel/kprobes/ftrace.c |    5 ++---
 arch/x86/kernel/kprobes/opt.c    |    1 -
 4 files changed, 10 insertions(+), 21 deletions(-)
Documentation/kprobes.txt +5 -6
index 94df43224c6c..679cba3380e4 100644
@@ -566,12 +566,11 @@ the same handler) may run concurrently on different CPUs.
 Kprobes does not use mutexes or allocate memory except during
 registration and unregistration.
 
-Probe handlers are run with preemption disabled.  Depending on the
-architecture and optimization state, handlers may also run with
-interrupts disabled (e.g., kretprobe handlers and optimized kprobe
-handlers run without interrupt disabled on x86/x86-64).  In any case,
-your handler should not yield the CPU (e.g., by attempting to acquire
-a semaphore).
+Probe handlers are run with preemption disabled or interrupt disabled,
+which depends on the architecture and optimization state.  (e.g.,
+kretprobe handlers and optimized kprobe handlers run without interrupt
+disabled on x86/x86-64).  In any case, your handler should not yield
+the CPU (e.g., by attempting to acquire a semaphore, or waiting I/O).
 
 Since a return probe is implemented by replacing the return
 address with the trampoline's address, stack backtraces and calls
arch/x86/kernel/kprobes/core.c +3 -11
index 7663f23aa860..b771a01d51f4 100644
@@ -592,7 +592,6 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
 		 * stepping.
 		 */
 		regs->ip = (unsigned long)p->ainsn.insn;
-		preempt_enable_no_resched();
 		return;
 	}
 #endif
@@ -665,12 +664,10 @@ int kprobe_int3_handler(struct pt_regs *regs)
 
 	addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
 	/*
-	 * We don't want to be preempted for the entire
-	 * duration of kprobe processing. We conditionally
-	 * re-enable preemption at the end of this function,
-	 * and also in reenter_kprobe() and setup_singlestep().
+	 * We don't want to be preempted for the entire duration of kprobe
+	 * processing. Since int3 and debug trap disables irqs and we clear
+	 * IF while singlestepping, it must be no preemptible.
 	 */
-	preempt_disable();
 
 	kcb = get_kprobe_ctlblk();
 	p = get_kprobe(addr);
@@ -704,11 +701,9 @@ int kprobe_int3_handler(struct pt_regs *regs)
 		 * the original instruction.
 		 */
 		regs->ip = (unsigned long)addr;
-		preempt_enable_no_resched();
 		return 1;
 	} /* else: not a kprobe fault; let the kernel handle it */
 
-	preempt_enable_no_resched();
 	return 0;
 }
 NOKPROBE_SYMBOL(kprobe_int3_handler);
@@ -959,8 +954,6 @@ int kprobe_debug_handler(struct pt_regs *regs)
 	}
 	reset_current_kprobe();
 out:
-	preempt_enable_no_resched();
-
 	/*
 	 * if somebody else is singlestepping across a probe point, flags
 	 * will have TF set, in which case, continue the remaining processing
@@ -1007,7 +1000,6 @@ int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
 			restore_previous_kprobe(kcb);
 		else
 			reset_current_kprobe();
-		preempt_enable_no_resched();
 	} else if (kcb->kprobe_status == KPROBE_HIT_ACTIVE ||
 		   kcb->kprobe_status == KPROBE_HIT_SSDONE) {
 		/*
arch/x86/kernel/kprobes/ftrace.c +2 -3
index c8696f2a583f..f1ac65d6b352 100644
@@ -67,10 +67,9 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
 		preempt_disable();
 		__this_cpu_write(current_kprobe, p);
 		kcb->kprobe_status = KPROBE_HIT_ACTIVE;
-		if (!p->pre_handler || !p->pre_handler(p, regs)) {
+		if (!p->pre_handler || !p->pre_handler(p, regs))
 			skip_singlestep(p, regs, kcb, orig_ip);
-			preempt_enable_no_resched();
-		}
+		preempt_enable_no_resched();
 		/*
 		 * If pre_handler returns !0, it sets regs->ip and
 		 * resets current kprobe, and keep preempt count +1.
arch/x86/kernel/kprobes/opt.c +0 -1
index 203d398802a3..eaf02f2e7300 100644
@@ -491,7 +491,6 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
 		regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
 		if (!reenter)
 			reset_current_kprobe();
-		preempt_enable_no_resched();
 		return 1;
 	}
 	return 0;
author maintainer
#8 lore raw

RFC PATCH 8/9 error-injection: Fix to not enabling preemption in pre_handler

In reply to Masami Hiramatsu

Since kprobes pre_handler doesn't need to recover preemption even if it modifies regs->ip anymore, this fixes to remove the preempt_enable_no_resched() from pre_handler.

---
 kernel/fail_function.c |    1 -
 1 file changed, 1 deletion(-)
kernel/fail_function.c +0 -1
index 21b0122cb39c..b1713521f096 100644
@@ -176,7 +176,6 @@ static int fei_kprobe_handler(struct kprobe *kp, struct pt_regs *regs)
 		override_function_with_return(regs);
 		/* Kprobe specific fixup */
 		reset_current_kprobe();
-		preempt_enable_no_resched();
 		return 1;
 	}
 
#9 lore raw

Re: [RFC PATCH -tip 8/9] error-injection: Fix to not enabling preemption in pre_handler

Quoted 14 lines · Masami Hiramatsu

Since kprobes pre_handler doesn't need to recover preemption even if it modifies regs->ip anymore, this fixes to remove the preempt_enable_no_resched() from pre_handler.

---
 kernel/fail_function.c |    1 -
 1 file changed, 1 deletion(-)
kernel/fail_function.c +0 -0
index 21b0122cb39c..b1713521f096 100644

kernel/fail_function.c static int fei_kprobe_handler(struct kprobe *kp, struct pt_regs *regs) · line 180

Quoted 6 lines
kernel/fail_function.c +0 -1
@@ -176,7 +176,6 @@ static int fei_kprobe_handler(struct kprobe *kp, struct pt_regs *regs)
 		override_function_with_return(regs);
 		/* Kprobe specific fixup */
 		reset_current_kprobe();
-		preempt_enable_no_resched();
 		return 1;
 	}

So where did the matching preempt_disable() get removed? If it's the 6/9 patch, then this patch (and 8/9) should very much be part of it.

There should be no bisection breakage in the series.

Thanks,

Ingo

author maintainer
#10 lore raw

Re: [RFC PATCH -tip 8/9] error-injection: Fix to not enabling preemption in pre_handler

Quoted 12 lines · On Sat, 10 Mar 2018 09:22:48 +0100 Ingo Molnar <[email protected]> wrote:
Quoted 9 lines · Masami Hiramatsu

Since kprobes pre_handler doesn't need to recover preemption even if it modifies regs->ip anymore, this fixes to remove the preempt_enable_no_resched() from pre_handler.

---
 kernel/fail_function.c |    1 -
 1 file changed, 1 deletion(-)
Quoted 14 lines

kernel/fail_function.c static int fei_kprobe_handler(struct kprobe *kp, struct pt_regs *regs) · line 180

Quoted 11 lines
kernel/fail_function.c +0 -1
index 21b0122cb39c..b1713521f096 100644
@@ -176,7 +176,6 @@ static int fei_kprobe_handler(struct kprobe *kp, struct pt_regs *regs)
 		override_function_with_return(regs);
 		/* Kprobe specific fixup */
 		reset_current_kprobe();
-		preempt_enable_no_resched();
 		return 1;
 	}

So where did the matching preempt_disable() get removed? If it's the 6/9 patch, then this patch (and 8/9) should very much be part of it.

It is 7/9, in kprobe_int3_handler() and kprobe_ftrace_handler(). The latter is a bit tricky, originally it enable preemption only when the pre_handler returns 0, but 7/9 changes it always enables preemption.

Quoted 2 lines

There should be no bisection breakage in the series.

OK, I will merge 7/9-9/9 (anyway those are currently only support x86).

Thanks,

Quoted 4 lines

Thanks,

Ingo

Signature · 1 line
Masami Hiramatsu <[email protected]>
author maintainer
#11 lore raw

RFC PATCH 9/9 tracing: kprobes: Fix to not enabling preemption

In reply to Masami Hiramatsu

Since kprobes pre_handler doesn't need to recover preemption even if it modifies regs->ip anymore, this fixes to remove the preempt_enable_no_resched() from pre_handler.

---
 kernel/trace/trace_kprobe.c |    3 ---
 1 file changed, 3 deletions(-)
kernel/trace/trace_kprobe.c +0 -3
index 5ce9b8cf7be3..6c894e2be8d6 100644
@@ -1221,12 +1221,9 @@ kprobe_perf_func(struct trace_kprobe *tk, struct pt_regs *regs)
 		 * We need to check and see if we modified the pc of the
 		 * pt_regs, and if so clear the kprobe and return 1 so that we
 		 * don't do the single stepping.
-		 * The ftrace kprobe handler leaves it up to us to re-enable
-		 * preemption here before returning if we've modified the ip.
 		 */
 		if (orig_ip != instruction_pointer(regs)) {
 			reset_current_kprobe();
-			preempt_enable_no_resched();
 			return 1;
 		}
 		if (!ret)
maintainer
#12 lore raw
In reply to Masami Hiramatsu
Quoted 32 lines · On Fri, 9 Mar 2018 21:35:17 +0900 Masami Hiramatsu <[email protected]> wrote:

Hello,

Since we decided to remove jprobe from kernel last year, its APIs are disabled and we worked on moving in-kernel jprobe users to kprobes or trace-events. And now no jprobe users are here anymore.

I think it is good time to get rid of jprobe implementation from the kernel. However, I need other arch developers help to complete it, since jprobe is implemented multi arch wide. I can remove those code, but can not test all of those.

Here is the series of patches to show how to do that. I tried to remove it from x86 tree. Basically we need to do 3 things;

- Remove jprobe functions (register/unregister, setjump/longjump) from generic/arch-dependent code. [1/9][2/9][3/9]
- Remove break_handler related code. [4/9][5/9][6/9]
- Do not disable preemption on exception handler [7/9][8/9][9/9]

The [3/9] and [6/9] are destractive changes except for x86 (means causes build errors) since those arch still have some references of those functions. So we need to write patches similar to [2/9] and [5/9] for each arch before applying those. In this series I sorted it as this order just for review, [3/9] and [6/9] should be applied after all archs have been fixed.

Quoted 7 lines

Also, [7/9] is a kind of destractive, which changes required behavior for the pre_handlers which changes regs->ip. So we also need a patch similar to [7/9] for each arch too. Fortunately, current in-tree such user is very limited, both works only on x86. So it is not hurry, but we need to change arch dependent code.

Hi Masami,

thanks for doing all this. I do want to review this and your other patch set. I've just been traveling a lot. I came home from California yesterday and will be leaving Sunday to Portland for ELC. Will you be there?

-- Steve

author maintainer
#13 lore raw
Quoted 43 lines · On Fri, 9 Mar 2018 18:54:02 -0500 Steven Rostedt <[email protected]> wrote:
Quoted 32 lines · On Fri, 9 Mar 2018 21:35:17 +0900 Masami Hiramatsu <[email protected]> wrote:

Hello,

Since we decided to remove jprobe from kernel last year, its APIs are disabled and we worked on moving in-kernel jprobe users to kprobes or trace-events. And now no jprobe users are here anymore.

I think it is good time to get rid of jprobe implementation from the kernel. However, I need other arch developers help to complete it, since jprobe is implemented multi arch wide. I can remove those code, but can not test all of those.

Here is the series of patches to show how to do that. I tried to remove it from x86 tree. Basically we need to do 3 things;

- Remove jprobe functions (register/unregister, setjump/longjump) from generic/arch-dependent code. [1/9][2/9][3/9]
- Remove break_handler related code. [4/9][5/9][6/9]
- Do not disable preemption on exception handler [7/9][8/9][9/9]

The [3/9] and [6/9] are destractive changes except for x86 (means causes build errors) since those arch still have some references of those functions. So we need to write patches similar to [2/9] and [5/9] for each arch before applying those. In this series I sorted it as this order just for review, [3/9] and [6/9] should be applied after all archs have been fixed.

Quoted 7 lines

Also, [7/9] is a kind of destractive, which changes required behavior for the pre_handlers which changes regs->ip. So we also need a patch similar to [7/9] for each arch too. Fortunately, current in-tree such user is very limited, both works only on x86. So it is not hurry, but we need to change arch dependent code.

Quoted 4 lines

Hi Masami,

thanks for doing all this. I do want to review this and your other patch set.

Thanks!

Quoted 3 lines

I've just been traveling a lot. I came home from California yesterday and will be leaving Sunday to Portland for ELC. Will you be there?

Oh, no, sorry I'll not be there. Anyway, I will wait for your review. :)

Quoted 2 lines

-- Steve

Signature · 1 line
Masami Hiramatsu <[email protected]>
#14 lore raw
In reply to Masami Hiramatsu
Quoted 55 lines · Masami Hiramatsu

Hello,

Since we decided to remove jprobe from kernel last year, its APIs are disabled and we worked on moving in-kernel jprobe users to kprobes or trace-events. And now no jprobe users are here anymore.

I think it is good time to get rid of jprobe implementation from the kernel. However, I need other arch developers help to complete it, since jprobe is implemented multi arch wide. I can remove those code, but can not test all of those.

Here is the series of patches to show how to do that. I tried to remove it from x86 tree. Basically we need to do 3 things;

- Remove jprobe functions (register/unregister, setjump/longjump) from generic/arch-dependent code. [1/9][2/9][3/9]
- Remove break_handler related code. [4/9][5/9][6/9]
- Do not disable preemption on exception handler [7/9][8/9][9/9]

The [3/9] and [6/9] are destractive changes except for x86 (means causes build errors) since those arch still have some references of those functions. So we need to write patches similar to [2/9] and [5/9] for each arch before applying those. In this series I sorted it as this order just for review, [3/9] and [6/9] should be applied after all archs have been fixed.

Also, [7/9] is a kind of destractive, which changes required behavior for the pre_handlers which changes regs->ip. So we also need a patch similar to [7/9] for each arch too. Fortunately, current in-tree such user is very limited, both works only on x86. So it is not hurry, but we need to change arch dependent code.

Thank you,

---

Masami Hiramatsu (9):
kprobes: Remove jprobe API implementation
x86: kprobes: Remove jprobe implementation
kprobes: Remove jprobe data structure and interfaces
kprobes: Ignore break_handler
x86: kprobes: Ignore break_handler
kprobes: Remove break_handler from struct kprobe
x86: kprobes: Do not disable preempt on int3 path
error-injection: Fix to not enabling preemption in pre_handler
tracing: kprobes: Fix to not enabling preemption

Quoted 11 lines
 Documentation/kprobes.txt        |   13 ++--
 arch/x86/include/asm/kprobes.h   |    3 -
 arch/x86/kernel/kprobes/common.h |   10 ---
 arch/x86/kernel/kprobes/core.c   |  114 ++------------------------------------
 arch/x86/kernel/kprobes/ftrace.c |   21 +------
 arch/x86/kernel/kprobes/opt.c    |    1 
 include/linux/kprobes.h          |   54 ------------------
 kernel/fail_function.c           |    1 
 kernel/kprobes.c                 |  115 ++------------------------------------
 kernel/trace/trace_kprobe.c      |    3 -
 10 files changed, 20 insertions(+), 315 deletions(-)

Nice work, and I love the diffstat, but please do a series that works (builds and boots and has working kprobes) at every interim step.

Thanks,

Ingo

author maintainer
#15 lore raw
Quoted 70 lines · On Sat, 10 Mar 2018 09:24:44 +0100 Ingo Molnar <[email protected]> wrote:
Quoted 55 lines · Masami Hiramatsu

Hello,

Since we decided to remove jprobe from kernel last year, its APIs are disabled and we worked on moving in-kernel jprobe users to kprobes or trace-events. And now no jprobe users are here anymore.

I think it is good time to get rid of jprobe implementation from the kernel. However, I need other arch developers help to complete it, since jprobe is implemented multi arch wide. I can remove those code, but can not test all of those.

Here is the series of patches to show how to do that. I tried to remove it from x86 tree. Basically we need to do 3 things;

- Remove jprobe functions (register/unregister, setjump/longjump) from generic/arch-dependent code. [1/9][2/9][3/9]
- Remove break_handler related code. [4/9][5/9][6/9]
- Do not disable preemption on exception handler [7/9][8/9][9/9]

The [3/9] and [6/9] are destractive changes except for x86 (means causes build errors) since those arch still have some references of those functions. So we need to write patches similar to [2/9] and [5/9] for each arch before applying those. In this series I sorted it as this order just for review, [3/9] and [6/9] should be applied after all archs have been fixed.

Also, [7/9] is a kind of destractive, which changes required behavior for the pre_handlers which changes regs->ip. So we also need a patch similar to [7/9] for each arch too. Fortunately, current in-tree such user is very limited, both works only on x86. So it is not hurry, but we need to change arch dependent code.

Thank you,

---

Masami Hiramatsu (9):
kprobes: Remove jprobe API implementation
x86: kprobes: Remove jprobe implementation
kprobes: Remove jprobe data structure and interfaces
kprobes: Ignore break_handler
x86: kprobes: Ignore break_handler
kprobes: Remove break_handler from struct kprobe
x86: kprobes: Do not disable preempt on int3 path
error-injection: Fix to not enabling preemption in pre_handler
tracing: kprobes: Fix to not enabling preemption

Quoted 11 lines
 Documentation/kprobes.txt        |   13 ++--
 arch/x86/include/asm/kprobes.h   |    3 -
 arch/x86/kernel/kprobes/common.h |   10 ---
 arch/x86/kernel/kprobes/core.c   |  114 ++------------------------------------
 arch/x86/kernel/kprobes/ftrace.c |   21 +------
 arch/x86/kernel/kprobes/opt.c    |    1 
 include/linux/kprobes.h          |   54 ------------------
 kernel/fail_function.c           |    1 
 kernel/kprobes.c                 |  115 ++------------------------------------
 kernel/trace/trace_kprobe.c      |    3 -
 10 files changed, 20 insertions(+), 315 deletions(-)
Quoted 2 lines

Nice work, and I love the diffstat, but please do a series that works (builds and boots and has working kprobes) at every interim step.

Thank you! Yes, I'm thinking just keep header files no change (no removing API and structure) until all archs apply C file changes in next version, so that we can avoid any build error/test error.

Thanks,

Quoted 4 lines

Thanks,

Ingo

Signature · 1 line
Masami Hiramatsu <[email protected]>