From a5784e6a2d85acc7619d7555fc834abe5cb17337 Mon Sep 17 00:00:00 2001 From: Vyacheslav Cherkashin Date: Wed, 22 Oct 2014 14:49:26 +0400 Subject: [PATCH] [IMPROVE] remove links to build modules Change-Id: Ibf0bdd848e3e03c9b5c1b4c9b5ec8390c8886bfd Signed-off-by: Vyacheslav Cherkashin --- build.sh | 9 ++++----- kprobe/Kbuild | 15 ++++++++------- kprobe/arch/{asm-arm => arm/swap-asm}/memory_rwx.c | 0 kprobe/arch/{asm-arm => arm/swap-asm}/memory_rwx.h | 0 kprobe/arch/{asm-arm => arm/swap-asm}/swap_kprobes.c | 0 kprobe/arch/{asm-arm => arm/swap-asm}/swap_kprobes.h | 0 .../arch/{asm-arm => arm/swap-asm}/trampoline_arm.S | 0 .../arch/{asm-arm => arm/swap-asm}/trampoline_arm.h | 0 kprobe/arch/{asm-x86 => x86/swap-asm}/swap_kprobes.c | 0 kprobe/arch/{asm-x86 => x86/swap-asm}/swap_kprobes.h | 0 kprobe/swap_kprobes.c | 2 +- kprobe/swap_kprobes.h | 2 +- uprobe/Kbuild | 11 +++++++++-- uprobe/arch/{asm-arm => arm/swap-asm}/swap_uprobes.c | 20 +++++++++++++------- uprobe/arch/{asm-arm => arm/swap-asm}/swap_uprobes.h | 3 +++ .../{asm-arm => arm/swap-asm}/trampoline_thumb.S | 0 .../{asm-arm => arm/swap-asm}/trampoline_thumb.h | 0 uprobe/arch/{asm-x86 => x86/swap-asm}/swap_uprobes.c | 8 ++++++-- uprobe/arch/{asm-x86 => x86/swap-asm}/swap_uprobes.h | 3 +++ uprobe/swap_uprobes.c | 12 +++++++----- uprobe/swap_uprobes.h | 4 +++- us_manager/us_slot_manager.c | 3 ++- writer/swap_writer_module.c | 6 ++++-- 23 files changed, 64 insertions(+), 34 deletions(-) rename kprobe/arch/{asm-arm => arm/swap-asm}/memory_rwx.c (100%) rename kprobe/arch/{asm-arm => arm/swap-asm}/memory_rwx.h (100%) rename kprobe/arch/{asm-arm => arm/swap-asm}/swap_kprobes.c (100%) rename kprobe/arch/{asm-arm => arm/swap-asm}/swap_kprobes.h (100%) rename kprobe/arch/{asm-arm => arm/swap-asm}/trampoline_arm.S (100%) rename kprobe/arch/{asm-arm => arm/swap-asm}/trampoline_arm.h (100%) rename kprobe/arch/{asm-x86 => x86/swap-asm}/swap_kprobes.c (100%) rename kprobe/arch/{asm-x86 => x86/swap-asm}/swap_kprobes.h (100%) rename uprobe/arch/{asm-arm => arm/swap-asm}/swap_uprobes.c (99%) rename uprobe/arch/{asm-arm => arm/swap-asm}/swap_uprobes.h (97%) rename uprobe/arch/{asm-arm => arm/swap-asm}/trampoline_thumb.S (100%) rename uprobe/arch/{asm-arm => arm/swap-asm}/trampoline_thumb.h (100%) rename uprobe/arch/{asm-x86 => x86/swap-asm}/swap_uprobes.c (99%) rename uprobe/arch/{asm-x86 => x86/swap-asm}/swap_uprobes.h (97%) diff --git a/build.sh b/build.sh index 8915d08..b13e5dd 100755 --- a/build.sh +++ b/build.sh @@ -50,13 +50,12 @@ ksyms_module_name=swap_ksyms.ko install_dir="/opt/swap/sdk" -rm -f ${kprobe_arch_dir}/asm -ln -s asm-${link_name} ${kprobe_arch_dir}/asm -rm -f ${uprobe_arch_dir}/asm -ln -s asm-${link_name} ${uprobe_arch_dir}/asm +asm_kprobe_dir=${modules_dir}/kprobe/arch/${link_name}/ +asm_uprobe_dir=${modules_dir}/uprobe/arch/${link_name}/ make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} \ - M=${modules_dir} extra_cflags="-Werror -I${modules_dir}" modules || exit 1 + M=${modules_dir} extra_cflags="-Werror -I${modules_dir} -I${asm_kprobe_dir} \ + -I${asm_uprobe_dir}" modules || exit 1 modules=\ "${buffer_dir}/${buffer_module_name} \ diff --git a/kprobe/Kbuild b/kprobe/Kbuild index 4a71126..640899f 100644 --- a/kprobe/Kbuild +++ b/kprobe/Kbuild @@ -3,14 +3,15 @@ EXTRA_CFLAGS := $(extra_cflags) obj-m := swap_kprobe.o swap_kprobe-y := swap_kprobes.o \ swap_kprobes_deps.o \ - arch/asm/swap_kprobes.o \ swap_slots.o -ifeq ($(CONFIG_ARM), y) -swap_kprobe-y += arch/asm/trampoline_arm.o - +### ARM +swap_kprobe-$(CONFIG_ARM) += arch/arm/swap-asm/swap_kprobes.o \ + arch/arm/swap-asm/trampoline_arm.o ifeq ($(CONFIG_STRICT_MEMORY_RWX), y) -swap_kprobe-y += arch/asm/memory_rwx.o -endif # CONFIG_STRICT_MEMORY_RWX +swap_kprobe-$(CONFIG_ARM) += arch/arm/swap-asm/memory_rwx.o +endif #ifeq ($(CONFIG_STRICT_MEMORY_RWX), y) + -endif # CONFIG_ARM \ No newline at end of file +### X86 +swap_kprobe-$(CONFIG_X86) += arch/x86/swap-asm/swap_kprobes.o diff --git a/kprobe/arch/asm-arm/memory_rwx.c b/kprobe/arch/arm/swap-asm/memory_rwx.c similarity index 100% rename from kprobe/arch/asm-arm/memory_rwx.c rename to kprobe/arch/arm/swap-asm/memory_rwx.c diff --git a/kprobe/arch/asm-arm/memory_rwx.h b/kprobe/arch/arm/swap-asm/memory_rwx.h similarity index 100% rename from kprobe/arch/asm-arm/memory_rwx.h rename to kprobe/arch/arm/swap-asm/memory_rwx.h diff --git a/kprobe/arch/asm-arm/swap_kprobes.c b/kprobe/arch/arm/swap-asm/swap_kprobes.c similarity index 100% rename from kprobe/arch/asm-arm/swap_kprobes.c rename to kprobe/arch/arm/swap-asm/swap_kprobes.c diff --git a/kprobe/arch/asm-arm/swap_kprobes.h b/kprobe/arch/arm/swap-asm/swap_kprobes.h similarity index 100% rename from kprobe/arch/asm-arm/swap_kprobes.h rename to kprobe/arch/arm/swap-asm/swap_kprobes.h diff --git a/kprobe/arch/asm-arm/trampoline_arm.S b/kprobe/arch/arm/swap-asm/trampoline_arm.S similarity index 100% rename from kprobe/arch/asm-arm/trampoline_arm.S rename to kprobe/arch/arm/swap-asm/trampoline_arm.S diff --git a/kprobe/arch/asm-arm/trampoline_arm.h b/kprobe/arch/arm/swap-asm/trampoline_arm.h similarity index 100% rename from kprobe/arch/asm-arm/trampoline_arm.h rename to kprobe/arch/arm/swap-asm/trampoline_arm.h diff --git a/kprobe/arch/asm-x86/swap_kprobes.c b/kprobe/arch/x86/swap-asm/swap_kprobes.c similarity index 100% rename from kprobe/arch/asm-x86/swap_kprobes.c rename to kprobe/arch/x86/swap-asm/swap_kprobes.c diff --git a/kprobe/arch/asm-x86/swap_kprobes.h b/kprobe/arch/x86/swap-asm/swap_kprobes.h similarity index 100% rename from kprobe/arch/asm-x86/swap_kprobes.h rename to kprobe/arch/x86/swap-asm/swap_kprobes.h diff --git a/kprobe/swap_kprobes.c b/kprobe/swap_kprobes.c index b5983e4..697b789 100644 --- a/kprobe/swap_kprobes.c +++ b/kprobe/swap_kprobes.c @@ -42,7 +42,7 @@ #include #include -#include +#include #include "swap_slots.h" #include "swap_kdebug.h" diff --git a/kprobe/swap_kprobes.h b/kprobe/swap_kprobes.h index 944bb44..5f1ed62 100644 --- a/kprobe/swap_kprobes.h +++ b/kprobe/swap_kprobes.h @@ -43,7 +43,7 @@ #include #include -#include +#include #ifdef CONFIG_ARM diff --git a/uprobe/Kbuild b/uprobe/Kbuild index 518445c..beb9b6a 100644 --- a/uprobe/Kbuild +++ b/uprobe/Kbuild @@ -2,5 +2,12 @@ EXTRA_CFLAGS := $(extra_cflags) KBUILD_EXTRA_SYMBOLS = $(src)/../kprobe/Module.symvers obj-m := swap_uprobe.o -swap_uprobe-y := swap_uprobes.o arch/asm/swap_uprobes.o -swap_uprobe-$(CONFIG_ARM) += arch/asm/trampoline_thumb.o +swap_uprobe-y := swap_uprobes.o + +### ARM +swap_uprobe-$(CONFIG_ARM) += arch/arm/swap-asm/swap_uprobes.o \ + arch/arm/swap-asm/trampoline_thumb.o + + +### X86 +swap_uprobe-$(CONFIG_X86) += arch/x86/swap-asm/swap_uprobes.o diff --git a/uprobe/arch/asm-arm/swap_uprobes.c b/uprobe/arch/arm/swap-asm/swap_uprobes.c similarity index 99% rename from uprobe/arch/asm-arm/swap_uprobes.c rename to uprobe/arch/arm/swap-asm/swap_uprobes.c index 5413272..0a3786a 100644 --- a/uprobe/arch/asm-arm/swap_uprobes.c +++ b/uprobe/arch/arm/swap-asm/swap_uprobes.c @@ -30,18 +30,24 @@ * Arch-dependent uprobe interface implementation for ARM. */ -#include -#include -#include + +#include /* need for asm/traps.h */ +#include /* need for asm/traps.h */ + +#include /* need for asm/traps.h */ #include -#include -#include + #include +#include #include +#include + +#include +#include + +#include "swap_uprobes.h" #include "trampoline_thumb.h" -// FIXME: -#include /** * @def flush_insns diff --git a/uprobe/arch/asm-arm/swap_uprobes.h b/uprobe/arch/arm/swap-asm/swap_uprobes.h similarity index 97% rename from uprobe/arch/asm-arm/swap_uprobes.h rename to uprobe/arch/arm/swap-asm/swap_uprobes.h index 4f87e84..826e308 100644 --- a/uprobe/arch/asm-arm/swap_uprobes.h +++ b/uprobe/arch/arm/swap-asm/swap_uprobes.h @@ -35,6 +35,9 @@ #define _ARM_SWAP_UPROBES_H +#include /* FIXME: for UPROBES_TRAMP_LEN */ + + struct kprobe; struct task_struct; struct uprobe; diff --git a/uprobe/arch/asm-arm/trampoline_thumb.S b/uprobe/arch/arm/swap-asm/trampoline_thumb.S similarity index 100% rename from uprobe/arch/asm-arm/trampoline_thumb.S rename to uprobe/arch/arm/swap-asm/trampoline_thumb.S diff --git a/uprobe/arch/asm-arm/trampoline_thumb.h b/uprobe/arch/arm/swap-asm/trampoline_thumb.h similarity index 100% rename from uprobe/arch/asm-arm/trampoline_thumb.h rename to uprobe/arch/arm/swap-asm/trampoline_thumb.h diff --git a/uprobe/arch/asm-x86/swap_uprobes.c b/uprobe/arch/x86/swap-asm/swap_uprobes.c similarity index 99% rename from uprobe/arch/asm-x86/swap_uprobes.c rename to uprobe/arch/x86/swap-asm/swap_uprobes.c index 7e40594..f4faca5 100644 --- a/uprobe/arch/asm-x86/swap_uprobes.c +++ b/uprobe/arch/x86/swap-asm/swap_uprobes.c @@ -30,10 +30,14 @@ * Arch-dependent uprobe interface implementation for x86. */ + #include -#include -#include + #include +#include + +#include "swap_uprobes.h" + /** * @struct uprobe_ctlblk diff --git a/uprobe/arch/asm-x86/swap_uprobes.h b/uprobe/arch/x86/swap-asm/swap_uprobes.h similarity index 97% rename from uprobe/arch/asm-x86/swap_uprobes.h rename to uprobe/arch/x86/swap-asm/swap_uprobes.h index 9e1a586..3ca6334 100644 --- a/uprobe/arch/asm-x86/swap_uprobes.h +++ b/uprobe/arch/x86/swap-asm/swap_uprobes.h @@ -34,6 +34,9 @@ #define _X86_SWAP_UPROBES_H +#include /* FIXME: for UPROBES_TRAMP_LEN */ + + struct uprobe; struct uretprobe; struct uretprobe_instance; diff --git a/uprobe/swap_uprobes.c b/uprobe/swap_uprobes.c index aa6904c..c8ffd51 100644 --- a/uprobe/swap_uprobes.c +++ b/uprobe/swap_uprobes.c @@ -31,17 +31,19 @@ */ -#include "swap_uprobes.h" -#include - -#include - #include #include #include + #include +#include #include +#include + +#include "swap_uprobes.h" + + enum { UPROBE_HASH_BITS = 10, UPROBE_TABLE_SIZE = (1 << UPROBE_HASH_BITS) diff --git a/uprobe/swap_uprobes.h b/uprobe/swap_uprobes.h index 8d91b14..da06aff 100644 --- a/uprobe/swap_uprobes.h +++ b/uprobe/swap_uprobes.h @@ -35,7 +35,9 @@ #include -#include + +#include + /** * @struct uprobe diff --git a/us_manager/us_slot_manager.c b/us_manager/us_slot_manager.c index 02aecfe..126b5df 100644 --- a/us_manager/us_slot_manager.c +++ b/us_manager/us_slot_manager.c @@ -29,8 +29,9 @@ #include #include #include + #include -#include +#include #include "us_manager_common.h" diff --git a/writer/swap_writer_module.c b/writer/swap_writer_module.c index af9646f..00e35c7 100644 --- a/writer/swap_writer_module.c +++ b/writer/swap_writer_module.c @@ -39,13 +39,15 @@ #include #include #include + #include -#include -#include #include #include +#include +#include + #include "swap_writer_module.h" #include "swap_writer_errors.h" #include "kernel_operations.h" -- 2.7.4