kprobe: kprobe-booster against 2.6.16-rc1 for i386
PATCH 2/2 kprobe: kprobe-booster against 2.6.16-rc1 for i386
Hi, Andrew
Here is a patch of kprobe-booster for i386 arch against linux-2.6.16-rc1 and also appliable against 2.6.16-rc1-mm4.
This patch works with kernel preemption. On preemptable kernel, kprobe-booster works only when the preemption is disabled.
Best Regards,
Signature · 187 lines
Masami HIRAMATSU 2nd Research Dept. Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected] Signed-off-by: Masami Hiramatsu <[email protected]> arch/i386/kernel/kprobes.c | 92 ++++++++++++++++++++++++++++++++++++++++++++- include/asm-i386/kprobes.h | 6 ++ 2 files changed, 96 insertions(+), 2 deletions(-) diff -Narup a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c --- a/arch/i386/kernel/kprobes.c 2006-01-30 18:17:17.000000000 +0900 +++ b/arch/i386/kernel/kprobes.c 2006-01-30 18:31:38.000000000 +0900 @@ -41,6 +41,49 @@ void jprobe_return_end(void); DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL; DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); +/* insert a jmp code */ +static inline void set_jmp_op(void *from, void *to) +{ + struct __arch_jmp_op { + char op; + long raddr; + } __attribute__((packed)) *jop; + jop = (struct __arch_jmp_op *)from; + jop->raddr = (long)(to) - ((long)(from) + 5); + jop->op = RELATIVEJUMP_INSTRUCTION; +} + +/* + * returns non-zero if opcodes can be boosted. + */ +static inline int can_boost(kprobe_opcode_t opcode) +{ + switch (opcode & 0xf0 ) { + case 0x70: + return 0; /* can't boost conditional jump */ + case 0x90: + /* can't boost call and pushf */ + return opcode != 0x9a && opcode != 0x9c; + case 0xc0: + /* can't boost undefined opcodes and soft-interruptions */ + return (0xc1 < opcode && opcode < 0xc6) || + (0xc7 < opcode && opcode < 0xcc) || opcode == 0xcf; + case 0xd0: + /* can boost AA* and XLAT */ + return (opcode == 0xd4 || opcode == 0xd5 || opcode == 0xd7); + case 0xe0: + /* can boost in/out and (may be) jmps */ + return (0xe3 < opcode && opcode != 0xe8); + case 0xf0: + /* clear and set flags can be boost */ + return (opcode == 0xf5 || (0xf7 < opcode && opcode < 0xfe)); + default: + /* currently, can't boost 2 bytes opcodes */ + return opcode != 0x0f; + } +} + + /* * returns non-zero if opcode modifies the interrupt flag. */ @@ -60,6 +103,11 @@ int __kprobes arch_prepare_kprobe(struct { memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t)); p->opcode = *p->addr; + if (can_boost(p->opcode)) { + p->ainsn.boostable = 0; + } else { + p->ainsn.boostable = -1; + } return 0; } @@ -146,6 +194,9 @@ static int __kprobes kprobe_handler(stru kprobe_opcode_t *addr = NULL; unsigned long *lp; struct kprobe_ctlblk *kcb; +#ifdef CONFIG_PREEMPT + unsigned pre_preempt_count = preempt_count(); +#endif /* CONFIG_PREEMPT */ /* * We don't want to be preempted for the entire @@ -240,6 +291,21 @@ static int __kprobes kprobe_handler(stru /* handler has already set things up, so skip ss setup */ return 1; + if (p->ainsn.boostable == 1 && +#ifdef CONFIG_PREEMPT + !(pre_preempt_count()) && /* + * This enables booster when the direct + * execution path aren't preempted. + */ +#endif /* CONFIG_PREEMPT */ + !p->post_handler && !p->break_handler ) { + /* Boost up -- we can execute copied instructions directly */ + reset_current_kprobe(); + regs->eip = (unsigned long)&p->ainsn.insn; + preempt_enable_no_resched(); + return 1; + } + ss_probe: prepare_singlestep(p, regs); kcb->kprobe_status = KPROBE_HIT_SS; @@ -345,6 +411,8 @@ int __kprobes trampoline_probe_handler(s * 2) If the single-stepped instruction was a call, the return address * that is atop the stack is the address following the copied instruction. * We need to make it the address following the original instruction. + * + * This function also checks instruction size for preparing direct execution. */ static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb) @@ -365,6 +433,7 @@ static void __kprobes resume_execution(s case 0xca: case 0xea: /* jmp absolute -- eip is correct */ /* eip is already adjusted, no more changes required */ + p->ainsn.boostable = 1; goto no_change; case 0xe8: /* call relative - Fix return addr */ *tos = orig_eip + (*tos - copy_eip); @@ -372,18 +441,37 @@ static void __kprobes resume_execution(s case 0xff: if ((p->ainsn.insn[1] & 0x30) == 0x10) { /* call absolute, indirect */ - /* Fix return addr; eip is correct. */ + /* + * Fix return addr; eip is correct. + * But this is not boostable + */ *tos = orig_eip + (*tos - copy_eip); goto no_change; } else if (((p->ainsn.insn[1] & 0x31) == 0x20) || /* jmp near, absolute indirect */ ((p->ainsn.insn[1] & 0x31) == 0x21)) { /* jmp far, absolute indirect */ - /* eip is correct. */ + /* eip is correct. And this is boostable */ + p->ainsn.boostable = 1; goto no_change; } default: break; } + if (p->ainsn.boostable == 0) { + if ((regs->eip > copy_eip) && + (regs->eip - copy_eip) + 5 < MAX_INSN_SIZE) { + /* + * These instructions can be executed directly if it + * jumps back to correct address. + */ + set_jmp_op((void *)regs->eip, + (void *)orig_eip + (regs->eip - copy_eip)); + p->ainsn.boostable = 1; + } else { + p->ainsn.boostable = -1; + } + } + regs->eip = orig_eip + (regs->eip - copy_eip); no_change: diff -Narup a/include/asm-i386/kprobes.h b/include/asm-i386/kprobes.h --- a/include/asm-i386/kprobes.h 2006-01-24 19:07:39.000000000 +0900 +++ b/include/asm-i386/kprobes.h 2006-01-30 18:31:38.000000000 +0900 @@ -31,6 +31,7 @@ struct pt_regs; typedef u8 kprobe_opcode_t; #define BREAKPOINT_INSTRUCTION 0xcc +#define RELATIVEJUMP_INSTRUCTION 0xe9 #define MAX_INSN_SIZE 16 #define MAX_STACK_SIZE 64 #define MIN_STACK_SIZE(ADDR) (((MAX_STACK_SIZE) < \ @@ -48,6 +49,11 @@ void kretprobe_trampoline(void); struct arch_specific_insn { /* copy of the original instruction */ kprobe_opcode_t insn[MAX_INSN_SIZE]; + /* + * If this flag is not 0, this kprobe can be boost when its + * post_handler and break_handler is not set. + */ + int boostable; }; struct prev_kprobe {
Sorry, I took a single mistake
Review static int __kprobes kprobe_handler(stru · line 296
Quoted 7 lines · Masami Hiramatsu
(quoted diff) +3
-0@@ -240,6 +291,21 @@ static int __kprobes kprobe_handler(stru /* handler has already set things up, so skip ss setup */ return 1; + if (p->ainsn.boostable == 1 && +#ifdef CONFIG_PREEMPT + !(pre_preempt_count()) && /*
This should be;
Review static int __kprobes kprobe_handler(stru · line 297
Quoted 1 line
(quoted diff) +1
-0+ !(pre_preempt_count) && /*
And I attach a fixed patch in this mail.
Quoted 16 lines
(quoted diff) +12
-0+ * This enables booster when the direct + * execution path aren't preempted. + */ +#endif /* CONFIG_PREEMPT */ + !p->post_handler && !p->break_handler ) { + /* Boost up -- we can execute copied instructions directly */ + reset_current_kprobe(); + regs->eip = (unsigned long)&p->ainsn.insn; + preempt_enable_no_resched(); + return 1; + } + ss_probe: prepare_singlestep(p, regs); kcb->kprobe_status = KPROBE_HIT_SS;@@ -345,6 +411,8 @@ int __kprobes trampoline_probe_handler(s
Signature · 187 lines
Masami HIRAMATSU 2nd Research Dept. Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected] Signed-off-by: Masami Hiramatsu <[email protected]> arch/i386/kernel/kprobes.c | 92 ++++++++++++++++++++++++++++++++++++++++++++- include/asm-i386/kprobes.h | 6 ++ 2 files changed, 96 insertions(+), 2 deletions(-) diff -Narup a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c --- a/arch/i386/kernel/kprobes.c 2006-01-24 22:43:17.000000000 +0900 +++ b/arch/i386/kernel/kprobes.c 2006-01-24 23:12:23.000000000 +0900 @@ -41,6 +41,49 @@ void jprobe_return_end(void); DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL; DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); +/* insert a jmp code */ +static inline void set_jmp_op(void *from, void *to) +{ + struct __arch_jmp_op { + char op; + long raddr; + } __attribute__((packed)) *jop; + jop = (struct __arch_jmp_op *)from; + jop->raddr = (long)(to) - ((long)(from) + 5); + jop->op = RELATIVEJUMP_INSTRUCTION; +} + +/* + * returns non-zero if opcodes can be boosted. + */ +static inline int can_boost(kprobe_opcode_t opcode) +{ + switch (opcode & 0xf0 ) { + case 0x70: + return 0; /* can't boost conditional jump */ + case 0x90: + /* can't boost call and pushf */ + return opcode != 0x9a && opcode != 0x9c; + case 0xc0: + /* can't boost undefined opcodes and soft-interruptions */ + return (0xc1 < opcode && opcode < 0xc6) || + (0xc7 < opcode && opcode < 0xcc) || opcode == 0xcf; + case 0xd0: + /* can boost AA* and XLAT */ + return (opcode == 0xd4 || opcode == 0xd5 || opcode == 0xd7); + case 0xe0: + /* can boost in/out and (may be) jmps */ + return (0xe3 < opcode && opcode != 0xe8); + case 0xf0: + /* clear and set flags can be boost */ + return (opcode == 0xf5 || (0xf7 < opcode && opcode < 0xfe)); + default: + /* currently, can't boost 2 bytes opcodes */ + return opcode != 0x0f; + } +} + + /* * returns non-zero if opcode modifies the interrupt flag. */ @@ -60,6 +103,11 @@ int __kprobes arch_prepare_kprobe(struct { memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t)); p->opcode = *p->addr; + if (can_boost(p->opcode)) { + p->ainsn.boostable = 0; + } else { + p->ainsn.boostable = -1; + } return 0; } @@ -146,6 +194,9 @@ static int __kprobes kprobe_handler(stru kprobe_opcode_t *addr = NULL; unsigned long *lp; struct kprobe_ctlblk *kcb; +#ifdef CONFIG_PREEMPT + unsigned pre_preempt_count = preempt_count(); +#endif /* CONFIG_PREEMPT */ /* * We don't want to be preempted for the entire @@ -240,6 +291,21 @@ static int __kprobes kprobe_handler(stru /* handler has already set things up, so skip ss setup */ return 1; + if (p->ainsn.boostable == 1 && +#ifdef CONFIG_PREEMPT + !(pre_preempt_count) && /* + * This enables booster when the direct + * execution path aren't preempted. + */ +#endif /* CONFIG_PREEMPT */ + !p->post_handler && !p->break_handler ) { + /* Boost up -- we can execute copied instructions directly */ + reset_current_kprobe(); + regs->eip = (unsigned long)&p->ainsn.insn; + preempt_enable_no_resched(); + return 1; + } + ss_probe: prepare_singlestep(p, regs); kcb->kprobe_status = KPROBE_HIT_SS; @@ -345,6 +411,8 @@ int __kprobes trampoline_probe_handler(s * 2) If the single-stepped instruction was a call, the return address * that is atop the stack is the address following the copied instruction. * We need to make it the address following the original instruction. + * + * This function also checks instruction size for preparing direct execution. */ static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb) @@ -365,6 +433,7 @@ static void __kprobes resume_execution(s case 0xca: case 0xea: /* jmp absolute -- eip is correct */ /* eip is already adjusted, no more changes required */ + p->ainsn.boostable = 1; goto no_change; case 0xe8: /* call relative - Fix return addr */ *tos = orig_eip + (*tos - copy_eip); @@ -372,18 +441,37 @@ static void __kprobes resume_execution(s case 0xff: if ((p->ainsn.insn[1] & 0x30) == 0x10) { /* call absolute, indirect */ - /* Fix return addr; eip is correct. */ + /* + * Fix return addr; eip is correct. + * But this is not boostable + */ *tos = orig_eip + (*tos - copy_eip); goto no_change; } else if (((p->ainsn.insn[1] & 0x31) == 0x20) || /* jmp near, absolute indirect */ ((p->ainsn.insn[1] & 0x31) == 0x21)) { /* jmp far, absolute indirect */ - /* eip is correct. */ + /* eip is correct. And this is boostable */ + p->ainsn.boostable = 1; goto no_change; } default: break; } + if (p->ainsn.boostable == 0) { + if ((regs->eip > copy_eip) && + (regs->eip - copy_eip) + 5 < MAX_INSN_SIZE) { + /* + * These instructions can be executed directly if it + * jumps back to correct address. + */ + set_jmp_op((void *)regs->eip, + (void *)orig_eip + (regs->eip - copy_eip)); + p->ainsn.boostable = 1; + } else { + p->ainsn.boostable = -1; + } + } + regs->eip = orig_eip + (regs->eip - copy_eip); no_change: diff -Narup a/include/asm-i386/kprobes.h b/include/asm-i386/kprobes.h --- a/include/asm-i386/kprobes.h 2006-01-24 19:07:39.000000000 +0900 +++ b/include/asm-i386/kprobes.h 2006-01-24 22:54:35.000000000 +0900 @@ -31,6 +31,7 @@ struct pt_regs; typedef u8 kprobe_opcode_t; #define BREAKPOINT_INSTRUCTION 0xcc +#define RELATIVEJUMP_INSTRUCTION 0xe9 #define MAX_INSN_SIZE 16 #define MAX_STACK_SIZE 64 #define MIN_STACK_SIZE(ADDR) (((MAX_STACK_SIZE) < \ @@ -48,6 +49,11 @@ void kretprobe_trampoline(void); struct arch_specific_insn { /* copy of the original instruction */ kprobe_opcode_t insn[MAX_INSN_SIZE]; + /* + * If this flag is not 0, this kprobe can be boost when its + * post_handler and break_handler is not set. + */ + int boostable; }; struct prev_kprobe {
Quoted 16 lines · Masami Hiramatsu
(quoted diff) +8
-0+#ifdef CONFIG_PREEMPT + unsigned pre_preempt_count = preempt_count(); +#endif /* CONFIG_PREEMPT */ /* * We don't want to be preempted for the entire@@ -240,6 +291,21 @@ static int __kprobes kprobe_handler(stru /* handler has already set things up, so skip ss setup */ return 1; + if (p->ainsn.boostable == 1 && +#ifdef CONFIG_PREEMPT + !(pre_preempt_count) && /* + * This enables booster when the direct + * execution path aren't preempted.
Review static int __kprobes kprobe_handler(stru · line 308
Quoted 10 lines
(quoted diff) +10
-0+ */ +#endif /* CONFIG_PREEMPT */ + !p->post_handler && !p->break_handler ) { + /* Boost up -- we can execute copied instructions directly */ + reset_current_kprobe(); + regs->eip = (unsigned long)&p->ainsn.insn; + preempt_enable_no_resched(); + return 1; + } +
These preempt tricks look rather nasty. Can you please describe what the problem is, precisely? And how this code avoids it? Perhaps we can find something cleaner.
Also, the patch adds a preempt_enable() but I don't see a corresponding preempt_disable(). Am I missing something?
Hi, Andrew
Quoted 3 lines · Andrew Morton
These preempt tricks look rather nasty. Can you please describe what the problem is, precisely? And how this code avoids it? Perhaps we can find something cleaner.
The problem is how to remove the copied instructions of the kprobe *safely* on the preemptable kernel (CONFIG_PREEMPT=y).
Kprobes basically executes the following actions;
(1)int3
(2)preempt_disable()
(3)kprobe_prehandler()
(4)copied instructioin(single step)
(5)kprobe_posthandler()
(6)preempt_enable()
(7)return to the original code
During the execution of copied instruction, preemption is disabled (from step (2) to (6)).
When unregistering the probes, Kprobe waits for RCU quiescent state by using synchronize_sched() after removing int3 instruction.
Thus we can ensure the copied instruction is not executed.
On the other hand, kprobe-booster executes the following actions;
(1)int3
(2)preempt_disable()
(3)kprobe_prehandler()
(4)preempt_enable() <-- this one is added by my patch
(5)copied instruction(direct execution)
(6)jmp back to the original code
The problem is that we have no way to prevent preemption on step (5) or (6). We cannot call preempt_disable() after step (6), because there are no rooms to do that. Thus, some other processes may be preempted at step(5) or (6) on preemptable kernel. And I couldn't find the easy way to ensure that other processes' stack do *not* have the address of them. (I thought some way to do that, but those are very costly.)
So currently, I simply boost the kprobe only when the probe point is already preemption disabled.
Quoted 2 lines
Also, the patch adds a
preempt_enable()but I don't see a correspondingpreempt_disable(). Am I missing something?
It is corresponding to the preempt_disable() in the top of kprobe_handler().
I copied the code of kprobe_handler() here:
static int __kprobes kprobe_handler(struct pt_regs *regs)
{
struct kprobe *p;
int ret = 0;
kprobe_opcode_t *addr = NULL;
unsigned long *lp;
struct kprobe_ctlblk *kcb;
/*
* We don't want to be preempted for the entire
* duration of kprobe processing
*/
preempt_disable(); <-- HERE
kcb = get_kprobe_ctlblk();Best regards,
Signature · 4 lines
Masami HIRAMATSU 2nd Research Dept. Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected]
PATCH 2/2 kprobe: kprobe-booster against 2.6.16-rc5 for i386
In reply to Masami HiramatsuHi, Andrew
Here is a patch of kprobe-booster for i386 arch against linux-2.6.16-rc5. The kprobe-booster patch is also under the influence of the NX-protection support patch. So, I fixed that.
Could you replace the previous patches with these patches?
The description of kprobe-booster:
==================================
Current kprobe copies the original instruction at the probe point and replaces it with a breakpoint instruction (int3). When the kernel hits the probe point, kprobe handler is invoked. And the copied instruction is single-step executed on the copied buffer (not on the original address) by kprobe. After that, the kprobe checks registers and modify it (if need) as if the instructions was executed on the original address.
My proposal is based on the fact there are many instructions which do NOT require the register modification after the single-step execution. When the copied instruction is a kind of them, kprobe just jumps back to the next instruction after single-step execution. If so, why don't we execute those instructions directly?
With kprobe-booster patch, kprobes will execute a copied instruction directly and (if need) jump back to original code. This direct execution is executed when the kprobe don't have both post_handler and break_handler, and the copied instruction can be executed directly.
I sorted instructions which can be executed directly or not;
- Call instructions are NG(can not be executed directly). We should correct the return address pushed into top of stack.
- Indirect instructions except for absolute indirect-jumps are NG. Those instructions changes EIP randomly. We should check EIP and correct it.
- Instructions that change EIP beyond the range of the instruction buffer are NG.
- Instructions that change EIP to tail 5 bytes of the instruction buffer (it is the size of a jump instruction). We must write a jump instruction which backs to original kernel code in the instruction buffer.
- Break point instruction is NG. We should not touch EIP and pass to other handlers.
- Absolute direct/indirect jumps are OK.- Conditional Jumps are NG.
- Halt and software-interruptions are NG. Because it will stay on the instruction buffer of kprobes.
- Prefixes are NG.
- Unknown/reserved opcode is NG.
- Other 1 byte instructions are OK. But those instructions need a jump back code.
- 2 bytes instructions are mapped sparsely. So, in this release, this patch don't boost those instructions.
From Intel's IA-32 opcode map described in IA-32 Intel
Architecture Software Developer's Manual Vol.2 B, I determined that following opcodes are not boostable.
- 0FH (2byte escape)
- 70H - 7FH (Jump on condition)
- 9AH (Call) and 9CH (Pushf)
- C0H-C1H (Grp 2: includes reserved opcode)
- C6H-C7H (Grp11: includes reserved opcode)
- CCH-CEH (Software-interrupt)
- D0H-D3H (Grp2: includes reserved opcode)
- D6H (Reserved)
- D8H-DFH (Coprocessor)
- E0H-E3H (loop/conditional jump)
- E8H (Call)
- F0H-F3H (Prefixes and reserved)
- F4H (Halt)
- F6H-F7H (Grp3: includes reserved opcode)
- FEH-FFH(Grp4,5: includes reserved opcode)
Kprobe-booster checks whether target instruction can be boosted
(can be executed directly) at arch_copy_kprobe() function.
If the target instruction can be boosted, it clears "boostable" flag. If not, it sets "boostable" flag -1. This is disabled status. In resume_execution() function, If "boostable" flag is cleared, kprobe-booster measures the size of the target instruction and sets "boostable" flag 1.
In kprobe_handler(), kprobe checks the "boostable" flag. If the flag is 1, it resets current kprobe and executes instruction buffer directly instead of single stepping.
When unregistering a boosted kprobe, it calls synchronize_sched() after "int3" is removed. So we can ensure followings after the synchronize_sched() called.
- interrupt handlers are finished on all CPUs.
- instruction buffer is not executed on all CPUs.
And we can release the boosted kprobe safely.
And also, on preemptible kernel, the booster is not enabled where the kernel preemption is enabled. So, there are no preempted threads on the instruction buffer.
Best Regards,
Signature · 187 lines
Masami HIRAMATSU 2nd Research Dept. Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected] Signed-off-by: Masami Hiramatsu <[email protected]> arch/i386/kernel/kprobes.c | 92 ++++++++++++++++++++++++++++++++++++++++++++- include/asm-i386/kprobes.h | 6 ++ 2 files changed, 96 insertions(+), 2 deletions(-) diff -Narup a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c --- a/arch/i386/kernel/kprobes.c 2006-02-27 16:30:58.000000000 +0900 +++ b/arch/i386/kernel/kprobes.c 2006-02-27 16:38:59.000000000 +0900 @@ -41,6 +41,49 @@ void jprobe_return_end(void); DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL; DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); +/* insert a jmp code */ +static inline void set_jmp_op(void *from, void *to) +{ + struct __arch_jmp_op { + char op; + long raddr; + } __attribute__((packed)) *jop; + jop = (struct __arch_jmp_op *)from; + jop->raddr = (long)(to) - ((long)(from) + 5); + jop->op = RELATIVEJUMP_INSTRUCTION; +} + +/* + * returns non-zero if opcodes can be boosted. + */ +static inline int can_boost(kprobe_opcode_t opcode) +{ + switch (opcode & 0xf0 ) { + case 0x70: + return 0; /* can't boost conditional jump */ + case 0x90: + /* can't boost call and pushf */ + return opcode != 0x9a && opcode != 0x9c; + case 0xc0: + /* can't boost undefined opcodes and soft-interruptions */ + return (0xc1 < opcode && opcode < 0xc6) || + (0xc7 < opcode && opcode < 0xcc) || opcode == 0xcf; + case 0xd0: + /* can boost AA* and XLAT */ + return (opcode == 0xd4 || opcode == 0xd5 || opcode == 0xd7); + case 0xe0: + /* can boost in/out and (may be) jmps */ + return (0xe3 < opcode && opcode != 0xe8); + case 0xf0: + /* clear and set flags can be boost */ + return (opcode == 0xf5 || (0xf7 < opcode && opcode < 0xfe)); + default: + /* currently, can't boost 2 bytes opcodes */ + return opcode != 0x0f; + } +} + + /* * returns non-zero if opcode modifies the interrupt flag. */ @@ -65,6 +108,11 @@ int __kprobes arch_prepare_kprobe(struct memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t)); p->opcode = *p->addr; + if (can_boost(p->opcode)) { + p->ainsn.boostable = 0; + } else { + p->ainsn.boostable = -1; + } return 0; } @@ -158,6 +206,9 @@ static int __kprobes kprobe_handler(stru kprobe_opcode_t *addr = NULL; unsigned long *lp; struct kprobe_ctlblk *kcb; +#ifdef CONFIG_PREEMPT + unsigned pre_preempt_count = preempt_count(); +#endif /* CONFIG_PREEMPT */ /* * We don't want to be preempted for the entire @@ -252,6 +303,21 @@ static int __kprobes kprobe_handler(stru /* handler has already set things up, so skip ss setup */ return 1; + if (p->ainsn.boostable == 1 && +#ifdef CONFIG_PREEMPT + !(pre_preempt_count()) && /* + * This enables booster when the direct + * execution path aren't preempted. + */ +#endif /* CONFIG_PREEMPT */ + !p->post_handler && !p->break_handler ) { + /* Boost up -- we can execute copied instructions directly */ + reset_current_kprobe(); + regs->eip = (unsigned long)p->ainsn.insn; + preempt_enable_no_resched(); + return 1; + } + ss_probe: prepare_singlestep(p, regs); kcb->kprobe_status = KPROBE_HIT_SS; @@ -357,6 +423,8 @@ int __kprobes trampoline_probe_handler(s * 2) If the single-stepped instruction was a call, the return address * that is atop the stack is the address following the copied instruction. * We need to make it the address following the original instruction. + * + * This function also checks instruction size for preparing direct execution. */ static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb) @@ -377,6 +445,7 @@ static void __kprobes resume_execution(s case 0xca: case 0xea: /* jmp absolute -- eip is correct */ /* eip is already adjusted, no more changes required */ + p->ainsn.boostable = 1; goto no_change; case 0xe8: /* call relative - Fix return addr */ *tos = orig_eip + (*tos - copy_eip); @@ -384,18 +453,37 @@ static void __kprobes resume_execution(s case 0xff: if ((p->ainsn.insn[1] & 0x30) == 0x10) { /* call absolute, indirect */ - /* Fix return addr; eip is correct. */ + /* + * Fix return addr; eip is correct. + * But this is not boostable + */ *tos = orig_eip + (*tos - copy_eip); goto no_change; } else if (((p->ainsn.insn[1] & 0x31) == 0x20) || /* jmp near, absolute indirect */ ((p->ainsn.insn[1] & 0x31) == 0x21)) { /* jmp far, absolute indirect */ - /* eip is correct. */ + /* eip is correct. And this is boostable */ + p->ainsn.boostable = 1; goto no_change; } default: break; } + if (p->ainsn.boostable == 0) { + if ((regs->eip > copy_eip) && + (regs->eip - copy_eip) + 5 < MAX_INSN_SIZE) { + /* + * These instructions can be executed directly if it + * jumps back to correct address. + */ + set_jmp_op((void *)regs->eip, + (void *)orig_eip + (regs->eip - copy_eip)); + p->ainsn.boostable = 1; + } else { + p->ainsn.boostable = -1; + } + } + regs->eip = orig_eip + (regs->eip - copy_eip); no_change: diff -Narup a/include/asm-i386/kprobes.h b/include/asm-i386/kprobes.h --- a/include/asm-i386/kprobes.h 2006-02-27 16:21:48.000000000 +0900 +++ b/include/asm-i386/kprobes.h 2006-02-27 16:38:59.000000000 +0900 @@ -34,6 +34,7 @@ struct pt_regs; typedef u8 kprobe_opcode_t; #define BREAKPOINT_INSTRUCTION 0xcc +#define RELATIVEJUMP_INSTRUCTION 0xe9 #define MAX_INSN_SIZE 16 #define MAX_STACK_SIZE 64 #define MIN_STACK_SIZE(ADDR) (((MAX_STACK_SIZE) < \ @@ -51,6 +52,11 @@ void kretprobe_trampoline(void); struct arch_specific_insn { /* copy of the original instruction */ kprobe_opcode_t *insn; + /* + * If this flag is not 0, this kprobe can be boost when its + * post_handler and break_handler is not set. + */ + int boostable; }; struct prev_kprobe {
Re: [PATCH][take2][2/2] kprobe: kprobe-booster against 2.6.16-rc5 for i386
Quoted 6 lines · Masami Hiramatsu
Here is a patch of kprobe-booster for i386 arch against linux-2.6.16-rc5.
The kprobe-booster patch is also under the influence of the NX-protection support patch. So, I fixed that.Could you replace the previous patches with these patches?
I'd prefer not to. Once a patch has been in -mm for this long I really prefer to not see wholesale replacements. When people do this to me I usually turn their replacements into incremental patches so we can see what changed. Which is useful.
Your first patch was identical to what I already have, so I dropped that.
Your second patch made these changes:
arch/i386/kernel/kprobes.c renamed from arch/i386/kernel/kprobes.c~kprobe-kprobe-booster-against-2616-rc5-for +2 -2
@@ -305,7 +305,7 @@ static int __kprobes kprobe_handler(stru if (p->ainsn.boostable == 1 &&#ifdef CONFIG_PREEMPT - !(pre_preempt_count) &&/* + !(pre_preempt_count ()) &&/* * This enables booster when the direct * execution path aren't preempted. */
@@ -313,7 +313,7 @@ static int __kprobes kprobe_handler(stru !p->post_handler && !p->break_handler ) {/* Boost up -- we can execute copied instructions directly */ reset_current_kprobe (); - regs->eip = (unsigned long )&p->ainsn.insn; + regs->eip = (unsigned long )p->ainsn.insn;preempt_enable_no_resched ();return 1 ; }
The first hunk is surely wrong - pre_preempt_count is a local unsigned integer, not a function.
And I'm not sure about the second hunk either - surely an `eip' should point at an instruction, not be assigned the value of an instruction?
So I'll drop both patches. If you have bugfixes, please make them relative to already-merged things. Against most-recent -mm is best, as I do fix patches up, and other people send fixes which you might not have merged locally. And please ensure that the changes compile and run with and without CONFIG_PREEMPT!
Re: [PATCH][take2][2/2] kprobe: kprobe-booster against 2.6.16-rc5 for i386
Hi, Andrew
Quoted 5 lines · Andrew Morton
Quoted 4 lines · Masami Hiramatsu
Here is a patch of kprobe-booster for i386 arch against linux-2.6.16-rc5.
The kprobe-booster patch is also under the influence of the NX-protection support patch. So, I fixed that.
Quoted 8 lines
Quoted 1 line
Could you replace the previous patches with these patches?
I'd prefer not to. Once a patch has been in -mm for this long I really prefer to not see wholesale replacements. When people do this to me I usually turn their replacements into incremental patches so we can see what changed. Which is useful.
Your first patch was identical to what I already have, so I dropped that.
Thank you for your advice. I will re-create an additional patch against recent -mm tree.
Quoted 23 lines
Your second patch made these changes:
arch/i386/kernel/kprobes.c renamed from arch/i386/kernel/kprobes.c~kprobe-kprobe-booster-against-2616-rc5-for +2
-2@@ -305,7 +305,7 @@ static int __kprobes kprobe_handler(stru if (p->ainsn.boostable == 1 &&#ifdef CONFIG_PREEMPT - !(pre_preempt_count) &&/* + !(pre_preempt_count ()) &&/* * This enables booster when the direct * execution path aren't preempted. */@@ -313,7 +313,7 @@ static int __kprobes kprobe_handler(stru !p->post_handler && !p->break_handler ) {/* Boost up -- we can execute copied instructions directly */ reset_current_kprobe (); - regs->eip = (unsigned long )&p->ainsn.insn; + regs->eip = (unsigned long )p->ainsn.insn;preempt_enable_no_resched ();return 1 ; }
Quoted 2 lines
The first hunk is surely wrong -
pre_preempt_countis a local unsigned integer, not a function.
I'm sorry. It's my fault. The first hunk is just a degradation.
Quoted 2 lines
And I'm not sure about the second hunk either - surely an `eip' should point at an instruction, not be assigned the value of an instruction?
This change is important. Because NX-protection support patch makes the ainsn.insn a pointer instead of a data structure, so now (&p->ainsn.insn) means just an address of the pointer -- not the instruction address.
Quoted 5 lines
So I'll drop both patches. If you have bugfixes, please make them relative to already-merged things. Against most-recent -mm is best, as I do fix patches up, and other people send fixes which you might not have merged locally. And please ensure that the changes compile and run with and without
CONFIG_PREEMPT!
OK. I will get the latest -mm tree and test it.
And I will re-send the patch ASAP.
Signature · 4 lines
Masami HIRAMATSU 2nd Research Dept. Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected]
PATCH 1/1 kprobe: kprobe-booster fix for NX support on i386
Hi, Andrew
Here is the patch to fix kprobe-booster against linux-2.6.16-rc5-mm1.
- Fix to assign the correct address of the instruction buffer. From linux-2.6.16-rc5, the ainsn.insn on i386 arch became a pointer instead of an array itself.
Best regards,
Signature · 21 lines
Masami HIRAMATSU 2nd Research Dept. Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected] Signed-off-by: Masami Hiramatsu <[email protected]> kprobes.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -Narup a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c --- a/arch/i386/kernel/kprobes.c 2006-03-01 09:53:22.000000000 +0900 +++ b/arch/i386/kernel/kprobes.c 2006-03-01 09:56:58.000000000 +0900 @@ -313,7 +313,7 @@ static int __kprobes kprobe_handler(stru !p->post_handler && !p->break_handler ) { /* Boost up -- we can execute copied instructions directly */ reset_current_kprobe(); - regs->eip = (unsigned long)&p->ainsn.insn; + regs->eip = (unsigned long)p->ainsn.insn; preempt_enable_no_resched(); return 1; }