[CLEAN] remove swap_task_data.ko

Change-Id: I6eb7f9327ef96cae66edafea7ef15ec4f6575c50
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --git a/Kbuild b/Kbuild
index 9fd50c0..e658e81 100644 (file)
--- a/Kbuild
+++ b/Kbuild
@@ -15,7 +15,6 @@ obj-m := master/ \
          parser/ \
          retprobe/ \
          webprobe/ \
-         task_data/ \
          preload/ \
          fbiprobe/ \
          wsp/ \

diff --git a/preload/preload_module.c b/preload/preload_module.c
index 0188344..33b1bd1 100644 (file)
--- a/preload/preload_module.c
+++ b/preload/preload_module.c
@@ -20,7 +20,6 @@
 #include <writer/kernel_operations.h>
 #include <master/swap_initializer.h>
 #include <writer/swap_msg.h>
-#include <task_data/task_data.h>
 #include "preload.h"
 #include "preload_probe.h"
 #include "preload_debugfs.h"

diff --git a/task_data/Kbuild b/task_data/Kbuild
deleted file mode 100644 (file)
index 7505fcf..0000000
--- a/task_data/Kbuild
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_CFLAGS := $(extra_cflags)
-
-obj-m := swap_task_data.o
-swap_task_data-y := task_data.o

diff --git a/task_data/task_data.c b/task_data/task_data.c
deleted file mode 100644 (file)
index d079b3c..0000000
--- a/task_data/task_data.c
+++ /dev/null
@@ -1,258 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/stop_machine.h>
-#include <linux/slab.h>
-#include <kprobe/swap_td_raw.h>
-#include <kprobe/swap_kprobes.h>
-#include <ksyms/ksyms.h>
-#include <master/swap_initializer.h>
-#include <us_manager/callbacks.h>
-#include "task_data.h"
-
-/* lower bits are used as flags */
-#define TD_MAGIC_MASK 0xfffffff0
-#define TD_FLAGS_MASK (~TD_MAGIC_MASK)
-
-#define __DEFINE_TD_MAGIC(m) ((m) & TD_MAGIC_MASK)
-
-#define TD_MAGIC __DEFINE_TD_MAGIC(0xbebebebe)
-#define TD_PREFIX "[TASK_DATA] "
-
-struct task_data {
-       void *data;
-       unsigned long magic;
-} __attribute__((packed));
-
-#define get_magic(td) ((td)->magic & TD_MAGIC_MASK)
-#define get_flags(td) ((td)->magic & TD_FLAGS_MASK)
-
-static int __task_data_cbs_start_h = -1;
-static int __task_data_cbs_stop_h = -1;
-
-static struct td_raw td_raw;
-
-static inline struct task_data *__td(struct task_struct *task)
-{
-       return (struct task_data *)swap_td_raw(&td_raw, task);
-}
-
-static inline bool __td_check(struct task_data *td)
-{
-       return (get_magic(td) == TD_MAGIC);
-}
-
-static inline void __td_init(struct task_data *td, void *data,
-                            unsigned long flags)
-{
-       td->magic = TD_MAGIC | (flags & TD_FLAGS_MASK);
-       td->data = data;
-}
-
-static inline void __td_free(struct task_data *td)
-{
-       unsigned long flags = get_flags(td);
-       bool ok = __td_check(td);
-
-       /* freeing the data if consistency check fails is dangerous:
-        * better leave it as a memory leak instead */
-       if (ok) {
-               if ((flags & SWAP_TD_FREE) && td->data)
-                       kfree(td->data);
-               td->magic = 0;
-               td->data = NULL;
-               return;
-       }
-}
-
-void *swap_task_data_get(struct task_struct *task, int *ok)
-{
-       struct task_data *td = __td(task);
-
-       if (ok)
-               *ok = __td_check(td);
-
-       return td->data;
-}
-EXPORT_SYMBOL_GPL(swap_task_data_get);
-
-void swap_task_data_set(struct task_struct *task, void *data,
-                       unsigned long flags)
-{
-       struct task_data *td = __td(task);
-
-       __td_init(td, data, flags);
-}
-EXPORT_SYMBOL_GPL(swap_task_data_set);
-
-
-static atomic_t start_flag = ATOMIC_INIT(0);
-
-static int copy_process_ret_handler(struct kretprobe_instance *ri,
-                                   struct pt_regs *regs)
-{
-       struct task_struct *task;
-
-       if (atomic_read(&start_flag) == 0)
-               return 0;
-
-       task = (struct task_struct *)regs_return_value(regs);
-       if (!IS_ERR(task))
-               swap_task_data_clean(task);
-
-       return 0;
-}
-
-static int do_exit_handler(struct kprobe *p, struct pt_regs *regs)
-{
-       struct task_data *td;
-
-       if (atomic_read(&start_flag) == 0)
-               return 0;
-
-       td = __td(current);
-       __td_free(td);
-
-       return 0;
-}
-
-static struct kretprobe copy_process_rp = {
-       .handler = copy_process_ret_handler
-};
-
-static struct kprobe do_exit_probe = {
-       .pre_handler = do_exit_handler
-};
-
-static int __task_data_init(void *data)
-{
-       struct task_struct *g, *t;
-
-       /* set start_flags */
-       atomic_set(&start_flag, 1);
-
-       do_each_thread(g, t) {
-               swap_task_data_clean(t);
-       } while_each_thread(g, t);
-
-       return 0;
-}
-
-static int __task_data_exit(void *data)
-{
-       struct task_struct *g, *t;
-       struct task_data *td;
-
-       do_each_thread(g, t) {
-               td = __td(t);
-               __td_free(td);
-       } while_each_thread(g, t);
-
-       /* reset start_flags */
-       atomic_set(&start_flag, 0);
-
-       return 0;
-}
-
-static void task_data_start(void)
-{
-       int ret;
-
-       ret = swap_register_kprobe(&do_exit_probe);
-       if (ret) {
-               pr_err(TD_PREFIX "register on 'do_exit' failed: ret=%d\n", ret);
-               return;
-       }
-
-       ret = swap_register_kretprobe(&copy_process_rp);
-       if (ret) {
-               swap_unregister_kprobe(&do_exit_probe);
-               pr_err(TD_PREFIX "register on 'copy_process' failed: ret=%d\n", ret);
-               return;
-       }
-
-       /* stop_machine: cannot get tasklist_lock from module */
-       ret = stop_machine(__task_data_init, NULL, NULL);
-       if (ret)
-               printk(TD_PREFIX "task data initialization failed: %d\n", ret);
-}
-
-static void task_data_stop(void)
-{
-       int ret;
-
-       /* stop_machine: the same here */
-       ret = stop_machine(__task_data_exit, NULL, NULL);
-       if (ret) {
-               printk(TD_PREFIX "task data cleanup failed: %d\n", ret);
-               /* something went wrong: at least make sure we unregister
-                * all the installed probes */
-               swap_unregister_kprobe(&do_exit_probe);
-       }
-
-       swap_unregister_kretprobe(&copy_process_rp);
-       swap_unregister_kprobe(&do_exit_probe);
-}
-
-static int task_data_once(void)
-{
-       const char *sym;
-
-       sym = "copy_process";
-       copy_process_rp.kp.addr = (kprobe_opcode_t *)swap_ksyms_substr(sym);
-       if (copy_process_rp.kp.addr == NULL)
-               goto not_found;
-
-       sym = "do_exit";
-       do_exit_probe.addr = (kprobe_opcode_t *)swap_ksyms_substr(sym);
-       if (do_exit_probe.addr == NULL)
-               goto not_found;
-
-       return 0;
-
-not_found:
-       pr_err(TD_PREFIX "ERROR: symbol %s(...) not found\n", sym);
-       return -ESRCH;
-}
-
-static int task_data_init(void)
-{
-       int ret = 0;
-
-       ret = swap_td_raw_reg(&td_raw, sizeof(struct task_data));
-       if (ret)
-               return ret;
-
-       __task_data_cbs_start_h = us_manager_reg_cb(START_CB, task_data_start);
-       if (__task_data_cbs_start_h < 0) {
-               ret = __task_data_cbs_start_h;
-               printk(KERN_ERR TD_PREFIX "start_cb registration failed\n");
-               goto out;
-       }
-
-       __task_data_cbs_stop_h = us_manager_reg_cb(STOP_CB_TD, task_data_stop);
-       if (__task_data_cbs_stop_h < 0) {
-               ret = __task_data_cbs_stop_h;
-               us_manager_unreg_cb(__task_data_cbs_start_h);
-               printk(KERN_ERR TD_PREFIX "stop_cb registration failed\n");
-       }
-
-out:
-       if (ret)
-               swap_td_raw_unreg(&td_raw);
-
-       return ret;
-}
-
-static void task_data_exit(void)
-{
-       us_manager_unreg_cb(__task_data_cbs_start_h);
-       us_manager_unreg_cb(__task_data_cbs_stop_h);
-       swap_td_raw_unreg(&td_raw);
-}
-
-SWAP_LIGHT_INIT_MODULE(task_data_once, task_data_init, task_data_exit,
-                      NULL, NULL);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("SWAP Task Data Module");

diff --git a/task_data/task_data.h b/task_data/task_data.h
deleted file mode 100644 (file)
index a5e67cf..0000000
--- a/task_data/task_data.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __TASK_DATA__
-#define __TASK_DATA__
-
-#define SWAP_TD_FREE 0x1 /* kfree task data automatically */
-
-struct task_struct;
-
-void *swap_task_data_get(struct task_struct *task, int *ok);
-void swap_task_data_set(struct task_struct *task, void *data,
-                       unsigned long flags);
-
-static inline void swap_task_data_clean(struct task_struct *task)
-{
-       swap_task_data_set(task, NULL, 0);
-}
-
-#endif /* __TASK_DATA__ */

diff --git a/us_manager/callbacks.h b/us_manager/callbacks.h
index f6d1b27..ba835d4 100644 (file)
--- a/us_manager/callbacks.h
+++ b/us_manager/callbacks.h
@@ -4,7 +4,6 @@
 enum callback_t {
        START_CB = 0,
        STOP_CB,
-       STOP_CB_TD
 };
 
 /* Gets callback type (on start or on stop) and function pointer.

diff --git a/us_manager/us_manager.c b/us_manager/us_manager.c
index 51e9110..25c6c31 100644 (file)
--- a/us_manager/us_manager.c
+++ b/us_manager/us_manager.c
@@ -61,8 +61,6 @@ static void do_usm_stop(void)
        uninstall_all();
        unregister_helper_bottom();
        sspt_proc_free_all();
-       exec_cbs(STOP_CB_TD);
-
 }
 
 static int do_usm_start(void)