X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=kprobe%2Farch%2Fasm-arm%2Fdbi_kprobes.c;h=197bc1cbd8ac94a4d4e2a16f18f1356df317143b;hb=39e348ee971240fde96f196917d24652e3d71686;hp=2ba60f1951141f25a4c8ec89a3b47b2ed3d8d483;hpb=d6e53dc7caa4b88eba17a0c32335fa2fa903be92;p=kernel%2Fswap-modules.git

diff --git a/kprobe/arch/asm-arm/dbi_kprobes.c b/kprobe/arch/asm-arm/dbi_kprobes.c
index 2ba60f1..197bc1c 100644
--- a/kprobe/arch/asm-arm/dbi_kprobes.c
+++ b/kprobe/arch/asm-arm/dbi_kprobes.c
@@ -33,19 +33,16 @@
 #include <linux/mm.h>
 
 #include "dbi_kprobes.h"
+#include "trampoline_arm.h"
 #include "../dbi_kprobes.h"
+#include "../../dbi_kprobes.h"
 
 #include "../../dbi_kdebug.h"
 #include "../../dbi_insn_slots.h"
 #include "../../dbi_kprobes_deps.h"
-#include "../../dbi_uprobes.h"
+#include <ksyms.h>
 
 #include <asm/cacheflush.h>
-
-#ifdef OVERHEAD_DEBUG
-#include <linux/time.h>
-#endif
-
 #include <asm/traps.h>
 #include <asm/ptrace.h>
 #include <linux/list.h>
@@ -53,646 +50,210 @@
 
 #define SUPRESS_BUG_MESSAGES
 
-extern unsigned long sched_addr;
-extern unsigned long fork_addr;
-
 extern struct kprobe * per_cpu__current_kprobe;
-extern spinlock_t kretprobe_lock;
-extern struct kretprobe *sched_rp;
-
-extern struct hlist_head kprobe_insn_pages;
-extern struct hlist_head uprobe_insn_pages;
-
-extern unsigned long (*kallsyms_search) (const char *name);
-
-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 void (*__swap_register_undef_hook)(struct undef_hook *hook);
+static void (*__swap_unregister_undef_hook)(struct undef_hook *hook);
 
-static kprobe_opcode_t get_addr_b(kprobe_opcode_t insn, kprobe_opcode_t *addr)
+static struct kprobe trampoline_p =
 {
-	// 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
-		0xe92dd800,    // stmdb        sp!, {fp, ip, lr, pc}
-		0xe24cb004,    // sub          fp, ip, #4      ; 0x4
-		0x00000000,    // b
-		0xe3500000,    // cmp          r0, #0  ; 0x0
-		0xe89da800,    // ldmia        sp, {fp, sp, pc}
-		0x00000000,    // nop
-		0xffffffff     // end
-};
-
-
-struct kprobe trampoline_p =
-{
-	.addr = (kprobe_opcode_t *) & kretprobe_trampoline,
+	.addr = (kprobe_opcode_t *)&kretprobe_trampoline,
 	.pre_handler = trampoline_probe_handler
 };
 
-// is instruction Thumb2 and NOT a branch, etc...
-int isThumb2(kprobe_opcode_t insn)
-{
-	if((	(insn & 0xf800) == 0xe800 ||
-		(insn & 0xf800) == 0xf000 ||
-		(insn & 0xf800) == 0xf800)) return 1;
-	return 0;
-}
-
-
-int prep_pc_dep_insn_execbuf (kprobe_opcode_t * insns, kprobe_opcode_t insn, int uregs)
+int prep_pc_dep_insn_execbuf(kprobe_opcode_t *insns, kprobe_opcode_t insn, int uregs)
 {
 	int i;
 
-	if (uregs & 0x10)
-	{
+	if (uregs & 0x10) {
 		int reg_mask = 0x1;
 		//search in reg list
-		for (i = 0; i < 13; i++, reg_mask <<= 1)
-		{
+		for (i = 0; i < 13; i++, reg_mask <<= 1) {
 			if (!(insn & reg_mask))
 				break;
 		}
-	}
-	else
-	{
-		for (i = 0; i < 13; i++)
-		{
-			if ((uregs & 0x1) && (ARM_INSN_REG_RN (insn) == i))
+	} else {
+		for (i = 0; i < 13; i++) {
+			if ((uregs & 0x1) && (ARM_INSN_REG_RN(insn) == i))
 				continue;
-			if ((uregs & 0x2) && (ARM_INSN_REG_RD (insn) == i))
+			if ((uregs & 0x2) && (ARM_INSN_REG_RD(insn) == i))
 				continue;
-			if ((uregs & 0x4) && (ARM_INSN_REG_RS (insn) == i))
+			if ((uregs & 0x4) && (ARM_INSN_REG_RS(insn) == i))
 				continue;
-			if ((uregs & 0x8) && (ARM_INSN_REG_RM (insn) == i))
+			if ((uregs & 0x8) && (ARM_INSN_REG_RM(insn) == i))
 				continue;
 			break;
 		}
 	}
-	if (i == 13)
-	{
+
+	if (i == 13) {
 		DBPRINTF ("there are no free register %x in insn %lx!", uregs, insn);
 		return -EINVAL;
 	}
 	DBPRINTF ("prep_pc_dep_insn_execbuf: using R%d, changing regs %x", i, uregs);
 
 	// set register to save
-	ARM_INSN_REG_SET_RD (insns[0], i);
+	ARM_INSN_REG_SET_RD(insns[0], i);
 	// set register to load address to
-	ARM_INSN_REG_SET_RD (insns[1], i);
+	ARM_INSN_REG_SET_RD(insns[1], i);
 	// set instruction to execute and patch it
-	if (uregs & 0x10)
-	{
-		ARM_INSN_REG_CLEAR_MR (insn, 15);
-		ARM_INSN_REG_SET_MR (insn, i);
-	}
-	else
-	{
-		if ((uregs & 0x1) && (ARM_INSN_REG_RN (insn) == 15))
-			ARM_INSN_REG_SET_RN (insn, i);
-		if ((uregs & 0x2) && (ARM_INSN_REG_RD (insn) == 15))
-			ARM_INSN_REG_SET_RD (insn, i);
-		if ((uregs & 0x4) && (ARM_INSN_REG_RS (insn) == 15))
-			ARM_INSN_REG_SET_RS (insn, i);
-		if ((uregs & 0x8) && (ARM_INSN_REG_RM (insn) == 15))
-			ARM_INSN_REG_SET_RM (insn, i);
+	if (uregs & 0x10) {
+		ARM_INSN_REG_CLEAR_MR(insn, 15);
+		ARM_INSN_REG_SET_MR(insn, i);
+	} else {
+		if ((uregs & 0x1) && (ARM_INSN_REG_RN(insn) == 15))
+			ARM_INSN_REG_SET_RN(insn, i);
+		if ((uregs & 0x2) && (ARM_INSN_REG_RD(insn) == 15))
+			ARM_INSN_REG_SET_RD(insn, i);
+		if ((uregs & 0x4) && (ARM_INSN_REG_RS(insn) == 15))
+			ARM_INSN_REG_SET_RS(insn, i);
+		if ((uregs & 0x8) && (ARM_INSN_REG_RM(insn) == 15))
+			ARM_INSN_REG_SET_RM(insn, i);
 	}
+
 	insns[UPROBES_TRAMP_INSN_IDX] = insn;
 	// set register to restore
-	ARM_INSN_REG_SET_RD (insns[3], i);
-	return 0;
-}
-
-
-
-int prep_pc_dep_insn_execbuf_thumb (kprobe_opcode_t * insns, kprobe_opcode_t insn, int uregs)
-{
-	unsigned char mreg = 0;
-	unsigned char reg = 0;
-
-
-	if (THUMB_INSN_MATCH (APC, insn) || THUMB_INSN_MATCH (LRO3, insn))
-	{
-		reg = ((insn & 0xffff) & uregs) >> 8;
-	}else{
-		if (THUMB_INSN_MATCH (MOV3, insn))
-		{
-			if (((((unsigned char) insn) & 0xff) >> 3) == 15)
-				reg = (insn & 0xffff) & uregs;
-			else
-				return 0;
-		}else{
-			if (THUMB2_INSN_MATCH (ADR, insn))
-			{
-				reg = ((insn >> 16) & uregs) >> 8;
-				if (reg == 15) return 0;
-			}else{
-				if (THUMB2_INSN_MATCH (LDRW, insn) || THUMB2_INSN_MATCH (LDRW1, insn) ||
-				    THUMB2_INSN_MATCH (LDRHW, insn) || THUMB2_INSN_MATCH (LDRHW1, insn) ||
-				    THUMB2_INSN_MATCH (LDRWL, insn))
-				{
-					reg = ((insn >> 16) & uregs) >> 12;
-					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) || 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 ((	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)
-	{
-		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 + 3) = (*((unsigned short*)insns + 3) & 0xffc7) | (mreg << 3);
-		*((unsigned short*)insns + 7) = (*((unsigned short*)insns + 7) & 0xf8ff) | (mreg << 8);
-		*((unsigned short*)insns + 8) = (*((unsigned short*)insns + 8) & 0xffc7) | (mreg << 3);
-		*((unsigned short*)insns + 9) = (*((unsigned short*)insns + 9) & 0xffc7) | ((mreg + 1) << 3);
-		*((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
-		*((unsigned short*)insns + 4) = ((insn & 0xffff) | 0x800);				// ADD Rd, SP, #immed_8*4
-	}else{
-		if (THUMB_INSN_MATCH (LRO3, insn))
-		{
-//			LDR Rd, [PC, #immed_8*4] -> LDR Rd, [SP, #immed_8*4]
-			*((unsigned short*)insns + 4) = ((insn & 0xffff) + 0x5000);			// LDR Rd, [SP, #immed_8*4]
-		}else{
-			if (THUMB_INSN_MATCH (MOV3, insn))
-			{
-//				MOV Rd, PC -> MOV Rd, SP
-				*((unsigned short*)insns + 4) = ((insn & 0xffff) ^ 0x10);		// MOV Rd, SP
-			}else{
-				if (THUMB2_INSN_MATCH (ADR, insn))
-				{
-//					ADDW Rd, PC, #imm -> ADDW Rd, SP, #imm
-					insns[2] = (insn & 0xfffffff0) | 0x0d;				// ADDW Rd, SP, #imm
-				}else{
-					if (THUMB2_INSN_MATCH (LDRW, insn) || THUMB2_INSN_MATCH (LDRBW, insn) ||
-					    THUMB2_INSN_MATCH (LDRHW, insn))
-					{
-//						LDR.W Rt, [PC, #-<imm_12>] -> LDR.W Rt, [SP, #-<imm_8>]
-//						!!!!!!!!!!!!!!!!!!!!!!!!
-//						!!! imm_12 vs. imm_8 !!!
-//						!!!!!!!!!!!!!!!!!!!!!!!!
-						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 (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>]
-						}else{
-							if (THUMB2_INSN_MATCH (MUL, insn))
-							{
-								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
-								}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>]
-									}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) || THUMB2_INSN_MATCH (STRBW, insn))
-	{
-		insns[2] = (insn & 0xfff0ffff) | 0x000d0000;								// STRx.W Rt, [Rn, SP]
-	}else{
-		if (THUMB2_INSN_MATCH (STRD, insn) || THUMB2_INSN_MATCH (STRHT, insn) || THUMB2_INSN_MATCH (STRT, insn) || THUMB2_INSN_MATCH (STRHW1, insn))
-		{
-			if (THUMB2_INSN_REG_RN(insn) == 15)
-			{
-				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
-		}
-	}
+	ARM_INSN_REG_SET_RD(insns[3], i);
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(prep_pc_dep_insn_execbuf);
 
-
-
-int arch_check_insn_arm (struct arch_specific_insn *ainsn)
+int arch_check_insn_arm(struct arch_specific_insn *ainsn)
 {
 	int ret = 0;
 
 	// check instructions that can change PC by nature
 	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]))
-	{
+//	    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])) 	{
 		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_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))
-	{
+	} 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_arm[0]);
 		ret = -EFAULT;
-	}
 #endif // CONFIG_CPU_V7
 	// check special instruction loads store multiple registers
-	else if ((ARM_INSN_MATCH (LM, ainsn->insn_arm[0]) || ARM_INSN_MATCH (SM, ainsn->insn_arm[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_arm[0], 15) ||
+		   (ARM_INSN_REG_MR(ainsn->insn_arm[0], 15) ||
 			 // store/load with pc update
-			 ((ARM_INSN_REG_RN (ainsn->insn_arm[0]) == 15) && (ainsn->insn_arm[0] & 0x200000))))
-	{
+		    ((ARM_INSN_REG_RN(ainsn->insn_arm[0]) == 15) && (ainsn->insn_arm[0] & 0x200000)))) {
 		DBPRINTF ("Bad insn arch_check_insn_arm: %lx\n", ainsn->insn_arm[0]);
 		ret = -EFAULT;
 	}
-	return ret;
-}
-
-int arch_check_insn_thumb (struct arch_specific_insn *ainsn)
-{
-	int ret = 0;
-
-	// check instructions that can change PC
-	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])) )
-	{
-		DBPRINTF ("Bad insn arch_check_insn_thumb: %lx\n", ainsn->insn_thumb[0]);
-		ret = -EFAULT;
-	}
 
 	return ret;
 }
+EXPORT_SYMBOL_GPL(arch_check_insn_arm);
 
-int arch_prepare_kretprobe (struct kretprobe *p)
-{
-	DBPRINTF("Warrning: arch_prepare_kretprobe is not implemented\n");
-	return 0;
-}
-
-int arch_prepare_kprobe (struct kprobe *p)
+int arch_prepare_kprobe(struct kprobe *p, struct slot_manager *sm)
 {
 	kprobe_opcode_t insns[KPROBES_TRAMP_LEN];
 	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)
-{
-	kprobe_opcode_t insn;
-	unsigned int bpi = (unsigned int) base - (unsigned int) addr - 8;
-
-	insn = bpi >> 2;
-	DBPRINTF ("base=%x addr=%x base-addr-8=%x\n", base, addr, bpi);
-	if (abs (insn & 0xffffff) > 0xffffff)
-	{
-		DBPRINTF ("ERROR: kprobe address out of range\n");
-		BUG ();
-	}
-	insn = insn & 0xffffff;
-	insn = insn | ((link != 0) ? 0xeb000000 : 0xea000000);
-	DBPRINTF ("insn=%lX\n", insn);
-	return (unsigned int) insn;
-}
+	kprobe_opcode_t insn[MAX_INSN_SIZE];
+	struct arch_specific_insn ainsn;
 
+	/* insn: must be on special executable page on i386. */
+	p->ainsn.insn = alloc_insn_slot(sm);
+	if (!p->ainsn.insn)
+		return -ENOMEM;
 
-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);
+	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;
+			}
 
-int arch_prepare_uprobe (struct kprobe *p, struct task_struct *task, int atomic)
-{
-	int ret = 0;
-	kprobe_opcode_t insn[MAX_INSN_SIZE];
+		// 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;
+			}
+		}
 
-	if ((unsigned long) p->addr & 0x01)
-	{
-		printk("Error in %s at %d: attempt to register kprobe at an unaligned address\n", __FILE__, __LINE__);
-		return -EINVAL;
-	}
-	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_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;
+		// 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(sm, 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(sm, 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(sm, p->ainsn.insn);
+		printk("arch_prepare_kprobe: instruction 0x%lx not instrumentation, addr=0x%p\n", insn[0], p->addr);
 	}
-	return ret;
-}
 
-int arch_prepare_uretprobe (struct kretprobe *p, struct task_struct *task)
-{
-	DBPRINTF("Warrning: arch_prepare_uretprobe is not implemented\n");
-	return 0;
+	return ret;
 }
 
-void prepare_singlestep (struct kprobe *p, struct pt_regs *regs)
+void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
 {
 	if (p->ss_addr) {
 		regs->ARM_pc = (unsigned long)p->ss_addr;
@@ -701,27 +262,18 @@ void prepare_singlestep (struct kprobe *p, struct pt_regs *regs)
 		regs->ARM_pc = (unsigned long)p->ainsn.insn;
 	}
 }
+EXPORT_SYMBOL_GPL(prepare_singlestep);
 
 void save_previous_kprobe(struct kprobe_ctlblk *kcb, struct kprobe *p_run)
 {
-	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 = p_run;
+	kcb->prev_kprobe.kp = kprobe_running();
 	kcb->prev_kprobe.status = kcb->kprobe_status;
 }
 
 void restore_previous_kprobe(struct kprobe_ctlblk *kcb)
 {
-	set_current_kprobe(kcb->prev_kprobe.kp, NULL, NULL);
+	__get_cpu_var(current_kprobe) = kcb->prev_kprobe.kp;
 	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)
@@ -730,638 +282,140 @@ void set_current_kprobe(struct kprobe *p, struct pt_regs *regs, struct kprobe_ct
 	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)
-{
-	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)
-	{
-		printk("Error in %s at %d: attempt to register kprobe at an unaligned address\n", __FILE__, __LINE__);
-		return -EINVAL;
-	}
-	insn[0] = p->opcode;
-	ainsn.insn_arm = insn;
-	if (!arch_check_insn_arm(&ainsn))
-	{
-		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)))
-		{
-			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_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)
+static int kprobe_handler(struct pt_regs *regs)
 {
-	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)
-	{
-		printk("Error in %s at %d: attempt to register kprobe at an unaligned address\n", __FILE__, __LINE__);
-		return -EINVAL;
-	}
-	insn[0] = p->opcode;
-	ainsn.insn_thumb = insn;
-	if (!arch_check_insn_thumb(&ainsn))
-	{
-		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)
-		{
-			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;
-		}
-		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]))
-		{
-			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;
-		}
-	}
-	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;
-}
-
-static int check_validity_insn(struct kprobe *p, struct pt_regs *regs, struct task_struct *task)
-{
-	struct kprobe *kp;
+	struct kprobe *p, *cur;
+	struct kprobe_ctlblk *kcb;
 
-	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;
+	kcb = get_kprobe_ctlblk();
+	cur = kprobe_running();
+	p = get_kprobe((void *)regs->ARM_pc);
+
+	if (p) {
+		if (cur) {
+			/* Kprobe is pending, so we're recursing. */
+			switch (kcb->kprobe_status) {
+			case KPROBE_HIT_ACTIVE:
+			case KPROBE_HIT_SSDONE:
+				/* A pre- or post-handler probe got us here. */
+				kprobes_inc_nmissed_count(p);
+				save_previous_kprobe(kcb, NULL);
+				set_current_kprobe(p, 0, 0);
+				kcb->kprobe_status = KPROBE_REENTER;
+				prepare_singlestep(p, regs);
+				restore_previous_kprobe(kcb);
+				break;
+			default:
+				/* impossible cases */
+				BUG();
 			}
 		} 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;
-		}
-	} 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;
+			set_current_kprobe(p, 0, 0);
+			kcb->kprobe_status = KPROBE_HIT_ACTIVE;
+
+			if (!p->pre_handler || !p->pre_handler(p, regs)) {
+				kcb->kprobe_status = KPROBE_HIT_SS;
+				prepare_singlestep(p, regs);
+				reset_current_kprobe();
 			}
-		} 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;
 		}
+	} else {
+		goto no_kprobe;
 	}
 
 	return 0;
-}
 
-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;
+no_kprobe:
+	printk("no_kprobe\n");
+	return 1;
 }
 
-int kprobe_handler(struct pt_regs *regs)
+int kprobe_trap_handler(struct pt_regs *regs, unsigned int instr)
 {
-	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;
+	int ret;
+	unsigned long flags;
 
 #ifdef SUPRESS_BUG_MESSAGES
 	int swap_oops_in_progress;
-	// oops_in_progress used to avoid BUG() messages that slow down kprobe_handler() execution
+	/* 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 ();
-
-	/* Check we're not actually recursing */
-	// TODO: event is not saving in trace
-	p_run = kprobe_running();
-	if (p_run)
-	{
-		DBPRINTF("lock???");
-		if (p)
-		{
-			if (!tgid && (addr == (kprobe_opcode_t *)kretprobe_trampoline)) {
-				save_previous_kprobe(kcb, p_run);
-				kcb->kprobe_status = KPROBE_REENTER;
-				reenter = 1;
-			} 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.
-				 */
-				kprobes_inc_nmissed_count (p);
-				prepare_singlestep (p, regs);
-
-				err_out = 0;
-				goto out;
-			}
-		} else {
-			if(tgid) { //we can reenter probe upon uretprobe exception
-				DBPRINTF ("check for UNDEF_INSTRUCTION %p\n", addr);
-				// UNDEF_INSTRUCTION from user space
-
-				p = get_kprobe_by_insn_slot(addr, tgid, regs);
-				if (p) {
-					save_previous_kprobe(kcb, p_run);
-					kcb->kprobe_status = KPROBE_REENTER;
-					reenter = 1;
-					retprobe = 1;
-					DBPRINTF ("uretprobe %p\n", addr);
-				}
-			}
-			if(!p) {
-				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 (tgid)
-					ssaddr = p->ainsn.insn + UPROBES_TRAMP_SS_BREAK_IDX;
-				else
-					ssaddr = p->ainsn.insn + KPROBES_TRAMP_SS_BREAK_IDX;
-				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();
-					}
-				}
-				DBPRINTF ("kprobe_running !!! goto no");
-				ret = 1;
-				/* If it's not ours, can't be delete race, (we hold lock). */
-				DBPRINTF ("no_kprobe");
-				goto no_kprobe;
-			}
-		}
-	}
-
-	if (!p) {
-		if (tgid) {
-			DBPRINTF ("search UNDEF_INSTRUCTION %p\n", addr);
-			// UNDEF_INSTRUCTION from user space
-
-			p = get_kprobe_by_insn_slot(addr, tgid, regs);
-			if (!p) {
-				/* Not one of ours: let kernel handle it */
-				DBPRINTF ("no_kprobe");
-				goto no_kprobe;
-			}
-			retprobe = 1;
-			DBPRINTF ("uretprobe %p\n", addr);
-		} 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 long tmp = p->opcode >> 16;
-			write_proc_vm_atomic(current, (unsigned long)((unsigned short*)p->addr + 1), &tmp, 2);
-		} else {
-			unsigned long tmp = p->opcode;
-			write_proc_vm_atomic(current, (unsigned long)((unsigned short*)p->addr), &tmp, 4);
-		}
-		flush_icache_range ((unsigned int) p->addr, (unsigned int) (((unsigned int) p->addr) + (sizeof (kprobe_opcode_t) * 2)));
-	}
-	set_current_kprobe(p, NULL, NULL);
-	if(!reenter)
-		kcb->kprobe_status = KPROBE_HIT_ACTIVE;
-	if (retprobe) {		//(einsn == UNDEF_INSTRUCTION)
-		ret = trampoline_probe_handler (p, regs);
-	} else if (p->pre_handler) {
-		ret = p->pre_handler (p, regs);
-		if(p->pre_handler != trampoline_probe_handler) {
-			reset_current_kprobe();
-		}
-	}
-
-	if (ret) {
-		/* handler has already set things up, so skip ss setup */
-		err_out = 0;
-		goto out;
-	}
-
-no_kprobe:
-	msg_out = "no_kprobe\n";
-	err_out = 1; 		// return with death
-	goto out;
-
-no_kprobe_live:
-	msg_out = "no_kprobe live\n";
-	err_out = 0; 		// ok - life is life
-	goto out;
-
-out:
+	local_irq_save(flags);
+	preempt_disable();
+	ret = kprobe_handler(regs);
 	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
+	local_irq_restore(flags);
+
 #ifdef SUPRESS_BUG_MESSAGES
 	oops_in_progress = swap_oops_in_progress;
 #endif
 
-	if(msg_out) {
-		printk(msg_out);
-	}
-
-	return err_out;
+	return ret;
 }
 
-int setjmp_pre_handler (struct kprobe *p, struct pt_regs *regs)
+int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 {
-	struct jprobe *jp = container_of (p, struct jprobe, kp);
-	kprobe_pre_entry_handler_t pre_entry;
-	entry_point_t entry;
-
-# ifdef REENTER
-//	p = kprobe_running(regs);
-# endif
-
-	DBPRINTF ("pjp = 0x%p jp->entry = 0x%p", jp, jp->entry);
-	entry = (entry_point_t) jp->entry;
-	pre_entry = (kprobe_pre_entry_handler_t) jp->pre_entry;
-	//if(!entry)
-	//      DIE("entry NULL", regs)
-	DBPRINTF ("entry = 0x%p jp->entry = 0x%p", entry, 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) {
-		    patch_suspended_all_task_ret_addr(sched_rp);
-		}
-		if (pre_entry)
-			p->ss_addr = (void *)pre_entry (jp->priv_arg, regs);
-		if (entry){
-			entry (regs->ARM_r0, regs->ARM_r1, regs->ARM_r2, regs->ARM_r3, regs->ARM_r4, regs->ARM_r5);
-		}
-		else {
-			if (p->tgid)
-				dbi_arch_uprobe_return ();
-			else
-				dbi_jprobe_return ();
-		}
+	struct jprobe *jp = container_of(p, struct jprobe, kp);
+	kprobe_pre_entry_handler_t pre_entry = (kprobe_pre_entry_handler_t)jp->pre_entry;
+	entry_point_t entry = (entry_point_t)jp->entry;
+	pre_entry = (kprobe_pre_entry_handler_t)jp->pre_entry;
+
+	if (((unsigned long)p->addr == sched_addr) && sched_rp) {
+		struct thread_info *tinfo = (struct thread_info *)regs->ARM_r2;
+		patch_suspended_task(sched_rp, tinfo->task);
 	}
-	else if (p->tgid)
-		dbi_arch_uprobe_return ();
 
-	prepare_singlestep (p, regs);
+	if (pre_entry) {
+		p->ss_addr = (void *)pre_entry (jp->priv_arg, regs);
+	}
 
-	return 1;
-}
+	if (entry) {
+		entry(regs->ARM_r0, regs->ARM_r1, regs->ARM_r2,
+		      regs->ARM_r3, regs->ARM_r4, regs->ARM_r5);
+	} else {
+		dbi_jprobe_return();
+	}
 
-void dbi_jprobe_return (void)
-{
+	return 0;
 }
 
-void dbi_arch_uprobe_return (void)
+void dbi_jprobe_return (void)
 {
 }
 
 int longjmp_break_handler (struct kprobe *p, struct pt_regs *regs)
 {
-# ifndef REENTER
-	//kprobe_opcode_t insn = BREAKPOINT_INSTRUCTION;
-	kprobe_opcode_t insns[2];
-
-	if (p->pid)
-	{
-		insns[0] = BREAKPOINT_INSTRUCTION;
-		insns[1] = p->opcode;
-		//p->opcode = *p->addr;
-		if (read_proc_vm_atomic (current, (unsigned long) (p->addr), &(p->opcode), sizeof (p->opcode)) < sizeof (p->opcode))
-		{
-			printk ("ERROR[%lu]: failed to read vm of proc %s/%u addr %p.", nCount, current->comm, current->pid, p->addr);
-			return -1;
-		}
-		//*p->addr = BREAKPOINT_INSTRUCTION;
-		//*(p->addr+1) = p->opcode;
-		if (write_proc_vm_atomic (current, (unsigned long) (p->addr), insns, sizeof (insns)) < sizeof (insns))
-		{
-			printk ("ERROR[%lu]: failed to write vm of proc %s/%u addr %p.", nCount, current->comm, current->pid, p->addr);
-			return -1;
-		}
-	}
-	else
-	{
-		DBPRINTF ("p->opcode = 0x%lx *p->addr = 0x%lx p->addr = 0x%p\n", p->opcode, *p->addr, p->addr);
-		*(p->addr + 1) = p->opcode;
-		p->opcode = *p->addr;
-		*p->addr = BREAKPOINT_INSTRUCTION;
-
-		flush_icache_range ((unsigned int) p->addr, (unsigned int) (((unsigned int) p->addr) + (sizeof (kprobe_opcode_t) * 2)));
-	}
-
-	reset_current_kprobe();
-
-#endif //REENTER
-
 	return 0;
 }
+EXPORT_SYMBOL_GPL(longjmp_break_handler);
 
-
-void arch_arm_kprobe (struct kprobe *p)
+void arch_arm_kprobe(struct kprobe *p)
 {
 	*p->addr = BREAKPOINT_INSTRUCTION;
-	flush_icache_range ((unsigned long) p->addr, (unsigned long) p->addr + sizeof (kprobe_opcode_t));
+	flush_icache_range((unsigned long)p->addr, (unsigned long)p->addr + sizeof(kprobe_opcode_t));
 }
 
-void arch_disarm_kprobe (struct kprobe *p)
+void arch_disarm_kprobe(struct kprobe *p)
 {
 	*p->addr = p->opcode;
-	flush_icache_range ((unsigned long) p->addr, (unsigned long) p->addr + sizeof (kprobe_opcode_t));
+	flush_icache_range((unsigned long)p->addr, (unsigned long)p->addr + sizeof(kprobe_opcode_t));
 }
 
-
-int trampoline_probe_handler (struct kprobe *p, struct pt_regs *regs)
+int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
 {
 	struct kretprobe_instance *ri = NULL;
 	struct hlist_head *head;
 	struct hlist_node *node, *tmp;
 	unsigned long flags, orig_ret_address = 0;
-	unsigned long trampoline_address = (unsigned long) &kretprobe_trampoline;
+	unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline;
 
 	struct kretprobe *crp = NULL;
-	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk ();
-
-	DBPRINTF ("start");
-
-	if (p && p->tgid){
-		// in case of user space retprobe trampoline is at the Nth instruction of US tramp
-		if (!thumb_mode( regs ))
-			trampoline_address = (unsigned long)(p->ainsn.insn + UPROBES_TRAMP_RET_BREAK_IDX);
-		else
-			trampoline_address = (unsigned long)(p->ainsn.insn) + 0x1b;
-	}
+	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
 
-	spin_lock_irqsave (&kretprobe_lock, flags);
+	spin_lock_irqsave(&kretprobe_lock, flags);
 
 	/*
 	 * We are using different hash keys (current and mm) for finding kernel
@@ -1369,11 +423,7 @@ int trampoline_probe_handler (struct kprobe *p, struct pt_regs *regs)
 	 * 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);
-	}
+	head = kretprobe_inst_table_head(current);
 
 	/*
 	 * It is possible to have multiple instances associated with a given
@@ -1388,17 +438,16 @@ int trampoline_probe_handler (struct kprobe *p, struct pt_regs *regs)
 	 *       real return address, and all the rest will point to
 	 *       kretprobe_trampoline
 	 */
-	hlist_for_each_entry_safe (ri, node, tmp, head, hlist)
-	{
+	hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
 		if (ri->task != current)
 			/* another task is sharing our hash bucket */
 			continue;
-		if (ri->rp && ri->rp->handler){
-			ri->rp->handler (ri, regs, ri->rp->priv_arg);
+		if (ri->rp && ri->rp->handler) {
+			ri->rp->handler(ri, regs, ri->rp->priv_arg);
 		}
 
-		orig_ret_address = (unsigned long) ri->ret_addr;
-		recycle_rp_inst (ri);
+		orig_ret_address = (unsigned long)ri->ret_addr;
+		recycle_rp_inst(ri);
 		if (orig_ret_address != trampoline_address)
 			/*
 			 * This is the real return address. Any other
@@ -1407,97 +456,18 @@ int trampoline_probe_handler (struct kprobe *p, struct pt_regs *regs)
 			 */
 			break;
 	}
-	kretprobe_assert (ri, orig_ret_address, trampoline_address);
-	//BUG_ON(!orig_ret_address || (orig_ret_address == trampoline_address));
-	//E.G. Check this code in case of __switch_to function instrumentation -- currently this code generates dump in this case
-	//if (trampoline_address != (unsigned long) &kretprobe_trampoline){
-	//if (ri->rp2) BUG_ON (ri->rp2->kp.tgid == 0);
-	//if (ri->rp) BUG_ON (ri->rp->kp.tgid == 0);
-	//else if (ri->rp2) BUG_ON (ri->rp2->kp.tgid == 0);
-	//}
-	if ((ri->rp && ri->rp->kp.tgid) || (ri->rp2 && ri->rp2->kp.tgid))
-		BUG_ON (trampoline_address == (unsigned long) &kretprobe_trampoline);
-
-	regs->uregs[14] = orig_ret_address;
-	DBPRINTF ("regs->uregs[14] = 0x%lx\n", regs->uregs[14]);
-	DBPRINTF ("regs->uregs[15] = 0x%lx\n", regs->uregs[15]);
-
-	if (trampoline_address != (unsigned long) &kretprobe_trampoline)
-	{
-		regs->uregs[15] = orig_ret_address;
-	}else{
-		if (!thumb_mode( regs )) regs->uregs[15] += 4;
-		else regs->uregs[15] += 2;
-	}
-
-	DBPRINTF ("regs->uregs[15] = 0x%lx\n", regs->uregs[15]);
+	kretprobe_assert(ri, orig_ret_address, trampoline_address);
 
-	if(p){ // ARM, MIPS, X86 user space
-		if (thumb_mode( regs ) && !(regs->uregs[14] & 0x01))
-		{
-			regs->ARM_cpsr &= 0xFFFFFFDF;
-		}else{
-			if (user_mode( regs ) && (regs->uregs[14] & 0x01))
-			{
-				regs->ARM_cpsr |= 0x20;
-			}
-		}
+	regs->ARM_lr = orig_ret_address;
+	regs->ARM_pc = orig_ret_address;
 
-		//TODO: test - enter function, delete us retprobe, exit function
-		// for user space retprobes only - deferred deletion
-
-		if (trampoline_address != (unsigned long) &kretprobe_trampoline)
-		{
-			// 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_safe (ri, node, tmp, head, hlist)
-				{
-					/*
-					 * 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
-					// 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();
-		}
+	if (kcb->kprobe_status == KPROBE_REENTER) {
+		restore_previous_kprobe(kcb);
+	} else {
+		reset_current_kprobe();
 	}
 
-	spin_unlock_irqrestore (&kretprobe_lock, flags);
+	spin_unlock_irqrestore(&kretprobe_lock, flags);
 
 	/*
 	 * By returning a non-zero value, we are telling
@@ -1507,123 +477,88 @@ int trampoline_probe_handler (struct kprobe *p, struct pt_regs *regs)
 
 	return 1;
 }
+EXPORT_SYMBOL_GPL(trampoline_probe_handler);
 
-void  __arch_prepare_kretprobe (struct kretprobe *rp, struct pt_regs *regs)
+void arch_prepare_kretprobe(struct kretprobe *rp, struct pt_regs *regs)
 {
 	struct kretprobe_instance *ri;
 
 	DBPRINTF ("start\n");
 	//TODO: test - remove retprobe after func entry but before its exit
-	if ((ri = get_free_rp_inst (rp)) != NULL)
-	{
+	if ((ri = get_free_rp_inst(rp)) != NULL) {
 		ri->rp = rp;
-		ri->rp2 = NULL;
 		ri->task = current;
-		ri->ret_addr = (kprobe_opcode_t *) regs->uregs[14];
+		ri->ret_addr = (kprobe_opcode_t *)regs->uregs[14];
+		ri->sp = (kprobe_opcode_t *)regs->ARM_sp; //uregs[13];
 
-		if (rp->kp.tgid)
-			if (!thumb_mode( regs ))
-				regs->uregs[14] = (unsigned long) (rp->kp.ainsn.insn + UPROBES_TRAMP_RET_BREAK_IDX);
-			else
-				regs->uregs[14] = (unsigned long) (rp->kp.ainsn.insn) + 0x1b;
+		/* Set flag of current mode */
+		ri->sp = (kprobe_opcode_t *)((long)ri->sp | !!thumb_mode(regs));
 
-		else	/* Replace the return addr with trampoline addr */
-			regs->uregs[14] = (unsigned long) &kretprobe_trampoline;
+		/* Replace the return addr with trampoline addr */
+		regs->uregs[14] = (unsigned long)&kretprobe_trampoline;
 
 //		DBPRINTF ("ret addr set to %p->%lx\n", ri->ret_addr, regs->uregs[14]);
-		add_rp_inst (ri);
-	}
-	else {
+		add_rp_inst(ri);
+	} else {
 		DBPRINTF ("WARNING: missed retprobe %p\n", rp->kp.addr);
 		rp->nmissed++;
 	}
 }
 
-
-int asm_init_module_dependencies()
+void swap_register_undef_hook(struct undef_hook *hook)
 {
-	//No module dependencies
-	return 0;
+	__swap_register_undef_hook(hook);
 }
+EXPORT_SYMBOL_GPL(swap_register_undef_hook);
 
-
-void (* do_kpro)(struct undef_hook *);
-void (* undo_kpro)(struct undef_hook *);
+void swap_unregister_undef_hook(struct undef_hook *hook)
+{
+	__swap_unregister_undef_hook(hook);
+}
+EXPORT_SYMBOL_GPL(swap_unregister_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
+static 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)
+int arch_init_kprobes(void)
 {
-	unsigned int do_bp_handler = 0;
 	int ret = 0;
 
-	if (arch_init_module_dependencies())
-	{
-		DBPRINTF ("Unable to init module dependencies\n");
-		return -1;
-	}
-
-	do_bp_handler = (unsigned int) kallsyms_search ("do_undefinstr");
-	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);
 	// Register hooks (kprobe_handler)
-	do_kpro = (void *)kallsyms_search ("register_undef_hook");
-	if (do_kpro == 0) {
+	__swap_register_undef_hook = swap_ksyms("register_undef_hook");
+	if (__swap_register_undef_hook == NULL) {
 		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) {
+	__swap_unregister_undef_hook = swap_ksyms("unregister_undef_hook");
+	if (__swap_unregister_undef_hook == NULL) {
                 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);
+	swap_register_undef_hook(&undef_ho_k);
 	if ((ret = dbi_register_kprobe (&trampoline_p)) != 0) {
 		//dbi_unregister_jprobe(&do_exit_p, 0);
 		return ret;
 	}
+
 	return ret;
 }
 
-void __exit dbi_arch_exit_kprobes (void)
+void arch_exit_kprobes(void)
 {
-	undo_kpro(&undef_ho_u_t);
-	undo_kpro(&undef_ho_u);
-	undo_kpro(&undef_ho_k);
+	dbi_unregister_kprobe(&trampoline_p, NULL);
+	swap_unregister_undef_hook(&undef_ho_k);
 }
 
-//EXPORT_SYMBOL_GPL (dbi_arch_uprobe_return);
-//EXPORT_SYMBOL_GPL (dbi_arch_exit_kprobes);
+/* export symbol for trampoline_arm.h */
+EXPORT_SYMBOL_GPL(gen_insn_execbuf);
+EXPORT_SYMBOL_GPL(pc_dep_insn_execbuf);