[REFACTOR] remove argument 'atomic' in US API

diff --git a/driver/helper.c b/driver/helper.c
index c59f205..3c5c97b 100644 (file)
--- a/driver/helper.c
+++ b/driver/helper.c
@@ -176,7 +176,7 @@ static int mr_pre_handler(struct kprobe *p, struct pt_regs *regs)
                        printk("failed to uninstall IPs (%d)!\n", ret);
                }
 
-               dbi_unregister_all_uprobes(task, 1);
+               dbi_unregister_all_uprobes(task);
        }
 
 out:

diff --git a/driver/sspt/sspt.h b/driver/sspt/sspt.h
index 79af2c0..183d8f9 100644 (file)
--- a/driver/sspt/sspt.h
+++ b/driver/sspt/sspt.h
@@ -96,7 +96,7 @@ enum US_FLAGS {
 
 static inline int register_usprobe_my(struct task_struct *task, struct us_ip *ip)
 {
-       return register_usprobe(task, ip, 1);
+       return register_usprobe(task, ip);
 }
 
 static inline int unregister_usprobe_my(struct task_struct *task, struct us_ip *ip, enum US_FLAGS flag)
@@ -105,7 +105,7 @@ static inline int unregister_usprobe_my(struct task_struct *task, struct us_ip *
 
        switch (flag) {
        case US_UNREGS_PROBE:
-               err = unregister_usprobe(task, ip, 1);
+               err = unregister_usprobe(task, ip);
                break;
        case US_DISARM:
                disarm_uprobe(&ip->jprobe.up.kp, task);

diff --git a/driver/us_proc_inst.c b/driver/us_proc_inst.c
index 27ea788..ef6ef31 100644 (file)
--- a/driver/us_proc_inst.c
+++ b/driver/us_proc_inst.c
@@ -254,7 +254,7 @@ int deinst_usr_space_proc (void)
                                        EPRINTF ("failed to uninstall IPs (%d)!", ret);
                                }
 
-                               dbi_unregister_all_uprobes(task, 1);
+                               dbi_unregister_all_uprobes(task);
                        }
                }
        }
@@ -285,7 +285,7 @@ int deinst_usr_space_proc (void)
                        put_task_struct (task);
 
                        printk("### 1 ### dbi_unregister_all_uprobes:\n");
-                       dbi_unregister_all_uprobes(task, 1);
+                       dbi_unregister_all_uprobes(task);
                        us_proc_info.tgid = 0;
                        for(i = 0; i < us_proc_info.libs_count; i++)
                                us_proc_info.p_libs[i].loaded = 0;
@@ -696,7 +696,7 @@ int uretprobe_event_handler(struct uretprobe_instance *probe, struct pt_regs *re
        return 0;
 }
 
-int register_usprobe(struct task_struct *task, struct us_ip *ip, int atomic)
+int register_usprobe(struct task_struct *task, struct us_ip *ip)
 {
        int ret = 0;
 
@@ -713,7 +713,7 @@ int register_usprobe(struct task_struct *task, struct us_ip *ip, int atomic)
        ip->jprobe.priv_arg = ip;
        ip->jprobe.up.task = task;
        ip->jprobe.up.sm = ip->page->file->procs->sm;
-       ret = dbi_register_ujprobe(&ip->jprobe, atomic);
+       ret = dbi_register_ujprobe(&ip->jprobe);
        if (ret) {
                if (ret == -ENOEXEC) {
                        pack_event_info(ERR_MSG_ID, RECORD_ENTRY, "dp",
@@ -734,7 +734,7 @@ int register_usprobe(struct task_struct *task, struct us_ip *ip, int atomic)
                ip->retprobe.priv_arg = ip;
                ip->retprobe.up.task = task;
                ip->retprobe.up.sm = ip->page->file->procs->sm;
-               ret = dbi_register_uretprobe(&ip->retprobe, atomic);
+               ret = dbi_register_uretprobe(&ip->retprobe);
                if (ret) {
                        EPRINTF ("dbi_register_uretprobe() failure %d", ret);
                        return ret;
@@ -744,12 +744,12 @@ int register_usprobe(struct task_struct *task, struct us_ip *ip, int atomic)
        return 0;
 }
 
-int unregister_usprobe(struct task_struct *task, struct us_ip *ip, int atomic)
+int unregister_usprobe(struct task_struct *task, struct us_ip *ip)
 {
-       dbi_unregister_ujprobe(&ip->jprobe, atomic);
+       dbi_unregister_ujprobe(&ip->jprobe);
 
        if (ip->flag_retprobe) {
-               dbi_unregister_uretprobe(&ip->retprobe, atomic);
+               dbi_unregister_uretprobe(&ip->retprobe);
        }
 
        return 0;

diff --git a/driver/us_proc_inst.h b/driver/us_proc_inst.h
index 6af6abf..a3f2f21 100644 (file)
--- a/driver/us_proc_inst.h
+++ b/driver/us_proc_inst.h
@@ -43,8 +43,8 @@ enum US_FLAGS;
 int is_libonly(void);
 int is_us_instrumentation(void);
 
-int register_usprobe(struct task_struct *task, struct us_ip *ip, int atomic);
-int unregister_usprobe(struct task_struct *task, struct us_ip *ip, int atomic);
+int register_usprobe(struct task_struct *task, struct us_ip *ip);
+int unregister_usprobe(struct task_struct *task, struct us_ip *ip);
 
 struct dentry *dentry_by_path(const char *path);
 int install_otg_ip(unsigned long addr,

diff --git a/uprobe/arch/asm-arm/swap_uprobes.c b/uprobe/arch/asm-arm/swap_uprobes.c
index e25f3ae..77ec122 100644 (file)
--- a/uprobe/arch/asm-arm/swap_uprobes.c
+++ b/uprobe/arch/asm-arm/swap_uprobes.c
@@ -536,7 +536,7 @@ static int arch_copy_trampoline_thumb_uprobe(struct kprobe *p, struct task_struc
        return 0;
 }
 
-int arch_prepare_uprobe(struct uprobe *up, struct hlist_head *page_list, int atomic)
+int arch_prepare_uprobe(struct uprobe *up, struct hlist_head *page_list)
 {
        int ret = 0;
        struct kprobe *p = &up->kp;

diff --git a/uprobe/arch/asm-arm/swap_uprobes.h b/uprobe/arch/asm-arm/swap_uprobes.h
index 34e1edb..a0c2392 100644 (file)
--- a/uprobe/arch/asm-arm/swap_uprobes.h
+++ b/uprobe/arch/asm-arm/swap_uprobes.h
@@ -10,7 +10,7 @@ static inline void dbi_arch_uprobe_return(void)
 {
 }
 
-int arch_prepare_uprobe(struct uprobe *up, struct hlist_head *page_list, int atomic);
+int arch_prepare_uprobe(struct uprobe *up, struct hlist_head *page_list);
 
 int setjmp_upre_handler(struct kprobe *p, struct pt_regs *regs);
 static inline int longjmp_break_uhandler(struct kprobe *p, struct pt_regs *regs)

diff --git a/uprobe/swap_uprobes.c b/uprobe/swap_uprobes.c
index c4ab6f7..e0d2908 100644 (file)
--- a/uprobe/swap_uprobes.c
+++ b/uprobe/swap_uprobes.c
@@ -506,7 +506,7 @@ static struct uretprobe_instance *get_free_urp_inst(struct uretprobe *rp)
 }
 // ===================================================================
 
-int dbi_register_uprobe(struct uprobe *up, int atomic)
+int dbi_register_uprobe(struct uprobe *up)
 {
        int ret = 0;
        struct kprobe *p, *old_p;
@@ -551,7 +551,7 @@ int dbi_register_uprobe(struct uprobe *up, int atomic)
                goto out;
        }
 
-       ret = arch_prepare_uprobe(up, &uprobe_insn_pages, atomic);
+       ret = arch_prepare_uprobe(up, &uprobe_insn_pages);
        if (ret) {
                DBPRINTF("goto out\n", ret);
                goto out;
@@ -570,7 +570,7 @@ out:
        return ret;
 }
 
-void dbi_unregister_uprobe(struct uprobe *up, int atomic)
+void dbi_unregister_uprobe(struct uprobe *up)
 {
        struct kprobe *p, *old_p, *list_p;
        int cleanup_p;
@@ -635,7 +635,7 @@ valid_p:
        }
 }
 
-int dbi_register_ujprobe(struct ujprobe *jp, int atomic)
+int dbi_register_ujprobe(struct ujprobe *jp)
 {
        int ret = 0;
 
@@ -643,14 +643,14 @@ int dbi_register_ujprobe(struct ujprobe *jp, int atomic)
        jp->up.kp.pre_handler = setjmp_upre_handler;
        jp->up.kp.break_handler = longjmp_break_uhandler;
 
-       ret = dbi_register_uprobe(&jp->up, atomic);
+       ret = dbi_register_uprobe(&jp->up);
 
        return ret;
 }
 
-void dbi_unregister_ujprobe(struct ujprobe *jp, int atomic)
+void dbi_unregister_ujprobe(struct ujprobe *jp)
 {
-       dbi_unregister_uprobe(&jp->up, atomic);
+       dbi_unregister_uprobe(&jp->up);
        /*
         * Here is an attempt to unregister even those probes that have not been
         * installed (hence not added to the hlist).
@@ -753,7 +753,7 @@ static int pre_handler_uretprobe(struct kprobe *p, struct pt_regs *regs)
        return 0;
 }
 
-int dbi_register_uretprobe(struct uretprobe *rp, int atomic)
+int dbi_register_uretprobe(struct uretprobe *rp)
 {
        int i, ret = 0;
        struct uretprobe_instance *inst;
@@ -792,7 +792,7 @@ int dbi_register_uretprobe(struct uretprobe *rp, int atomic)
        rp->nmissed = 0;
 
        /* Establish function entry probe point */
-       ret = dbi_register_uprobe(&rp->up, atomic);
+       ret = dbi_register_uprobe(&rp->up);
        if (ret) {
                free_urp_inst(rp);
                goto out;
@@ -888,7 +888,7 @@ int dbi_disarm_urp_inst_for_task(struct task_struct *parent, struct task_struct
 }
 EXPORT_SYMBOL_GPL(dbi_disarm_urp_inst_for_task);
 
-void dbi_unregister_uretprobe(struct uretprobe *rp, int atomic)
+void dbi_unregister_uretprobe(struct uretprobe *rp)
 {
        unsigned long flags;
        struct uretprobe_instance *ri;
@@ -928,10 +928,10 @@ void dbi_unregister_uretprobe(struct uretprobe *rp, int atomic)
        spin_unlock_irqrestore(&uretprobe_lock, flags);
        free_urp_inst(rp);
 
-       dbi_unregister_uprobe(&rp->up, atomic);
+       dbi_unregister_uprobe(&rp->up);
 }
 
-void dbi_unregister_all_uprobes(struct task_struct *task, int atomic)
+void dbi_unregister_all_uprobes(struct task_struct *task)
 {
        struct hlist_head *head;
        struct hlist_node *node, *tnode;
@@ -945,7 +945,7 @@ void dbi_unregister_all_uprobes(struct task_struct *task, int atomic)
                                struct uprobe *up = container_of(p, struct uprobe, kp);
                                printk("dbi_unregister_all_uprobes: delete uprobe at %p[%lx] for %s/%d\n",
                                                p->addr, (unsigned long)p->opcode, task->comm, task->pid);
-                               dbi_unregister_uprobe(up, atomic);
+                               dbi_unregister_uprobe(up);
                        }
                }
        }

diff --git a/uprobe/swap_uprobes.h b/uprobe/swap_uprobes.h
index 678ce24..68b2cbc 100644 (file)
--- a/uprobe/swap_uprobes.h
+++ b/uprobe/swap_uprobes.h
@@ -80,16 +80,16 @@ struct uretprobe_instance {
        struct task_struct *task;
 };
 
-int dbi_register_uprobe(struct uprobe *p, int atomic);
-void dbi_unregister_uprobe(struct uprobe *p, int atomic);
+int dbi_register_uprobe(struct uprobe *p);
+void dbi_unregister_uprobe(struct uprobe *p);
 
-int dbi_register_ujprobe(struct ujprobe *jp, int atomic);
-void dbi_unregister_ujprobe(struct ujprobe *jp, int atomic);
+int dbi_register_ujprobe(struct ujprobe *jp);
+void dbi_unregister_ujprobe(struct ujprobe *jp);
 
-int dbi_register_uretprobe(struct uretprobe *rp, int atomic);
-void dbi_unregister_uretprobe(struct uretprobe *rp, int atomic);
+int dbi_register_uretprobe(struct uretprobe *rp);
+void dbi_unregister_uretprobe(struct uretprobe *rp);
 
-void dbi_unregister_all_uprobes(struct task_struct *task, int atomic);
+void dbi_unregister_all_uprobes(struct task_struct *task);
 
 void dbi_uprobe_return(void);
 struct kprobe *get_ukprobe(void *addr, pid_t tgid);