Merge branch 'kernel' of 106.109.8.71:/srv/git/dbi into kernel

[kernel/swap-modules.git] / kprobe / dbi_insn_slots.h

diff --git a/kprobe/dbi_insn_slots.h b/kprobe/dbi_insn_slots.h
index 98fcbe3..39e63a3 100644 (file)
--- a/kprobe/dbi_insn_slots.h
+++ b/kprobe/dbi_insn_slots.h
@@ -1,5 +1,5 @@
-#ifndef _SRC_INSNS_SLOTS_H
-#define _SRC_INSNS_SLOTS_H
+#ifndef _DBI_INSNS_SLOTS_H
+#define _DBI_INSNS_SLOTS_H
 
 /*
  *  Kernel Probes (KProbes)
@@ -44,27 +44,21 @@
  *
  * 2008-2009    Alexey Gerenkov <a.gerenkov@samsung.com> User-Space
  *              Probes initial implementation; Support x86/ARM/MIPS for both user and kernel spaces.
- * 2010         Ekaterina Gorelkina <e.gorelkina@samsung.com>: redesign module for separating core and arch parts 
- *
-
+ * 2010         Ekaterina Gorelkina <e.gorelkina@samsung.com>: redesign module for separating core and arch parts
+ * 2012-2013    Vyacheslav Cherkashin <v.cherkashin@samsung.com> new memory allocator for slots
  */
 
-#include "dbi_kprobes.h"
-
-
-#define INSNS_PER_PAGE (PAGE_SIZE/(MAX_INSN_SIZE * sizeof(kprobe_opcode_t)))
-
-int collect_garbage_slots (struct hlist_head *page_list, struct task_struct *task);
-
-kprobe_opcode_t *get_insn_slot (struct task_struct *task, int atomic);
-void free_insn_slot (struct hlist_head *page_list, struct task_struct *task, kprobe_opcode_t *slot, int dirty);
-
-void purge_garbage_uslots(struct task_struct *task, int atomic);
-
-unsigned long alloc_user_pages(struct task_struct *task, unsigned long len, 
-               unsigned long prot, unsigned long flags, int atomic);
-int check_safety (void);
+#include <linux/types.h>
 
+struct slot_manager {
+       unsigned long slot_size;
+       void *(*alloc)(struct slot_manager *sm);
+       void (*free)(struct slot_manager *sm, void *ptr);
+       struct hlist_head page_list;
+       void *data;
+};
 
+void *alloc_insn_slot(struct slot_manager *sm);
+void free_insn_slot(struct slot_manager *sm, void *slot);
 
-#endif /*  _SRC_INSNS_SLOTS_H */ 
+#endif /* _DBI_INSNS_SLOTS_H */