* 2008-2009 Alexey Gerenkov <a.gerenkov@samsung.com> User-Space
* Probes initial implementation; Support x86.
* 2010 Ekaterina Gorelkina <e.gorelkina@samsung.com>: redesign module for separating core and arch parts
- *
* 2010-2011 Alexander Shirshikov <a.shirshikov@samsung.com>: initial implementation for Thumb
+ * 2012 Stanislav Andreev <s.andreev@samsung.com>: added time debug profiling support; BUG() message fix
+ * 2012 Stanislav Andreev <s.andreev@samsung.com>: redesign of kprobe functionality -
+ * kprobe_handler() now called via undefined instruction hooks
+ * 2012 Stanislav Andreev <s.andreev@samsung.com>: hash tables search implemented for uprobes
*/
-#include<linux/module.h>
+#include <linux/module.h>
+#include <linux/mm.h>
#include "dbi_kprobes.h"
#include "../dbi_kprobes.h"
-
#include "../../dbi_kdebug.h"
#include "../../dbi_insn_slots.h"
#include "../../dbi_kprobes_deps.h"
#include <asm/cacheflush.h>
-unsigned int *arr_traps_original;
+#ifdef OVERHEAD_DEBUG
+#include <linux/time.h>
+#endif
+
+#include <asm/traps.h>
+#include <asm/ptrace.h>
+#include <linux/list.h>
+#include <linux/hash.h>
+
+#define SUPRESS_BUG_MESSAGES
-extern unsigned int *sched_addr;
-extern unsigned int *fork_addr;
+extern unsigned long sched_addr;
+extern unsigned long fork_addr;
extern struct kprobe * per_cpu__current_kprobe;
extern spinlock_t kretprobe_lock;
extern unsigned long (*kallsyms_search) (const char *name);
-extern struct kprobe *kprobe_running (void);
-extern struct kprobe_ctlblk *get_kprobe_ctlblk (void);
-extern void reset_current_kprobe (void);
+extern struct kprobe *kprobe_running(void);
+extern void reset_current_kprobe(void);
+extern struct kprobe_ctlblk *get_kprobe_ctlblk(void);
extern struct kprobe * current_kprobe;
+extern struct hlist_head kprobe_table[KPROBE_TABLE_SIZE];
+#ifdef OVERHEAD_DEBUG
+unsigned long swap_sum_time = 0;
+unsigned long swap_sum_hit = 0;
+EXPORT_SYMBOL_GPL (swap_sum_time);
+EXPORT_SYMBOL_GPL (swap_sum_hit);
+#endif
+
+#define sign_extend(x, signbit) ((x) | (0 - ((x) & (1 << (signbit)))))
+#define branch_displacement(insn) sign_extend(((insn) & 0xffffff) << 2, 25)
+
+static kprobe_opcode_t get_addr_b(kprobe_opcode_t insn, kprobe_opcode_t *addr)
+{
+ // real position less then PC by 8
+ return (kprobe_opcode_t)((long)addr + 8 + branch_displacement(insn));
+}
unsigned int arr_traps_template[] = {
0xe1a0c00d, // mov ip, sp
.pre_handler = trampoline_probe_handler
};
-
-static struct kprobe *my_p[0xffff];
-static struct task_struct *my_task[0xffff];
-static int my_atomic[0xffff];
-static int my_probe = 0;
-static int my_handler_lock = 0;
-
-
-void arch_arm_reinit()
-{
- my_probe = 0;
- my_handler_lock = 0;
-}
-
-
// is instruction Thumb2 and NOT a branch, etc...
int isThumb2(kprobe_opcode_t insn)
{
{
for (i = 0; i < 13; i++)
{
- // DBPRINTF("prep_pc_dep_insn_execbuf: check R%d/%d, changing regs %x in %x",
- // i, ARM_INSN_REG_RN(insn), uregs, insn);
if ((uregs & 0x1) && (ARM_INSN_REG_RN (insn) == i))
continue;
if ((uregs & 0x2) && (ARM_INSN_REG_RD (insn) == i))
ARM_INSN_REG_SET_RD (insns[0], i);
// set register to load address to
ARM_INSN_REG_SET_RD (insns[1], i);
- // set instruction to execute and patch it
+ // set instruction to execute and patch it
if (uregs & 0x10)
{
ARM_INSN_REG_CLEAR_MR (insn, 15);
unsigned char mreg = 0;
unsigned char reg = 0;
+
if (THUMB_INSN_MATCH (APC, insn) || THUMB_INSN_MATCH (LRO3, insn))
{
reg = ((insn & 0xffff) & uregs) >> 8;
{
if (((((unsigned char) insn) & 0xff) >> 3) == 15)
reg = (insn & 0xffff) & uregs;
- else
+ else
return 0;
}else{
if (THUMB2_INSN_MATCH (ADR, insn))
if (reg == 15) return 0;
}else{
// LDRB.W PC, [PC, #immed] => PLD [PC, #immed], so Rt == PC is skipped
- if (THUMB2_INSN_MATCH (LDRBW, insn) || THUMB2_INSN_MATCH (LDRBW1, insn))
+ if (THUMB2_INSN_MATCH (LDRBW, insn) || THUMB2_INSN_MATCH (LDRBW1, insn) || THUMB2_INSN_MATCH (LDREX, insn))
{
reg = ((insn >> 16) & uregs) >> 12;
+ }else{
+ if (THUMB2_INSN_MATCH (DP, insn))
+ {
+ reg = ((insn >> 16) & uregs) >> 12;
+ if (reg == 15) return 0;
+ }else{
+ if (THUMB2_INSN_MATCH (RSBW, insn))
+ {
+ reg = ((insn >> 12) & uregs) >> 8;
+ if (reg == 15) return 0;
+ }else{
+ if (THUMB2_INSN_MATCH (RORW, insn))
+ {
+ reg = ((insn >> 12) & uregs) >> 8;
+ if (reg == 15) return 0;
+ }else{
+ if (THUMB2_INSN_MATCH (ROR, insn) || THUMB2_INSN_MATCH (LSLW1, insn) || THUMB2_INSN_MATCH (LSLW2, insn) || THUMB2_INSN_MATCH (LSRW1, insn) || THUMB2_INSN_MATCH (LSRW2, insn))
+ {
+ reg = ((insn >> 12) & uregs) >> 8;
+ if (reg == 15) return 0;
+ }else{
+ if (THUMB2_INSN_MATCH (TEQ1, insn) || THUMB2_INSN_MATCH (TST1, insn))
+ {
+ reg = 15;
+ }else{
+ if (THUMB2_INSN_MATCH (TEQ2, insn) || THUMB2_INSN_MATCH (TST2, insn))
+ {
+ reg = THUMB2_INSN_REG_RM(insn);
+ }
+ }
+ }
+ }
+ }
+ }
}
}
}
}
}
- if (reg == 6 || reg == 7)
+ if (( THUMB2_INSN_MATCH (STRW, insn) || THUMB2_INSN_MATCH (STRBW, insn) || THUMB2_INSN_MATCH (STRD, insn) || \
+ THUMB2_INSN_MATCH (STRHT, insn) || THUMB2_INSN_MATCH (STRT, insn) || THUMB2_INSN_MATCH (STRHW1, insn) || \
+ THUMB2_INSN_MATCH (STRHW, insn)) && THUMB2_INSN_REG_RT(insn) == 15)
{
- mreg = reg - 2;
+ reg = THUMB2_INSN_REG_RT(insn);
+ }
+ if (reg == 6 || reg == 7)
+ {
*((unsigned short*)insns + 0) = (*((unsigned short*)insns + 0) & 0x00ff) | ((1 << mreg) | (1 << (mreg + 1)));
*((unsigned short*)insns + 1) = (*((unsigned short*)insns + 1) & 0xf8ff) | (mreg << 8);
*((unsigned short*)insns + 2) = (*((unsigned short*)insns + 2) & 0xfff8) | (mreg + 1);
*((unsigned short*)insns + 10) = (*((unsigned short*)insns + 10) & 0x00ff) | (( 1 << mreg) | (1 << (mreg + 1)));
}
+
if (THUMB_INSN_MATCH (APC, insn))
{
// ADD Rd, PC, #immed_8*4 -> ADD Rd, SP, #immed_8*4
insns[2] = (insn & 0xf0fffff0) | 0x0c00000d; // LDR.W Rt, [SP, #-<imm_8>]
}else{
if (THUMB2_INSN_MATCH (LDRW1, insn) || THUMB2_INSN_MATCH (LDRBW1, insn) ||
- THUMB2_INSN_MATCH (LDRHW1, insn) || THUMB2_INSN_MATCH (LDRD, insn) || THUMB2_INSN_MATCH (LDRD1, insn))
+ THUMB2_INSN_MATCH (LDRHW1, insn) || THUMB2_INSN_MATCH (LDRD, insn) || THUMB2_INSN_MATCH (LDRD1, insn) ||
+ THUMB2_INSN_MATCH (LDREX, insn))
{
// LDRx.W Rt, [PC, #+<imm_12>] -> LDRx.W Rt, [SP, #+<imm_12>] (+/-imm_8 for LDRD Rt, Rt2, [PC, #<imm_8>]
- insns[2] = (insn & 0xfffffff0) | 0xd; // LDRx.W Rt, [SP, #+<imm_12>]
+ insns[2] = (insn & 0xfffffff0) | 0xd; // LDRx.W Rt, [SP, #+<imm_12>]
}else{
if (THUMB2_INSN_MATCH (MUL, insn))
{
- insns[2] = (insn & 0xfff0ffff) | 0x000d0000; // MUL Rd, Rn, SP
+ insns[2] = (insn & 0xfff0ffff) | 0x000d0000; // MUL Rd, Rn, SP
}else{ if (THUMB2_INSN_MATCH (DP, insn))
{
- if (THUMB2_INSN_REG_RM(insn) == 15) insns[2] = (insn & 0xfff0ffff) | 0x000d0000; // DP Rd, Rn, PC
- else if (THUMB2_INSN_REG_RN(insn) == 15) insns[2] = (insn & 0xfffffff0) | 0xd; // DP Rd, PC, Rm
+ if (THUMB2_INSN_REG_RM(insn) == 15) insns[2] = (insn & 0xfff0ffff) | 0x000d0000; // DP Rd, Rn, PC
+ else if (THUMB2_INSN_REG_RN(insn) == 15) insns[2] = (insn & 0xfffffff0) | 0xd; // DP Rd, PC, Rm
}else{ if (THUMB2_INSN_MATCH (LDRWL, insn))
{
// LDRx.W Rt, [PC, #<imm_12>] -> LDRx.W Rt, [SP, #+<imm_12>] (+/-imm_8 for LDRD Rt, Rt2, [PC, #<imm_8>]
- insns[2] = (insn & 0xfffffff0) | 0xd; // LDRx.W Rt, [SP, #+<imm_12>]
+ insns[2] = (insn & 0xfffffff0) | 0xd; // LDRx.W Rt, [SP, #+<imm_12>]
+ }else{ if (THUMB2_INSN_MATCH (RSBW, insn))
+ {
+ insns[2] = (insn & 0xfffffff0) | 0xd; // RSB{S}.W Rd, PC, #<const> -> RSB{S}.W Rd, SP, #<const>
+ }else{ if (THUMB2_INSN_MATCH (RORW, insn) || THUMB2_INSN_MATCH (LSLW1, insn) || THUMB2_INSN_MATCH (LSRW1, insn))
+ {
+ if ((THUMB2_INSN_REG_RM(insn) == 15) && (THUMB2_INSN_REG_RN(insn) == 15))
+ {
+ insns[2] = (insn & 0xfffdfffd); // ROR.W Rd, PC, PC
+ }else if (THUMB2_INSN_REG_RM(insn) == 15) insns[2] = (insn & 0xfff0ffff) | 0xd0000; // ROR.W Rd, Rn, PC
+ else if (THUMB2_INSN_REG_RN(insn) == 15) insns[2] = (insn & 0xfffffff0) | 0xd; // ROR.W Rd, PC, Rm
+ }else{ if (THUMB2_INSN_MATCH (ROR, insn) || THUMB2_INSN_MATCH (LSLW2, insn) || THUMB2_INSN_MATCH (LSRW2, insn))
+ {
+ insns[2] = (insn & 0xfff0ffff) | 0xd0000; // ROR{S} Rd, PC, #<const> -> ROR{S} Rd, SP, #<const>
+ }
+ }
+ }
}
}
}
}
}
- if (THUMB2_INSN_MATCH (STRW, insn))
+ if (THUMB2_INSN_MATCH (STRW, insn) || THUMB2_INSN_MATCH (STRBW, insn))
{
- insns[2] = (insn & 0xf0fffff0) | 0x0c00000d; // STRx.W Rt, [SP, #-<imm_8>]
- if (((insn & 0xf000) >> 12) == 15)
- {
- insns[2] = (insn & 0xffffffff) | 0xd000; // STRx.W SP, [SP, #-<imm_8>]
- }
+ insns[2] = (insn & 0xfff0ffff) | 0x000d0000; // STRx.W Rt, [Rn, SP]
}else{
- if (THUMB2_INSN_MATCH (STRW1, insn))
+ if (THUMB2_INSN_MATCH (STRD, insn) || THUMB2_INSN_MATCH (STRHT, insn) || THUMB2_INSN_MATCH (STRT, insn) || THUMB2_INSN_MATCH (STRHW1, insn))
{
- insns[2] = (insn & 0xfffffff0) | 0x0000000d; // STRx.W Rt, [SP, #+<imm_12>]
- if (((insn & 0xf000) >> 12) == 15)
+ if (THUMB2_INSN_REG_RN(insn) == 15)
{
- insns[2] = (insn & 0xffffffff) | 0xd000; // STRx.W SP, [SP, #+<imm_12>]
+ insns[2] = (insn & 0xfffffff0) | 0xd; // STRD/T/HT{.W} Rt, [SP, ...]
+ }else{
+ insns[2] = insn;
+ }
+ }else{
+ if (THUMB2_INSN_MATCH (STRHW, insn) && (THUMB2_INSN_REG_RN(insn) == 15))
+ {
+ if (THUMB2_INSN_REG_RN(insn) == 15)
+ {
+ insns[2] = (insn & 0xf0fffff0) | 0x0c00000d; // STRH.W Rt, [SP, #-<imm_8>]
+ }else{
+ insns[2] = insn;
+ }
}
}
}
+// STRx PC, xxx
+ if ((reg == 15) && (THUMB2_INSN_MATCH (STRW, insn) || \
+ THUMB2_INSN_MATCH (STRBW, insn) || \
+ THUMB2_INSN_MATCH (STRD, insn) || \
+ THUMB2_INSN_MATCH (STRHT, insn) || \
+ THUMB2_INSN_MATCH (STRT, insn) || \
+ THUMB2_INSN_MATCH (STRHW1, insn) || \
+ THUMB2_INSN_MATCH (STRHW, insn) ))
+ {
+ insns[2] = (insns[2] & 0x0fffffff) | 0xd0000000;
+ }
+
+
+
+ if (THUMB2_INSN_MATCH (TEQ1, insn) || THUMB2_INSN_MATCH (TST1, insn))
+ {
+ insns[2] = (insn & 0xfffffff0) | 0xd; // TEQ SP, #<const>
+ }else{ if (THUMB2_INSN_MATCH (TEQ2, insn) || THUMB2_INSN_MATCH (TST2, insn))
+ {
+ if ((THUMB2_INSN_REG_RN(insn) == 15) && (THUMB2_INSN_REG_RM(insn) == 15))
+ {
+ insns[2] = (insn & 0xfffdfffd); // TEQ/TST PC, PC
+ }else if (THUMB2_INSN_REG_RM(insn) == 15) insns[2] = (insn & 0xfff0ffff) | 0xd0000; // TEQ/TST Rn, PC
+ else if (THUMB2_INSN_REG_RN(insn) == 15) insns[2] = (insn & 0xfffffff0) | 0xd; // TEQ/TST PC, Rm
+ }
+ }
+
return 0;
}
int ret = 0;
// check instructions that can change PC by nature
- if ( ARM_INSN_MATCH (UNDEF, ainsn->insn[0]) ||
- ARM_INSN_MATCH (AUNDEF, ainsn->insn[0]) ||
- ARM_INSN_MATCH (SWI, ainsn->insn[0]) ||
- ARM_INSN_MATCH (BREAK, ainsn->insn[0]) ||
- ARM_INSN_MATCH (B, ainsn->insn[0]) ||
- ARM_INSN_MATCH (BL, ainsn->insn[0]) ||
- ARM_INSN_MATCH (BLX1, ainsn->insn[0]) ||
- ARM_INSN_MATCH (BLX2, ainsn->insn[0]) ||
- ARM_INSN_MATCH (BX, ainsn->insn[0]) ||
- ARM_INSN_MATCH (BXJ, ainsn->insn[0]))
+ if (
+// ARM_INSN_MATCH (UNDEF, ainsn->insn_arm[0]) ||
+ ARM_INSN_MATCH (AUNDEF, ainsn->insn_arm[0]) ||
+ ARM_INSN_MATCH (SWI, ainsn->insn_arm[0]) ||
+ ARM_INSN_MATCH (BREAK, ainsn->insn_arm[0]) ||
+ ARM_INSN_MATCH (BL, ainsn->insn_arm[0]) ||
+ ARM_INSN_MATCH (BLX1, ainsn->insn_arm[0]) ||
+ ARM_INSN_MATCH (BLX2, ainsn->insn_arm[0]) ||
+ ARM_INSN_MATCH (BX, ainsn->insn_arm[0]) ||
+ ARM_INSN_MATCH (BXJ, ainsn->insn_arm[0]))
{
- printk ("Bad insn arch_check_insn_arm: %lx\n", ainsn->insn[0]);
- DBPRINTF ("Bad insn arch_check_insn_arm: %lx\n", ainsn->insn[0]);
+ DBPRINTF ("Bad insn arch_check_insn_arm: %lx\n", ainsn->insn_arm[0]);
ret = -EFAULT;
}
#ifndef CONFIG_CPU_V7
// check instructions that can write result to PC
- else if ((ARM_INSN_MATCH (DPIS, ainsn->insn[0]) ||
- ARM_INSN_MATCH (DPRS, ainsn->insn[0]) ||
- ARM_INSN_MATCH (DPI, ainsn->insn[0]) ||
- ARM_INSN_MATCH (LIO, ainsn->insn[0]) ||
- ARM_INSN_MATCH (LRO, ainsn->insn[0])) &&
- (ARM_INSN_REG_RD (ainsn->insn[0]) == 15))
+ else if ((ARM_INSN_MATCH (DPIS, ainsn->insn_arm[0]) ||
+ ARM_INSN_MATCH (DPRS, ainsn->insn_arm[0]) ||
+ ARM_INSN_MATCH (DPI, ainsn->insn_arm[0]) ||
+ ARM_INSN_MATCH (LIO, ainsn->insn_arm[0]) ||
+ ARM_INSN_MATCH (LRO, ainsn->insn_arm[0])) &&
+ (ARM_INSN_REG_RD (ainsn->insn_arm[0]) == 15))
{
- DBPRINTF ("Bad arch_check_insn_arm: %lx\n", ainsn->insn[0]);
- printk ("Bad arch_check_insn_arm: %lx\n", ainsn->insn[0]);
+ DBPRINTF ("Bad arch_check_insn_arm: %lx\n", ainsn->insn_arm[0]);
ret = -EFAULT;
}
#endif // CONFIG_CPU_V7
// check special instruction loads store multiple registers
- else if ((ARM_INSN_MATCH (LM, ainsn->insn[0]) || ARM_INSN_MATCH (SM, ainsn->insn[0])) &&
+ else if ((ARM_INSN_MATCH (LM, ainsn->insn_arm[0]) || ARM_INSN_MATCH (SM, ainsn->insn_arm[0])) &&
// store pc or load to pc
- (ARM_INSN_REG_MR (ainsn->insn[0], 15) ||
+ (ARM_INSN_REG_MR (ainsn->insn_arm[0], 15) ||
// store/load with pc update
- ((ARM_INSN_REG_RN (ainsn->insn[0]) == 15) && (ainsn->insn[0] & 0x200000))))
+ ((ARM_INSN_REG_RN (ainsn->insn_arm[0]) == 15) && (ainsn->insn_arm[0] & 0x200000))))
{
- printk ("Bad insn arch_check_insn_arm: %lx\n", ainsn->insn[0]);
- DBPRINTF ("Bad insn arch_check_insn_arm: %lx\n", ainsn->insn[0]);
+ DBPRINTF ("Bad insn arch_check_insn_arm: %lx\n", ainsn->insn_arm[0]);
ret = -EFAULT;
}
return ret;
int ret = 0;
// check instructions that can change PC
- if ( THUMB_INSN_MATCH (UNDEF, ainsn->insn[0]) ||
- THUMB_INSN_MATCH (SWI, ainsn->insn[0]) ||
- THUMB_INSN_MATCH (BREAK, ainsn->insn[0]) ||
- THUMB2_INSN_MATCH (BL, ainsn->insn[0]) ||
- THUMB_INSN_MATCH (B1, ainsn->insn[0]) ||
- THUMB_INSN_MATCH (B2, ainsn->insn[0]) ||
- THUMB2_INSN_MATCH (B1, ainsn->insn[0]) ||
- THUMB2_INSN_MATCH (B2, ainsn->insn[0]) ||
- THUMB2_INSN_MATCH (BLX1, ainsn->insn[0]) ||
- THUMB_INSN_MATCH (BLX2, ainsn->insn[0]) ||
- THUMB_INSN_MATCH (BX, ainsn->insn[0]) ||
- THUMB2_INSN_MATCH (BXJ, ainsn->insn[0]) ||
- (THUMB2_INSN_MATCH (ADR, ainsn->insn[0]) && THUMB2_INSN_REG_RD(ainsn->insn[0]) == 15) ||
- (THUMB2_INSN_MATCH (LDRW, ainsn->insn[0]) && THUMB2_INSN_REG_RT(ainsn->insn[0]) == 15) ||
- (THUMB2_INSN_MATCH (LDRW1, ainsn->insn[0]) && THUMB2_INSN_REG_RT(ainsn->insn[0]) == 15) ||
- (THUMB2_INSN_MATCH (LDRHW, ainsn->insn[0]) && THUMB2_INSN_REG_RT(ainsn->insn[0]) == 15) ||
- (THUMB2_INSN_MATCH (LDRHW1, ainsn->insn[0]) && THUMB2_INSN_REG_RT(ainsn->insn[0]) == 15) ||
- (THUMB2_INSN_MATCH (LDRWL, ainsn->insn[0]) && THUMB2_INSN_REG_RT(ainsn->insn[0]) == 15) ||
- (THUMB2_INSN_MATCH (DP, ainsn->insn[0]) && THUMB2_INSN_REG_RD(ainsn->insn[0]) == 15))
+ if ( THUMB_INSN_MATCH (UNDEF, ainsn->insn_thumb[0]) ||
+ THUMB_INSN_MATCH (SWI, ainsn->insn_thumb[0]) ||
+ THUMB_INSN_MATCH (BREAK, ainsn->insn_thumb[0]) ||
+ THUMB2_INSN_MATCH (BL, ainsn->insn_thumb[0]) ||
+ THUMB_INSN_MATCH (B1, ainsn->insn_thumb[0]) ||
+ THUMB_INSN_MATCH (B2, ainsn->insn_thumb[0]) ||
+ THUMB_INSN_MATCH (CBZ, ainsn->insn_thumb[0]) ||
+ THUMB2_INSN_MATCH (B1, ainsn->insn_thumb[0]) ||
+ THUMB2_INSN_MATCH (B2, ainsn->insn_thumb[0]) ||
+ THUMB2_INSN_MATCH (BLX1, ainsn->insn_thumb[0]) ||
+ THUMB_INSN_MATCH (BLX2, ainsn->insn_thumb[0]) ||
+ THUMB_INSN_MATCH (BX, ainsn->insn_thumb[0]) ||
+ THUMB2_INSN_MATCH (BXJ, ainsn->insn_thumb[0]) ||
+ (THUMB2_INSN_MATCH (ADR, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RD(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (LDRW, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RT(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (LDRW1, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RT(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (LDRHW, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RT(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (LDRHW1, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RT(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (LDRWL, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RT(ainsn->insn_thumb[0]) == 15) ||
+ THUMB2_INSN_MATCH (LDMIA, ainsn->insn_thumb[0]) ||
+ THUMB2_INSN_MATCH (LDMDB, ainsn->insn_thumb[0]) ||
+ (THUMB2_INSN_MATCH (DP, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RD(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (RSBW, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RD(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (RORW, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RD(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (ROR, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RD(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (LSLW1, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RD(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (LSLW2, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RD(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (LSRW1, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RD(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (LSRW2, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RD(ainsn->insn_thumb[0]) == 15) ||
+/* skip PC, #-imm12 -> SP, #-imm8 and Tegra-hanging instructions */
+ (THUMB2_INSN_MATCH (STRW1, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RN(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (STRBW1, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RN(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (STRHW1, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RN(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (STRW, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RN(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (STRHW, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RN(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (LDRW, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RN(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (LDRBW, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RN(ainsn->insn_thumb[0]) == 15) ||
+ (THUMB2_INSN_MATCH (LDRHW, ainsn->insn_thumb[0]) && THUMB2_INSN_REG_RN(ainsn->insn_thumb[0]) == 15) ||
+/* skip STRDx/LDRDx Rt, Rt2, [Rd, ...] */
+ (THUMB2_INSN_MATCH (LDRD, ainsn->insn_thumb[0]) || THUMB2_INSN_MATCH (LDRD1, ainsn->insn_thumb[0]) || THUMB2_INSN_MATCH (STRD, ainsn->insn_thumb[0])) )
{
- printk ("Bad insn arch_check_insn_thumb: %lx\n", ainsn->insn[0]);
- DBPRINTF ("Bad insn arch_check_insn_thumb: %lx\n", ainsn->insn[0]);
+ DBPRINTF ("Bad insn arch_check_insn_thumb: %lx\n", ainsn->insn_thumb[0]);
ret = -EFAULT;
}
int arch_prepare_kprobe (struct kprobe *p)
{
kprobe_opcode_t insns[KPROBES_TRAMP_LEN];
- int uregs, pc_dep;
- int ret = 0;
-
- if (!ret)
- {
- kprobe_opcode_t insn[MAX_INSN_SIZE];
- struct arch_specific_insn ainsn;
- /* insn: must be on special executable page on i386. */
- p->ainsn.insn = get_insn_slot (NULL, 0);
- if (!p->ainsn.insn)
- return -ENOMEM;
- memcpy (insn, p->addr, MAX_INSN_SIZE * sizeof (kprobe_opcode_t));
- ainsn.insn = insn;
- ret = arch_check_insn_arm (&ainsn);
- if (!ret)
- {
- p->opcode = *p->addr;
-
- p->ainsn.boostable = 1;
- uregs = pc_dep = 0;
- // Rn, Rm ,Rd
- if (ARM_INSN_MATCH (DPIS, insn[0]) || ARM_INSN_MATCH (LRO, insn[0]) ||
- ARM_INSN_MATCH (SRO, insn[0]))
- {
-
- uregs = 0xb;
- if ((ARM_INSN_REG_RN (insn[0]) == 15) || (ARM_INSN_REG_RM (insn[0]) == 15) ||
- (ARM_INSN_MATCH (SRO, insn[0]) && (ARM_INSN_REG_RD (insn[0]) == 15)))
- {
-
- DBPRINTF ("Unboostable insn %lx, DPIS/LRO/SRO\n", insn[0]);
- pc_dep = 1;
- }
- }
- // Rn ,Rd
- else if (ARM_INSN_MATCH (DPI, insn[0]) || ARM_INSN_MATCH (LIO, insn[0]) ||
- ARM_INSN_MATCH (SIO, insn[0]))
- {
-
- uregs = 0x3;
- if ((ARM_INSN_REG_RN (insn[0]) == 15) || (ARM_INSN_MATCH (SIO, insn[0]) &&
- (ARM_INSN_REG_RD (insn[0]) == 15)))
- {
-
- pc_dep = 1;
- DBPRINTF ("Unboostable insn %lx/%p/%d, DPI/LIO/SIO\n", insn[0], p, p->ainsn.boostable);
- }
- }
- // Rn, Rm, Rs
- else if (ARM_INSN_MATCH (DPRS, insn[0]))
- {
-
- uregs = 0xd;
- if ((ARM_INSN_REG_RN (insn[0]) == 15) || (ARM_INSN_REG_RM (insn[0]) == 15) ||
- (ARM_INSN_REG_RS (insn[0]) == 15))
- {
-
- pc_dep = 1;
- DBPRINTF ("Unboostable insn %lx, DPRS\n", insn[0]);
- }
- }
- // register list
- else if (ARM_INSN_MATCH (SM, insn[0]))
- {
-
- uregs = 0x10;
- if (ARM_INSN_REG_MR (insn[0], 15))
- {
-
- DBPRINTF ("Unboostable insn %lx, SM\n", insn[0]);
- pc_dep = 1;
- }
- }
- // check instructions that can write result to SP andu uses PC
- if (pc_dep && (ARM_INSN_REG_RD (ainsn.insn[0]) == 13))
- {
- static int count;
- count++;
- //printk ("insn writes result to SP and uses PC: %lx/%d\n", ainsn.insn[0], count);
- free_insn_slot (&kprobe_insn_pages, NULL, p->ainsn.insn, 0);
- ret = -EFAULT;
- }
- else {
- if (uregs && pc_dep)
- {
- memcpy (insns, pc_dep_insn_execbuf, sizeof (insns));
- if (prep_pc_dep_insn_execbuf (insns, insn[0], uregs) != 0)
- {
- DBPRINTF ("failed to prepare exec buffer for insn %lx!", insn[0]);
- free_insn_slot (&kprobe_insn_pages, NULL, p->ainsn.insn, 0);
- return -EINVAL;
- }
- //insns[KPROBES_TRAMP_SS_BREAK_IDX] = BREAKPOINT_INSTRUCTION;
- insns[6] = (kprobe_opcode_t) (p->addr + 2);
- }
- else
- {
- memcpy (insns, gen_insn_execbuf, sizeof (insns));
- insns[KPROBES_TRAMP_INSN_IDX] = insn[0];
- }
- //insns[KPROBES_TRAMP_RET_BREAK_IDX] = UNDEF_INSTRUCTION;
- insns[7] = (kprobe_opcode_t) (p->addr + 1);
- DBPRINTF ("arch_prepare_kprobe: insn %lx", insn[0]);
- DBPRINTF ("arch_prepare_kprobe: to %p - %lx %lx %lx %lx %lx %lx %lx %lx %lx",
- p->ainsn.insn, insns[0], insns[1], insns[2], insns[3], insns[4],
- insns[5], insns[6], insns[7], insns[8]);
- memcpy (p->ainsn.insn, insns, sizeof(insns));
- }
- }
- else
- {
- free_insn_slot (&kprobe_insn_pages, NULL, p->ainsn.insn, 0);
- }
- }
- return ret;
+ int uregs, pc_dep, ret = 0;
+ kprobe_opcode_t insn[MAX_INSN_SIZE];
+ struct arch_specific_insn ainsn;
+
+ /* insn: must be on special executable page on i386. */
+ p->ainsn.insn = get_insn_slot (NULL, 0);
+ if (!p->ainsn.insn)
+ return -ENOMEM;
+
+ memcpy (insn, p->addr, MAX_INSN_SIZE * sizeof (kprobe_opcode_t));
+ ainsn.insn_arm = ainsn.insn = insn;
+ ret = arch_check_insn_arm (&ainsn);
+ if (!ret)
+ {
+ p->opcode = *p->addr;
+ uregs = pc_dep = 0;
+
+ // Rn, Rm ,Rd
+ if(ARM_INSN_MATCH (DPIS, insn[0]) || ARM_INSN_MATCH (LRO, insn[0]) ||
+ ARM_INSN_MATCH (SRO, insn[0]))
+ {
+ uregs = 0xb;
+ if( (ARM_INSN_REG_RN (insn[0]) == 15) || (ARM_INSN_REG_RM (insn[0]) == 15) ||
+ (ARM_INSN_MATCH (SRO, insn[0]) && (ARM_INSN_REG_RD (insn[0]) == 15)) )
+ {
+ DBPRINTF ("Unboostable insn %lx, DPIS/LRO/SRO\n", insn[0]);
+ pc_dep = 1;
+ }
+ }
+ // Rn ,Rd
+ else if(ARM_INSN_MATCH (DPI, insn[0]) || ARM_INSN_MATCH (LIO, insn[0]) ||
+ ARM_INSN_MATCH (SIO, insn[0]))
+ {
+ uregs = 0x3;
+ if ((ARM_INSN_REG_RN (insn[0]) == 15) || (ARM_INSN_MATCH (SIO, insn[0]) &&
+ (ARM_INSN_REG_RD (insn[0]) == 15)))
+ {
+ pc_dep = 1;
+ DBPRINTF ("Unboostable insn %lx/%p, DPI/LIO/SIO\n", insn[0], p);
+ }
+ }
+ // Rn, Rm, Rs
+ else if(ARM_INSN_MATCH (DPRS, insn[0]))
+ {
+ uregs = 0xd;
+ if ((ARM_INSN_REG_RN (insn[0]) == 15) || (ARM_INSN_REG_RM (insn[0]) == 15) ||
+ (ARM_INSN_REG_RS (insn[0]) == 15))
+ {
+ pc_dep = 1;
+ DBPRINTF ("Unboostable insn %lx, DPRS\n", insn[0]);
+ }
+ }
+ // register list
+ else if(ARM_INSN_MATCH (SM, insn[0]))
+ {
+ uregs = 0x10;
+ if (ARM_INSN_REG_MR (insn[0], 15))
+ {
+ DBPRINTF ("Unboostable insn %lx, SM\n", insn[0]);
+ pc_dep = 1;
+ }
+ }
+ // check instructions that can write result to SP andu uses PC
+ if (pc_dep && (ARM_INSN_REG_RD (ainsn.insn[0]) == 13))
+ {
+ free_insn_slot(&kprobe_insn_pages, NULL, p->ainsn.insn);
+ ret = -EFAULT;
+ }
+ else
+ {
+ if (uregs && pc_dep)
+ {
+ memcpy (insns, pc_dep_insn_execbuf, sizeof (insns));
+ if (prep_pc_dep_insn_execbuf (insns, insn[0], uregs) != 0)
+ {
+ DBPRINTF ("failed to prepare exec buffer for insn %lx!", insn[0]);
+ free_insn_slot(&kprobe_insn_pages, NULL, p->ainsn.insn);
+ return -EINVAL;
+ }
+ insns[6] = (kprobe_opcode_t) (p->addr + 2);
+ }
+ else
+ {
+ memcpy (insns, gen_insn_execbuf, sizeof (insns));
+ insns[KPROBES_TRAMP_INSN_IDX] = insn[0];
+ }
+ insns[7] = (kprobe_opcode_t) (p->addr + 1);
+ DBPRINTF ("arch_prepare_kprobe: insn %lx", insn[0]);
+ DBPRINTF ("arch_prepare_kprobe: to %p - %lx %lx %lx %lx %lx %lx %lx %lx %lx",
+ p->ainsn.insn, insns[0], insns[1], insns[2], insns[3], insns[4],
+ insns[5], insns[6], insns[7], insns[8]);
+ memcpy (p->ainsn.insn, insns, sizeof(insns));
+ flush_icache_range((long unsigned)p->ainsn.insn, (long unsigned)(p->ainsn.insn) + sizeof(insns));
+#ifdef BOARD_tegra
+ flush_cache_all();
+#endif
+ }
+ }
+ else
+ {
+ free_insn_slot(&kprobe_insn_pages, NULL, p->ainsn.insn);
+ printk("arch_prepare_kprobe: instruction 0x%lx not instrumentation, addr=0x%p\n", insn[0], p->addr);
+ }
+
+ return ret;
}
static unsigned int arch_construct_brunch (unsigned int base, unsigned int addr, int link)
return (unsigned int) insn;
}
+
+int arch_copy_trampoline_arm_uprobe (struct kprobe *p, struct task_struct *task, int atomic);
+int arch_copy_trampoline_thumb_uprobe (struct kprobe *p, struct task_struct *task, int atomic);
+
int arch_prepare_uprobe (struct kprobe *p, struct task_struct *task, int atomic)
{
int ret = 0;
-
-// printk ( ">>>>>>>>>>>>>>>arch_prepare_uprobe task:%s %x\n", task->comm, p->addr );
+ kprobe_opcode_t insn[MAX_INSN_SIZE];
if ((unsigned long) p->addr & 0x01)
{
- DBPRINTF ("Attempt to register kprobe at an unaligned address");
- ret = -EINVAL;
+ printk("Error in %s at %d: attempt to register kprobe at an unaligned address\n", __FILE__, __LINE__);
+ return -EINVAL;
}
- if (!ret)
- {
- my_p[my_probe] = p;
- my_task[my_probe] = task;
- my_atomic[my_probe] = atomic;
-
- my_probe++;
-
- kprobe_opcode_t insn[MAX_INSN_SIZE];
-
- if (!read_proc_vm_atomic (task, (unsigned long) p->addr, &insn, MAX_INSN_SIZE * sizeof(kprobe_opcode_t))) panic ("failed to read memory %p!\n", p->addr);
-
- p->opcode = insn[0];
- p->ainsn.insn = get_insn_slot(task, atomic);
- if (!p->ainsn.insn)
- {
- return -ENOMEM;
- }
-
- p->ainsn.boostable = 1;
+ if (!read_proc_vm_atomic (task, (unsigned long) p->addr, &insn, MAX_INSN_SIZE * sizeof(kprobe_opcode_t)))
+ panic ("Failed to read memory task[tgid=%u, comm=%s] %p!\n", task->tgid, task->comm, p->addr);
+ p->opcode = insn[0];
+ p->ainsn.insn_arm = get_insn_slot(task, atomic);
+ if (!p->ainsn.insn_arm) {
+ printk("Error in %s at %d: kprobe slot allocation error (arm)\n", __FILE__, __LINE__);
+ return -ENOMEM;
+ }
+ ret = arch_copy_trampoline_arm_uprobe(p, task, 1);
+ if (ret) {
+ free_insn_slot(&uprobe_insn_pages, task, p->ainsn.insn_arm);
+ return -EFAULT;
+ }
+ p->ainsn.insn_thumb = get_insn_slot(task, atomic);
+ if (!p->ainsn.insn_thumb) {
+ printk("Error in %s at %d: kprobe slot allocation error (thumb)\n", __FILE__, __LINE__);
+ return -ENOMEM;
+ }
+ ret = arch_copy_trampoline_thumb_uprobe(p, task, 1);
+ if (ret) {
+ free_insn_slot(&uprobe_insn_pages, task, p->ainsn.insn_arm);
+ free_insn_slot(&uprobe_insn_pages, task, p->ainsn.insn_thumb);
+ return -EFAULT;
+ }
+ if ((p->safe_arm == -1) && (p->safe_thumb == -1)) {
+ printk("Error in %s at %d: failed arch_copy_trampoline_*_uprobe() (both) [tgid=%u, addr=%x, data=%x]\n",
+ __FILE__, __LINE__, task->tgid, p->addr, p->opcode);
+ if (!write_proc_vm_atomic (task, (unsigned long) p->addr, &p->opcode, sizeof (p->opcode)))
+ panic ("Failed to write memory %p!\n", p->addr);
+ free_insn_slot(&uprobe_insn_pages, task, p->ainsn.insn_arm);
+ free_insn_slot(&uprobe_insn_pages, task, p->ainsn.insn_thumb);
+ return -EFAULT;
}
return ret;
}
void prepare_singlestep (struct kprobe *p, struct pt_regs *regs)
{
- if(p->ss_addr)
- {
- regs->uregs[15] = (unsigned long) p->ss_addr;
+ if (p->ss_addr) {
+ regs->ARM_pc = (unsigned long)p->ss_addr;
p->ss_addr = NULL;
+ } else {
+ regs->ARM_pc = (unsigned long)p->ainsn.insn;
}
- else
- regs->uregs[15] = (unsigned long) p->ainsn.insn;
}
-void save_previous_kprobe (struct kprobe_ctlblk *kcb, struct kprobe *cur_p)
+void save_previous_kprobe(struct kprobe_ctlblk *kcb, struct kprobe *p_run)
{
- if (kcb->prev_kprobe.kp != NULL)
- {
+ if (p_run == NULL) {
+ panic("arm_save_previous_kprobe: p_run == NULL\n");
+ }
+
+ if (kcb->prev_kprobe.kp != NULL) {
DBPRINTF ("no space to save new probe[]: task = %d/%s", current->pid, current->comm);
}
- kcb->prev_kprobe.kp = kprobe_running ();
+ kcb->prev_kprobe.kp = p_run;
kcb->prev_kprobe.status = kcb->kprobe_status;
}
-void restore_previous_kprobe (struct kprobe_ctlblk *kcb)
+void restore_previous_kprobe(struct kprobe_ctlblk *kcb)
{
- __get_cpu_var (current_kprobe) = kcb->prev_kprobe.kp;
+ set_current_kprobe(kcb->prev_kprobe.kp, NULL, NULL);
kcb->kprobe_status = kcb->prev_kprobe.status;
kcb->prev_kprobe.kp = NULL;
kcb->prev_kprobe.status = 0;
}
-void set_current_kprobe (struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
+void set_current_kprobe(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
{
- __get_cpu_var (current_kprobe) = p;
+ __get_cpu_var(current_kprobe) = p;
DBPRINTF ("set_current_kprobe: p=%p addr=%p\n", p, p->addr);
}
int arch_copy_trampoline_arm_uprobe (struct kprobe *p, struct task_struct *task, int atomic)
{
- int ret = 0;
kprobe_opcode_t insns[UPROBES_TRAMP_LEN];
int uregs, pc_dep;
+ kprobe_opcode_t insn[MAX_INSN_SIZE];
+ struct arch_specific_insn ainsn;
+ p->safe_arm = -1;
if ((unsigned long) p->addr & 0x01)
{
- DBPRINTF ("Attempt to register kprobe at an unaligned address");
- ret = -EINVAL;
+ printk("Error in %s at %d: attempt to register kprobe at an unaligned address\n", __FILE__, __LINE__);
+ return -EINVAL;
}
-
- if (!ret)
+ insn[0] = p->opcode;
+ ainsn.insn_arm = insn;
+ if (!arch_check_insn_arm(&ainsn))
{
- kprobe_opcode_t insn[MAX_INSN_SIZE];
- struct arch_specific_insn ainsn;
-
-// *p->addr = p->opcode;
-// flush_icache_range ((unsigned long) p->addr, (unsigned long) p->addr + sizeof (kprobe_opcode_t));
-
-// if (!read_proc_vm_atomic (task, (unsigned long) p->addr, &insn, MAX_INSN_SIZE * sizeof(kprobe_opcode_t)))
-// panic ("failed to read memory %p!\n", p->addr);
-
- insn[0] = p->opcode;
-
- ainsn.insn = insn;
-
- ret = arch_check_insn_arm (&ainsn);
- if (!ret)
+ p->safe_arm = 0;
+ }
+ uregs = pc_dep = 0;
+ // Rn, Rm ,Rd
+ if (ARM_INSN_MATCH (DPIS, insn[0]) || ARM_INSN_MATCH (LRO, insn[0]) ||
+ ARM_INSN_MATCH (SRO, insn[0]))
+ {
+ uregs = 0xb;
+ if ((ARM_INSN_REG_RN (insn[0]) == 15) || (ARM_INSN_REG_RM (insn[0]) == 15) ||
+ (ARM_INSN_MATCH (SRO, insn[0]) && (ARM_INSN_REG_RD (insn[0]) == 15)))
{
-// p->opcode = insn[0];
-// p->ainsn.insn = get_insn_slot(task, atomic);
-
-// if (!p->ainsn.insn)
-// return -ENOMEM;
-
-// p->ainsn.boostable = 1;
-
- uregs = pc_dep = 0;
-
- // Rn, Rm ,Rd
- if (ARM_INSN_MATCH (DPIS, insn[0]) || ARM_INSN_MATCH (LRO, insn[0]) ||
- ARM_INSN_MATCH (SRO, insn[0]))
- {
- uregs = 0xb;
- if ((ARM_INSN_REG_RN (insn[0]) == 15) || (ARM_INSN_REG_RM (insn[0]) == 15) ||
- (ARM_INSN_MATCH (SRO, insn[0]) && (ARM_INSN_REG_RD (insn[0]) == 15)))
- {
- DBPRINTF ("Unboostable insn %lx, DPIS/LRO/SRO\n", insn[0]);
- pc_dep = 1;
- }
- }
- // Rn ,Rd
- else if (ARM_INSN_MATCH (DPI, insn[0]) || ARM_INSN_MATCH (LIO, insn[0]) ||
- ARM_INSN_MATCH (SIO, insn[0]))
- {
- uregs = 0x3;
- if ((ARM_INSN_REG_RN (insn[0]) == 15) || (ARM_INSN_MATCH (SIO, insn[0]) &&
- (ARM_INSN_REG_RD (insn[0]) == 15)))
- {
- pc_dep = 1;
- DBPRINTF ("Unboostable insn %lx/%p/%d, DPI/LIO/SIO\n", insn[0], p, p->ainsn.boostable);
- }
- }
- // Rn, Rm, Rs
- else if (ARM_INSN_MATCH (DPRS, insn[0]))
- {
- uregs = 0xd;
- if ((ARM_INSN_REG_RN (insn[0]) == 15) || (ARM_INSN_REG_RM (insn[0]) == 15) ||
- (ARM_INSN_REG_RS (insn[0]) == 15))
- {
- pc_dep = 1;
- DBPRINTF ("Unboostable insn %lx, DPRS\n", insn[0]);
- }
- }
- // register list
- else if (ARM_INSN_MATCH (SM, insn[0]))
- {
- uregs = 0x10;
- if (ARM_INSN_REG_MR (insn[0], 15))
- {
- DBPRINTF ("Unboostable insn %lx, SM\n", insn[0]);
- pc_dep = 1;
- }
- }
- // check instructions that can write result to SP andu uses PC
- if (pc_dep && (ARM_INSN_REG_RD (ainsn.insn[0]) == 13))
- {
- static int count;
- count++;
- //printk ("insn writes result to SP and uses PC: %lx/%d\n", ainsn.insn[0], count);
- free_insn_slot (&uprobe_insn_pages, task, p->ainsn.insn, 0);
- ret = -EFAULT;
- }
- else {
- if (uregs && pc_dep)
- {
- memcpy (insns, pc_dep_insn_execbuf, sizeof (insns));
- if (prep_pc_dep_insn_execbuf (insns, insn[0], uregs) != 0)
- {
- DBPRINTF ("failed to prepare exec buffer for insn %lx!", insn[0]);
- free_insn_slot (&uprobe_insn_pages, task, p->ainsn.insn, 0);
- return -EINVAL;
- }
- //insns[UPROBES_TRAMP_SS_BREAK_IDX] = BREAKPOINT_INSTRUCTION;
- insns[6] = (kprobe_opcode_t) (p->addr + 2);
- }
- else
- {
- memcpy (insns, gen_insn_execbuf, sizeof (insns));
- insns[UPROBES_TRAMP_INSN_IDX] = insn[0];
- }
- insns[UPROBES_TRAMP_RET_BREAK_IDX] = UNDEF_INSTRUCTION;
- insns[7] = (kprobe_opcode_t) (p->addr + 1);
- DBPRINTF ("arch_prepare_uprobe: to %p - %lx %lx %lx %lx %lx %lx %lx %lx %lx",
- p->ainsn.insn, insns[0], insns[1], insns[2], insns[3], insns[4],
- insns[5], insns[6], insns[7], insns[8]);
- }
-
- if (!write_proc_vm_atomic (task, (unsigned long) p->ainsn.insn, insns, sizeof (insns)))
- {
- panic("failed to write memory %p!\n", p->ainsn.insn);
- DBPRINTF ("failed to write insn slot to process memory: insn %p, addr %p, probe %p!", insn, p->ainsn.insn, p->addr);
- //printk ("failed to write insn slot to process memory: %p/%d insn %lx, addr %p, probe %p!\n", task, task->pid, insn, p->ainsn.insn, p->addr);
- free_insn_slot (&uprobe_insn_pages, task, p->ainsn.insn, 0);
- return -EINVAL;
- }
+ DBPRINTF ("Unboostable insn %lx, DPIS/LRO/SRO\n", insn[0]);
+ pc_dep = 1;
}
}
- return ret;
-}
+ // Rn ,Rd
+ else if (ARM_INSN_MATCH (DPI, insn[0]) || ARM_INSN_MATCH (LIO, insn[0]) ||
+ ARM_INSN_MATCH (SIO, insn[0]))
+ {
+ uregs = 0x3;
+ if ((ARM_INSN_REG_RN (insn[0]) == 15) || (ARM_INSN_MATCH (SIO, insn[0]) &&
+ (ARM_INSN_REG_RD (insn[0]) == 15)))
+ {
+ pc_dep = 1;
+ DBPRINTF ("Unboostable insn %lx/%p, DPI/LIO/SIO\n", insn[0], p);
+ }
+ }
+ // Rn, Rm, Rs
+ else if (ARM_INSN_MATCH (DPRS, insn[0]))
+ {
+ uregs = 0xd;
+ if ((ARM_INSN_REG_RN (insn[0]) == 15) || (ARM_INSN_REG_RM (insn[0]) == 15) ||
+ (ARM_INSN_REG_RS (insn[0]) == 15))
+ {
+ pc_dep = 1;
+ DBPRINTF ("Unboostable insn %lx, DPRS\n", insn[0]);
+ }
+ }
+ // register list
+ else if (ARM_INSN_MATCH (SM, insn[0]))
+ {
+ uregs = 0x10;
+ if (ARM_INSN_REG_MR (insn[0], 15))
+ {
+ DBPRINTF ("Unboostable insn %lx, SM\n", insn[0]);
+ pc_dep = 1;
+ }
+ }
+ // check instructions that can write result to SP andu uses PC
+ if (pc_dep && (ARM_INSN_REG_RD (ainsn.insn_arm[0]) == 13))
+ {
+ printk("Error in %s at %d: instruction check failed (arm)\n", __FILE__, __LINE__);
+ p->safe_arm = -1;
+ // TODO: move free to later phase
+ //free_insn_slot (&uprobe_insn_pages, task, p->ainsn.insn_arm, 0);
+ //ret = -EFAULT;
+ }
+ if (unlikely(uregs && pc_dep))
+ {
+ memcpy (insns, pc_dep_insn_execbuf, sizeof (insns));
+ if (prep_pc_dep_insn_execbuf (insns, insn[0], uregs) != 0)
+ {
+ printk("Error in %s at %d: failed to prepare exec buffer for insn %lx!",
+ __FILE__, __LINE__, insn[0]);
+ p->safe_arm = -1;
+ // TODO: move free to later phase
+ //free_insn_slot (&uprobe_insn_pages, task, p->ainsn.insn_arm, 0);
+ //return -EINVAL;
+ }
+ //insns[UPROBES_TRAMP_SS_BREAK_IDX] = BREAKPOINT_INSTRUCTION;
+ insns[6] = (kprobe_opcode_t) (p->addr + 2);
+ }
+ else
+ {
+ memcpy (insns, gen_insn_execbuf, sizeof (insns));
+ insns[UPROBES_TRAMP_INSN_IDX] = insn[0];
+ }
+ insns[UPROBES_TRAMP_RET_BREAK_IDX] = BREAKPOINT_INSTRUCTION;
+ insns[7] = (kprobe_opcode_t) (p->addr + 1);
+ // B
+ if(ARM_INSN_MATCH (B, ainsn.insn_arm[0]))
+ {
+ memcpy (insns, pc_dep_insn_execbuf, sizeof (insns));
+ insns[UPROBES_TRAMP_RET_BREAK_IDX] = BREAKPOINT_INSTRUCTION;
+ insns[6] = (kprobe_opcode_t) (p->addr + 2);
+ insns[7] = get_addr_b(p->opcode, p->addr);
+ }
+ DBPRINTF ("arch_prepare_uprobe: to %p - %lx %lx %lx %lx %lx %lx %lx %lx %lx",
+ p->ainsn.insn_arm, insns[0], insns[1], insns[2], insns[3], insns[4],
+ insns[5], insns[6], insns[7], insns[8]);
+ if (!write_proc_vm_atomic (task, (unsigned long) p->ainsn.insn_arm, insns, sizeof (insns)))
+ {
+ panic("failed to write memory %p!\n", p->ainsn.insn);
+ // Mr_Nobody: we have to panic, really??...
+ //free_insn_slot (&uprobe_insn_pages, task, p->ainsn.insn_arm, 0);
+ //return -EINVAL;
+ }
+ return 0;
+}
int arch_copy_trampoline_thumb_uprobe (struct kprobe *p, struct task_struct *task, int atomic)
{
- int ret = 0;
int uregs, pc_dep;
unsigned int addr;
-
+ kprobe_opcode_t insn[MAX_INSN_SIZE];
+ struct arch_specific_insn ainsn;
kprobe_opcode_t insns[UPROBES_TRAMP_LEN * 2];
+ p->safe_thumb = -1;
if ((unsigned long) p->addr & 0x01)
{
- DBPRINTF ("Attempt to register kprobe at an unaligned address");
- ret = -EINVAL;
+ printk("Error in %s at %d: attempt to register kprobe at an unaligned address\n", __FILE__, __LINE__);
+ return -EINVAL;
}
- if (!ret)
+ insn[0] = p->opcode;
+ ainsn.insn_thumb = insn;
+ if (!arch_check_insn_thumb(&ainsn))
{
- kprobe_opcode_t insn[MAX_INSN_SIZE];
- struct arch_specific_insn ainsn;
-
-// *p->addr = p->opcode;
-// flush_icache_range ((unsigned long) p->addr, (unsigned long) p->addr + sizeof (kprobe_opcode_t));
-
-// if (!read_proc_vm_atomic (task, (unsigned long) p->addr, &insn, MAX_INSN_SIZE * sizeof(kprobe_opcode_t)))
-// panic ("failed to read memory %p!\n", p->addr);
-
- insn[0] = p->opcode;
-
- ainsn.insn = insn;
-
- ret = arch_check_insn_thumb (&ainsn);
- if (!ret)
+ p->safe_thumb = 0;
+ }
+ uregs = 0;
+ pc_dep = 0;
+ if (THUMB_INSN_MATCH (APC, insn[0]) || THUMB_INSN_MATCH (LRO3, insn[0]))
+ {
+ uregs = 0x0700; // 8-10
+ pc_dep = 1;
+ }
+ else if (THUMB_INSN_MATCH (MOV3, insn[0]) && (((((unsigned char) insn[0]) & 0xff) >> 3) == 15))
+ {
+ // MOV Rd, PC
+ uregs = 0x07;
+ pc_dep = 1;
+ }
+ else if THUMB2_INSN_MATCH (ADR, insn[0])
+ {
+ uregs = 0x0f00; // Rd 8-11
+ pc_dep = 1;
+ }
+ else if (((THUMB2_INSN_MATCH (LDRW, insn[0]) || THUMB2_INSN_MATCH (LDRW1, insn[0]) ||
+ THUMB2_INSN_MATCH (LDRBW, insn[0]) || THUMB2_INSN_MATCH (LDRBW1, insn[0]) ||
+ THUMB2_INSN_MATCH (LDRHW, insn[0]) || THUMB2_INSN_MATCH (LDRHW1, insn[0]) ||
+ THUMB2_INSN_MATCH (LDRWL, insn[0])) && THUMB2_INSN_REG_RN(insn[0]) == 15) ||
+ THUMB2_INSN_MATCH (LDREX, insn[0]) ||
+ ((THUMB2_INSN_MATCH (STRW, insn[0]) || THUMB2_INSN_MATCH (STRBW, insn[0]) ||
+ THUMB2_INSN_MATCH (STRHW, insn[0]) || THUMB2_INSN_MATCH (STRHW1, insn[0])) &&
+ (THUMB2_INSN_REG_RN(insn[0]) == 15 || THUMB2_INSN_REG_RT(insn[0]) == 15)) ||
+ ((THUMB2_INSN_MATCH (STRT, insn[0]) || THUMB2_INSN_MATCH (STRHT, insn[0])) &&
+ (THUMB2_INSN_REG_RN(insn[0]) == 15 || THUMB2_INSN_REG_RT(insn[0]) == 15)) )
+ {
+ uregs = 0xf000; // Rt 12-15
+ pc_dep = 1;
+ }
+ else if ((THUMB2_INSN_MATCH (LDRD, insn[0]) || THUMB2_INSN_MATCH (LDRD1, insn[0])) && (THUMB2_INSN_REG_RN(insn[0]) == 15))
+ {
+ uregs = 0xff00; // Rt 12-15, Rt2 8-11
+ pc_dep = 1;
+ }
+ else if (THUMB2_INSN_MATCH (MUL, insn[0]) && THUMB2_INSN_REG_RM(insn[0]) == 15)
+ {
+ uregs = 0xf;
+ pc_dep = 1;
+ }
+ else if (THUMB2_INSN_MATCH (DP, insn[0]) && (THUMB2_INSN_REG_RN(insn[0]) == 15 || THUMB2_INSN_REG_RM(insn[0]) == 15))
+ {
+ uregs = 0xf000; // Rd 12-15
+ pc_dep = 1;
+ }
+ else if (THUMB2_INSN_MATCH(STRD, insn[0]) && ((THUMB2_INSN_REG_RN(insn[0]) == 15) || (THUMB2_INSN_REG_RT(insn[0]) == 15) || THUMB2_INSN_REG_RT2(insn[0]) == 15))
+ {
+ uregs = 0xff00; // Rt 12-15, Rt2 8-11
+ pc_dep = 1;
+ }
+ else if (THUMB2_INSN_MATCH (RSBW, insn[0]) && THUMB2_INSN_REG_RN(insn[0]) == 15)
+ {
+ uregs = 0x0f00; // Rd 8-11
+ pc_dep = 1;
+ }
+ else if (THUMB2_INSN_MATCH (RORW, insn[0]) && (THUMB2_INSN_REG_RN(insn[0]) == 15 || THUMB2_INSN_REG_RM(insn[0]) == 15))
+ {
+ uregs = 0x0f00;
+ pc_dep = 1;
+ }
+ else if ((THUMB2_INSN_MATCH (ROR, insn[0]) || THUMB2_INSN_MATCH(LSLW2, insn[0]) || THUMB2_INSN_MATCH(LSRW2, insn[0])) && THUMB2_INSN_REG_RM(insn[0]) == 15)
+ {
+ uregs = 0x0f00; // Rd 8-11
+ pc_dep = 1;
+ }
+ else if ((THUMB2_INSN_MATCH (LSLW1, insn[0]) || THUMB2_INSN_MATCH (LSRW1, insn[0])) && (THUMB2_INSN_REG_RN(insn[0]) == 15 || THUMB2_INSN_REG_RM(insn[0]) == 15))
+ {
+ uregs = 0x0f00; // Rd 8-11
+ pc_dep = 1;
+ }
+ else if ((THUMB2_INSN_MATCH (TEQ1, insn[0]) || THUMB2_INSN_MATCH (TST1, insn[0])) && THUMB2_INSN_REG_RN(insn[0]) == 15)
+ {
+ uregs = 0xf0000; //Rn 0-3 (16-19)
+ pc_dep = 1;
+ }
+ else if ((THUMB2_INSN_MATCH (TEQ2, insn[0]) || THUMB2_INSN_MATCH (TST2, insn[0])) &&
+ (THUMB2_INSN_REG_RN(insn[0]) == 15 || THUMB2_INSN_REG_RM(insn[0]) == 15))
+ {
+ uregs = 0xf0000; //Rn 0-3 (16-19)
+ pc_dep = 1;
+ }
+ if (unlikely(uregs && pc_dep))
+ {
+ memcpy (insns, pc_dep_insn_execbuf_thumb, 18 * 2);
+ if (prep_pc_dep_insn_execbuf_thumb (insns, insn[0], uregs) != 0)
{
-// p->opcode = insn[0];
-// p->ainsn.insn = get_insn_slot(task, atomic);
-
-// if (!p->ainsn.insn)
-// return -ENOMEM;
-
-// p->ainsn.boostable = 1;
-
- uregs = 0;
- pc_dep = 0;
-
- if (THUMB_INSN_MATCH (APC, insn[0]) || THUMB_INSN_MATCH (LRO3, insn[0]))
- {
- uregs = 0x0700; // 8-10
- pc_dep = 1;
- }else if (THUMB_INSN_MATCH (MOV3, insn[0]) && (((((unsigned char) insn[0]) & 0xff) >> 3) == 15))
- {
- // MOV Rd, PC
- uregs = 0x07;
- pc_dep = 1;
- }else if THUMB2_INSN_MATCH (ADR, insn[0])
- {
- uregs = 0x0f00; // Rd 8-11
- pc_dep = 1;
- }else if(( THUMB2_INSN_MATCH (LDRW, insn[0]) || THUMB2_INSN_MATCH (LDRW1, insn[0]) ||
- THUMB2_INSN_MATCH (LDRBW, insn[0]) || THUMB2_INSN_MATCH (LDRBW1, insn[0]) ||
- THUMB2_INSN_MATCH (LDRHW, insn[0]) || THUMB2_INSN_MATCH (LDRHW1, insn[0]) ||
- THUMB2_INSN_MATCH (STRW, insn[0]) || THUMB2_INSN_MATCH (STRW1, insn[0]) ||
- THUMB2_INSN_MATCH (LDRWL, insn[0])) && (THUMB2_INSN_REG_RN(insn[0]) == 15))
- {
- uregs = 0xf000; // Rt 12-15
- pc_dep = 1;
- }else if ((THUMB2_INSN_MATCH (LDRD, insn[0]) || THUMB2_INSN_MATCH (LDRD1, insn[0])) && (THUMB2_INSN_REG_RN(insn[0])))
- {
- uregs = 0xff00; // Rt 12-15, Rt2 8-11
- pc_dep = 1;
- }else if (THUMB2_INSN_MATCH (MUL, insn[0]) && THUMB2_INSN_REG_RM(insn[0]))
- {
- uregs = 0xf;
- pc_dep = 1;
- }else if (THUMB2_INSN_MATCH (DP, insn[0]) && (THUMB2_INSN_REG_RM(insn[0]) || THUMB2_INSN_REG_RN(insn[0])))
- {
- pc_dep = 1;
- uregs = 0xf;
- }
-
-
- if (uregs && pc_dep)
- {
- memcpy (insns, pc_dep_insn_execbuf_thumb, 18 * 2);
- if (prep_pc_dep_insn_execbuf_thumb (insns, insn[0], uregs) != 0)
- {
- DBPRINTF ("failed to prepare exec buffer for insn %lx!", insn[0]);
- free_insn_slot (&uprobe_insn_pages, task, p->ainsn.insn, 0);
- return -EINVAL;
- }
- addr = ((unsigned int)p->addr) + 4;
-
- *((unsigned short*)insns + 13) = 0xffff;
- *((unsigned short*)insns + 14) = addr & 0x0000ffff;
- *((unsigned short*)insns + 15) = addr >> 16;
-
- if (!isThumb2(insn[0]))
- {
- addr = ((unsigned int)p->addr) + 2;
-
- *((unsigned short*)insns + 16) = addr & 0x0000ffff;
- *((unsigned short*)insns + 17) = addr >> 16;
- }else{
- addr = ((unsigned int)p->addr) + 4;
-
- *((unsigned short*)insns + 16) = addr & 0x0000ffff;
- *((unsigned short*)insns + 17) = addr >> 16;
- }
- }else{
- memcpy (insns, gen_insn_execbuf_thumb, 18 * 2);
-
- *((unsigned short*)insns + 13) = 0xffff;
-
- if (!isThumb2(insn[0]))
- {
- addr = ((unsigned int)p->addr) + 2;
-
- *((unsigned short*)insns + 2) = insn[0];
- *((unsigned short*)insns + 16) = addr & 0x0000ffff;
- *((unsigned short*)insns + 17) = addr >> 16;
- }else{
- addr = ((unsigned int)p->addr) + 4;
- insns[1] = insn[0];
- *((unsigned short*)insns + 16) = addr & 0x0000ffff;
- *((unsigned short*)insns + 17) = addr >> 16;
- }
- }
+ printk("Error in %s at %d: failed to prepare exec buffer for insn %lx!",
+ __FILE__, __LINE__, insn[0]);
+ p->safe_thumb = -1;
+ //free_insn_slot (&uprobe_insn_pages, task, p->ainsn.insn_thumb, 0);
+ //return -EINVAL;
}
-
- if (!write_proc_vm_atomic (task, (unsigned long) p->ainsn.insn, insns, 18 * 2))
+ addr = ((unsigned int)p->addr) + 4;
+ *((unsigned short*)insns + 13) = 0xdeff;
+ *((unsigned short*)insns + 14) = addr & 0x0000ffff;
+ *((unsigned short*)insns + 15) = addr >> 16;
+ if (!isThumb2(insn[0]))
{
- panic("failed to write memory %p!\n", p->ainsn.insn);
- DBPRINTF ("failed to write insn slot to process memory: insn %p, addr %p, probe %p!", insn, p->ainsn.insn, p->addr);
- //printk ("failed to write insn slot to process memory: %p/%d insn %lx, addr %p, probe %p!\n", task, task->pid, insn, p->ainsn.insn, p->addr);
- free_insn_slot (&uprobe_insn_pages, task, p->ainsn.insn, 0);
- return -EINVAL;
+ addr = ((unsigned int)p->addr) + 2;
+ *((unsigned short*)insns + 16) = (addr & 0x0000ffff) | 0x1;
+ *((unsigned short*)insns + 17) = addr >> 16;
+ }
+ else {
+ addr = ((unsigned int)p->addr) + 4;
+ *((unsigned short*)insns + 16) = (addr & 0x0000ffff) | 0x1;
+ *((unsigned short*)insns + 17) = addr >> 16;
}
}
-
- return ret;
+ else {
+ memcpy (insns, gen_insn_execbuf_thumb, 18 * 2);
+ *((unsigned short*)insns + 13) = 0xdeff;
+ if (!isThumb2(insn[0]))
+ {
+ addr = ((unsigned int)p->addr) + 2;
+ *((unsigned short*)insns + 2) = insn[0];
+ *((unsigned short*)insns + 16) = (addr & 0x0000ffff) | 0x1;
+ *((unsigned short*)insns + 17) = addr >> 16;
+ }
+ else {
+ addr = ((unsigned int)p->addr) + 4;
+ insns[1] = insn[0];
+ *((unsigned short*)insns + 16) = (addr & 0x0000ffff) | 0x1;
+ *((unsigned short*)insns + 17) = addr >> 16;
+ }
+ }
+ if (!write_proc_vm_atomic (task, (unsigned long) p->ainsn.insn_thumb, insns, 18 * 2))
+ {
+ panic("failed to write memory %p!\n", p->ainsn.insn_thumb);
+ // Mr_Nobody: we have to panic, really??...
+ //free_insn_slot (&uprobe_insn_pages, task, p->ainsn.insn_thumb, 0);
+ //return -EINVAL;
+ }
+ return 0;
}
-
-int kprobe_handler (struct pt_regs *regs)
+static int check_validity_insn(struct kprobe *p, struct pt_regs *regs, struct task_struct *task)
{
- struct kprobe *p = 0;
- int ret = 0, pid = 0, retprobe = 0, reenter = 0;
- kprobe_opcode_t *addr = NULL, *ssaddr = 0;
- struct kprobe_ctlblk *kcb;
- int my_pr = 0;
- int i = 0;
-
- preempt_disable ();
+ struct kprobe *kp;
- if (user_mode(regs))
- {
- if (!thumb_mode ( regs )) addr = (kprobe_opcode_t *) (regs->uregs[15] - 4);
- else addr = (kprobe_opcode_t *) (regs->uregs[15] - 2);
-
- //printk ("%s %x\n", __FUNCTION__, addr );
-
- for(i = 0; i < my_probe; i++)
- {
- if (my_p[i]->addr == addr)
- {
- my_handler_lock = 0;
- my_pr = i;
- break;
- }else{
- my_handler_lock = 1;
+ if (unlikely(thumb_mode(regs))) {
+ if (p->safe_thumb != -1) {
+ p->ainsn.insn = p->ainsn.insn_thumb;
+ list_for_each_entry_rcu(kp, &p->list, list) {
+ kp->ainsn.insn = p->ainsn.insn_thumb;
}
+ } else {
+ printk("Error in %s at %d: we are in thumb mode (!) and check instruction was fail \
+ (%0lX instruction at %p address)!\n", __FILE__, __LINE__, p->opcode, p->addr);
+ // Test case when we do our actions on already running application
+ arch_disarm_uprobe(p, task);
+ return -1;
}
-
- if (0 == my_handler_lock)
- {
- my_handler_lock = 1;
-
- if (thumb_mode(regs) /*&& addr != 0xad327238 */)
- {
- if ((ret = arch_copy_trampoline_thumb_uprobe(my_p[my_pr], my_task[my_pr], my_atomic[my_pr])) != 0)
- {
- printk(" >>>>> arch_copy_trampoline_thumb_uprobe error\n");
- preempt_enable_no_resched ();
- return ret;
- }
- }else{
- if ((ret = arch_copy_trampoline_arm_uprobe(my_p[my_pr], my_task[my_pr], my_atomic[my_pr])) != 0)
- {
- printk(" >>>>> arch_copy_trampoline_arm_uprobe error\n");
- preempt_enable_no_resched ();
- return ret;
- }
+ } else {
+ if (p->safe_arm != -1) {
+ p->ainsn.insn = p->ainsn.insn_arm;
+ list_for_each_entry_rcu(kp, &p->list, list) {
+ kp->ainsn.insn = p->ainsn.insn_arm;
}
+ } else {
+ printk("Error in %s at %d: we are in arm mode (!) and check instruction was fail \
+ (%0lX instruction at %p address)!\n", __FILE__, __LINE__, p->opcode, p->addr);
+ // Test case when we do our actions on already running application
+ arch_disarm_uprobe(p, task);
+ return -1;
}
}
- /* We're in an interrupt, but this is clear and BUG()-safe. */
+ return 0;
+}
- if (!thumb_mode ( regs )) regs->uregs[15] -= 4;
- else regs->uregs[15] -= 2;
+static int kprobe_trap_handler(struct pt_regs *regs, unsigned int instr)
+{
+ int ret;
+ unsigned long flags;
+ local_irq_save(flags);
+ ret = kprobe_handler(regs);
+ local_irq_restore(flags);
+ return ret;
+}
- addr = (kprobe_opcode_t *) regs->uregs[15];
+int kprobe_handler(struct pt_regs *regs)
+{
+ int err_out = 0;
+ char *msg_out = NULL;
+ unsigned long user_m = user_mode(regs);
+ pid_t tgid = (user_m) ? current->tgid : 0;
+ kprobe_opcode_t *addr = (kprobe_opcode_t *) (regs->ARM_pc);
+
+ struct kprobe *p = NULL, *p_run = NULL;
+ int ret = 0, retprobe = 0, reenter = 0;
+ kprobe_opcode_t *ssaddr = 0;
+ struct kprobe_ctlblk *kcb;
-// DBPRINTF ("KPROBE: regs->uregs[15] = 0x%lx addr = 0x%p\n", regs->uregs[15], addr);
- //DBPRINTF("regs->uregs[14] = 0x%lx\n", regs->uregs[14]);
+#ifdef SUPRESS_BUG_MESSAGES
+ int swap_oops_in_progress;
+ // oops_in_progress used to avoid BUG() messages that slow down kprobe_handler() execution
+ swap_oops_in_progress = oops_in_progress;
+ oops_in_progress = 1;
+#endif
+#ifdef OVERHEAD_DEBUG
+ struct timeval swap_tv1;
+ struct timeval swap_tv2;
+#define USEC_IN_SEC_NUM 1000000
+ do_gettimeofday(&swap_tv1);
+#endif
+ preempt_disable();
+
+// printk("### kprobe_handler: task[tgid=%u (%s)] addr=%p\n", tgid, current->comm, addr);
+ p = get_kprobe(addr, tgid);
+
+ if (user_m && p && (check_validity_insn(p, regs, current) != 0)) {
+ goto no_kprobe_live;
+ }
+ /* We're in an interrupt, but this is clear and BUG()-safe. */
kcb = get_kprobe_ctlblk ();
- if (user_mode (regs))
- {
- //DBPRINTF("exception[%lu] from user mode %s/%u addr %p (%lx).", nCount, current->comm, current->pid, addr, regs->uregs[14]);
- pid = current->tgid;
- }
-
/* Check we're not actually recursing */
- if (kprobe_running ())
+ // TODO: event is not saving in trace
+ p_run = kprobe_running();
+ if (p_run)
{
- DBPRINTF ("lock???");
- p = get_kprobe (addr, pid, current);
+ DBPRINTF("lock???");
if (p)
{
- if(!pid && (addr == (kprobe_opcode_t *)kretprobe_trampoline)){
- save_previous_kprobe (kcb, p);
+ if (!tgid && (addr == (kprobe_opcode_t *)kretprobe_trampoline)) {
+ save_previous_kprobe(kcb, p_run);
kcb->kprobe_status = KPROBE_REENTER;
reenter = 1;
- }
- else {
+ } else {
/* We have reentered the kprobe_handler(), since
* another probe was hit while within the handler.
* We here save the original kprobes variables and
* just single step on the instruction of the new probe
* without calling any user handlers.
*/
- if(!p->ainsn.boostable){
- save_previous_kprobe (kcb, p);
- set_current_kprobe (p, regs, kcb);
- }
kprobes_inc_nmissed_count (p);
prepare_singlestep (p, regs);
- if(!p->ainsn.boostable)
- kcb->kprobe_status = KPROBE_REENTER;
- preempt_enable_no_resched ();
- return 1;
+
+ err_out = 0;
+ goto out;
}
- }
- else
- {
- if(pid) { //we can reenter probe upon uretprobe exception
+ } else {
+ if(tgid) { //we can reenter probe upon uretprobe exception
DBPRINTF ("check for UNDEF_INSTRUCTION %p\n", addr);
// UNDEF_INSTRUCTION from user space
- if (!thumb_mode ( regs ))
- p = get_kprobe_by_insn_slot (addr-UPROBES_TRAMP_RET_BREAK_IDX, pid, current);
- else
- p = get_kprobe_by_insn_slot ((unsigned long)addr - 0x1a, pid, current);
-
+ p = get_kprobe_by_insn_slot(addr, tgid, regs);
if (p) {
- save_previous_kprobe (kcb, p);
+ save_previous_kprobe(kcb, p_run);
kcb->kprobe_status = KPROBE_REENTER;
reenter = 1;
retprobe = 1;
}
}
if(!p) {
- p = __get_cpu_var (current_kprobe);
+ p = p_run;
DBPRINTF ("kprobe_running !!! p = 0x%p p->break_handler = 0x%p", p, p->break_handler);
/*if (p->break_handler && p->break_handler(p, regs)) {
DBPRINTF("kprobe_running !!! goto ss");
goto ss_probe;
- } */
+ } */
DBPRINTF ("unknown uprobe at %p cur at %p/%p\n", addr, p->addr, p->ainsn.insn);
- if(pid)
+ if (tgid)
ssaddr = p->ainsn.insn + UPROBES_TRAMP_SS_BREAK_IDX;
else
ssaddr = p->ainsn.insn + KPROBES_TRAMP_SS_BREAK_IDX;
- if (addr == ssaddr)
- {
- regs->uregs[15] = (unsigned long) (p->addr + 1);
- DBPRINTF ("finish step at %p cur at %p/%p, redirect to %lx\n", addr, p->addr, p->ainsn.insn, regs->uregs[15]);
+ if (addr == ssaddr) {
+ regs->ARM_pc = (unsigned long) (p->addr + 1);
+ DBPRINTF ("finish step at %p cur at %p/%p, redirect to %lx\n", addr, p->addr, p->ainsn.insn, regs->ARM_pc);
if (kcb->kprobe_status == KPROBE_REENTER) {
- restore_previous_kprobe (kcb);
- }
- else {
- reset_current_kprobe ();
+ restore_previous_kprobe(kcb);
+ } else {
+ reset_current_kprobe();
}
}
DBPRINTF ("kprobe_running !!! goto no");
}
}
}
- //if(einsn != UNDEF_INSTRUCTION) {
-// DBPRINTF ("get_kprobe %p-%d", addr, pid);
- if (!p)
- {
- p = get_kprobe (addr, pid, current);
- }
- if (!p)
- {
- if(pid) {
+ if (!p) {
+ if (tgid) {
DBPRINTF ("search UNDEF_INSTRUCTION %p\n", addr);
// UNDEF_INSTRUCTION from user space
- if (!thumb_mode ( regs ))
- p = get_kprobe_by_insn_slot (addr-UPROBES_TRAMP_RET_BREAK_IDX, pid, current);
- else
- p = get_kprobe_by_insn_slot ((unsigned long)addr - 0x1a, pid, current);
-
+ p = get_kprobe_by_insn_slot(addr, tgid, regs);
if (!p) {
/* Not one of ours: let kernel handle it */
DBPRINTF ("no_kprobe");
}
retprobe = 1;
DBPRINTF ("uretprobe %p\n", addr);
- }
- else {
+ } else {
/* Not one of ours: let kernel handle it */
DBPRINTF ("no_kprobe");
goto no_kprobe;
}
}
-
// restore opcode for thumb app
- if (user_mode( regs ) && thumb_mode( regs ))
- {
- if (!isThumb2(p->opcode))
- {
- *((unsigned short*)p->addr + 1) = p->opcode >> 16;
- }else{
- *((unsigned int*)p->addr) = p->opcode;
+ if (user_mode( regs ) && thumb_mode( regs )) {
+ if (!isThumb2(p->opcode)) {
+ unsigned long tmp = p->opcode >> 16;
+ write_proc_vm_atomic(current, (unsigned long)((unsigned short*)p->addr + 1), &tmp, 2);
+
+ // "2*sizeof(kprobe_opcode_t)" - strange. Should be "sizeof(kprobe_opcode_t)", need to test
+ flush_icache_range((unsigned int) p->addr, ((unsigned int)p->addr) + (2 * sizeof(kprobe_opcode_t)));
}
- flush_icache_range ((unsigned int) p->addr, (unsigned int) (((unsigned int) p->addr) + (sizeof (kprobe_opcode_t) * 2)));
}
-
- set_current_kprobe (p, regs, kcb);
-
+ set_current_kprobe(p, NULL, NULL);
if(!reenter)
kcb->kprobe_status = KPROBE_HIT_ACTIVE;
-
- if (retprobe) //(einsn == UNDEF_INSTRUCTION)
+ if (retprobe) { //(einsn == UNDEF_INSTRUCTION)
ret = trampoline_probe_handler (p, regs);
- else if (p->pre_handler)
- {
+ } else if (p->pre_handler) {
ret = p->pre_handler (p, regs);
- if(!p->ainsn.boostable)
- kcb->kprobe_status = KPROBE_HIT_SS;
- else if(p->pre_handler != trampoline_probe_handler)
- reset_current_kprobe ();
+ if(p->pre_handler != trampoline_probe_handler) {
+ reset_current_kprobe();
+ }
}
- if (ret)
- {
- DBPRINTF ("p->pre_handler 1");
+
+ if (ret) {
/* handler has already set things up, so skip ss setup */
- return 1;
+ err_out = 0;
+ goto out;
}
- DBPRINTF ("p->pre_handler 0");
no_kprobe:
- preempt_enable_no_resched ();
- return ret;
-}
-
-
-void patch_suspended_task_ret_addr(struct task_struct *p, struct kretprobe *rp)
-{
- struct kretprobe_instance *ri = NULL;
- struct hlist_node *node, *tmp;
- struct hlist_head *head;
- unsigned long flags;
- int found = 0;
-
- spin_lock_irqsave (&kretprobe_lock, flags);
- head = kretprobe_inst_table_head (p);
- hlist_for_each_entry_safe (ri, node, tmp, head, hlist){
- if ((ri->rp == rp) && (p == ri->task)){
- found = 1;
- break;
- }
- }
- spin_unlock_irqrestore (&kretprobe_lock, flags);
+ msg_out = "no_kprobe\n";
+ err_out = 1; // return with death
+ goto out;
-#ifndef task_thread_info
-#define task_thread_info(task) (task)->thread_info
-#endif // task_thread_info
+no_kprobe_live:
+ msg_out = "no_kprobe live\n";
+ err_out = 0; // ok - life is life
+ goto out;
- if (found){
- // update PC
- if(thread_saved_pc(p) != (unsigned long)&kretprobe_trampoline){
- ri->ret_addr = (kprobe_opcode_t *)thread_saved_pc(p);
- task_thread_info(p)->cpu_context.pc = (unsigned long) &kretprobe_trampoline;
- }
- return;
+out:
+ preempt_enable_no_resched();
+#ifdef OVERHEAD_DEBUG
+ do_gettimeofday(&swap_tv2);
+ swap_sum_hit++;
+ swap_sum_time += ((swap_tv2.tv_sec - swap_tv1.tv_sec) * USEC_IN_SEC_NUM +
+ (swap_tv2.tv_usec - swap_tv1.tv_usec));
+#endif
+#ifdef SUPRESS_BUG_MESSAGES
+ oops_in_progress = swap_oops_in_progress;
+#endif
+
+ if(msg_out) {
+ printk(msg_out);
}
- if ((ri = get_free_rp_inst(rp)) != NULL)
- {
- ri->rp = rp;
- ri->rp2 = NULL;
- ri->task = p;
- ri->ret_addr = (kprobe_opcode_t *)thread_saved_pc(p);
- task_thread_info(p)->cpu_context.pc = (unsigned long) &kretprobe_trampoline;
- add_rp_inst (ri);
- // printk("change2 saved pc %p->%p for %d/%d/%p\n", ri->ret_addr, &kretprobe_trampoline, p->tgid, p->pid, p);
- }
- else{
- printk("no ri for %d\n", p->pid);
- BUG();
- }
+ return err_out;
}
int setjmp_pre_handler (struct kprobe *p, struct pt_regs *regs)
entry_point_t entry;
# ifdef REENTER
- p = __get_cpu_var (current_kprobe);
+// p = kprobe_running(regs);
# endif
DBPRINTF ("pjp = 0x%p jp->entry = 0x%p", jp, jp->entry);
//call handler for all kernel probes and user space ones which belong to current tgid
if (!p->tgid || (p->tgid == current->tgid))
- {
- if(!p->tgid && ((unsigned int)p->addr == sched_addr) && sched_rp){
- struct task_struct *p, *g;
- rcu_read_lock();
- //swapper task
- if(current != &init_task)
- patch_suspended_task_ret_addr(&init_task, sched_rp);
- // other tasks
- do_each_thread(g, p){
- if(p == current)
- continue;
- patch_suspended_task_ret_addr(p, sched_rp);
- } while_each_thread(g, p);
- rcu_read_unlock();
+ {
+ if(!p->tgid && ((unsigned int)p->addr == sched_addr) && sched_rp) {
+ patch_suspended_all_task_ret_addr(sched_rp);
}
if (pre_entry)
p->ss_addr = (void *)pre_entry (jp->priv_arg, regs);
}
else {
if (p->tgid)
- arch_uprobe_return ();
+ dbi_arch_uprobe_return ();
else
- jprobe_return ();
+ dbi_jprobe_return ();
}
}
else if (p->tgid)
- arch_uprobe_return ();
+ dbi_arch_uprobe_return ();
prepare_singlestep (p, regs);
return 1;
}
-void jprobe_return (void)
+void dbi_jprobe_return (void)
{
- preempt_enable_no_resched();
}
-void arch_uprobe_return (void)
+void dbi_arch_uprobe_return (void)
{
- preempt_enable_no_resched();
}
int longjmp_break_handler (struct kprobe *p, struct pt_regs *regs)
flush_icache_range ((unsigned int) p->addr, (unsigned int) (((unsigned int) p->addr) + (sizeof (kprobe_opcode_t) * 2)));
}
- reset_current_kprobe ();
+ reset_current_kprobe();
#endif //REENTER
int trampoline_probe_handler (struct kprobe *p, struct pt_regs *regs)
{
struct kretprobe_instance *ri = NULL;
- struct hlist_head *head, empty_rp;
+ struct hlist_head *head;
struct hlist_node *node, *tmp;
unsigned long flags, orig_ret_address = 0;
unsigned long trampoline_address = (unsigned long) &kretprobe_trampoline;
trampoline_address = (unsigned long)(p->ainsn.insn) + 0x1b;
}
- INIT_HLIST_HEAD (&empty_rp);
spin_lock_irqsave (&kretprobe_lock, flags);
- head = kretprobe_inst_table_head (current);
+
+ /*
+ * We are using different hash keys (current and mm) for finding kernel
+ * space and user space probes. Kernel space probes can change mm field in
+ * task_struct. User space probes can be shared between threads of one
+ * process so they have different current but same mm.
+ */
+ if (p && p->tgid) {
+ head = kretprobe_inst_table_head(current->mm);
+ } else {
+ head = kretprobe_inst_table_head(current);
+ }
/*
* It is possible to have multiple instances associated with a given
* task either because an multiple functions in the call path
- * have a return probe installed on them, and/or more then one
+ * have a return probe installed on them, and/or more then one
* return probe was registered for a target function.
*
* We can handle this because:
}
orig_ret_address = (unsigned long) ri->ret_addr;
-
- recycle_rp_inst (ri, &empty_rp);
+ recycle_rp_inst (ri);
if (orig_ret_address != trampoline_address)
/*
* This is the real return address. Any other
DBPRINTF ("regs->uregs[15] = 0x%lx\n", regs->uregs[15]);
if(p){ // ARM, MIPS, X86 user space
- if (kcb->kprobe_status == KPROBE_REENTER)
- restore_previous_kprobe (kcb);
- else
- reset_current_kprobe ();
-
if (thumb_mode( regs ) && !(regs->uregs[14] & 0x01))
{
regs->ARM_cpsr &= 0xFFFFFFDF;
// if we are not at the end of the list and current retprobe should be disarmed
if (node && ri->rp2)
{
+ struct hlist_node *current_node = node;
crp = ri->rp2;
/*sprintf(die_msg, "deferred disarm p->addr = %p [%lx %lx %lx]\n",
crp->kp.addr, *kaddrs[0], *kaddrs[1], *kaddrs[2]);
DIE(die_msg, regs); */
// look for other instances for the same retprobe
- hlist_for_each_entry_continue (ri, node, hlist)
+ hlist_for_each_entry_safe (ri, node, tmp, head, hlist)
{
- if (ri->task != current)
- continue; /* another task is sharing our hash bucket */
- if (ri->rp2 == crp) //if instance belong to the same retprobe
+ /*
+ * Trying to find another retprobe instance associated with
+ * the same retprobe.
+ */
+ if (ri->rp2 == crp && node != current_node)
break;
}
if (!node)
- { // if there are no more instances for this retprobe
+ {
+ // if there are no more instances for this retprobe
// delete retprobe
+ struct kprobe *is_p = &crp->kp;
DBPRINTF ("defered retprobe deletion p->addr = %p", crp->kp.addr);
+ /*
+ If there is no any retprobe instances of this retprobe
+ we can free the resources related to the probe.
+ */
+ if (!(hlist_unhashed(&is_p->is_hlist_arm))) {
+ hlist_del_rcu(&is_p->is_hlist_arm);
+ }
+ if (!(hlist_unhashed(&is_p->is_hlist_thumb))) {
+ hlist_del_rcu(&is_p->is_hlist_thumb);
+ }
unregister_uprobe (&crp->kp, current, 1);
kfree (crp);
}
+ hlist_del(current_node);
}
}
+
+ if (kcb->kprobe_status == KPROBE_REENTER) {
+ restore_previous_kprobe(kcb);
+ } else {
+ reset_current_kprobe();
+ }
}
spin_unlock_irqrestore (&kretprobe_lock, flags);
- hlist_for_each_entry_safe (ri, node, tmp, &empty_rp, hlist)
- {
- hlist_del (&ri->hlist);
- kfree (ri);
- }
- preempt_enable_no_resched ();
/*
* By returning a non-zero value, we are telling
* kprobe_handler() that we don't want the post_handler
return 0;
}
-int __init arch_init_kprobes (void)
-{
- unsigned int do_bp_handler;
- unsigned int kprobe_handler_addr;
- unsigned int insns_num = 0;
- unsigned int code_size = 0;
+void (* do_kpro)(struct undef_hook *);
+void (* undo_kpro)(struct undef_hook *);
+
+// kernel probes hook
+struct undef_hook undef_ho_k = {
+ .instr_mask = 0xffffffff,
+ .instr_val = BREAKPOINT_INSTRUCTION,
+ .cpsr_mask = MODE_MASK,
+ .cpsr_val = SVC_MODE,
+ .fn = kprobe_trap_handler
+};
+
+// userspace probes hook (arm)
+struct undef_hook undef_ho_u = {
+ .instr_mask = 0xffffffff,
+ .instr_val = BREAKPOINT_INSTRUCTION,
+ .cpsr_mask = MODE_MASK,
+ .cpsr_val = USR_MODE,
+ .fn = kprobe_trap_handler
+};
+// userspace probes hook (thumb)
+struct undef_hook undef_ho_u_t = {
+ .instr_mask = 0xffffffff,
+ .instr_val = BREAKPOINT_INSTRUCTION & 0x0000ffff,
+ .cpsr_mask = MODE_MASK,
+ .cpsr_val = USR_MODE,
+ .fn = kprobe_trap_handler
+};
+
+int __init arch_init_kprobes (void)
+{
+ unsigned int do_bp_handler = 0;
int ret = 0;
if (arch_init_module_dependencies())
}
do_bp_handler = (unsigned int) kallsyms_search ("do_undefinstr");
-
- kprobe_handler_addr = (unsigned int) &kprobe_handler;
- insns_num = sizeof (arr_traps_template) / sizeof (arr_traps_template[0]);
- code_size = insns_num * sizeof (unsigned int);
- DBPRINTF ("insns_num = %d\n", insns_num);
- // Save original code
- arr_traps_original = kmalloc (code_size, GFP_KERNEL);
- if (!arr_traps_original)
- {
- DBPRINTF ("Unable to allocate space for original code of <do_bp>!\n");
- return -1;
- }
- memcpy (arr_traps_original, (void *) do_bp_handler, code_size);
-
+ if (do_bp_handler == 0) {
+ DBPRINTF("no do_undefinstr symbol found!");
+ return -1;
+ }
arr_traps_template[NOTIFIER_CALL_CHAIN_INDEX] = arch_construct_brunch ((unsigned int)kprobe_handler, do_bp_handler + NOTIFIER_CALL_CHAIN_INDEX * 4, 1);
-
- // Insert new code
- memcpy ((void *) do_bp_handler, arr_traps_template, code_size);
- flush_icache_range (do_bp_handler, do_bp_handler + code_size);
- if((ret = register_kprobe (&trampoline_p, 0)) != 0){
- //unregister_jprobe(&do_exit_p, 0);
+ // Register hooks (kprobe_handler)
+ do_kpro = (void *)kallsyms_search ("register_undef_hook");
+ if (do_kpro == 0) {
+ printk("no register_undef_hook symbol found!\n");
+ return -1;
+ }
+
+ // Unregister hooks (kprobe_handler)
+ undo_kpro = (void *)kallsyms_search ("unregister_undef_hook");
+ if (undo_kpro == 0) {
+ printk("no unregister_undef_hook symbol found!\n");
+ return -1;
+ }
+
+ do_kpro(&undef_ho_k);
+ do_kpro(&undef_ho_u);
+ do_kpro(&undef_ho_u_t);
+ if ((ret = dbi_register_kprobe (&trampoline_p)) != 0) {
+ //dbi_unregister_jprobe(&do_exit_p, 0);
return ret;
}
-
return ret;
}
-void __exit arch_exit_kprobes (void)
+void __exit dbi_arch_exit_kprobes (void)
{
- unsigned int do_bp_handler;
-
- unsigned int insns_num = 0;
- unsigned int code_size = 0;
-
- // Get instruction address
- do_bp_handler = (unsigned int) kallsyms_search ("do_undefinstr");
-
- //unregister_jprobe(&do_exit_p, 0);
-
- // Replace back the original code
-
- insns_num = sizeof (arr_traps_template) / sizeof (arr_traps_template[0]);
- code_size = insns_num * sizeof (unsigned int);
- memcpy ((void *) do_bp_handler, arr_traps_original, code_size);
- flush_icache_range (do_bp_handler, do_bp_handler + code_size);
- kfree (arr_traps_original);
- arr_traps_original = NULL;
+ undo_kpro(&undef_ho_u_t);
+ undo_kpro(&undef_ho_u);
+ undo_kpro(&undef_ho_k);
}
-
-EXPORT_SYMBOL_GPL (arch_uprobe_return);
-EXPORT_SYMBOL_GPL (arch_exit_kprobes);
+//EXPORT_SYMBOL_GPL (dbi_arch_uprobe_return);
+//EXPORT_SYMBOL_GPL (dbi_arch_exit_kprobes);