[REFACTOR] Replace kprobe_opcode_t -> uprobe_opcode_t

Change-Id: I3a883fda7d0b26c4b3d91d8174aebaa09ea012f4
Signed-off-by: Anatolii Nikulin <nikulin.a@samsung.com>

diff --git a/uprobe/arch/arm/swap-asm/swap_uprobes.c b/uprobe/arch/arm/swap-asm/swap_uprobes.c
index 56a4a20..9bee2fb 100644 (file)
--- a/uprobe/arch/arm/swap-asm/swap_uprobes.c
+++ b/uprobe/arch/arm/swap-asm/swap_uprobes.c
@@ -57,14 +57,14 @@
        flush_icache_range((unsigned long)(addr),               \
                           (unsigned long)(addr) + (size))
 
-static inline long branch_t16_dest(kprobe_opcode_t insn, unsigned int insn_addr)
+static inline long branch_t16_dest(uprobe_opcode_t insn, unsigned int insn_addr)
 {
        long offset = insn & 0x3ff;
        offset -= insn & 0x400;
        return insn_addr + 4 + offset * 2;
 }
 
-static inline long branch_cond_t16_dest(kprobe_opcode_t insn,
+static inline long branch_cond_t16_dest(uprobe_opcode_t insn,
                                        unsigned int insn_addr)
 {
        long offset = insn & 0x7f;
@@ -72,7 +72,7 @@ static inline long branch_cond_t16_dest(kprobe_opcode_t insn,
        return insn_addr + 4 + offset * 2;
 }
 
-static inline long branch_t32_dest(kprobe_opcode_t insn, unsigned int insn_addr)
+static inline long branch_t32_dest(uprobe_opcode_t insn, unsigned int insn_addr)
 {
        unsigned int poff = insn & 0x3ff;
        unsigned int offset = (insn & 0x07fe0000) >> 17;
@@ -85,7 +85,7 @@ static inline long branch_t32_dest(kprobe_opcode_t insn, unsigned int insn_addr)
        return (insn_addr + 4 + (poff << 12) + offset * 4) & ~3;
 }
 
-static inline long cbz_t16_dest(kprobe_opcode_t insn, unsigned int insn_addr)
+static inline long cbz_t16_dest(uprobe_opcode_t insn, unsigned int insn_addr)
 {
        unsigned int i = (insn & 0x200) >> 3;
        unsigned int offset = (insn & 0xf8) >> 2;
@@ -93,7 +93,7 @@ static inline long cbz_t16_dest(kprobe_opcode_t insn, unsigned int insn_addr)
 }
 
 /* is instruction Thumb2 and NOT a branch, etc... */
-static int is_thumb2(kprobe_opcode_t insn)
+static int is_thumb2(uprobe_opcode_t insn)
 {
        return ((insn & 0xf800) == 0xe800 ||
                (insn & 0xf800) == 0xf000 ||
@@ -173,8 +173,8 @@ static int arch_check_insn_thumb(unsigned long insn)
        return ret;
 }
 
-static int prep_pc_dep_insn_execbuf_thumb(kprobe_opcode_t *insns,
-                                         kprobe_opcode_t insn, int uregs)
+static int prep_pc_dep_insn_execbuf_thumb(uprobe_opcode_t *insns,
+                                         uprobe_opcode_t insn, int uregs)
 {
        unsigned char mreg = 0;
        unsigned char reg = 0;
@@ -676,11 +676,11 @@ void arch_opcode_analysis_uretprobe(struct uretprobe *rp)
  */
 int arch_prepare_uretprobe(struct uretprobe_instance *ri, struct pt_regs *regs)
 {
-       ri->ret_addr = (kprobe_opcode_t *)regs->ARM_lr;
-       ri->sp = (kprobe_opcode_t *)regs->ARM_sp;
+       ri->ret_addr = (uprobe_opcode_t *)regs->ARM_lr;
+       ri->sp = (uprobe_opcode_t *)regs->ARM_sp;
 
        /* Set flag of current mode */
-       ri->sp = (kprobe_opcode_t *)((long)ri->sp | !!thumb_mode(regs));
+       ri->sp = (uprobe_opcode_t *)((long)ri->sp | !!thumb_mode(regs));
 
        if (ri->preload_thumb) {
                regs->ARM_lr = (unsigned long)(ri->rp->up.ainsn.insn) + 0x1b;
@@ -799,7 +799,7 @@ int setjmp_upre_handler(struct uprobe *p, struct pt_regs *regs)
        entry_point_t entry = (entry_point_t)jp->entry;
 
        if (pre_entry) {
-               p->ss_addr[smp_processor_id()] = (kprobe_opcode_t *)
+               p->ss_addr[smp_processor_id()] = (uprobe_opcode_t *)
                                                 pre_entry(jp->priv_arg, regs);
        }
 
@@ -940,7 +940,7 @@ static void uprobe_prepare_singlestep(struct uprobe *p, struct pt_regs *regs)
 
 static int uprobe_handler(struct pt_regs *regs)
 {
-       kprobe_opcode_t *addr = (kprobe_opcode_t *)(regs->ARM_pc);
+       uprobe_opcode_t *addr = (uprobe_opcode_t *)(regs->ARM_pc);
        struct task_struct *task = current;
        pid_t tgid = task->tgid;
        struct uprobe *p;

diff --git a/uprobe/arch/arm/swap-asm/swap_uprobes.h b/uprobe/arch/arm/swap-asm/swap_uprobes.h
index ee21d13..2a05864 100644 (file)
--- a/uprobe/arch/arm/swap-asm/swap_uprobes.h
+++ b/uprobe/arch/arm/swap-asm/swap_uprobes.h
@@ -44,6 +44,8 @@ struct uprobe;
 struct uretprobe;
 struct uretprobe_instance;
 
+typedef unsigned long uprobe_opcode_t;
+
 /**
  * @struct arch_specific_tramp
  * @brief Stores arch-dependent trampolines.

diff --git a/uprobe/arch/x86/swap-asm/swap_uprobes.c b/uprobe/arch/x86/swap-asm/swap_uprobes.c
index 0d6053a..b12e024 100644 (file)
--- a/uprobe/arch/x86/swap-asm/swap_uprobes.c
+++ b/uprobe/arch/x86/swap-asm/swap_uprobes.c
@@ -160,7 +160,7 @@ int setjmp_upre_handler(struct uprobe *p, struct pt_regs *regs)
                       regs->sp + 4);
 
        if (pre_entry)
-               p->ss_addr[smp_processor_id()] = (kprobe_opcode_t *)
+               p->ss_addr[smp_processor_id()] = (uprobe_opcode_t *)
                                                 pre_entry(jp->priv_arg, regs);
 
        if (entry)
@@ -182,7 +182,7 @@ int arch_prepare_uretprobe(struct uretprobe_instance *ri, struct pt_regs *regs)
 {
        /* Replace the return addr with trampoline addr */
        unsigned long ra = trampoline_addr(&ri->rp->up);
-       ri->sp = (kprobe_opcode_t *)regs->sp;
+       ri->sp = (uprobe_opcode_t *)regs->sp;
 
        if (!read_proc_vm_atomic(current, regs->EREG(sp), &(ri->ret_addr),
                                 sizeof(ri->ret_addr))) {
@@ -298,7 +298,7 @@ static void resume_execution(struct uprobe *p,
        unsigned long *tos, tos_dword = 0;
        unsigned long copy_eip = (unsigned long)p->ainsn.insn;
        unsigned long orig_eip = (unsigned long)p->addr;
-       kprobe_opcode_t insns[2];
+       uprobe_opcode_t insns[2];
 
        regs->EREG(flags) &= ~TF_MASK;
 
@@ -312,7 +312,7 @@ static void resume_execution(struct uprobe *p,
        }
 
        if (!read_proc_vm_atomic(current, (unsigned long)p->ainsn.insn, insns,
-                                2 * sizeof(kprobe_opcode_t))) {
+                                2 * sizeof(uprobe_opcode_t))) {
                printk(KERN_WARNING
                       "failed to read first 2 opcodes of instruction copy from user space %p!\n",
                       p->ainsn.insn);
@@ -466,13 +466,13 @@ static void uprobe_prepare_singlestep(struct uprobe *p, struct pt_regs *regs)
 static int uprobe_handler(struct pt_regs *regs)
 {
        struct uprobe *p;
-       kprobe_opcode_t *addr;
+       uprobe_opcode_t *addr;
        struct task_struct *task = current;
        pid_t tgid = task->tgid;
 
        save_current_flags(regs);
 
-       addr = (kprobe_opcode_t *)(regs->EREG(ip) - sizeof(kprobe_opcode_t));
+       addr = (uprobe_opcode_t *)(regs->EREG(ip) - sizeof(uprobe_opcode_t));
        p = get_uprobe(addr, tgid);
 
        if (p == NULL) {

diff --git a/uprobe/arch/x86/swap-asm/swap_uprobes.h b/uprobe/arch/x86/swap-asm/swap_uprobes.h
index 038f65c..ec1f4d5 100644 (file)
--- a/uprobe/arch/x86/swap-asm/swap_uprobes.h
+++ b/uprobe/arch/x86/swap-asm/swap_uprobes.h
@@ -41,6 +41,8 @@ struct uprobe;
 struct uretprobe;
 struct uretprobe_instance;
 
+typedef u8 uprobe_opcode_t;
+
 /**
  * @struct arch_specific_tramp
  * @brief Stores x86 trampoline

diff --git a/uprobe/swap_uprobes.c b/uprobe/swap_uprobes.c
index 2f6d3c3..283323d 100644 (file)
--- a/uprobe/swap_uprobes.c
+++ b/uprobe/swap_uprobes.c
@@ -83,7 +83,7 @@ void print_uprobe_hash_table(void)
  */
 static inline void copy_uprobe(struct uprobe *old_p, struct uprobe *p)
 {
-       memcpy(&p->opcode, &old_p->opcode, sizeof(kprobe_opcode_t));
+       memcpy(&p->opcode, &old_p->opcode, sizeof(uprobe_opcode_t));
        memcpy(&p->ainsn, &old_p->ainsn, sizeof(struct arch_specific_insn));
 #ifdef CONFIG_ARM
        p->safe_arm = old_p->safe_arm;
@@ -207,7 +207,7 @@ static int register_aggr_uprobe(struct uprobe *old_p, struct uprobe *p)
 
 static int arm_uprobe(struct uprobe *p)
 {
-       kprobe_opcode_t insn = BREAKPOINT_INSTRUCTION;
+       uprobe_opcode_t insn = BREAKPOINT_INSTRUCTION;
        int ret = write_proc_vm_atomic(p->task, (unsigned long)p->addr,
                                       &insn, sizeof(insn));
        if (!ret) {
@@ -490,7 +490,7 @@ int swap_register_uprobe(struct uprobe *p)
 #if defined(CONFIG_ARM)
        /* TODO: must be corrected in 'bundle' */
        if ((unsigned long) p->addr & 0x01)
-               p->addr = (kprobe_opcode_t *)((unsigned long)p->addr &
+               p->addr = (uprobe_opcode_t *)((unsigned long)p->addr &
                                              0xfffffffe);
 #endif
 

diff --git a/uprobe/swap_uprobes.h b/uprobe/swap_uprobes.h
index 9578cf8..cd701d6 100644 (file)
--- a/uprobe/swap_uprobes.h
+++ b/uprobe/swap_uprobes.h
@@ -73,7 +73,7 @@ struct uprobe {
        /** List of uprobes for multi-handler support.*/
        struct list_head list;
        /** Location of the probe point. */
-       kprobe_opcode_t *addr;
+       uprobe_opcode_t *addr;
        /** Called before addr is executed.*/
        uprobe_pre_handler_t pre_handler;
        /** Called after addr is executed, unless...*/
@@ -83,7 +83,7 @@ struct uprobe {
        /** Return 1 if it handled fault, otherwise kernel will see it.*/
        uprobe_break_handler_t break_handler;
        /** Saved opcode (which has been replaced with breakpoint).*/
-       kprobe_opcode_t opcode;
+       uprobe_opcode_t opcode;
        /** Copy of the original instruction.*/
        struct arch_specific_insn ainsn;
        /** Override single-step target address, may be used to redirect
@@ -92,7 +92,7 @@ struct uprobe {
         * replacement. If jprobe.entry should return address of function or
         * NULL if original function should be called.
         * Not supported for X86, not tested for MIPS. */
-       kprobe_opcode_t *ss_addr[NR_CPUS];
+       uprobe_opcode_t *ss_addr[NR_CPUS];
 #ifdef CONFIG_ARM
        /** Safe/unsafe to use probe on ARM.*/
        unsigned safe_arm:1;
@@ -168,8 +168,8 @@ struct uretprobe_instance {
        struct hlist_node uflist;           /**< Free list */
        struct hlist_node hlist;            /**< Used list */
        struct uretprobe *rp;               /**< Pointer to the parent uretprobe */
-       kprobe_opcode_t *ret_addr;          /**< Return address */
-       kprobe_opcode_t *sp;                /**< Pointer to stack */
+       uprobe_opcode_t *ret_addr;          /**< Return address */
+       uprobe_opcode_t *sp;                /**< Pointer to stack */
        struct task_struct *task;           /**< Pointer to the task struct */
 #ifdef CONFIG_ARM
        /* FIXME Preload: if this flag is set then ignore the thumb_mode(regs)