Merge branch 'dev' into kernel

Conflicts:
src/modules/kprobe/arch/asm-arm/dbi_kprobes.c
src/modules/kprobe/arch/asm-arm/dbi_kprobes_thumb.h

[COPYRIGHT] remove commit 29e0e20a8e8

Merge commit 'c3b2c00db03530f8b928b959e085d5b9f6ce3264' into kernel

Conflicts:
src/modules/kprobe/dbi_uprobes.c

[REFACTOR] move and redesign install_proc_probes()

refactoring:
install_proc_probes() --> sspt_procs_install()
move: from src/modules/driver/us_proc_inst.c
to src/modules/driver/sspt/sspt_procs.c

install_page_probes() --> sspt_procs_install_page()
move: from src/modules/driver/us_proc_inst.c
to src/modules/driver/sspt/sspt_procs.c

mm_read_lock() and mm_read_unlock()
move: from src/modules/driver/us_proc_inst.c
to src/modules/driver/sspt/sspt_procs.c

set_mapping_file() --> sspt_file_set_mapping()
move: from src/modules/driver/us_proc_inst.c
to src/modules/driver/sspt/sspt_file.c

[REFACTOR] move and rename install_file_probes()

move:
from src/modules/driver/us_proc_inst.c
to src/modules/driver/sspt/sspt_file.c

rename:
install_file_probes() --> sspt_file_install()

[REFACTOR] new interface at install_file_probes()

-void install_file_probes(struct task_struct *task, struct mm_struct *mm,
                          struct sspt_file *file)
+void install_file_probes(struct sspt_file *file)

[REFACTOR] new interface at sspt_register_page()

-int sspt_register_page(struct sspt_page *page, struct sspt_file *file,
                        struct task_struct *task)
+int sspt_register_page(struct sspt_page *page, struct sspt_file *file)

[REFACTOR] new interface at sspt_register_usprobe()

-int sspt_register_usprobe(struct task_struct *task, struct us_ip *ip)
+int sspt_register_usprobe(struct us_ip *ip)

[REFACTOR] move and rename check_install_pages_in_file()

move:
from src/modules/driver/us_proc_inst.c
to src/modules/driver/sspt/sspt_file.c

rename:
check_install_pages_in_file() --> sspt_file_check_install_pages()

[REFACTOR] rename find_proc_by_task()

find_proc_by_task() --> check_dentry()

Merge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev

[FEATURE] Add Thumb branches instrumentation

FYI Functions with bl or blx as first instructions do not have
explicit  returns. Swap will not collect returns from this kind of functions.

[REFACTOR] redesign /un/register_usprobe()

-int register_usprobe(struct task_struct *task, struct us_ip *ip);
+int register_usprobe(struct us_ip *ip);

-int unregister_usprobe(struct task_struct *task, struct us_ip *ip);
+int unregister_usprobe(struct us_ip *ip);

[REFACTOR] create  field 'task' in 'srtuct sspt_procs'

[REFACTOR] move and rename /un/register_us_page_probe()

move:
from src/modules/driver/us_proc_inst.c
to src/modules/driver/sspt/sspt_page.c

rename:
register_us_page_probe() --> sspt_register_page()
unregister_us_page_probe() --> sspt_unregister_page()

[REFACTOR] apps and libonly in one list

[REFACTOR] remove argument 'atomic'

from:
install_proc_probes()
install_page_probes()

[REFACTOR] rename /un/register_usprobe_my()

/un/register_usprobe_my() --> sspt_/un/register_usprobe()

[REFACTOR] remove argument 'atomic' in US API

[REFACTOR] move and rename get_proc_probes_by_task*()

get_proc_probes_by_task() --> sspt_procs_get_by_task()
get_proc_probes_by_task_or_new() --> sspt_procs_get_by_task_or_new()

move:
from src/modules/driver/us_proc_inst.c
to src/modules/driver/sspt/sspt_procs.c

[REFACTOR] create helper and us_slot_manager

[REFACTOR] create empty swap_us_manager module

[REFACTOR] remove overhead calculation

for do_page_fault()

[REFACTOR] remove copy_process_ret_pre_code()

move functional from copy_process_ret_pre_code() to ret_handler_cp()

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

[FIX] x86: failed to read stack in dbi_disarm_urp_inst

dbi_disarm_urp_inst:
- kprobe_opcode_t -> unsigned long for all address variables involved;

asm-x86: __arch_prepare_kretprobe:
- ri->sp = &regs->EREG(sp); -> ri->sp = regs->EREG(sp);

It let read stack and found trampoline in dbi_disarm_urp_inst.

There are still problems with _start and uClibc probes both on
arm and x86.

Merge branch 'dev' into kernel

Conflicts:
src/modules/driver/us_proc_inst.c

Merge commit '47da1aa59eb36b55cda9138bec39942a14f051c4' into kernel

Conflicts:
src/modules/kprobe/arch/dbi_kprobes.c
src/modules/kprobe/dbi_kprobes.h

Merge commit 'e27784e31bd662313ac83c1632a70b51e5d86563' into kernel

Conflicts:
src/modules/kprobe/arch/asm-arm/dbi_kprobes.c
src/modules/kprobe/arch/asm-arm/dbi_kprobes.h
src/modules/kprobe/arch/dbi_kprobes.h

[FIX] simultaneous working do_page_fault() and US instrumentation

[REFACTOR] redesign add_probe();

[REFACTOR] replace unmap_jprobe on unmap_kprobe

and redesign jdo_munmap() --> unmap_pre_handler()

[REFACTOR] replace jmm_release on mr_kprobe

and redesign jmm_release() --> mr_pre_handler()

[REFACTOR] remove remove_probe_from_list()

it is not used

[REFACTOR] redesign install_kern_otg_probe()

[FIX] move called unregister_helper_ks_probes()

fix commit f5182378f9f321dea54a70418071f0d340beffba

[REFACTOR] move probes_manager_/init/down()

from src/modules/driver/probes_manager.c
to src/modules/driver/module.c

[REFACTOR] remve 'spinlock_t ec_probe_spinlock'

it is not used

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

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

[FIX] us probes: port SWAP to x86, kernel 3.8.2

Apply follow_page_mask and new get_user_pages_uprobe only for
LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) rather than
LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0).
On x86 it doesn't work with KERNEL_VERSION(3, 8, 2).
Test on test/resources/src/pthread/pthread.c

[FIX] Correct addr in do_page_fault_j_pre_code

do_page_fault:
x86 -> do_page_fault(struct pt_regs *regs, unsigned long error_code)
unsigned long address = read_cr2();
arm -> do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)

[REFACTOR] create empty swap_ks_manager module

[REFACTOR] remove remove_probe()

it is not used

[REFACTOR] redesign add_probe_to_list() and add_probe()

[REFACTOR] create and using create/free/_kern_probe()

[REFACTOR] move definition 'struct hlist_head kernel_probes'

from src/modules/driver/storage.c
to src/modules/driver/probes_manager.c

[REFACTOR] redesign and move find_probe()

move:
from src/modules/driver/storage.c
to src/modules/driver/probes_manager.c

[REFACTOR] redesign and move remove_probe_from_list()

from src/modules/driver/storage.c
to src/modules/driver/probes_manager.c

[FIX] not set retprobes for sys_exit_group and do_group_exit

Related to f8fa40b9f377164f117eeec47832b5b3351b4ec5, where retprobe for
do_exit is not set.
These functions do not return by design (contain NOTREACHED comment),
so we do not need to set retprobes for them.

[FIX] x86: pending retprobes unregistering

This is the fix to f8fa40b9f377164f117eeec47832b5b3351b4ec5 for x86.

What's been done here:
 - kprobe_opcode_t -> unsigned long for all address variables involved;
 - sp is set to &regs->sp, not regs->sp (which is upmost value on
   stack).

Tested on:
  - i386 Qemu, Buildroot rootfs, Linux kernel 3.8.2;
  - ARM Qemu, Buildroot rootfs, Linux kernel 3.8.2;
  - U1HD, GT-I8800_c210v30_cluster_20121002_1.

[REFACTOR] move add_probe_to_list()

from src/modules/driver/storage.c
to src/modules/driver/probes_manager.c

[REFACTOR] redesign and rename detach_selected_probes()

detach_selected_probes() --> unset_kernel_probes()

[REFACTOR] redesign and rename attach_selected_probes()

attach_selected_probes() --> set_kernel_probes()

[REFACTOR] remove 'struct hlist_head otg_kernel_probes'

it is not used

[FIX] misspelling in e27784e31bd662313ac83c1632a70b51e5d86563

[FIX] __switch_to instrumentation on x86

What's been done here:
 - patch next task: value on top of next's stack is patched;
 - for that we need for regs structure (containing sp register);
 - it requires changing API of the following functions:
   - patch_suspended_task(): added regs argument;
   - set_task_trampoline(): task -> patch address;
   - arch_get_patch_addr() added (takes task and regs and returns
 address to patch).

Known issues:
 - x86 __switch_to instrumentation won't work at multi-core systems
   (because there is no code, that removes retprobes on user stop;
   because there is no regs argument passed to
   dbi_unregister_kretprobe());
 - I've left both old arch_get_task_pc()/arch_set_task_pc() and new
   arch_get_patch_addr() APIs.  They do rougly same things.

Tested on:
 - i386 Qemu, Buildroot rootfs, Linux kernel 3.8.2;
 - ARM Qemu, Buildroot rootfs, Linux kernel 3.8.2;
 - U1HD, GT-I8800_c210v30_cluster_20121002_1.

Merge branch 'dev' into kernel

Conflicts:
src/modules/driver/probes_manager.c
src/modules/kprobe/arch/asm-arm/dbi_kprobes.c
src/modules/kprobe/dbi_insn_slots.c
src/modules/kprobe/dbi_kprobes.c
src/modules/kprobe/dbi_uprobes.c

[REFACTOR] create /un/init_helper()

[REFACTOR] create /un/register_helper_ks_probes()

[REFACTOR] redesign /un/register_kernel_probe()

[REFACTOR] remove unused code

global variables:
probes_flags,
us_proc_probes

functions:
install_kernel_probe(),
uninstall_kernel_probe()

[REFACTOR] improve method of setting the auxiliary kprobe on do_page_fault()

[REFACTOR] remove installed probe on do_exit()

[REFACTOR] improve method of setting the auxiliary kprobe on do_munmap()

[REFACTOR] improve method of setting the auxiliary kprobe on mm_release()

[REFACTOR] improve method of setting the auxiliary kprobe on copy_process()

[FIX] correct disarm for children task

[REFACTOR] remove don't used definition ARCH_REG_VAL

[REFACTOR] redesign arch_prepare_kretprobe()

-void arch_prepare_kretprobe(struct kretprobe *rp, struct pt_regs *regs)
+void arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs)

[REFACTOR] rename arch_prepare_uretprobe_hl()

arch_prepare_uretprobe_hl() --> arch_prepare_uretprobe()

[REFACTOR] remove field 'disarm' from 'srtuct kretprobe'

[IMPROVE] add entry_handler() in kretprobe

[REFACTOR] remove not used functions

from:
src/modules/driver/us_proc_inst.h
src/modules/driver/us_proc_inst.c

[CLEAN] remove java instrumentation

[CLEAN] remove ANDROID_APP

[CLEAN] remove SLP_APP

[FIX] Continue repairing in case of linux-kernel=2.6

Replace follow_page_uprobe() by follow_page() in __get_user_pages_uprobe().

[FIX] linux<=2.6 compiling failed

Start reparing. Move follow_page_uprobe() under linux-version>=3.8.

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

Conflicts:
src/modules/driver/us_proc_inst.c

Resolve a conflict in install_file_probes()
with 832ea7b4775fe7d70de3fd9e97e0865a94db0fe7

[IMPROVE] create slot_manager

[FIX] Port SWAP to current Linux Kernel Mainline (3.9-rc5)

1. hlist_* API changed -> removed one argument;
2. file struct f_vfsmnt field removed -> replaced it with f_path.mnt;
3. do_mmap_pgoff() prototype changed -> added one argument;
4. __get_user_pages changed significantly -> stolen last version
   and put to __get_user_pages_uprobe;
5. follow_page() mechanism changed -> added follow_page_mask()

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

[IMPROVE] implement bidirectionality sspt tree

[FIX] removing probes from list if we can't handle it

Merge branch 'dev' into kernel

Conflicts:
src/modules/kprobe/arch/asm-arm/dbi_kprobes.c

[FIX] remove 'trampoline_p' probe, when unload kprobe module

[REFACTOR] redesign arch_prepare_kprobe()

-int arch_prepare_kprobe(struct kprobe *p)
+int arch_prepare_kprobe(struct kprobe *p, struct hlist_head *page_list)

[REFACTOR] redesign arch_prepare_uprobe()

-int arch_prepare_uprobe(struct uprobe *up, int atomic)
+int arch_prepare_uprobe(struct uprobe *up, struct hlist_head *page_list, int atomic)

[REFACTOR] redesign arch_set_orig_ret_addr()

[REFACTOR] redesign trampoline_probe_handler()

[REFACTOR] code style fix for 'asm-arm/dbi_kprobes.c'

src/modules/kprobe/arch/asm-arm/dbi_kprobes.c

[REFACTOR] remove 'OVERHEAD_DEBUG'

[REFACTOR] remove arch/dbi_kprobes.*

files:
src/modules/kprobe/arch/dbi_kprobes.h
src/modules/kprobe/arch/dbi_kprobes.c

[REFACTOR] move declaration arch_prepare_kretprobe()

from src/modules/kprobe/arch/dbi_kprobes.h
to src/modules/kprobe/arch/asm-arm/dbi_kprobes.h

[REFACTOR] move declaration arch_prepare_kprobe()

from src/modules/kprobe/arch/dbi_kprobes.h
to src/modules/kprobe/arch/asm-arm/dbi_kprobes.h

[REFACTOR] rename __arch_prepare_kretprobe()

__arch_prepare_kretprobe() --> arch_prepare_kretprobe()

[REFACTOR] remove arch_prepare_kretprobe()

[REFACTOR] move declaration kretprobe_trampoline()

from src/modules/kprobe/arch/dbi_kprobes.h
to src/modules/kprobe/arch/asm-arm/dbi_kprobes.h

[REFACTORE] move declaration arch_/init/exit/_kprobes()

arch_init_kprobes()
arch_exit_kprobes()
from src/modules/kprobe/arch/dbi_kprobes.h
to src/modules/kprobe/arch/asm-arm/dbi_kprobes.h