[REFACTOR] create usm_/un/register_probe()

diff --git a/driver/sspt/sspt_page.c b/driver/sspt/sspt_page.c
index d73902c..c58c485 100644 (file)
--- a/driver/sspt/sspt_page.c
+++ b/driver/sspt/sspt_page.c
@@ -62,6 +62,11 @@ static void sspt_list_add_ip(struct sspt_page *page, struct us_ip *ip)
        ip->page = page;
 }
 
+static void sspt_list_del_ip(struct us_ip *ip)
+{
+       list_del(&ip->list);
+}
+
 struct sspt_page *sspt_page_copy(const struct sspt_page *page)
 {
        struct us_ip *ip, *new_ip;
@@ -105,6 +110,12 @@ void sspt_add_ip(struct sspt_page *page, struct us_ip *ip)
        sspt_list_add_ip(page, ip);
 }
 
+void sspt_del_ip(struct us_ip *ip)
+{
+       sspt_list_del_ip(ip);
+       free_ip(ip);
+}
+
 struct us_ip *sspt_find_ip(struct sspt_page *page, unsigned long offset)
 {
        struct us_ip *ip;

diff --git a/driver/sspt/sspt_page.h b/driver/sspt/sspt_page.h
index 5c98ace..8a4d3c2 100644 (file)
--- a/driver/sspt/sspt_page.h
+++ b/driver/sspt/sspt_page.h
@@ -48,6 +48,7 @@ struct sspt_page *sspt_page_copy(const struct sspt_page *page);
 void sspt_page_free(struct sspt_page *page);
 
 void sspt_add_ip(struct sspt_page *page, struct us_ip *ip);
+void sspt_del_ip(struct us_ip *ip);
 struct us_ip *sspt_find_ip(struct sspt_page *page, unsigned long offset);
 
 static inline void sspt_page_assert_install(const struct sspt_page *page)

diff --git a/us_manager/Makefile.am b/us_manager/Makefile.am
index 9977d38..664cf75 100644 (file)
--- a/us_manager/Makefile.am
+++ b/us_manager/Makefile.am
@@ -5,7 +5,12 @@ module_dir = $(realpath $(top_srcdir)/src/modules/us_manager)
 module_name = swap_us_manager
 cross_compiler = $(subst gcc,,$(CC))
 
-extra_cflags = "$(board_opt)"
+inlude_opt = -I$(realpath $(top_srcdir)/src/modules/driver) \
+             -I$(realpath $(top_srcdir)/src/modules/uprobe) \
+             -I$(realpath $(top_srcdir)/src/modules/kprobe) \
+             -I$(realpath $(top_srcdir)/src/modules/kprobe/arch)
+
+extra_cflags = "$(inlude_opt) $(board_opt)"
 
 all-local:
        $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) extra_cflags=$(extra_cflags) \

diff --git a/us_manager/us_manager.c b/us_manager/us_manager.c
index b9b82c1..69a02ad 100644 (file)
--- a/us_manager/us_manager.c
+++ b/us_manager/us_manager.c
@@ -1,12 +1,66 @@
 #include <linux/module.h>
+#include <sspt/sspt_proc.h>
+#include <sspt/sspt_page.h>
+
+static struct sspt_proc *proc_base;
+
+int usm_register_probe(struct dentry *dentry, unsigned long offset,
+                      void *pre_handler, void *jp_handler, void *rp_handler)
+{
+       char *file_name;
+       struct sspt_file *file;
+       struct ip_data ip_d;
+
+       file_name = dentry->d_iname;
+       file = sspt_proc_find_file_or_new(proc_base, dentry, file_name);
+
+       ip_d.flag_retprobe = 1;
+       ip_d.got_addr = 0;
+       ip_d.jp_handler = jp_handler;
+       ip_d.offset = offset;
+       ip_d.pre_handler = pre_handler;
+       ip_d.rp_handler = rp_handler;
+
+       sspt_file_add_ip(file, &ip_d);
+
+       return 0;
+}
+
+int usm_unregister_probe(struct dentry *dentry, unsigned long offset)
+{
+       struct sspt_file *file;
+       struct sspt_page *page;
+       struct us_ip *ip;
+
+       file = sspt_proc_find_file(proc_base, dentry);
+       if (file == NULL)
+               return -EINVAL;
+
+       page = sspt_get_page(file, offset);
+       if (page == NULL)
+               return -EINVAL;
+
+       ip = sspt_find_ip(page, offset & ~PAGE_MASK);
+       if (ip == NULL) {
+               sspt_put_page(page);
+               return -EINVAL;
+       }
+
+       sspt_del_ip(ip);
+       sspt_put_page(page);
+
+       return 0;
+}
 
 static int __init init_us_manager(void)
 {
+       proc_base = sspt_proc_create(NULL, NULL);
        return 0;
 }
 
 static void __exit exit_us_manager(void)
 {
+       sspt_proc_free(proc_base);
 }
 
 module_init(init_us_manager);