* [PATCH v11 1/7] ARM: probes: move all probe code to dedicate directory
2014-12-01 8:45 [PATCH v11 0/7] ARM: kprobes: OPTPROBES and other improvements Wang Nan
@ 2014-12-01 8:48 ` Wang Nan
2014-12-02 4:59 ` Masami Hiramatsu
2014-12-01 8:48 ` [PATCH v11 2/7] ARM: kprobes: introduces checker Wang Nan
` (5 subsequent siblings)
6 siblings, 1 reply; 16+ messages in thread
From: Wang Nan @ 2014-12-01 8:48 UTC (permalink / raw)
To: linux-arm-kernel
In discussion on LKML (https://lkml.org/lkml/2014/11/28/158), Russell
King suggest to move all probe related code to arch/arm/probes. This
patch do the work. Due to dependency on 'arch/arm/kernel/patch.h', this
patch also move patch.h to 'arch/arm/include/asm/patch.h', and related
'#include' directive are also midified to '#include <asm/patch.h>'.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
arch/arm/Makefile | 1 +
arch/arm/{kernel => include/asm}/patch.h | 0
arch/arm/kernel/Makefile | 16 ++--------------
arch/arm/kernel/jump_label.c | 2 +-
arch/arm/kernel/patch.c | 3 +--
arch/arm/probes/Makefile | 15 +++++++++++++++
arch/arm/{kernel => probes}/kprobes-arm.c | 0
arch/arm/{kernel => probes}/kprobes-common.c | 0
arch/arm/{kernel => probes}/kprobes-test-arm.c | 0
arch/arm/{kernel => probes}/kprobes-test-thumb.c | 0
arch/arm/{kernel => probes}/kprobes-test.c | 0
arch/arm/{kernel => probes}/kprobes-test.h | 0
arch/arm/{kernel => probes}/kprobes-thumb.c | 0
arch/arm/{kernel => probes}/kprobes.c | 2 +-
arch/arm/{kernel => probes}/kprobes.h | 0
arch/arm/{kernel => probes}/probes-arm.c | 0
arch/arm/{kernel => probes}/probes-arm.h | 0
arch/arm/{kernel => probes}/probes-thumb.c | 0
arch/arm/{kernel => probes}/probes-thumb.h | 0
arch/arm/{kernel => probes}/probes.c | 0
arch/arm/{kernel => probes}/probes.h | 0
arch/arm/{kernel => probes}/uprobes-arm.c | 0
arch/arm/{kernel => probes}/uprobes.c | 0
arch/arm/{kernel => probes}/uprobes.h | 0
24 files changed, 21 insertions(+), 18 deletions(-)
rename arch/arm/{kernel => include/asm}/patch.h (100%)
create mode 100644 arch/arm/probes/Makefile
rename arch/arm/{kernel => probes}/kprobes-arm.c (100%)
rename arch/arm/{kernel => probes}/kprobes-common.c (100%)
rename arch/arm/{kernel => probes}/kprobes-test-arm.c (100%)
rename arch/arm/{kernel => probes}/kprobes-test-thumb.c (100%)
rename arch/arm/{kernel => probes}/kprobes-test.c (100%)
rename arch/arm/{kernel => probes}/kprobes-test.h (100%)
rename arch/arm/{kernel => probes}/kprobes-thumb.c (100%)
rename arch/arm/{kernel => probes}/kprobes.c (99%)
rename arch/arm/{kernel => probes}/kprobes.h (100%)
rename arch/arm/{kernel => probes}/probes-arm.c (100%)
rename arch/arm/{kernel => probes}/probes-arm.h (100%)
rename arch/arm/{kernel => probes}/probes-thumb.c (100%)
rename arch/arm/{kernel => probes}/probes-thumb.h (100%)
rename arch/arm/{kernel => probes}/probes.c (100%)
rename arch/arm/{kernel => probes}/probes.h (100%)
rename arch/arm/{kernel => probes}/uprobes-arm.c (100%)
rename arch/arm/{kernel => probes}/uprobes.c (100%)
rename arch/arm/{kernel => probes}/uprobes.h (100%)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 034a949..a57d9bb 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -266,6 +266,7 @@ core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/
# If we have a machine-specific directory, then include it in the build.
core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
+core-y += arch/arm/probes/
core-y += arch/arm/net/
core-y += arch/arm/crypto/
core-y += arch/arm/firmware/
diff --git a/arch/arm/kernel/patch.h b/arch/arm/include/asm/patch.h
similarity index 100%
rename from arch/arm/kernel/patch.h
rename to arch/arm/include/asm/patch.h
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 38ddd9f..40d3e00 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -51,20 +51,8 @@ obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o
obj-$(CONFIG_JUMP_LABEL) += jump_label.o insn.o patch.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
-obj-$(CONFIG_UPROBES) += probes.o probes-arm.o uprobes.o uprobes-arm.o
-obj-$(CONFIG_KPROBES) += probes.o kprobes.o kprobes-common.o patch.o
-ifdef CONFIG_THUMB2_KERNEL
-obj-$(CONFIG_KPROBES) += kprobes-thumb.o probes-thumb.o
-else
-obj-$(CONFIG_KPROBES) += kprobes-arm.o probes-arm.o
-endif
-obj-$(CONFIG_ARM_KPROBES_TEST) += test-kprobes.o
-test-kprobes-objs := kprobes-test.o
-ifdef CONFIG_THUMB2_KERNEL
-test-kprobes-objs += kprobes-test-thumb.o
-else
-test-kprobes-objs += kprobes-test-arm.o
-endif
+# Main staffs in KPROBES are in arch/arm/probes/ .
+obj-$(CONFIG_KPROBES) += patch.o
obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o
obj-$(CONFIG_ARM_THUMBEE) += thumbee.o
obj-$(CONFIG_KGDB) += kgdb.o
diff --git a/arch/arm/kernel/jump_label.c b/arch/arm/kernel/jump_label.c
index 4ce4f78..c6c73ed 100644
--- a/arch/arm/kernel/jump_label.c
+++ b/arch/arm/kernel/jump_label.c
@@ -1,8 +1,8 @@
#include <linux/kernel.h>
#include <linux/jump_label.h>
+#include <asm/patch.h>
#include "insn.h"
-#include "patch.h"
#ifdef HAVE_JUMP_LABEL
diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
index 07314af..08bcfa1 100644
--- a/arch/arm/kernel/patch.c
+++ b/arch/arm/kernel/patch.c
@@ -5,8 +5,7 @@
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/opcodes.h>
-
-#include "patch.h"
+#include <asm/patch.h>
struct patch {
void *addr;
diff --git a/arch/arm/probes/Makefile b/arch/arm/probes/Makefile
new file mode 100644
index 0000000..34b53b0
--- /dev/null
+++ b/arch/arm/probes/Makefile
@@ -0,0 +1,15 @@
+obj-$(CONFIG_UPROBES) += probes.o probes-arm.o uprobes.o uprobes-arm.o
+obj-$(CONFIG_KPROBES) += probes.o kprobes.o kprobes-common.o
+ifdef CONFIG_THUMB2_KERNEL
+obj-$(CONFIG_KPROBES) += kprobes-thumb.o probes-thumb.o
+else
+obj-$(CONFIG_KPROBES) += kprobes-arm.o probes-arm.o
+endif
+obj-$(CONFIG_ARM_KPROBES_TEST) += test-kprobes.o
+test-kprobes-objs := kprobes-test.o
+ifdef CONFIG_THUMB2_KERNEL
+test-kprobes-objs += kprobes-test-thumb.o
+else
+test-kprobes-objs += kprobes-test-arm.o
+endif
+
diff --git a/arch/arm/kernel/kprobes-arm.c b/arch/arm/probes/kprobes-arm.c
similarity index 100%
rename from arch/arm/kernel/kprobes-arm.c
rename to arch/arm/probes/kprobes-arm.c
diff --git a/arch/arm/kernel/kprobes-common.c b/arch/arm/probes/kprobes-common.c
similarity index 100%
rename from arch/arm/kernel/kprobes-common.c
rename to arch/arm/probes/kprobes-common.c
diff --git a/arch/arm/kernel/kprobes-test-arm.c b/arch/arm/probes/kprobes-test-arm.c
similarity index 100%
rename from arch/arm/kernel/kprobes-test-arm.c
rename to arch/arm/probes/kprobes-test-arm.c
diff --git a/arch/arm/kernel/kprobes-test-thumb.c b/arch/arm/probes/kprobes-test-thumb.c
similarity index 100%
rename from arch/arm/kernel/kprobes-test-thumb.c
rename to arch/arm/probes/kprobes-test-thumb.c
diff --git a/arch/arm/kernel/kprobes-test.c b/arch/arm/probes/kprobes-test.c
similarity index 100%
rename from arch/arm/kernel/kprobes-test.c
rename to arch/arm/probes/kprobes-test.c
diff --git a/arch/arm/kernel/kprobes-test.h b/arch/arm/probes/kprobes-test.h
similarity index 100%
rename from arch/arm/kernel/kprobes-test.h
rename to arch/arm/probes/kprobes-test.h
diff --git a/arch/arm/kernel/kprobes-thumb.c b/arch/arm/probes/kprobes-thumb.c
similarity index 100%
rename from arch/arm/kernel/kprobes-thumb.c
rename to arch/arm/probes/kprobes-thumb.c
diff --git a/arch/arm/kernel/kprobes.c b/arch/arm/probes/kprobes.c
similarity index 99%
rename from arch/arm/kernel/kprobes.c
rename to arch/arm/probes/kprobes.c
index 6d64420..43b2488 100644
--- a/arch/arm/kernel/kprobes.c
+++ b/arch/arm/probes/kprobes.c
@@ -30,11 +30,11 @@
#include <asm/cacheflush.h>
#include <linux/percpu.h>
#include <linux/bug.h>
+#include <asm/patch.h>
#include "kprobes.h"
#include "probes-arm.h"
#include "probes-thumb.h"
-#include "patch.h"
#define MIN_STACK_SIZE(addr) \
min((unsigned long)MAX_STACK_SIZE, \
diff --git a/arch/arm/kernel/kprobes.h b/arch/arm/probes/kprobes.h
similarity index 100%
rename from arch/arm/kernel/kprobes.h
rename to arch/arm/probes/kprobes.h
diff --git a/arch/arm/kernel/probes-arm.c b/arch/arm/probes/probes-arm.c
similarity index 100%
rename from arch/arm/kernel/probes-arm.c
rename to arch/arm/probes/probes-arm.c
diff --git a/arch/arm/kernel/probes-arm.h b/arch/arm/probes/probes-arm.h
similarity index 100%
rename from arch/arm/kernel/probes-arm.h
rename to arch/arm/probes/probes-arm.h
diff --git a/arch/arm/kernel/probes-thumb.c b/arch/arm/probes/probes-thumb.c
similarity index 100%
rename from arch/arm/kernel/probes-thumb.c
rename to arch/arm/probes/probes-thumb.c
diff --git a/arch/arm/kernel/probes-thumb.h b/arch/arm/probes/probes-thumb.h
similarity index 100%
rename from arch/arm/kernel/probes-thumb.h
rename to arch/arm/probes/probes-thumb.h
diff --git a/arch/arm/kernel/probes.c b/arch/arm/probes/probes.c
similarity index 100%
rename from arch/arm/kernel/probes.c
rename to arch/arm/probes/probes.c
diff --git a/arch/arm/kernel/probes.h b/arch/arm/probes/probes.h
similarity index 100%
rename from arch/arm/kernel/probes.h
rename to arch/arm/probes/probes.h
diff --git a/arch/arm/kernel/uprobes-arm.c b/arch/arm/probes/uprobes-arm.c
similarity index 100%
rename from arch/arm/kernel/uprobes-arm.c
rename to arch/arm/probes/uprobes-arm.c
diff --git a/arch/arm/kernel/uprobes.c b/arch/arm/probes/uprobes.c
similarity index 100%
rename from arch/arm/kernel/uprobes.c
rename to arch/arm/probes/uprobes.c
diff --git a/arch/arm/kernel/uprobes.h b/arch/arm/probes/uprobes.h
similarity index 100%
rename from arch/arm/kernel/uprobes.h
rename to arch/arm/probes/uprobes.h
--
1.8.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v11 1/7] ARM: probes: move all probe code to dedicate directory
2014-12-01 8:48 ` [PATCH v11 1/7] ARM: probes: move all probe code to dedicate directory Wang Nan
@ 2014-12-02 4:59 ` Masami Hiramatsu
2014-12-02 10:16 ` [PATCH] " Wang Nan
2014-12-02 10:23 ` [PATCH v11 1/7] " Wang Nan
0 siblings, 2 replies; 16+ messages in thread
From: Masami Hiramatsu @ 2014-12-02 4:59 UTC (permalink / raw)
To: linux-arm-kernel
(2014/12/01 17:48), Wang Nan wrote:
> In discussion on LKML (https://lkml.org/lkml/2014/11/28/158), Russell
> King suggest to move all probe related code to arch/arm/probes. This
> patch do the work. Due to dependency on 'arch/arm/kernel/patch.h', this
> patch also move patch.h to 'arch/arm/include/asm/patch.h', and related
> '#include' directive are also midified to '#include <asm/patch.h>'.
Moving is good to me, but renaming files are also required I think.
> Signed-off-by: Wang Nan <wangnan0@huawei.com>
> ---
> arch/arm/Makefile | 1 +
> arch/arm/{kernel => include/asm}/patch.h | 0
> arch/arm/kernel/Makefile | 16 ++--------------
> arch/arm/kernel/jump_label.c | 2 +-
> arch/arm/kernel/patch.c | 3 +--
> arch/arm/probes/Makefile | 15 +++++++++++++++
> arch/arm/{kernel => probes}/kprobes-arm.c | 0
> arch/arm/{kernel => probes}/kprobes-common.c | 0
> arch/arm/{kernel => probes}/kprobes-test-arm.c | 0
> arch/arm/{kernel => probes}/kprobes-test-thumb.c | 0
> arch/arm/{kernel => probes}/kprobes-test.c | 0
> arch/arm/{kernel => probes}/kprobes-test.h | 0
> arch/arm/{kernel => probes}/kprobes-thumb.c | 0
> arch/arm/{kernel => probes}/kprobes.c | 2 +-
> arch/arm/{kernel => probes}/kprobes.h | 0
> arch/arm/{kernel => probes}/probes-arm.c | 0
> arch/arm/{kernel => probes}/probes-arm.h | 0
> arch/arm/{kernel => probes}/probes-thumb.c | 0
> arch/arm/{kernel => probes}/probes-thumb.h | 0
> arch/arm/{kernel => probes}/probes.c | 0
> arch/arm/{kernel => probes}/probes.h | 0
> arch/arm/{kernel => probes}/uprobes-arm.c | 0
> arch/arm/{kernel => probes}/uprobes.c | 0
> arch/arm/{kernel => probes}/uprobes.h | 0
As I did on x86, these would be better renamed as expressing what they do.
I guess most of the files may have emulate-*.c or decode-*.c :)
Thank you,
--
Masami HIRAMATSU
Software Platform Research Dept. Linux Technology Research Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt at hitachi.com
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH] ARM: probes: move all probe code to dedicate directory
2014-12-02 4:59 ` Masami Hiramatsu
@ 2014-12-02 10:16 ` Wang Nan
2014-12-02 10:23 ` [PATCH v11 1/7] " Wang Nan
1 sibling, 0 replies; 16+ messages in thread
From: Wang Nan @ 2014-12-02 10:16 UTC (permalink / raw)
To: linux-arm-kernel
In discussion on LKML (https://lkml.org/lkml/2014/11/28/158), Russell
King suggests to move all probe related code to arch/arm/probes. This
patch does the work. Due to dependency on 'arch/arm/kernel/patch.h', this
patch also moves patch.h to 'arch/arm/include/asm/patch.h', and related
'#include' directives are also midified to '#include <asm/patch.h>'.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
v1 -> v2:
- Names of files are also changes to express their function.
---
arch/arm/Makefile | 1 +
arch/arm/{kernel => include/asm}/patch.h | 0
arch/arm/kernel/Makefile | 16 ++--------------
arch/arm/kernel/jump_label.c | 2 +-
arch/arm/kernel/patch.c | 3 +--
arch/arm/probes/Makefile | 15 +++++++++++++++
arch/arm/{kernel/probes-arm.c => probes/decode-arm.c} | 4 ++--
arch/arm/{kernel/probes-arm.h => probes/decode-arm.h} | 0
.../arm/{kernel/probes-thumb.c => probes/decode-thumb.c} | 4 ++--
.../arm/{kernel/probes-thumb.h => probes/decode-thumb.h} | 0
arch/arm/{kernel/probes.c => probes/decode.c} | 2 +-
arch/arm/{kernel/probes.h => probes/decode.h} | 0
.../kprobes-arm.c => probes/kprobes/actions-arm.c} | 2 +-
.../kprobes-common.c => probes/kprobes/actions-common.c} | 0
.../kprobes-thumb.c => probes/kprobes/actions-thumb.c} | 2 +-
arch/arm/{kernel => probes/kprobes}/kprobes.c | 6 +++---
arch/arm/{kernel => probes/kprobes}/kprobes.h | 2 +-
.../kprobes-test-arm.c => probes/kprobes/test-arm.c} | 2 +-
.../kprobes-test.c => probes/kprobes/test-core.c} | 6 +++---
.../kprobes-test.h => probes/kprobes/test-core.h} | 0
.../kprobes-test-thumb.c => probes/kprobes/test-thumb.c} | 2 +-
.../uprobes-arm.c => probes/uprobes/actions-arm.c} | 4 ++--
arch/arm/{kernel => probes/uprobes}/uprobes.c | 4 ++--
arch/arm/{kernel => probes/uprobes}/uprobes.h | 0
24 files changed, 40 insertions(+), 37 deletions(-)
rename arch/arm/{kernel => include/asm}/patch.h (100%)
create mode 100644 arch/arm/probes/Makefile
rename arch/arm/{kernel/probes-arm.c => probes/decode-arm.c} (99%)
rename arch/arm/{kernel/probes-arm.h => probes/decode-arm.h} (100%)
rename arch/arm/{kernel/probes-thumb.c => probes/decode-thumb.c} (99%)
rename arch/arm/{kernel/probes-thumb.h => probes/decode-thumb.h} (100%)
rename arch/arm/{kernel/probes.c => probes/decode.c} (99%)
rename arch/arm/{kernel/probes.h => probes/decode.h} (100%)
rename arch/arm/{kernel/kprobes-arm.c => probes/kprobes/actions-arm.c} (99%)
rename arch/arm/{kernel/kprobes-common.c => probes/kprobes/actions-common.c} (100%)
rename arch/arm/{kernel/kprobes-thumb.c => probes/kprobes/actions-thumb.c} (99%)
rename arch/arm/{kernel => probes/kprobes}/kprobes.c (99%)
rename arch/arm/{kernel => probes/kprobes}/kprobes.h (98%)
rename arch/arm/{kernel/kprobes-test-arm.c => probes/kprobes/test-arm.c} (99%)
rename arch/arm/{kernel/kprobes-test.c => probes/kprobes/test-core.c} (99%)
rename arch/arm/{kernel/kprobes-test.h => probes/kprobes/test-core.h} (100%)
rename arch/arm/{kernel/kprobes-test-thumb.c => probes/kprobes/test-thumb.c} (99%)
rename arch/arm/{kernel/uprobes-arm.c => probes/uprobes/actions-arm.c} (99%)
rename arch/arm/{kernel => probes/uprobes}/uprobes.c (99%)
rename arch/arm/{kernel => probes/uprobes}/uprobes.h (100%)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 034a949..a57d9bb 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -266,6 +266,7 @@ core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/
# If we have a machine-specific directory, then include it in the build.
core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
+core-y += arch/arm/probes/
core-y += arch/arm/net/
core-y += arch/arm/crypto/
core-y += arch/arm/firmware/
diff --git a/arch/arm/kernel/patch.h b/arch/arm/include/asm/patch.h
similarity index 100%
rename from arch/arm/kernel/patch.h
rename to arch/arm/include/asm/patch.h
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 38ddd9f..40d3e00 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -51,20 +51,8 @@ obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o
obj-$(CONFIG_JUMP_LABEL) += jump_label.o insn.o patch.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
-obj-$(CONFIG_UPROBES) += probes.o probes-arm.o uprobes.o uprobes-arm.o
-obj-$(CONFIG_KPROBES) += probes.o kprobes.o kprobes-common.o patch.o
-ifdef CONFIG_THUMB2_KERNEL
-obj-$(CONFIG_KPROBES) += kprobes-thumb.o probes-thumb.o
-else
-obj-$(CONFIG_KPROBES) += kprobes-arm.o probes-arm.o
-endif
-obj-$(CONFIG_ARM_KPROBES_TEST) += test-kprobes.o
-test-kprobes-objs := kprobes-test.o
-ifdef CONFIG_THUMB2_KERNEL
-test-kprobes-objs += kprobes-test-thumb.o
-else
-test-kprobes-objs += kprobes-test-arm.o
-endif
+# Main staffs in KPROBES are in arch/arm/probes/ .
+obj-$(CONFIG_KPROBES) += patch.o
obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o
obj-$(CONFIG_ARM_THUMBEE) += thumbee.o
obj-$(CONFIG_KGDB) += kgdb.o
diff --git a/arch/arm/kernel/jump_label.c b/arch/arm/kernel/jump_label.c
index 4ce4f78..c6c73ed 100644
--- a/arch/arm/kernel/jump_label.c
+++ b/arch/arm/kernel/jump_label.c
@@ -1,8 +1,8 @@
#include <linux/kernel.h>
#include <linux/jump_label.h>
+#include <asm/patch.h>
#include "insn.h"
-#include "patch.h"
#ifdef HAVE_JUMP_LABEL
diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
index 07314af..08bcfa1 100644
--- a/arch/arm/kernel/patch.c
+++ b/arch/arm/kernel/patch.c
@@ -5,8 +5,7 @@
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/opcodes.h>
-
-#include "patch.h"
+#include <asm/patch.h>
struct patch {
void *addr;
diff --git a/arch/arm/probes/Makefile b/arch/arm/probes/Makefile
new file mode 100644
index 0000000..0b9bd28
--- /dev/null
+++ b/arch/arm/probes/Makefile
@@ -0,0 +1,15 @@
+obj-$(CONFIG_UPROBES) += decode.o decode-arm.o uprobes/uprobes.o uprobes/actions-arm.o
+obj-$(CONFIG_KPROBES) += decode.o kprobes/kprobes.o kprobes/actions-common.o
+ifdef CONFIG_THUMB2_KERNEL
+obj-$(CONFIG_KPROBES) += decode-thumb.o kprobes/actions-thumb.o
+else
+obj-$(CONFIG_KPROBES) += decode-arm.o kprobes/actions-arm.o
+endif
+obj-$(CONFIG_ARM_KPROBES_TEST) += test-kprobes.o
+test-kprobes-objs := kprobes/test-core.o
+ifdef CONFIG_THUMB2_KERNEL
+test-kprobes-objs += kprobes/test-thumb.o
+else
+test-kprobes-objs += kprobes/test-arm.o
+endif
+
diff --git a/arch/arm/kernel/probes-arm.c b/arch/arm/probes/decode-arm.c
similarity index 99%
rename from arch/arm/kernel/probes-arm.c
rename to arch/arm/probes/decode-arm.c
index 8eaef81..1fb81e7 100644
--- a/arch/arm/kernel/probes-arm.c
+++ b/arch/arm/probes/decode-arm.c
@@ -20,8 +20,8 @@
#include <linux/stddef.h>
#include <linux/ptrace.h>
-#include "probes.h"
-#include "probes-arm.h"
+#include "decode.h"
+#include "decode-arm.h"
#define sign_extend(x, signbit) ((x) | (0 - ((x) & (1 << (signbit)))))
diff --git a/arch/arm/kernel/probes-arm.h b/arch/arm/probes/decode-arm.h
similarity index 100%
rename from arch/arm/kernel/probes-arm.h
rename to arch/arm/probes/decode-arm.h
diff --git a/arch/arm/kernel/probes-thumb.c b/arch/arm/probes/decode-thumb.c
similarity index 99%
rename from arch/arm/kernel/probes-thumb.c
rename to arch/arm/probes/decode-thumb.c
index 4131351..2cddd18 100644
--- a/arch/arm/kernel/probes-thumb.c
+++ b/arch/arm/probes/decode-thumb.c
@@ -12,8 +12,8 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include "probes.h"
-#include "probes-thumb.h"
+#include "decode.h"
+#include "decode-thumb.h"
static const union decode_item t32_table_1110_100x_x0xx[] = {
diff --git a/arch/arm/kernel/probes-thumb.h b/arch/arm/probes/decode-thumb.h
similarity index 100%
rename from arch/arm/kernel/probes-thumb.h
rename to arch/arm/probes/decode-thumb.h
diff --git a/arch/arm/kernel/probes.c b/arch/arm/probes/decode.c
similarity index 99%
rename from arch/arm/kernel/probes.c
rename to arch/arm/probes/decode.c
index a8ab540..0141d70 100644
--- a/arch/arm/kernel/probes.c
+++ b/arch/arm/probes/decode.c
@@ -17,7 +17,7 @@
#include <asm/ptrace.h>
#include <linux/bug.h>
-#include "probes.h"
+#include "decode.h"
#ifndef find_str_pc_offset
diff --git a/arch/arm/kernel/probes.h b/arch/arm/probes/decode.h
similarity index 100%
rename from arch/arm/kernel/probes.h
rename to arch/arm/probes/decode.h
diff --git a/arch/arm/kernel/kprobes-arm.c b/arch/arm/probes/kprobes/actions-arm.c
similarity index 99%
rename from arch/arm/kernel/kprobes-arm.c
rename to arch/arm/probes/kprobes/actions-arm.c
index ac300c6..864feac 100644
--- a/arch/arm/kernel/kprobes-arm.c
+++ b/arch/arm/probes/kprobes/actions-arm.c
@@ -63,7 +63,7 @@
#include <linux/ptrace.h>
#include "kprobes.h"
-#include "probes-arm.h"
+#include "../decode-arm.h"
#if __LINUX_ARM_ARCH__ >= 6
#define BLX(reg) "blx "reg" \n\t"
diff --git a/arch/arm/kernel/kprobes-common.c b/arch/arm/probes/kprobes/actions-common.c
similarity index 100%
rename from arch/arm/kernel/kprobes-common.c
rename to arch/arm/probes/kprobes/actions-common.c
diff --git a/arch/arm/kernel/kprobes-thumb.c b/arch/arm/probes/kprobes/actions-thumb.c
similarity index 99%
rename from arch/arm/kernel/kprobes-thumb.c
rename to arch/arm/probes/kprobes/actions-thumb.c
index 9495d7f..35d6054 100644
--- a/arch/arm/kernel/kprobes-thumb.c
+++ b/arch/arm/probes/kprobes/actions-thumb.c
@@ -14,7 +14,7 @@
#include <linux/kprobes.h>
#include "kprobes.h"
-#include "probes-thumb.h"
+#include "decode-thumb.h"
/* These emulation encodings are functionally equivalent... */
#define t32_emulate_rd8rn16rm0ra12_noflags \
diff --git a/arch/arm/kernel/kprobes.c b/arch/arm/probes/kprobes/kprobes.c
similarity index 99%
rename from arch/arm/kernel/kprobes.c
rename to arch/arm/probes/kprobes/kprobes.c
index 6d64420..ea77d39 100644
--- a/arch/arm/kernel/kprobes.c
+++ b/arch/arm/probes/kprobes/kprobes.c
@@ -30,11 +30,11 @@
#include <asm/cacheflush.h>
#include <linux/percpu.h>
#include <linux/bug.h>
+#include <asm/patch.h>
#include "kprobes.h"
-#include "probes-arm.h"
-#include "probes-thumb.h"
-#include "patch.h"
+#include "decode-arm.h"
+#include "decode-thumb.h"
#define MIN_STACK_SIZE(addr) \
min((unsigned long)MAX_STACK_SIZE, \
diff --git a/arch/arm/kernel/kprobes.h b/arch/arm/probes/kprobes/kprobes.h
similarity index 98%
rename from arch/arm/kernel/kprobes.h
rename to arch/arm/probes/kprobes/kprobes.h
index 9a2712e..7b58ecf 100644
--- a/arch/arm/kernel/kprobes.h
+++ b/arch/arm/probes/kprobes/kprobes.h
@@ -19,7 +19,7 @@
#ifndef _ARM_KERNEL_KPROBES_H
#define _ARM_KERNEL_KPROBES_H
-#include "probes.h"
+#include "../decode.h"
/*
* These undefined instructions must be unique and
diff --git a/arch/arm/kernel/kprobes-test-arm.c b/arch/arm/probes/kprobes/test-arm.c
similarity index 99%
rename from arch/arm/kernel/kprobes-test-arm.c
rename to arch/arm/probes/kprobes/test-arm.c
index cb14242..d9a1255 100644
--- a/arch/arm/kernel/kprobes-test-arm.c
+++ b/arch/arm/probes/kprobes/test-arm.c
@@ -13,7 +13,7 @@
#include <asm/system_info.h>
#include <asm/opcodes.h>
-#include "kprobes-test.h"
+#include "test-core.h"
#define TEST_ISA "32"
diff --git a/arch/arm/kernel/kprobes-test.c b/arch/arm/probes/kprobes/test-core.c
similarity index 99%
rename from arch/arm/kernel/kprobes-test.c
rename to arch/arm/probes/kprobes/test-core.c
index b206d77..3dcfc58 100644
--- a/arch/arm/kernel/kprobes-test.c
+++ b/arch/arm/probes/kprobes/test-core.c
@@ -210,9 +210,9 @@
#include <asm/opcodes.h>
#include "kprobes.h"
-#include "probes-arm.h"
-#include "probes-thumb.h"
-#include "kprobes-test.h"
+#include "decode-arm.h"
+#include "decode-thumb.h"
+#include "test-core.h"
#define BENCHMARKING 1
diff --git a/arch/arm/kernel/kprobes-test.h b/arch/arm/probes/kprobes/test-core.h
similarity index 100%
rename from arch/arm/kernel/kprobes-test.h
rename to arch/arm/probes/kprobes/test-core.h
diff --git a/arch/arm/kernel/kprobes-test-thumb.c b/arch/arm/probes/kprobes/test-thumb.c
similarity index 99%
rename from arch/arm/kernel/kprobes-test-thumb.c
rename to arch/arm/probes/kprobes/test-thumb.c
index 844dd10..d58fa10 100644
--- a/arch/arm/kernel/kprobes-test-thumb.c
+++ b/arch/arm/probes/kprobes/test-thumb.c
@@ -12,7 +12,7 @@
#include <linux/module.h>
#include <asm/opcodes.h>
-#include "kprobes-test.h"
+#include "test-core.h"
#define TEST_ISA "16"
diff --git a/arch/arm/kernel/uprobes-arm.c b/arch/arm/probes/uprobes/actions-arm.c
similarity index 99%
rename from arch/arm/kernel/uprobes-arm.c
rename to arch/arm/probes/uprobes/actions-arm.c
index d3b655f..b98a0a8 100644
--- a/arch/arm/kernel/uprobes-arm.c
+++ b/arch/arm/probes/uprobes/actions-arm.c
@@ -13,8 +13,8 @@
#include <linux/uprobes.h>
#include <linux/module.h>
-#include "probes.h"
-#include "probes-arm.h"
+#include "../decode.h"
+#include "../decode-arm.h"
#include "uprobes.h"
static int uprobes_substitute_pc(unsigned long *pinsn, u32 oregs)
diff --git a/arch/arm/kernel/uprobes.c b/arch/arm/probes/uprobes/uprobes.c
similarity index 99%
rename from arch/arm/kernel/uprobes.c
rename to arch/arm/probes/uprobes/uprobes.c
index 56adf9c..f611989 100644
--- a/arch/arm/kernel/uprobes.c
+++ b/arch/arm/probes/uprobes/uprobes.c
@@ -17,8 +17,8 @@
#include <asm/opcodes.h>
#include <asm/traps.h>
-#include "probes.h"
-#include "probes-arm.h"
+#include "../decode.h"
+#include "../decode-arm.h"
#include "uprobes.h"
#define UPROBE_TRAP_NR UINT_MAX
diff --git a/arch/arm/kernel/uprobes.h b/arch/arm/probes/uprobes/uprobes.h
similarity index 100%
rename from arch/arm/kernel/uprobes.h
rename to arch/arm/probes/uprobes/uprobes.h
--
1.8.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v11 1/7] ARM: probes: move all probe code to dedicate directory
2014-12-02 4:59 ` Masami Hiramatsu
2014-12-02 10:16 ` [PATCH] " Wang Nan
@ 2014-12-02 10:23 ` Wang Nan
2014-12-03 4:38 ` Masami Hiramatsu
1 sibling, 1 reply; 16+ messages in thread
From: Wang Nan @ 2014-12-02 10:23 UTC (permalink / raw)
To: linux-arm-kernel
On 2014/12/2 12:59, Masami Hiramatsu wrote:
> (2014/12/01 17:48), Wang Nan wrote:
>> In discussion on LKML (https://lkml.org/lkml/2014/11/28/158), Russell
>> King suggest to move all probe related code to arch/arm/probes. This
>> patch do the work. Due to dependency on 'arch/arm/kernel/patch.h', this
>> patch also move patch.h to 'arch/arm/include/asm/patch.h', and related
>> '#include' directive are also midified to '#include <asm/patch.h>'.
>
> Moving is good to me, but renaming files are also required I think.
>
>> Signed-off-by: Wang Nan <wangnan0@huawei.com>
>> ---
>> arch/arm/Makefile | 1 +
>> arch/arm/{kernel => include/asm}/patch.h | 0
>> arch/arm/kernel/Makefile | 16 ++--------------
>> arch/arm/kernel/jump_label.c | 2 +-
>> arch/arm/kernel/patch.c | 3 +--
>> arch/arm/probes/Makefile | 15 +++++++++++++++
>> arch/arm/{kernel => probes}/kprobes-arm.c | 0
>> arch/arm/{kernel => probes}/kprobes-common.c | 0
>> arch/arm/{kernel => probes}/kprobes-test-arm.c | 0
>> arch/arm/{kernel => probes}/kprobes-test-thumb.c | 0
>> arch/arm/{kernel => probes}/kprobes-test.c | 0
>> arch/arm/{kernel => probes}/kprobes-test.h | 0
>> arch/arm/{kernel => probes}/kprobes-thumb.c | 0
>> arch/arm/{kernel => probes}/kprobes.c | 2 +-
>> arch/arm/{kernel => probes}/kprobes.h | 0
>> arch/arm/{kernel => probes}/probes-arm.c | 0
>> arch/arm/{kernel => probes}/probes-arm.h | 0
>> arch/arm/{kernel => probes}/probes-thumb.c | 0
>> arch/arm/{kernel => probes}/probes-thumb.h | 0
>> arch/arm/{kernel => probes}/probes.c | 0
>> arch/arm/{kernel => probes}/probes.h | 0
>> arch/arm/{kernel => probes}/uprobes-arm.c | 0
>> arch/arm/{kernel => probes}/uprobes.c | 0
>> arch/arm/{kernel => probes}/uprobes.h | 0
>
> As I did on x86, these would be better renamed as expressing what they do.
> I guess most of the files may have emulate-*.c or decode-*.c :)
>
> Thank you,
>
OK. I posted another patch in this thread. The directory tree is as follow:
arch/arm/probes/
|-- Makefile
|-- decode-arm.c
|-- decode-arm.h
|-- decode-thumb.c
|-- decode-thumb.h
|-- decode.c
|-- decode.h
|-- kprobes
| |-- actions-arm.c
| |-- actions-common.c
| |-- actions-thumb.c
| |-- kprobes.c
| |-- kprobes.h
| |-- test-arm.c
| |-- test-core.c
| |-- test-core.h
| `-- test-thumb.c
`-- uprobes
|-- actions-arm.c
|-- uprobes.c
`-- uprobes.h
2 directories, 19 files
What do you think?
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH v11 1/7] ARM: probes: move all probe code to dedicate directory
2014-12-02 10:23 ` [PATCH v11 1/7] " Wang Nan
@ 2014-12-03 4:38 ` Masami Hiramatsu
2014-12-03 5:28 ` Wang Nan
0 siblings, 1 reply; 16+ messages in thread
From: Masami Hiramatsu @ 2014-12-03 4:38 UTC (permalink / raw)
To: linux-arm-kernel
(2014/12/02 19:23), Wang Nan wrote:
> On 2014/12/2 12:59, Masami Hiramatsu wrote:
>> (2014/12/01 17:48), Wang Nan wrote:
>>> In discussion on LKML (https://lkml.org/lkml/2014/11/28/158), Russell
>>> King suggest to move all probe related code to arch/arm/probes. This
>>> patch do the work. Due to dependency on 'arch/arm/kernel/patch.h', this
>>> patch also move patch.h to 'arch/arm/include/asm/patch.h', and related
>>> '#include' directive are also midified to '#include <asm/patch.h>'.
>>
>> Moving is good to me, but renaming files are also required I think.
>>
>>> Signed-off-by: Wang Nan <wangnan0@huawei.com>
>>> ---
>>> arch/arm/Makefile | 1 +
>>> arch/arm/{kernel => include/asm}/patch.h | 0
>>> arch/arm/kernel/Makefile | 16 ++--------------
>>> arch/arm/kernel/jump_label.c | 2 +-
>>> arch/arm/kernel/patch.c | 3 +--
>>> arch/arm/probes/Makefile | 15 +++++++++++++++
>>> arch/arm/{kernel => probes}/kprobes-arm.c | 0
>>> arch/arm/{kernel => probes}/kprobes-common.c | 0
>>> arch/arm/{kernel => probes}/kprobes-test-arm.c | 0
>>> arch/arm/{kernel => probes}/kprobes-test-thumb.c | 0
>>> arch/arm/{kernel => probes}/kprobes-test.c | 0
>>> arch/arm/{kernel => probes}/kprobes-test.h | 0
>>> arch/arm/{kernel => probes}/kprobes-thumb.c | 0
>>> arch/arm/{kernel => probes}/kprobes.c | 2 +-
>>> arch/arm/{kernel => probes}/kprobes.h | 0
>>> arch/arm/{kernel => probes}/probes-arm.c | 0
>>> arch/arm/{kernel => probes}/probes-arm.h | 0
>>> arch/arm/{kernel => probes}/probes-thumb.c | 0
>>> arch/arm/{kernel => probes}/probes-thumb.h | 0
>>> arch/arm/{kernel => probes}/probes.c | 0
>>> arch/arm/{kernel => probes}/probes.h | 0
>>> arch/arm/{kernel => probes}/uprobes-arm.c | 0
>>> arch/arm/{kernel => probes}/uprobes.c | 0
>>> arch/arm/{kernel => probes}/uprobes.h | 0
>>
>> As I did on x86, these would be better renamed as expressing what they do.
>> I guess most of the files may have emulate-*.c or decode-*.c :)
>>
>> Thank you,
>>
>
> OK. I posted another patch in this thread. The directory tree is as follow:
>
> arch/arm/probes/
> |-- Makefile
> |-- decode-arm.c
> |-- decode-arm.h
> |-- decode-thumb.c
> |-- decode-thumb.h
> |-- decode.c
> |-- decode.h
> |-- kprobes
> | |-- actions-arm.c
> | |-- actions-common.c
> | |-- actions-thumb.c
> | |-- kprobes.c
> | |-- kprobes.h
> | |-- test-arm.c
> | |-- test-core.c
> | |-- test-core.h
> | `-- test-thumb.c
> `-- uprobes
> |-- actions-arm.c
> |-- uprobes.c
> `-- uprobes.h
>
> 2 directories, 19 files
>
> What do you think?
Yeah, that looks better :)
Btw, if you introduce probes/{kprobes,uprobes}/, *probes.c should be core.c too,
since the directories already show its name. And also, both dirs should have its
own Makefile.
Thank you,
--
Masami HIRAMATSU
Software Platform Research Dept. Linux Technology Research Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt at hitachi.com
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH v11 1/7] ARM: probes: move all probe code to dedicate directory
2014-12-03 4:38 ` Masami Hiramatsu
@ 2014-12-03 5:28 ` Wang Nan
2014-12-03 6:27 ` Masami Hiramatsu
0 siblings, 1 reply; 16+ messages in thread
From: Wang Nan @ 2014-12-03 5:28 UTC (permalink / raw)
To: linux-arm-kernel
On 2014/12/3 12:38, Masami Hiramatsu wrote:
> (2014/12/02 19:23), Wang Nan wrote:
>> On 2014/12/2 12:59, Masami Hiramatsu wrote:
>>> (2014/12/01 17:48), Wang Nan wrote:
>>>> In discussion on LKML (https://lkml.org/lkml/2014/11/28/158), Russell
>>>> King suggest to move all probe related code to arch/arm/probes. This
>>>> patch do the work. Due to dependency on 'arch/arm/kernel/patch.h', this
>>>> patch also move patch.h to 'arch/arm/include/asm/patch.h', and related
>>>> '#include' directive are also midified to '#include <asm/patch.h>'.
>>>
>>> Moving is good to me, but renaming files are also required I think.
>>>
>>>> Signed-off-by: Wang Nan <wangnan0@huawei.com>
>>>> ---
>>>> arch/arm/Makefile | 1 +
>>>> arch/arm/{kernel => include/asm}/patch.h | 0
>>>> arch/arm/kernel/Makefile | 16 ++--------------
>>>> arch/arm/kernel/jump_label.c | 2 +-
>>>> arch/arm/kernel/patch.c | 3 +--
>>>> arch/arm/probes/Makefile | 15 +++++++++++++++
>>>> arch/arm/{kernel => probes}/kprobes-arm.c | 0
>>>> arch/arm/{kernel => probes}/kprobes-common.c | 0
>>>> arch/arm/{kernel => probes}/kprobes-test-arm.c | 0
>>>> arch/arm/{kernel => probes}/kprobes-test-thumb.c | 0
>>>> arch/arm/{kernel => probes}/kprobes-test.c | 0
>>>> arch/arm/{kernel => probes}/kprobes-test.h | 0
>>>> arch/arm/{kernel => probes}/kprobes-thumb.c | 0
>>>> arch/arm/{kernel => probes}/kprobes.c | 2 +-
>>>> arch/arm/{kernel => probes}/kprobes.h | 0
>>>> arch/arm/{kernel => probes}/probes-arm.c | 0
>>>> arch/arm/{kernel => probes}/probes-arm.h | 0
>>>> arch/arm/{kernel => probes}/probes-thumb.c | 0
>>>> arch/arm/{kernel => probes}/probes-thumb.h | 0
>>>> arch/arm/{kernel => probes}/probes.c | 0
>>>> arch/arm/{kernel => probes}/probes.h | 0
>>>> arch/arm/{kernel => probes}/uprobes-arm.c | 0
>>>> arch/arm/{kernel => probes}/uprobes.c | 0
>>>> arch/arm/{kernel => probes}/uprobes.h | 0
>>>
>>> As I did on x86, these would be better renamed as expressing what they do.
>>> I guess most of the files may have emulate-*.c or decode-*.c :)
>>>
>>> Thank you,
>>>
>>
>> OK. I posted another patch in this thread. The directory tree is as follow:
>>
>> arch/arm/probes/
>> |-- Makefile
>> |-- decode-arm.c
>> |-- decode-arm.h
>> |-- decode-thumb.c
>> |-- decode-thumb.h
>> |-- decode.c
>> |-- decode.h
>> |-- kprobes
>> | |-- actions-arm.c
>> | |-- actions-common.c
>> | |-- actions-thumb.c
>> | |-- kprobes.c
>> | |-- kprobes.h
>> | |-- test-arm.c
>> | |-- test-core.c
>> | |-- test-core.h
>> | `-- test-thumb.c
>> `-- uprobes
>> |-- actions-arm.c
>> |-- uprobes.c
>> `-- uprobes.h
>>
>> 2 directories, 19 files
>>
>> What do you think?
>
> Yeah, that looks better :)
>
> Btw, if you introduce probes/{kprobes,uprobes}/, *probes.c should be core.c too,
> since the directories already show its name. And also, both dirs should have its
> own Makefile.
>
Seprated Makefile may introduce extra complexity. Think about someone try to compile
kprobe as a module (currently it is impossible due to dependencies between kprobe and
kernel core, but decoupling is possible), seprated Makefiles may force him to
create at least 3 modules for kprobe, even if one module is enough.
Anyway, there may some features in kernel build system can help him. I'll post
v12 patch series based on your suggestion.
Thank you.
> Thank you,
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH v11 1/7] ARM: probes: move all probe code to dedicate directory
2014-12-03 5:28 ` Wang Nan
@ 2014-12-03 6:27 ` Masami Hiramatsu
0 siblings, 0 replies; 16+ messages in thread
From: Masami Hiramatsu @ 2014-12-03 6:27 UTC (permalink / raw)
To: linux-arm-kernel
(2014/12/03 14:28), Wang Nan wrote:
> On 2014/12/3 12:38, Masami Hiramatsu wrote:
>> (2014/12/02 19:23), Wang Nan wrote:
>>> On 2014/12/2 12:59, Masami Hiramatsu wrote:
>>>> (2014/12/01 17:48), Wang Nan wrote:
>>>>> In discussion on LKML (https://lkml.org/lkml/2014/11/28/158), Russell
>>>>> King suggest to move all probe related code to arch/arm/probes. This
>>>>> patch do the work. Due to dependency on 'arch/arm/kernel/patch.h', this
>>>>> patch also move patch.h to 'arch/arm/include/asm/patch.h', and related
>>>>> '#include' directive are also midified to '#include <asm/patch.h>'.
>>>>
>>>> Moving is good to me, but renaming files are also required I think.
>>>>
>>>>> Signed-off-by: Wang Nan <wangnan0@huawei.com>
>>>>> ---
>>>>> arch/arm/Makefile | 1 +
>>>>> arch/arm/{kernel => include/asm}/patch.h | 0
>>>>> arch/arm/kernel/Makefile | 16 ++--------------
>>>>> arch/arm/kernel/jump_label.c | 2 +-
>>>>> arch/arm/kernel/patch.c | 3 +--
>>>>> arch/arm/probes/Makefile | 15 +++++++++++++++
>>>>> arch/arm/{kernel => probes}/kprobes-arm.c | 0
>>>>> arch/arm/{kernel => probes}/kprobes-common.c | 0
>>>>> arch/arm/{kernel => probes}/kprobes-test-arm.c | 0
>>>>> arch/arm/{kernel => probes}/kprobes-test-thumb.c | 0
>>>>> arch/arm/{kernel => probes}/kprobes-test.c | 0
>>>>> arch/arm/{kernel => probes}/kprobes-test.h | 0
>>>>> arch/arm/{kernel => probes}/kprobes-thumb.c | 0
>>>>> arch/arm/{kernel => probes}/kprobes.c | 2 +-
>>>>> arch/arm/{kernel => probes}/kprobes.h | 0
>>>>> arch/arm/{kernel => probes}/probes-arm.c | 0
>>>>> arch/arm/{kernel => probes}/probes-arm.h | 0
>>>>> arch/arm/{kernel => probes}/probes-thumb.c | 0
>>>>> arch/arm/{kernel => probes}/probes-thumb.h | 0
>>>>> arch/arm/{kernel => probes}/probes.c | 0
>>>>> arch/arm/{kernel => probes}/probes.h | 0
>>>>> arch/arm/{kernel => probes}/uprobes-arm.c | 0
>>>>> arch/arm/{kernel => probes}/uprobes.c | 0
>>>>> arch/arm/{kernel => probes}/uprobes.h | 0
>>>>
>>>> As I did on x86, these would be better renamed as expressing what they do.
>>>> I guess most of the files may have emulate-*.c or decode-*.c :)
>>>>
>>>> Thank you,
>>>>
>>>
>>> OK. I posted another patch in this thread. The directory tree is as follow:
>>>
>>> arch/arm/probes/
>>> |-- Makefile
>>> |-- decode-arm.c
>>> |-- decode-arm.h
>>> |-- decode-thumb.c
>>> |-- decode-thumb.h
>>> |-- decode.c
>>> |-- decode.h
>>> |-- kprobes
>>> | |-- actions-arm.c
>>> | |-- actions-common.c
>>> | |-- actions-thumb.c
>>> | |-- kprobes.c
>>> | |-- kprobes.h
>>> | |-- test-arm.c
>>> | |-- test-core.c
>>> | |-- test-core.h
>>> | `-- test-thumb.c
>>> `-- uprobes
>>> |-- actions-arm.c
>>> |-- uprobes.c
>>> `-- uprobes.h
>>>
>>> 2 directories, 19 files
>>>
>>> What do you think?
>>
>> Yeah, that looks better :)
>>
>> Btw, if you introduce probes/{kprobes,uprobes}/, *probes.c should be core.c too,
>> since the directories already show its name. And also, both dirs should have its
>> own Makefile.
>>
>
> Seprated Makefile may introduce extra complexity. Think about someone try to compile
> kprobe as a module (currently it is impossible due to dependencies between kprobe and
> kernel core, but decoupling is possible), seprated Makefiles may force him to
> create at least 3 modules for kprobe, even if one module is enough.
Hmm, OK, agreed.
>
> Anyway, there may some features in kernel build system can help him. I'll post
> v12 patch series based on your suggestion.
Thanks! :)
--
Masami HIRAMATSU
Software Platform Research Dept. Linux Technology Research Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt at hitachi.com
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v11 2/7] ARM: kprobes: introduces checker
2014-12-01 8:45 [PATCH v11 0/7] ARM: kprobes: OPTPROBES and other improvements Wang Nan
2014-12-01 8:48 ` [PATCH v11 1/7] ARM: probes: move all probe code to dedicate directory Wang Nan
@ 2014-12-01 8:48 ` Wang Nan
2014-12-01 8:48 ` [PATCH v11 3/7] ARM: kprobes: collects stack consumption for store instructions Wang Nan
` (4 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Wang Nan @ 2014-12-01 8:48 UTC (permalink / raw)
To: linux-arm-kernel
This patch introdces 'checker' to decoding phase, and calls checkers
when instruction decoding. This allows further decoding for specific
instructions. This patch introduces a stub call of checkers in kprobe
arch_prepare_kprobe() as an example and for further expansion.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Reviewed-by: Jon Medhurst <tixy@linaro.org>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
v1 -> v2:
- kprobe checker stubs are introduced in this patch.
v2 -> v3:
- Code cleanups following Masami Hiramatsu and Tixy's advises.
- Commit message improvements.
v3 -> v4:
- Move to arch/arm/probes.
---
arch/arm/probes/kprobes-arm.c | 2 ++
arch/arm/probes/kprobes-thumb.c | 3 +++
arch/arm/probes/kprobes.c | 6 ++++-
arch/arm/probes/kprobes.h | 7 +++--
arch/arm/probes/probes-arm.c | 5 ++--
arch/arm/probes/probes-arm.h | 3 ++-
arch/arm/probes/probes-thumb.c | 10 ++++---
arch/arm/probes/probes-thumb.h | 6 +++--
arch/arm/probes/probes.c | 60 ++++++++++++++++++++++++++++++++++++-----
arch/arm/probes/probes.h | 11 +++++++-
arch/arm/probes/uprobes.c | 2 +-
11 files changed, 95 insertions(+), 20 deletions(-)
diff --git a/arch/arm/probes/kprobes-arm.c b/arch/arm/probes/kprobes-arm.c
index ac300c6..5a81275 100644
--- a/arch/arm/probes/kprobes-arm.c
+++ b/arch/arm/probes/kprobes-arm.c
@@ -341,3 +341,5 @@ const union decode_action kprobes_arm_actions[NUM_PROBES_ARM_ACTIONS] = {
[PROBES_BRANCH] = {.handler = simulate_bbl},
[PROBES_LDMSTM] = {.decoder = kprobe_decode_ldmstm}
};
+
+const struct decode_checker *kprobes_arm_checkers[] = {NULL};
diff --git a/arch/arm/probes/kprobes-thumb.c b/arch/arm/probes/kprobes-thumb.c
index 9495d7f..b8ba7d2 100644
--- a/arch/arm/probes/kprobes-thumb.c
+++ b/arch/arm/probes/kprobes-thumb.c
@@ -664,3 +664,6 @@ const union decode_action kprobes_t32_actions[NUM_PROBES_T32_ACTIONS] = {
[PROBES_T32_MUL_ADD_LONG] = {
.handler = t32_emulate_rdlo12rdhi8rn16rm0_noflags},
};
+
+const struct decode_checker *kprobes_t32_checkers[] = {NULL};
+const struct decode_checker *kprobes_t16_checkers[] = {NULL};
diff --git a/arch/arm/probes/kprobes.c b/arch/arm/probes/kprobes.c
index 43b2488..e6e16a2 100644
--- a/arch/arm/probes/kprobes.c
+++ b/arch/arm/probes/kprobes.c
@@ -61,6 +61,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
kprobe_decode_insn_t *decode_insn;
const union decode_action *actions;
int is;
+ const struct decode_checker **checkers;
if (in_exception_text(addr))
return -EINVAL;
@@ -74,9 +75,11 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
insn = __opcode_thumb32_compose(insn, inst2);
decode_insn = thumb32_probes_decode_insn;
actions = kprobes_t32_actions;
+ checkers = kprobes_t32_checkers;
} else {
decode_insn = thumb16_probes_decode_insn;
actions = kprobes_t16_actions;
+ checkers = kprobes_t16_checkers;
}
#else /* !CONFIG_THUMB2_KERNEL */
thumb = false;
@@ -85,12 +88,13 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
insn = __mem_to_opcode_arm(*p->addr);
decode_insn = arm_probes_decode_insn;
actions = kprobes_arm_actions;
+ checkers = kprobes_arm_checkers;
#endif
p->opcode = insn;
p->ainsn.insn = tmp_insn;
- switch ((*decode_insn)(insn, &p->ainsn, true, actions)) {
+ switch ((*decode_insn)(insn, &p->ainsn, true, actions, checkers)) {
case INSN_REJECTED: /* not supported */
return -EINVAL;
diff --git a/arch/arm/probes/kprobes.h b/arch/arm/probes/kprobes.h
index 9a2712e..05f3b40 100644
--- a/arch/arm/probes/kprobes.h
+++ b/arch/arm/probes/kprobes.h
@@ -36,16 +36,19 @@ kprobe_decode_ldmstm(kprobe_opcode_t insn, struct arch_probes_insn *asi,
typedef enum probes_insn (kprobe_decode_insn_t)(probes_opcode_t,
struct arch_probes_insn *,
bool,
- const union decode_action *);
+ const union decode_action *,
+ const struct decode_checker *[*]);
#ifdef CONFIG_THUMB2_KERNEL
extern const union decode_action kprobes_t32_actions[];
extern const union decode_action kprobes_t16_actions[];
-
+extern const struct decode_checker *kprobes_t32_checkers[];
+extern const struct decode_checker *kprobes_t16_checkers[];
#else /* !CONFIG_THUMB2_KERNEL */
extern const union decode_action kprobes_arm_actions[];
+extern const struct decode_checker *kprobes_arm_checkers[];
#endif
diff --git a/arch/arm/probes/probes-arm.c b/arch/arm/probes/probes-arm.c
index 8eaef81..125feda 100644
--- a/arch/arm/probes/probes-arm.c
+++ b/arch/arm/probes/probes-arm.c
@@ -725,10 +725,11 @@ static void __kprobes arm_singlestep(probes_opcode_t insn,
*/
enum probes_insn __kprobes
arm_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
- bool emulate, const union decode_action *actions)
+ bool emulate, const union decode_action *actions,
+ const struct decode_checker *checkers[])
{
asi->insn_singlestep = arm_singlestep;
asi->insn_check_cc = probes_condition_checks[insn>>28];
return probes_decode_insn(insn, asi, probes_decode_arm_table, false,
- emulate, actions);
+ emulate, actions, checkers);
}
diff --git a/arch/arm/probes/probes-arm.h b/arch/arm/probes/probes-arm.h
index ace6572..8b11ec4 100644
--- a/arch/arm/probes/probes-arm.h
+++ b/arch/arm/probes/probes-arm.h
@@ -68,6 +68,7 @@ extern const union decode_item probes_decode_arm_table[];
enum probes_insn arm_probes_decode_insn(probes_opcode_t,
struct arch_probes_insn *, bool emulate,
- const union decode_action *actions);
+ const union decode_action *actions,
+ const struct decode_checker *checkers[]);
#endif
diff --git a/arch/arm/probes/probes-thumb.c b/arch/arm/probes/probes-thumb.c
index 4131351..a5022b4 100644
--- a/arch/arm/probes/probes-thumb.c
+++ b/arch/arm/probes/probes-thumb.c
@@ -863,20 +863,22 @@ static void __kprobes thumb32_singlestep(probes_opcode_t opcode,
enum probes_insn __kprobes
thumb16_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
- bool emulate, const union decode_action *actions)
+ bool emulate, const union decode_action *actions,
+ const struct decode_checker *checkers[])
{
asi->insn_singlestep = thumb16_singlestep;
asi->insn_check_cc = thumb_check_cc;
return probes_decode_insn(insn, asi, probes_decode_thumb16_table, true,
- emulate, actions);
+ emulate, actions, checkers);
}
enum probes_insn __kprobes
thumb32_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
- bool emulate, const union decode_action *actions)
+ bool emulate, const union decode_action *actions,
+ const struct decode_checker *checkers[])
{
asi->insn_singlestep = thumb32_singlestep;
asi->insn_check_cc = thumb_check_cc;
return probes_decode_insn(insn, asi, probes_decode_thumb32_table, true,
- emulate, actions);
+ emulate, actions, checkers);
}
diff --git a/arch/arm/probes/probes-thumb.h b/arch/arm/probes/probes-thumb.h
index 7c6f6eb..ccfe3e4 100644
--- a/arch/arm/probes/probes-thumb.h
+++ b/arch/arm/probes/probes-thumb.h
@@ -89,9 +89,11 @@ extern const union decode_item probes_decode_thumb16_table[];
enum probes_insn __kprobes
thumb16_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
- bool emulate, const union decode_action *actions);
+ bool emulate, const union decode_action *actions,
+ const struct decode_checker *checkers[]);
enum probes_insn __kprobes
thumb32_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
- bool emulate, const union decode_action *actions);
+ bool emulate, const union decode_action *actions,
+ const struct decode_checker *checkers[]);
#endif
diff --git a/arch/arm/probes/probes.c b/arch/arm/probes/probes.c
index a8ab540..6a7d92e 100644
--- a/arch/arm/probes/probes.c
+++ b/arch/arm/probes/probes.c
@@ -342,6 +342,31 @@ static const int decode_struct_sizes[NUM_DECODE_TYPES] = {
[DECODE_TYPE_REJECT] = sizeof(struct decode_reject)
};
+static int run_checkers(const struct decode_checker *checkers[],
+ int action, probes_opcode_t insn,
+ struct arch_probes_insn *asi,
+ const struct decode_header *h)
+{
+ const struct decode_checker **p;
+
+ if (!checkers)
+ return INSN_GOOD;
+
+ p = checkers;
+ while (*p != NULL) {
+ int retval;
+ probes_check_t *checker_func = (*p)[action].checker;
+
+ retval = INSN_GOOD;
+ if (checker_func)
+ retval = checker_func(insn, asi, h);
+ if (retval == INSN_REJECTED)
+ return retval;
+ p++;
+ }
+ return INSN_GOOD;
+}
+
/*
* probes_decode_insn operates on data tables in order to decode an ARM
* architecture instruction onto which a kprobe has been placed.
@@ -388,11 +413,17 @@ static const int decode_struct_sizes[NUM_DECODE_TYPES] = {
int __kprobes
probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
const union decode_item *table, bool thumb,
- bool emulate, const union decode_action *actions)
+ bool emulate, const union decode_action *actions,
+ const struct decode_checker *checkers[])
{
const struct decode_header *h = (struct decode_header *)table;
const struct decode_header *next;
bool matched = false;
+ /*
+ * @insn can be modified by decode_regs. Save its original
+ * value for checkers.
+ */
+ probes_opcode_t origin_insn = insn;
if (emulate)
insn = prepare_emulated_insn(insn, asi, thumb);
@@ -422,24 +453,41 @@ probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
}
case DECODE_TYPE_CUSTOM: {
+ int err;
struct decode_custom *d = (struct decode_custom *)h;
- return actions[d->decoder.action].decoder(insn, asi, h);
+ int action = d->decoder.action;
+
+ err = run_checkers(checkers, action, origin_insn, asi, h);
+ if (err == INSN_REJECTED)
+ return INSN_REJECTED;
+ return actions[action].decoder(insn, asi, h);
}
case DECODE_TYPE_SIMULATE: {
+ int err;
struct decode_simulate *d = (struct decode_simulate *)h;
- asi->insn_handler = actions[d->handler.action].handler;
+ int action = d->handler.action;
+
+ err = run_checkers(checkers, action, origin_insn, asi, h);
+ if (err == INSN_REJECTED)
+ return INSN_REJECTED;
+ asi->insn_handler = actions[action].handler;
return INSN_GOOD_NO_SLOT;
}
case DECODE_TYPE_EMULATE: {
+ int err;
struct decode_emulate *d = (struct decode_emulate *)h;
+ int action = d->handler.action;
+
+ err = run_checkers(checkers, action, origin_insn, asi, h);
+ if (err == INSN_REJECTED)
+ return INSN_REJECTED;
if (!emulate)
- return actions[d->handler.action].decoder(insn,
- asi, h);
+ return actions[action].decoder(insn, asi, h);
- asi->insn_handler = actions[d->handler.action].handler;
+ asi->insn_handler = actions[action].handler;
set_emulated_insn(insn, asi, thumb);
return INSN_GOOD;
}
diff --git a/arch/arm/probes/probes.h b/arch/arm/probes/probes.h
index dba9f24..b4bf1f5 100644
--- a/arch/arm/probes/probes.h
+++ b/arch/arm/probes/probes.h
@@ -314,6 +314,14 @@ union decode_action {
probes_custom_decode_t *decoder;
};
+typedef enum probes_insn (probes_check_t)(probes_opcode_t,
+ struct arch_probes_insn *,
+ const struct decode_header *);
+
+struct decode_checker {
+ probes_check_t *checker;
+};
+
#define DECODE_END \
{.bits = DECODE_TYPE_END}
@@ -402,6 +410,7 @@ probes_insn_handler_t probes_emulate_none;
int __kprobes
probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
const union decode_item *table, bool thumb, bool emulate,
- const union decode_action *actions);
+ const union decode_action *actions,
+ const struct decode_checker **checkers);
#endif
diff --git a/arch/arm/probes/uprobes.c b/arch/arm/probes/uprobes.c
index 56adf9c..372585a 100644
--- a/arch/arm/probes/uprobes.c
+++ b/arch/arm/probes/uprobes.c
@@ -88,7 +88,7 @@ int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm,
auprobe->ixol[1] = __opcode_to_mem_arm(UPROBE_SS_ARM_INSN);
ret = arm_probes_decode_insn(insn, &auprobe->asi, false,
- uprobes_probes_actions);
+ uprobes_probes_actions, NULL);
switch (ret) {
case INSN_REJECTED:
return -EINVAL;
--
1.8.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v11 3/7] ARM: kprobes: collects stack consumption for store instructions
2014-12-01 8:45 [PATCH v11 0/7] ARM: kprobes: OPTPROBES and other improvements Wang Nan
2014-12-01 8:48 ` [PATCH v11 1/7] ARM: probes: move all probe code to dedicate directory Wang Nan
2014-12-01 8:48 ` [PATCH v11 2/7] ARM: kprobes: introduces checker Wang Nan
@ 2014-12-01 8:48 ` Wang Nan
2014-12-01 8:48 ` [PATCH v11 4/7] ARM: kprobes: disallow probing stack consuming instructions Wang Nan
` (3 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Wang Nan @ 2014-12-01 8:48 UTC (permalink / raw)
To: linux-arm-kernel
This patch uses the previously introduced checker functionality on
store instructions to record their stack consumption information to
arch_probes_insn.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Reviewed-by: Jon Medhurst <tixy@linaro.org>
---
v1 -> v2:
- Bugfix and code improvements following Tixy's suggestion. See:
http://www.spinics.net/lists/arm-kernel/msg372912.html
v2 -> v3:
- Totaly reconstructed following Tixy' instruction. See:
https://lkml.org/lkml/2014/10/27/662 .
Add his SOB.
v3 -> v4:
- Commit message improvements.
- Comments improvements and code cleanup.
- A bug is found and fixed in decode table in arm_check_stack().
v4 -> v5:
- Bugs in thumb2 decoding table is found by Tixy and fixed.
v5 -> v6:
- Move to arch/arm/probes/ .
---
arch/arm/include/asm/probes.h | 1 +
arch/arm/probes/Makefile | 6 +-
arch/arm/probes/kprobes-arm.c | 3 +-
arch/arm/probes/kprobes-thumb.c | 5 +-
arch/arm/probes/probes-checkers-arm.c | 99 ++++++++++++++++++++++++++++
arch/arm/probes/probes-checkers-common.c | 101 ++++++++++++++++++++++++++++
arch/arm/probes/probes-checkers-thumb.c | 110 +++++++++++++++++++++++++++++++
arch/arm/probes/probes-checkers.h | 54 +++++++++++++++
arch/arm/probes/probes.c | 10 +++
9 files changed, 383 insertions(+), 6 deletions(-)
create mode 100644 arch/arm/probes/probes-checkers-arm.c
create mode 100644 arch/arm/probes/probes-checkers-common.c
create mode 100644 arch/arm/probes/probes-checkers-thumb.c
create mode 100644 arch/arm/probes/probes-checkers.h
diff --git a/arch/arm/include/asm/probes.h b/arch/arm/include/asm/probes.h
index 806cfe6..ccf9af3 100644
--- a/arch/arm/include/asm/probes.h
+++ b/arch/arm/include/asm/probes.h
@@ -38,6 +38,7 @@ struct arch_probes_insn {
probes_check_cc *insn_check_cc;
probes_insn_singlestep_t *insn_singlestep;
probes_insn_fn_t *insn_fn;
+ int stack_space;
};
#endif
diff --git a/arch/arm/probes/Makefile b/arch/arm/probes/Makefile
index 34b53b0..b566335 100644
--- a/arch/arm/probes/Makefile
+++ b/arch/arm/probes/Makefile
@@ -1,9 +1,9 @@
obj-$(CONFIG_UPROBES) += probes.o probes-arm.o uprobes.o uprobes-arm.o
-obj-$(CONFIG_KPROBES) += probes.o kprobes.o kprobes-common.o
+obj-$(CONFIG_KPROBES) += probes.o kprobes.o kprobes-common.o probes-checkers-common.o
ifdef CONFIG_THUMB2_KERNEL
-obj-$(CONFIG_KPROBES) += kprobes-thumb.o probes-thumb.o
+obj-$(CONFIG_KPROBES) += kprobes-thumb.o probes-thumb.o probes-checkers-thumb.o
else
-obj-$(CONFIG_KPROBES) += kprobes-arm.o probes-arm.o
+obj-$(CONFIG_KPROBES) += kprobes-arm.o probes-arm.o probes-checkers-arm.o
endif
obj-$(CONFIG_ARM_KPROBES_TEST) += test-kprobes.o
test-kprobes-objs := kprobes-test.o
diff --git a/arch/arm/probes/kprobes-arm.c b/arch/arm/probes/kprobes-arm.c
index 5a81275..56f78ce 100644
--- a/arch/arm/probes/kprobes-arm.c
+++ b/arch/arm/probes/kprobes-arm.c
@@ -64,6 +64,7 @@
#include "kprobes.h"
#include "probes-arm.h"
+#include "probes-checkers.h"
#if __LINUX_ARM_ARCH__ >= 6
#define BLX(reg) "blx "reg" \n\t"
@@ -342,4 +343,4 @@ const union decode_action kprobes_arm_actions[NUM_PROBES_ARM_ACTIONS] = {
[PROBES_LDMSTM] = {.decoder = kprobe_decode_ldmstm}
};
-const struct decode_checker *kprobes_arm_checkers[] = {NULL};
+const struct decode_checker *kprobes_arm_checkers[] = {arm_stack_checker, NULL};
diff --git a/arch/arm/probes/kprobes-thumb.c b/arch/arm/probes/kprobes-thumb.c
index b8ba7d2..dbfd3ca 100644
--- a/arch/arm/probes/kprobes-thumb.c
+++ b/arch/arm/probes/kprobes-thumb.c
@@ -15,6 +15,7 @@
#include "kprobes.h"
#include "probes-thumb.h"
+#include "probes-checkers.h"
/* These emulation encodings are functionally equivalent... */
#define t32_emulate_rd8rn16rm0ra12_noflags \
@@ -665,5 +666,5 @@ const union decode_action kprobes_t32_actions[NUM_PROBES_T32_ACTIONS] = {
.handler = t32_emulate_rdlo12rdhi8rn16rm0_noflags},
};
-const struct decode_checker *kprobes_t32_checkers[] = {NULL};
-const struct decode_checker *kprobes_t16_checkers[] = {NULL};
+const struct decode_checker *kprobes_t32_checkers[] = {t32_stack_checker, NULL};
+const struct decode_checker *kprobes_t16_checkers[] = {t16_stack_checker, NULL};
diff --git a/arch/arm/probes/probes-checkers-arm.c b/arch/arm/probes/probes-checkers-arm.c
new file mode 100644
index 0000000..cde9b5c
--- /dev/null
+++ b/arch/arm/probes/probes-checkers-arm.c
@@ -0,0 +1,99 @@
+/*
+ * arch/arm/probes/probes-checkers-arm.c
+ *
+ * Copyright (C) 2014 Huawei Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include "probes.h"
+#include "probes-arm.h"
+#include "probes-checkers.h"
+
+static enum probes_insn __kprobes arm_check_stack(probes_opcode_t insn,
+ struct arch_probes_insn *asi,
+ const struct decode_header *h)
+{
+ /*
+ * PROBES_LDRSTRD, PROBES_LDMSTM, PROBES_STORE,
+ * PROBES_STORE_EXTRA may get here. Simply mark all normal
+ * insns as STACK_USE_NONE.
+ */
+ static const union decode_item table[] = {
+ /*
+ * 'STR{,D,B,H}, Rt, [Rn, Rm]' should be marked as UNKNOWN
+ * if Rn or Rm is SP.
+ * x
+ * STR (register) cccc 011x x0x0 xxxx xxxx xxxx xxxx xxxx
+ * STRB (register) cccc 011x x1x0 xxxx xxxx xxxx xxxx xxxx
+ */
+ DECODE_OR (0x0e10000f, 0x0600000d),
+ DECODE_OR (0x0e1f0000, 0x060d0000),
+
+ /*
+ * x
+ * STRD (register) cccc 000x x0x0 xxxx xxxx xxxx 1111 xxxx
+ * STRH (register) cccc 000x x0x0 xxxx xxxx xxxx 1011 xxxx
+ */
+ DECODE_OR (0x0e5000bf, 0x000000bd),
+ DECODE_CUSTOM (0x0e5f00b0, 0x000d00b0, STACK_USE_UNKNOWN),
+
+ /*
+ * For PROBES_LDMSTM, only stmdx sp, [...] need to examine
+ *
+ * Bit B/A (bit 24) encodes arithmetic operation order. 1 means
+ * before, 0 means after.
+ * Bit I/D (bit 23) encodes arithmetic operation. 1 means
+ * increment, 0 means decrement.
+ *
+ * So:
+ * B I
+ * / /
+ * A D | Rn |
+ * STMDX SP, [...] cccc 100x 00x0 xxxx xxxx xxxx xxxx xxxx
+ */
+ DECODE_CUSTOM (0x0edf0000, 0x080d0000, STACK_USE_STMDX),
+
+ /* P U W | Rn | Rt | imm12 |*/
+ /* STR (immediate) cccc 010x x0x0 1101 xxxx xxxx xxxx xxxx */
+ /* STRB (immediate) cccc 010x x1x0 1101 xxxx xxxx xxxx xxxx */
+ /* P U W | Rn | Rt |imm4| |imm4|*/
+ /* STRD (immediate) cccc 000x x1x0 1101 xxxx xxxx 1111 xxxx */
+ /* STRH (immediate) cccc 000x x1x0 1101 xxxx xxxx 1011 xxxx */
+ /*
+ * index = (P == '1'); add = (U == '1').
+ * Above insns with:
+ * index == 0 (str{,d,h} rx, [sp], #+/-imm) or
+ * add == 1 (str{,d,h} rx, [sp, #+<imm>])
+ * should be STACK_USE_NONE.
+ * Only str{,b,d,h} rx,[sp,#-n] (P == 1 and U == 0) are
+ * required to be examined.
+ */
+ /* STR{,B} Rt,[SP,#-n] cccc 0101 0xx0 1101 xxxx xxxx xxxx xxxx */
+ DECODE_CUSTOM (0x0f9f0000, 0x050d0000, STACK_USE_FIXED_XXX),
+
+ /* STR{D,H} Rt,[SP,#-n] cccc 0001 01x0 1101 xxxx xxxx 1x11 xxxx */
+ DECODE_CUSTOM (0x0fdf00b0, 0x014d00b0, STACK_USE_FIXED_X0X),
+
+ /* fall through */
+ DECODE_CUSTOM (0, 0, STACK_USE_NONE),
+ DECODE_END
+ };
+
+ return probes_decode_insn(insn, asi, table, false, false, stack_check_actions, NULL);
+}
+
+const struct decode_checker arm_stack_checker[NUM_PROBES_ARM_ACTIONS] = {
+ [PROBES_LDRSTRD] = {.checker = arm_check_stack},
+ [PROBES_STORE_EXTRA] = {.checker = arm_check_stack},
+ [PROBES_STORE] = {.checker = arm_check_stack},
+ [PROBES_LDMSTM] = {.checker = arm_check_stack},
+};
diff --git a/arch/arm/probes/probes-checkers-common.c b/arch/arm/probes/probes-checkers-common.c
new file mode 100644
index 0000000..7db6b40
--- /dev/null
+++ b/arch/arm/probes/probes-checkers-common.c
@@ -0,0 +1,101 @@
+/*
+ * arch/arm/probes/probes-checkers-common.c
+ *
+ * Copyright (C) 2014 Huawei Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include "probes.h"
+#include "probes-arm.h"
+#include "probes-checkers.h"
+
+enum probes_insn checker_stack_use_none(probes_opcode_t insn,
+ struct arch_probes_insn *asi,
+ const struct decode_header *h)
+{
+ asi->stack_space = 0;
+ return INSN_GOOD_NO_SLOT;
+}
+
+enum probes_insn checker_stack_use_unknown(probes_opcode_t insn,
+ struct arch_probes_insn *asi,
+ const struct decode_header *h)
+{
+ asi->stack_space = -1;
+ return INSN_GOOD_NO_SLOT;
+}
+
+#ifdef CONFIG_THUMB2_KERNEL
+enum probes_insn checker_stack_use_imm_0xx(probes_opcode_t insn,
+ struct arch_probes_insn *asi,
+ const struct decode_header *h)
+{
+ int imm = insn & 0xff;
+ asi->stack_space = imm;
+ return INSN_GOOD_NO_SLOT;
+}
+
+/*
+ * Different from other insn uses imm8, the real addressing offset of
+ * STRD in T32 encoding should be imm8 * 4. See ARMARM description.
+ */
+enum probes_insn checker_stack_use_t32strd(probes_opcode_t insn,
+ struct arch_probes_insn *asi,
+ const struct decode_header *h)
+{
+ int imm = insn & 0xff;
+ asi->stack_space = imm << 2;
+ return INSN_GOOD_NO_SLOT;
+}
+#else
+enum probes_insn checker_stack_use_imm_x0x(probes_opcode_t insn,
+ struct arch_probes_insn *asi,
+ const struct decode_header *h)
+{
+ int imm = ((insn & 0xf00) >> 4) + (insn & 0xf);
+ asi->stack_space = imm;
+ return INSN_GOOD_NO_SLOT;
+}
+#endif
+
+enum probes_insn checker_stack_use_imm_xxx(probes_opcode_t insn,
+ struct arch_probes_insn *asi,
+ const struct decode_header *h)
+{
+ int imm = insn & 0xfff;
+ asi->stack_space = imm;
+ return INSN_GOOD_NO_SLOT;
+}
+
+enum probes_insn checker_stack_use_stmdx(probes_opcode_t insn,
+ struct arch_probes_insn *asi,
+ const struct decode_header *h)
+{
+ unsigned int reglist = insn & 0xffff;
+ int pbit = insn & (1 << 24);
+ asi->stack_space = (hweight32(reglist) - (!pbit ? 1 : 0)) * 4;
+
+ return INSN_GOOD_NO_SLOT;
+}
+
+const union decode_action stack_check_actions[] = {
+ [STACK_USE_NONE] = {.decoder = checker_stack_use_none},
+ [STACK_USE_UNKNOWN] = {.decoder = checker_stack_use_unknown},
+#ifdef CONFIG_THUMB2_KERNEL
+ [STACK_USE_FIXED_0XX] = {.decoder = checker_stack_use_imm_0xx},
+ [STACK_USE_T32STRD] = {.decoder = checker_stack_use_t32strd},
+#else
+ [STACK_USE_FIXED_X0X] = {.decoder = checker_stack_use_imm_x0x},
+#endif
+ [STACK_USE_FIXED_XXX] = {.decoder = checker_stack_use_imm_xxx},
+ [STACK_USE_STMDX] = {.decoder = checker_stack_use_stmdx},
+};
diff --git a/arch/arm/probes/probes-checkers-thumb.c b/arch/arm/probes/probes-checkers-thumb.c
new file mode 100644
index 0000000..309a4b7
--- /dev/null
+++ b/arch/arm/probes/probes-checkers-thumb.c
@@ -0,0 +1,110 @@
+/*
+ * arch/arm/probes/probes-checkers-arm.c
+ *
+ * Copyright (C) 2014 Huawei Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include "probes.h"
+#include "probes-thumb.h"
+#include "probes-checkers.h"
+
+static enum probes_insn __kprobes t32_check_stack(probes_opcode_t insn,
+ struct arch_probes_insn *asi,
+ const struct decode_header *h)
+{
+ /*
+ * PROBES_T32_LDMSTM, PROBES_T32_LDRDSTRD and PROBES_T32_LDRSTR
+ * may get here. Simply mark all normal insns as STACK_USE_NONE.
+ */
+ static const union decode_item table[] = {
+
+ /*
+ * First, filter out all ldr insns to make our life easier.
+ * Following load insns may come here:
+ * LDM, LDRD, LDR.
+ * In T32 encoding, bit 20 is enough for distinguishing
+ * load and store. All load insns have this bit set, when
+ * all store insns have this bit clear.
+ */
+ DECODE_CUSTOM (0x00100000, 0x00100000, STACK_USE_NONE),
+
+ /*
+ * Mark all 'STR{,B,H}, Rt, [Rn, Rm]' as STACK_USE_UNKNOWN
+ * if Rn or Rm is SP. T32 doesn't encode STRD.
+ */
+ /* xx | Rn | Rt | | Rm |*/
+ /* STR (register) 1111 1000 0100 xxxx xxxx 0000 00xx xxxx */
+ /* STRB (register) 1111 1000 0000 xxxx xxxx 0000 00xx xxxx */
+ /* STRH (register) 1111 1000 0010 xxxx xxxx 0000 00xx xxxx */
+ /* INVALID INSN 1111 1000 0110 xxxx xxxx 0000 00xx xxxx */
+ /* By Introducing INVALID INSN, bit 21 and 22 can be ignored. */
+ DECODE_OR (0xff9f0fc0, 0xf80d0000),
+ DECODE_CUSTOM (0xff900fcf, 0xf800000d, STACK_USE_UNKNOWN),
+
+
+ /* xx | Rn | Rt | PUW| imm8 |*/
+ /* STR (imm 8) 1111 1000 0100 1101 xxxx 110x xxxx xxxx */
+ /* STRB (imm 8) 1111 1000 0000 1101 xxxx 110x xxxx xxxx */
+ /* STRH (imm 8) 1111 1000 0010 1101 xxxx 110x xxxx xxxx */
+ /* INVALID INSN 1111 1000 0110 1101 xxxx 110x xxxx xxxx */
+ /* Only consider U == 0 and P == 1: strx rx, [sp, #-<imm>] */
+ DECODE_CUSTOM (0xff9f0e00, 0xf80d0c00, STACK_USE_FIXED_0XX),
+
+ /* For STR{,B,H} (imm 12), offset is always positive, so ignore them. */
+
+ /* P U W | Rn | Rt | Rt2| imm8 |*/
+ /* STRD (immediate) 1110 1001 01x0 1101 xxxx xxxx xxxx xxxx */
+ /*
+ * Only consider U == 0 and P == 1.
+ * Also note that STRD in T32 encoding is special:
+ * imm = ZeroExtend(imm8:'00', 32)
+ */
+ DECODE_CUSTOM (0xffdf0000, 0xe94d0000, STACK_USE_T32STRD),
+
+ /* | Rn | */
+ /* STMDB 1110 1001 00x0 1101 xxxx xxxx xxxx xxxx */
+ DECODE_CUSTOM (0xffdf0000, 0xe90d0000, STACK_USE_STMDX),
+
+ /* fall through */
+ DECODE_CUSTOM (0, 0, STACK_USE_NONE),
+ DECODE_END
+ };
+
+ return probes_decode_insn(insn, asi, table, false, false, stack_check_actions, NULL);
+}
+
+const struct decode_checker t32_stack_checker[NUM_PROBES_T32_ACTIONS] = {
+ [PROBES_T32_LDMSTM] = {.checker = t32_check_stack},
+ [PROBES_T32_LDRDSTRD] = {.checker = t32_check_stack},
+ [PROBES_T32_LDRSTR] = {.checker = t32_check_stack},
+};
+
+/*
+ * See following comments. This insn must be 'push'.
+ */
+static enum probes_insn __kprobes t16_check_stack(probes_opcode_t insn,
+ struct arch_probes_insn *asi,
+ const struct decode_header *h)
+{
+ unsigned int reglist = insn & 0x1ff;
+ asi->stack_space = hweight32(reglist) * 4;
+ return INSN_GOOD;
+}
+
+/*
+ * T16 encoding is simple: only the 'push' insn can need extra stack space.
+ * Other insns, like str, can only use r0-r7 as Rn.
+ */
+const struct decode_checker t16_stack_checker[NUM_PROBES_T16_ACTIONS] = {
+ [PROBES_T16_PUSH] = {.checker = t16_check_stack},
+};
diff --git a/arch/arm/probes/probes-checkers.h b/arch/arm/probes/probes-checkers.h
new file mode 100644
index 0000000..daaf170
--- /dev/null
+++ b/arch/arm/probes/probes-checkers.h
@@ -0,0 +1,54 @@
+/*
+ * arch/arm/probes/probes-checkers-common.c
+ *
+ * Copyright (C) 2014 Huawei Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+#ifndef _ARM_KERNEL_PROBES_CHECKERS_H
+#define _ARM_KERNEL_PROBES_CHECKERS_H
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include "probes.h"
+
+extern probes_check_t checker_stack_use_none;
+extern probes_check_t checker_stack_use_unknown;
+#ifdef CONFIG_THUMB2_KERNEL
+extern probes_check_t checker_stack_use_imm_0xx;
+#else
+extern probes_check_t checker_stack_use_imm_x0x;
+#endif
+extern probes_check_t checker_stack_use_imm_xxx;
+extern probes_check_t checker_stack_use_stmdx;
+
+enum {
+ STACK_USE_NONE,
+ STACK_USE_UNKNOWN,
+#ifdef CONFIG_THUMB2_KERNEL
+ STACK_USE_FIXED_0XX,
+ STACK_USE_T32STRD,
+#else
+ STACK_USE_FIXED_X0X,
+#endif
+ STACK_USE_FIXED_XXX,
+ STACK_USE_STMDX,
+ NUM_STACK_USE_TYPES
+};
+
+extern const union decode_action stack_check_actions[];
+
+#ifndef CONFIG_THUMB2_KERNEL
+extern const struct decode_checker arm_stack_checker[];
+#else
+#endif
+extern const struct decode_checker t32_stack_checker[];
+extern const struct decode_checker t16_stack_checker[];
+#endif
diff --git a/arch/arm/probes/probes.c b/arch/arm/probes/probes.c
index 6a7d92e..cc68986 100644
--- a/arch/arm/probes/probes.c
+++ b/arch/arm/probes/probes.c
@@ -425,6 +425,16 @@ probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
*/
probes_opcode_t origin_insn = insn;
+ /*
+ * stack_space is initialized to 0 here. Checker functions
+ * should update is value if they find this is a stack store
+ * instruction: positive value means bytes of stack usage,
+ * negitive value means unable to determine stack usage
+ * statically. For instruction doesn't store to stack, checker
+ * do nothing with it.
+ */
+ asi->stack_space = 0;
+
if (emulate)
insn = prepare_emulated_insn(insn, asi, thumb);
--
1.8.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v11 4/7] ARM: kprobes: disallow probing stack consuming instructions
2014-12-01 8:45 [PATCH v11 0/7] ARM: kprobes: OPTPROBES and other improvements Wang Nan
` (2 preceding siblings ...)
2014-12-01 8:48 ` [PATCH v11 3/7] ARM: kprobes: collects stack consumption for store instructions Wang Nan
@ 2014-12-01 8:48 ` Wang Nan
2014-12-01 8:48 ` [PATCH v11 5/7] ARM: kprobes: Add test cases for " Wang Nan
` (2 subsequent siblings)
6 siblings, 0 replies; 16+ messages in thread
From: Wang Nan @ 2014-12-01 8:48 UTC (permalink / raw)
To: linux-arm-kernel
This patch prohibits probing instructions for which the stack
requirements are unable to be determined statically. Some test cases
are found not work again after the modification, this patch also
removes them.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Reviewed-by: Jon Medhurst <tixy@linaro.org>
---
v1 -> v2:
- Use MAX_STACK_SIZE macro instead of hard coded stack size.
v2 -> v3:
- Commit message improvements.
v3 -> v4:
- Commit message improvements.
v4 -> v5:
- Move to arch/arm/probes.
---
arch/arm/include/asm/kprobes.h | 1 -
arch/arm/include/asm/probes.h | 12 ++++++++++++
arch/arm/kernel/entry-armv.S | 3 ++-
arch/arm/probes/kprobes-test-arm.c | 16 ++++++++++------
arch/arm/probes/kprobes.c | 9 +++++++++
5 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h
index 49fa0df..56f9ac6 100644
--- a/arch/arm/include/asm/kprobes.h
+++ b/arch/arm/include/asm/kprobes.h
@@ -22,7 +22,6 @@
#define __ARCH_WANT_KPROBES_INSN_SLOT
#define MAX_INSN_SIZE 2
-#define MAX_STACK_SIZE 64 /* 32 would probably be OK */
#define flush_insn_slot(p) do { } while (0)
#define kretprobe_blacklist_size 0
diff --git a/arch/arm/include/asm/probes.h b/arch/arm/include/asm/probes.h
index ccf9af3..f0a1ee8 100644
--- a/arch/arm/include/asm/probes.h
+++ b/arch/arm/include/asm/probes.h
@@ -19,6 +19,8 @@
#ifndef _ASM_PROBES_H
#define _ASM_PROBES_H
+#ifndef __ASSEMBLY__
+
typedef u32 probes_opcode_t;
struct arch_probes_insn;
@@ -41,4 +43,14 @@ struct arch_probes_insn {
int stack_space;
};
+#endif /* __ASSEMBLY__ */
+
+/*
+ * We assume one instruction can consume at most 64 bytes stack, which is
+ * 'push {r0-r15}'. Instructions consume more or unknown stack space like
+ * 'str r0, [sp, #-80]' and 'str r0, [sp, r1]' should be prohibit to probe.
+ * Both kprobe and jprobe use this macro.
+ */
+#define MAX_STACK_SIZE 64
+
#endif
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 2f5555d..672b219 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -31,6 +31,7 @@
#include "entry-header.S"
#include <asm/entry-macro-multi.S>
+#include <asm/probes.h>
/*
* Interrupt handling.
@@ -249,7 +250,7 @@ __und_svc:
@ If a kprobe is about to simulate a "stmdb sp..." instruction,
@ it obviously needs free stack space which then will belong to
@ the saved context.
- svc_entry 64
+ svc_entry MAX_STACK_SIZE
#else
svc_entry
#endif
diff --git a/arch/arm/probes/kprobes-test-arm.c b/arch/arm/probes/kprobes-test-arm.c
index cb14242..d8ad5bb 100644
--- a/arch/arm/probes/kprobes-test-arm.c
+++ b/arch/arm/probes/kprobes-test-arm.c
@@ -476,7 +476,8 @@ void kprobe_arm_test_cases(void)
TEST_GROUP("Extra load/store instructions")
TEST_RPR( "strh r",0, VAL1,", [r",1, 48,", -r",2, 24,"]")
- TEST_RPR( "streqh r",14,VAL2,", [r",13,0, ", r",12, 48,"]")
+ TEST_RPR( "streqh r",14,VAL2,", [r",11,0, ", r",12, 48,"]")
+ TEST_UNSUPPORTED( "streqh r14, [r13, r12]")
TEST_RPR( "strh r",1, VAL1,", [r",2, 24,", r",3, 48,"]!")
TEST_RPR( "strneh r",12,VAL2,", [r",11,48,", -r",10,24,"]!")
TEST_RPR( "strh r",2, VAL1,", [r",3, 24,"], r",4, 48,"")
@@ -565,7 +566,8 @@ void kprobe_arm_test_cases(void)
#if __LINUX_ARM_ARCH__ >= 5
TEST_RPR( "strd r",0, VAL1,", [r",1, 48,", -r",2,24,"]")
- TEST_RPR( "strccd r",8, VAL2,", [r",13,0, ", r",12,48,"]")
+ TEST_RPR( "strccd r",8, VAL2,", [r",11,0, ", r",12,48,"]")
+ TEST_UNSUPPORTED( "strccd r8, [r13, r12]")
TEST_RPR( "strd r",4, VAL1,", [r",2, 24,", r",3, 48,"]!")
TEST_RPR( "strcsd r",12,VAL2,", [r",11,48,", -r",10,24,"]!")
TEST_RPR( "strd r",2, VAL1,", [r",5, 24,"], r",4,48,"")
@@ -638,13 +640,15 @@ void kprobe_arm_test_cases(void)
TEST_RP( "str"byte" r",2, VAL1,", [r",3, 24,"], #48") \
TEST_RP( "str"byte" r",10,VAL2,", [r",9, 64,"], #-48") \
TEST_RPR("str"byte" r",0, VAL1,", [r",1, 48,", -r",2, 24,"]") \
- TEST_RPR("str"byte" r",14,VAL2,", [r",13,0, ", r",12, 48,"]") \
+ TEST_RPR("str"byte" r",14,VAL2,", [r",11,0, ", r",12, 48,"]") \
+ TEST_UNSUPPORTED("str"byte" r14, [r13, r12]") \
TEST_RPR("str"byte" r",1, VAL1,", [r",2, 24,", r",3, 48,"]!") \
TEST_RPR("str"byte" r",12,VAL2,", [r",11,48,", -r",10,24,"]!") \
TEST_RPR("str"byte" r",2, VAL1,", [r",3, 24,"], r",4, 48,"") \
TEST_RPR("str"byte" r",10,VAL2,", [r",9, 48,"], -r",11,24,"") \
TEST_RPR("str"byte" r",0, VAL1,", [r",1, 24,", r",2, 32,", asl #1]")\
- TEST_RPR("str"byte" r",14,VAL2,", [r",13,0, ", r",12, 32,", lsr #2]")\
+ TEST_RPR("str"byte" r",14,VAL2,", [r",11,0, ", r",12, 32,", lsr #2]")\
+ TEST_UNSUPPORTED("str"byte" r14, [r13, r12, lsr #2]")\
TEST_RPR("str"byte" r",1, VAL1,", [r",2, 24,", r",3, 32,", asr #3]!")\
TEST_RPR("str"byte" r",12,VAL2,", [r",11,24,", r",10, 4,", ror #31]!")\
TEST_P( "ldr"byte" r0, [r",0, 24,", #-2]") \
@@ -668,12 +672,12 @@ void kprobe_arm_test_cases(void)
LOAD_STORE("")
TEST_P( "str pc, [r",0,0,", #15*4]")
- TEST_R( "str pc, [sp, r",2,15*4,"]")
+ TEST_UNSUPPORTED( "str pc, [sp, r2]")
TEST_BF( "ldr pc, [sp, #15*4]")
TEST_BF_R("ldr pc, [sp, r",2,15*4,"]")
TEST_P( "str sp, [r",0,0,", #13*4]")
- TEST_R( "str sp, [sp, r",2,13*4,"]")
+ TEST_UNSUPPORTED( "str sp, [sp, r2]")
TEST_BF( "ldr sp, [sp, #13*4]")
TEST_BF_R("ldr sp, [sp, r",2,13*4,"]")
diff --git a/arch/arm/probes/kprobes.c b/arch/arm/probes/kprobes.c
index e6e16a2..e0d0522 100644
--- a/arch/arm/probes/kprobes.c
+++ b/arch/arm/probes/kprobes.c
@@ -115,6 +115,15 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
break;
}
+ /*
+ * Never instrument insn like 'str r0, [sp, +/-r1]'. Also, insn likes
+ * 'str r0, [sp, #-68]' should also be prohibited.
+ * See __und_svc.
+ */
+ if ((p->ainsn.stack_space < 0) ||
+ (p->ainsn.stack_space > MAX_STACK_SIZE))
+ return -EINVAL;
+
return 0;
}
--
1.8.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v11 5/7] ARM: kprobes: Add test cases for stack consuming instructions
2014-12-01 8:45 [PATCH v11 0/7] ARM: kprobes: OPTPROBES and other improvements Wang Nan
` (3 preceding siblings ...)
2014-12-01 8:48 ` [PATCH v11 4/7] ARM: kprobes: disallow probing stack consuming instructions Wang Nan
@ 2014-12-01 8:48 ` Wang Nan
2014-12-01 8:49 ` [PATCH v11 6/7] kprobes: Pass the original kprobe for preparing optimized kprobe Wang Nan
2014-12-01 8:49 ` [PATCH v11 7/7] ARM: kprobes: enable OPTPROBES for ARM 32 Wang Nan
6 siblings, 0 replies; 16+ messages in thread
From: Wang Nan @ 2014-12-01 8:48 UTC (permalink / raw)
To: linux-arm-kernel
These have extra 'checker' functions associated with them so
lets make sure those get covered by testing.
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
v1 -> v2:
- Move to arch/arm/probes/ .
---
arch/arm/probes/kprobes-test-arm.c | 17 +++++++++++++++--
arch/arm/probes/kprobes-test-thumb.c | 12 ++++++++++++
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/arch/arm/probes/kprobes-test-arm.c b/arch/arm/probes/kprobes-test-arm.c
index d8ad5bb..7aa96b6 100644
--- a/arch/arm/probes/kprobes-test-arm.c
+++ b/arch/arm/probes/kprobes-test-arm.c
@@ -12,6 +12,7 @@
#include <linux/module.h>
#include <asm/system_info.h>
#include <asm/opcodes.h>
+#include <asm/probes.h>
#include "kprobes-test.h"
@@ -478,6 +479,7 @@ void kprobe_arm_test_cases(void)
TEST_RPR( "strh r",0, VAL1,", [r",1, 48,", -r",2, 24,"]")
TEST_RPR( "streqh r",14,VAL2,", [r",11,0, ", r",12, 48,"]")
TEST_UNSUPPORTED( "streqh r14, [r13, r12]")
+ TEST_UNSUPPORTED( "streqh r14, [r12, r13]")
TEST_RPR( "strh r",1, VAL1,", [r",2, 24,", r",3, 48,"]!")
TEST_RPR( "strneh r",12,VAL2,", [r",11,48,", -r",10,24,"]!")
TEST_RPR( "strh r",2, VAL1,", [r",3, 24,"], r",4, 48,"")
@@ -502,6 +504,9 @@ void kprobe_arm_test_cases(void)
TEST_RP( "strplh r",12,VAL2,", [r",11,24,", #-4]!")
TEST_RP( "strh r",2, VAL1,", [r",3, 24,"], #48")
TEST_RP( "strh r",10,VAL2,", [r",9, 64,"], #-48")
+ TEST_RP( "strh r",3, VAL1,", [r",13,TEST_MEMORY_SIZE,", #-"__stringify(MAX_STACK_SIZE)"]!")
+ TEST_UNSUPPORTED("strh r3, [r13, #-"__stringify(MAX_STACK_SIZE)"-8]!")
+ TEST_RP( "strh r",4, VAL1,", [r",14,TEST_MEMORY_SIZE,", #-"__stringify(MAX_STACK_SIZE)"-8]!")
TEST_UNSUPPORTED(__inst_arm(0xe1efc3b0) " @ strh r12, [pc, #48]!")
TEST_UNSUPPORTED(__inst_arm(0xe0c9f3b0) " @ strh pc, [r9], #48")
@@ -568,6 +573,7 @@ void kprobe_arm_test_cases(void)
TEST_RPR( "strd r",0, VAL1,", [r",1, 48,", -r",2,24,"]")
TEST_RPR( "strccd r",8, VAL2,", [r",11,0, ", r",12,48,"]")
TEST_UNSUPPORTED( "strccd r8, [r13, r12]")
+ TEST_UNSUPPORTED( "strccd r8, [r12, r13]")
TEST_RPR( "strd r",4, VAL1,", [r",2, 24,", r",3, 48,"]!")
TEST_RPR( "strcsd r",12,VAL2,", [r",11,48,", -r",10,24,"]!")
TEST_RPR( "strd r",2, VAL1,", [r",5, 24,"], r",4,48,"")
@@ -591,6 +597,9 @@ void kprobe_arm_test_cases(void)
TEST_RP( "strvcd r",12,VAL2,", [r",11,24,", #-16]!")
TEST_RP( "strd r",2, VAL1,", [r",4, 24,"], #48")
TEST_RP( "strd r",10,VAL2,", [r",9, 64,"], #-48")
+ TEST_RP( "strd r",6, VAL1,", [r",13,TEST_MEMORY_SIZE,", #-"__stringify(MAX_STACK_SIZE)"]!")
+ TEST_UNSUPPORTED("strd r6, [r13, #-"__stringify(MAX_STACK_SIZE)"-8]!")
+ TEST_RP( "strd r",4, VAL1,", [r",12,TEST_MEMORY_SIZE,", #-"__stringify(MAX_STACK_SIZE)"-8]!")
TEST_UNSUPPORTED(__inst_arm(0xe1efc3f0) " @ strd r12, [pc, #48]!")
TEST_P( "ldrd r0, [r",0, 24,", #-8]")
@@ -639,16 +648,20 @@ void kprobe_arm_test_cases(void)
TEST_RP( "str"byte" r",12,VAL2,", [r",11,24,", #-4]!") \
TEST_RP( "str"byte" r",2, VAL1,", [r",3, 24,"], #48") \
TEST_RP( "str"byte" r",10,VAL2,", [r",9, 64,"], #-48") \
+ TEST_RP( "str"byte" r",3, VAL1,", [r",13,TEST_MEMORY_SIZE,", #-"__stringify(MAX_STACK_SIZE)"]!") \
+ TEST_UNSUPPORTED("str"byte" r3, [r13, #-"__stringify(MAX_STACK_SIZE)"-8]!") \
+ TEST_RP( "str"byte" r",4, VAL1,", [r",10,TEST_MEMORY_SIZE,", #-"__stringify(MAX_STACK_SIZE)"-8]!") \
TEST_RPR("str"byte" r",0, VAL1,", [r",1, 48,", -r",2, 24,"]") \
TEST_RPR("str"byte" r",14,VAL2,", [r",11,0, ", r",12, 48,"]") \
- TEST_UNSUPPORTED("str"byte" r14, [r13, r12]") \
+ TEST_UNSUPPORTED("str"byte" r14, [r13, r12]") \
+ TEST_UNSUPPORTED("str"byte" r14, [r12, r13]") \
TEST_RPR("str"byte" r",1, VAL1,", [r",2, 24,", r",3, 48,"]!") \
TEST_RPR("str"byte" r",12,VAL2,", [r",11,48,", -r",10,24,"]!") \
TEST_RPR("str"byte" r",2, VAL1,", [r",3, 24,"], r",4, 48,"") \
TEST_RPR("str"byte" r",10,VAL2,", [r",9, 48,"], -r",11,24,"") \
TEST_RPR("str"byte" r",0, VAL1,", [r",1, 24,", r",2, 32,", asl #1]")\
TEST_RPR("str"byte" r",14,VAL2,", [r",11,0, ", r",12, 32,", lsr #2]")\
- TEST_UNSUPPORTED("str"byte" r14, [r13, r12, lsr #2]")\
+ TEST_UNSUPPORTED("str"byte" r14, [r13, r12, lsr #2]") \
TEST_RPR("str"byte" r",1, VAL1,", [r",2, 24,", r",3, 32,", asr #3]!")\
TEST_RPR("str"byte" r",12,VAL2,", [r",11,24,", r",10, 4,", ror #31]!")\
TEST_P( "ldr"byte" r0, [r",0, 24,", #-2]") \
diff --git a/arch/arm/probes/kprobes-test-thumb.c b/arch/arm/probes/kprobes-test-thumb.c
index 844dd10..25e0a7c 100644
--- a/arch/arm/probes/kprobes-test-thumb.c
+++ b/arch/arm/probes/kprobes-test-thumb.c
@@ -11,6 +11,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <asm/opcodes.h>
+#include <asm/probes.h>
#include "kprobes-test.h"
@@ -416,6 +417,9 @@ void kprobe_thumb32_test_cases(void)
TEST_RR( "strd r",14,VAL2,", r",12,VAL1,", [sp, #16]!")
TEST_RRP("strd r",1, VAL1,", r",0, VAL2,", [r",7, 24,"], #16")
TEST_RR( "strd r",7, VAL2,", r",8, VAL1,", [sp], #-16")
+ TEST_RRP("strd r",6, VAL1,", r",7, VAL2,", [r",13, TEST_MEMORY_SIZE,", #-"__stringify(MAX_STACK_SIZE)"]!")
+ TEST_UNSUPPORTED("strd r6, r7, [r13, #-"__stringify(MAX_STACK_SIZE)"-8]!")
+ TEST_RRP("strd r",4, VAL1,", r",5, VAL2,", [r",14, TEST_MEMORY_SIZE,", #-"__stringify(MAX_STACK_SIZE)"-8]!")
TEST_UNSUPPORTED(__inst_thumb32(0xe9efec04) " @ strd r14, r12, [pc, #16]!")
TEST_UNSUPPORTED(__inst_thumb32(0xe8efec04) " @ strd r14, r12, [pc], #16")
@@ -821,14 +825,22 @@ CONDITION_INSTRUCTIONS(22,
TEST_RP( "str"size" r",14,VAL2,", [r",1, 256, ", #-128]!") \
TEST_RPR("str"size".w r",0, VAL1,", [r",1, 0,", r",2, 4,"]") \
TEST_RPR("str"size" r",14,VAL2,", [r",10,0,", r",11,4,", lsl #1]") \
+ TEST_UNSUPPORTED("str"size" r0, [r13, r1]") \
TEST_R( "str"size".w r",7, VAL1,", [sp, #24]") \
TEST_RP( "str"size".w r",0, VAL2,", [r",0,0, "]") \
+ TEST_RP( "str"size" r",6, VAL1,", [r",13, TEST_MEMORY_SIZE,", #-"__stringify(MAX_STACK_SIZE)"]!") \
+ TEST_UNSUPPORTED("str"size" r6, [r13, #-"__stringify(MAX_STACK_SIZE)"-8]!") \
+ TEST_RP( "str"size" r",4, VAL2,", [r",12, TEST_MEMORY_SIZE,", #-"__stringify(MAX_STACK_SIZE)"-8]!") \
TEST_UNSUPPORTED("str"size"t r0, [r1, #4]")
SINGLE_STORE("b")
SINGLE_STORE("h")
SINGLE_STORE("")
+ TEST_UNSUPPORTED(__inst_thumb32(0xf801000d) " @ strb r0, [r1, r13]")
+ TEST_UNSUPPORTED(__inst_thumb32(0xf821000d) " @ strh r0, [r1, r13]")
+ TEST_UNSUPPORTED(__inst_thumb32(0xf841000d) " @ str r0, [r1, r13]")
+
TEST("str sp, [sp]")
TEST_UNSUPPORTED(__inst_thumb32(0xf8cfe000) " @ str r14, [pc]")
TEST_UNSUPPORTED(__inst_thumb32(0xf8cef000) " @ str pc, [r14]")
--
1.8.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v11 6/7] kprobes: Pass the original kprobe for preparing optimized kprobe
2014-12-01 8:45 [PATCH v11 0/7] ARM: kprobes: OPTPROBES and other improvements Wang Nan
` (4 preceding siblings ...)
2014-12-01 8:48 ` [PATCH v11 5/7] ARM: kprobes: Add test cases for " Wang Nan
@ 2014-12-01 8:49 ` Wang Nan
2014-12-01 8:49 ` [PATCH v11 7/7] ARM: kprobes: enable OPTPROBES for ARM 32 Wang Nan
6 siblings, 0 replies; 16+ messages in thread
From: Wang Nan @ 2014-12-01 8:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Pass the original kprobe for preparing an optimized kprobe arch-dep
part, since for some architecture (e.g. ARM32) requires the information
in original kprobe.
---
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Wang Nan <wangnan0@huawei.com>
---
arch/x86/kernel/kprobes/opt.c | 3 ++-
include/linux/kprobes.h | 3 ++-
kernel/kprobes.c | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
index f1314d0..7028296 100644
--- a/arch/x86/kernel/kprobes/opt.c
+++ b/arch/x86/kernel/kprobes/opt.c
@@ -320,7 +320,8 @@ void arch_remove_optimized_kprobe(struct optimized_kprobe *op)
* Target instructions MUST be relocatable (checked inside)
* This is called when new aggr(opt)probe is allocated or reused.
*/
-int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
+ struct kprobe *__unused)
{
u8 *buf;
int ret;
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index f7296e5..7ab2c93 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -308,7 +308,8 @@ struct optimized_kprobe {
/* Architecture dependent functions for direct jump optimization */
extern int arch_prepared_optinsn(struct arch_optimized_insn *optinsn);
extern int arch_check_optimized_kprobe(struct optimized_kprobe *op);
-extern int arch_prepare_optimized_kprobe(struct optimized_kprobe *op);
+extern int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
+ struct kprobe *orig);
extern void arch_remove_optimized_kprobe(struct optimized_kprobe *op);
extern void arch_optimize_kprobes(struct list_head *oplist);
extern void arch_unoptimize_kprobes(struct list_head *oplist,
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 3995f54..9f28aa7 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -717,7 +717,7 @@ static void prepare_optimized_kprobe(struct kprobe *p)
struct optimized_kprobe *op;
op = container_of(p, struct optimized_kprobe, kp);
- arch_prepare_optimized_kprobe(op);
+ arch_prepare_optimized_kprobe(op, p);
}
/* Allocate new optimized_kprobe and try to prepare optimized instructions */
@@ -731,7 +731,7 @@ static struct kprobe *alloc_aggr_kprobe(struct kprobe *p)
INIT_LIST_HEAD(&op->list);
op->kp.addr = p->addr;
- arch_prepare_optimized_kprobe(op);
+ arch_prepare_optimized_kprobe(op, p);
return &op->kp;
}
--
1.8.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v11 7/7] ARM: kprobes: enable OPTPROBES for ARM 32
2014-12-01 8:45 [PATCH v11 0/7] ARM: kprobes: OPTPROBES and other improvements Wang Nan
` (5 preceding siblings ...)
2014-12-01 8:49 ` [PATCH v11 6/7] kprobes: Pass the original kprobe for preparing optimized kprobe Wang Nan
@ 2014-12-01 8:49 ` Wang Nan
2014-12-02 18:38 ` Jon Medhurst (Tixy)
6 siblings, 1 reply; 16+ messages in thread
From: Wang Nan @ 2014-12-01 8:49 UTC (permalink / raw)
To: linux-arm-kernel
This patch introduce kprobeopt for ARM 32.
Limitations:
- Currently only kernel compiled with ARM ISA is supported.
- Offset between probe point and optinsn slot must not larger than
32MiB. Masami Hiramatsu suggests replacing 2 words, it will make
things complex. Futher patch can make such optimization.
Kprobe opt on ARM is relatively simpler than kprobe opt on x86 because
ARM instruction is always 4 bytes aligned and 4 bytes long. This patch
replace probed instruction by a 'b', branch to trampoline code and then
calls optimized_callback(). optimized_callback() calls opt_pre_handler()
to execute kprobe handler. It also emulate/simulate replaced instruction.
When unregistering kprobe, the deferred manner of unoptimizer may leave
branch instruction before optimizer is called. Different from x86_64,
which only copy the probed insn after optprobe_template_end and
reexecute them, this patch call singlestep to emulate/simulate the insn
directly. Futher patch can optimize this behavior.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Jon Medhurst (Tixy) <tixy@linaro.org>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Will Deacon <will.deacon@arm.com>
---
v1 -> v2:
- Improvement: if replaced instruction is conditional, generate a
conditional branch instruction for it;
- Introduces RELATIVEJUMP_OPCODES due to ARM kprobe_opcode_t is 4
bytes;
- Removes size field in struct arch_optimized_insn;
- Use arm_gen_branch() to generate branch instruction;
- Remove all recover logic: ARM doesn't use tail buffer, no need
recover replaced instructions like x86;
- Remove incorrect CONFIG_THUMB checking;
- can_optimize() always returns true if address is well aligned;
- Improve optimized_callback: using opt_pre_handler();
- Bugfix: correct range checking code and improve comments;
- Fix commit message.
v2 -> v3:
- Rename RELATIVEJUMP_OPCODES to MAX_COPIED_INSNS;
- Remove unneeded checking:
arch_check_optimized_kprobe(), can_optimize();
- Add missing flush_icache_range() in arch_prepare_optimized_kprobe();
- Remove unneeded 'return;'.
v3 -> v4:
- Use __mem_to_opcode_arm() to translate copied_insn to ensure it
works in big endian kernel;
- Replace 'nop' placeholder in trampoline code template with
'.long 0' to avoid confusion: reader may regard 'nop' as an
instruction, but it is value in fact.
v4 -> v5:
- Don't optimize stack store operations.
- Introduce prepared field to arch_optimized_insn to indicate whether
it is prepared. Similar to size field with x86. See v1 -> v2.
v5 -> v6:
- Dynamically reserve stack according to instruction.
- Rename: kprobes-opt.c -> kprobes-opt-arm.c.
- Set op->optinsn.insn after all works are done.
v6 -> v7:
- Using checker to check stack consumption.
v7 -> v8:
- Small code adjustments.
v8 -> v9:
- Utilize original kprobe passed to arch_prepare_optimized_kprobe()
to avoid copy ainsn twice.
- A bug in arch_prepare_optimized_kprobe() is found and fixed.
v9 -> v10:
- Commit message improvements.
v10 -> v11:
- Move to arch/arm/probes/, insn.h is moved to arch/arm/include/asm.
- Code cleanup.
- Bugfix based on Tixy's test result:
- Trampoline deal with ARM -> Thumb transision instructions and
AEABI stack alignment requirement correctly.
- Trampoline code buffer should start at 4 byte aligned address.
We enforces it in this series by using macro to wrap 'code' var.
---
arch/arm/Kconfig | 1 +
arch/arm/{kernel => include/asm}/insn.h | 0
arch/arm/include/asm/kprobes.h | 34 ++++
arch/arm/kernel/Makefile | 2 +-
arch/arm/kernel/ftrace.c | 3 +-
arch/arm/kernel/jump_label.c | 3 +-
arch/arm/probes/Makefile | 1 +
arch/arm/probes/kprobes-opt-arm.c | 343 ++++++++++++++++++++++++++++++++
kernel/kprobes.c | 4 +
9 files changed, 386 insertions(+), 5 deletions(-)
rename arch/arm/{kernel => include/asm}/insn.h (100%)
create mode 100644 arch/arm/probes/kprobes-opt-arm.c
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 89c4b5c..8281cea 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -59,6 +59,7 @@ config ARM
select HAVE_MEMBLOCK
select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
+ select HAVE_OPTPROBES if (!THUMB2_KERNEL)
select HAVE_PERF_EVENTS
select HAVE_PERF_REGS
select HAVE_PERF_USER_STACK_DUMP
diff --git a/arch/arm/kernel/insn.h b/arch/arm/include/asm/insn.h
similarity index 100%
rename from arch/arm/kernel/insn.h
rename to arch/arm/include/asm/insn.h
diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h
index 56f9ac6..5574008 100644
--- a/arch/arm/include/asm/kprobes.h
+++ b/arch/arm/include/asm/kprobes.h
@@ -50,5 +50,39 @@ int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr);
int kprobe_exceptions_notify(struct notifier_block *self,
unsigned long val, void *data);
+/* optinsn template addresses */
+extern __visible kprobe_opcode_t optprobe_template_entry;
+extern __visible kprobe_opcode_t optprobe_template_val;
+extern __visible kprobe_opcode_t optprobe_template_call;
+extern __visible kprobe_opcode_t optprobe_template_end;
+extern __visible kprobe_opcode_t optprobe_template_sub_sp;
+extern __visible kprobe_opcode_t optprobe_template_add_sp;
+
+/*
+ * Plus 4 for potential alignment adjustment. See comments
+ * in arch_prepare_optimized_kprobe() in
+ * arch/arm/probes/kprobes-opt-arm.c .
+ */
+#define MAX_OPTIMIZED_LENGTH 4
+#define MAX_OPTINSN_SIZE \
+ (((unsigned long)&optprobe_template_end - \
+ (unsigned long)&optprobe_template_entry) + 4)
+#define RELATIVEJUMP_SIZE 4
+
+struct arch_optimized_insn {
+ /*
+ * copy of the original instructions.
+ * Different from x86, ARM kprobe_opcode_t is u32.
+ */
+#define MAX_COPIED_INSN (DIV_ROUND_UP(RELATIVEJUMP_SIZE, sizeof(kprobe_opcode_t)))
+ kprobe_opcode_t copied_insn[MAX_COPIED_INSN];
+ /* detour code buffer */
+ kprobe_opcode_t *insn;
+ /*
+ * We always copy one instruction on arm32,
+ * size always be 4, so didn't like x86, there is no
+ * size field.
+ */
+};
#endif /* _ARM_KPROBES_H */
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 40d3e00..1d0f4e7 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -52,7 +52,7 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o
obj-$(CONFIG_JUMP_LABEL) += jump_label.o insn.o patch.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
# Main staffs in KPROBES are in arch/arm/probes/ .
-obj-$(CONFIG_KPROBES) += patch.o
+obj-$(CONFIG_KPROBES) += patch.o insn.o
obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o
obj-$(CONFIG_ARM_THUMBEE) += thumbee.o
obj-$(CONFIG_KGDB) += kgdb.o
diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
index af9a8a9..ec7e332 100644
--- a/arch/arm/kernel/ftrace.c
+++ b/arch/arm/kernel/ftrace.c
@@ -19,8 +19,7 @@
#include <asm/cacheflush.h>
#include <asm/opcodes.h>
#include <asm/ftrace.h>
-
-#include "insn.h"
+#include <asm/insn.h>
#ifdef CONFIG_THUMB2_KERNEL
#define NOP 0xf85deb04 /* pop.w {lr} */
diff --git a/arch/arm/kernel/jump_label.c b/arch/arm/kernel/jump_label.c
index c6c73ed..35a8fbb 100644
--- a/arch/arm/kernel/jump_label.c
+++ b/arch/arm/kernel/jump_label.c
@@ -1,8 +1,7 @@
#include <linux/kernel.h>
#include <linux/jump_label.h>
#include <asm/patch.h>
-
-#include "insn.h"
+#include <asm/insn.h>
#ifdef HAVE_JUMP_LABEL
diff --git a/arch/arm/probes/Makefile b/arch/arm/probes/Makefile
index b566335..6746b19 100644
--- a/arch/arm/probes/Makefile
+++ b/arch/arm/probes/Makefile
@@ -4,6 +4,7 @@ ifdef CONFIG_THUMB2_KERNEL
obj-$(CONFIG_KPROBES) += kprobes-thumb.o probes-thumb.o probes-checkers-thumb.o
else
obj-$(CONFIG_KPROBES) += kprobes-arm.o probes-arm.o probes-checkers-arm.o
+obj-$(CONFIG_OPTPROBES) += kprobes-opt-arm.o
endif
obj-$(CONFIG_ARM_KPROBES_TEST) += test-kprobes.o
test-kprobes-objs := kprobes-test.o
diff --git a/arch/arm/probes/kprobes-opt-arm.c b/arch/arm/probes/kprobes-opt-arm.c
new file mode 100644
index 0000000..cc0949c
--- /dev/null
+++ b/arch/arm/probes/kprobes-opt-arm.c
@@ -0,0 +1,343 @@
+/*
+ * Kernel Probes Jump Optimization (Optprobes)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Copyright (C) IBM Corporation, 2002, 2004
+ * Copyright (C) Hitachi Ltd., 2012
+ * Copyright (C) Huawei Inc., 2014
+ */
+
+#include <linux/kprobes.h>
+#include <linux/jump_label.h>
+#include <asm/kprobes.h>
+#include <asm/cacheflush.h>
+/* for arm_gen_branch */
+#include <asm/insn.h>
+/* for patch_text */
+#include <asm/patch.h>
+
+/*
+ * NOTE: the first sub and add instruction will be modified according
+ * to the stack cost of the instruction.
+ */
+asm (
+ ".global optprobe_template_entry\n"
+ "optprobe_template_entry:\n"
+ ".global optprobe_template_sub_sp\n"
+ "optprobe_template_sub_sp:"
+ " sub sp, sp, #0xff\n"
+ " stmia sp, {r0 - r14} \n"
+ ".global optprobe_template_add_sp\n"
+ "optprobe_template_add_sp:"
+ " add r3, sp, #0xff\n"
+ " str r3, [sp, #52]\n"
+ " mrs r4, cpsr\n"
+ " str r4, [sp, #64]\n"
+ " mov r1, sp\n"
+ " ldr r0, 1f\n"
+ " ldr r2, 2f\n"
+
+ /*
+ * AEABI require a 8-bytes alignment stack. If
+ * SP % 8 == 4, we alloc another 4 bytes here.
+ */
+ " tst sp, #4\n"
+ " subne sp, #4\n"
+ " blx r2\n"
+
+ /*
+ * Here is a trick: the called handler should
+ * return its second param by r0, which is
+ * happens to be SP before the above AEABI
+ * adjustment. Therefore, we don't need to save
+ * and check whether we have done the above
+ * adjustment. See optimized_callback().
+ */
+ " mov sp, r0\n"
+ " ldr r1, [sp, #64]\n"
+ " tst r1, #"__stringify(PSR_T_BIT)"\n"
+ " ldrne r2, [sp, #60]\n"
+ " orrne r2, #1\n"
+ " strne r2, [sp, #60] @ set bit0 of PC for thumb\n"
+ " msr cpsr_cxsf, r1\n"
+ " ldmia sp, {r0 - r15}\n"
+ ".global optprobe_template_val\n"
+ "optprobe_template_val:\n"
+ "1: .long 0\n"
+ ".global optprobe_template_call\n"
+ "optprobe_template_call:\n"
+ "2: .long 0\n"
+ ".global optprobe_template_end\n"
+ "optprobe_template_end:\n");
+
+#define TMPL_VAL_IDX \
+ ((unsigned long *)&optprobe_template_val - (unsigned long *)&optprobe_template_entry)
+#define TMPL_CALL_IDX \
+ ((unsigned long *)&optprobe_template_call - (unsigned long *)&optprobe_template_entry)
+#define TMPL_END_IDX \
+ ((unsigned long *)&optprobe_template_end - (unsigned long *)&optprobe_template_entry)
+#define TMPL_ADD_SP \
+ ((unsigned long *)&optprobe_template_add_sp - (unsigned long *)&optprobe_template_entry)
+#define TMPL_SUB_SP \
+ ((unsigned long *)&optprobe_template_sub_sp - (unsigned long *)&optprobe_template_entry)
+
+/*
+ * ARM can always optimize an instruction when using ARM ISA, except
+ * instructions like 'str r0, [sp, r1]' which store to stack and unable
+ * to determine stack space consumption statically.
+ */
+int arch_prepared_optinsn(struct arch_optimized_insn *optinsn)
+{
+ return optinsn->insn != NULL;
+}
+
+/*
+ * In ARM ISA, kprobe opt always replace one instruction (4 bytes
+ * aligned and 4 bytes long). It is impossible to encounter another
+ * kprobe in the address range. So always return 0.
+ */
+int arch_check_optimized_kprobe(struct optimized_kprobe *op)
+{
+ return 0;
+}
+
+/* Caller must ensure addr & 3 == 0 */
+static int can_optimize(struct kprobe *kp)
+{
+ if (kp->ainsn.stack_space < 0)
+ return 0;
+ /*
+ * 255 is the biggest imm can be used in 'sub r0, r0, #<imm>'.
+ * Number larger than 255 needs special encoding.
+ */
+ if (kp->ainsn.stack_space > 255 - sizeof(struct pt_regs))
+ return 0;
+ return 1;
+}
+
+/* Free optimized instruction slot */
+static void
+__arch_remove_optimized_kprobe(struct optimized_kprobe *op, int dirty)
+{
+ if (op->optinsn.insn) {
+ free_optinsn_slot(op->optinsn.insn, dirty);
+ op->optinsn.insn = NULL;
+ }
+}
+
+extern void kprobe_handler(struct pt_regs *regs);
+
+static void*
+optimized_callback(struct optimized_kprobe *op, struct pt_regs *regs)
+{
+ unsigned long flags;
+ struct kprobe *p = &op->kp;
+ struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+
+ /* Save skipped registers */
+ regs->ARM_pc = (unsigned long)op->kp.addr;
+ regs->ARM_ORIG_r0 = ~0UL;
+
+ local_irq_save(flags);
+
+ if (kprobe_running()) {
+ kprobes_inc_nmissed_count(&op->kp);
+ } else {
+ __this_cpu_write(current_kprobe, &op->kp);
+ kcb->kprobe_status = KPROBE_HIT_ACTIVE;
+ opt_pre_handler(&op->kp, regs);
+ __this_cpu_write(current_kprobe, NULL);
+ }
+
+ /* In each case, we must singlestep the replaced instruction. */
+ op->kp.ainsn.insn_singlestep(p->opcode, &p->ainsn, regs);
+
+ local_irq_restore(flags);
+
+ /*
+ * See comments in trampoline code around on the 'blx'
+ * instruction. 'regs' happends to be the stack position the ASM
+ * code is required. It will be assigned to 'SP' immediately to
+ * make stack correct. Using this trick, we don't need save
+ * whether we adjust SP for AEABI.
+ */
+ return regs;
+}
+
+int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *orig)
+{
+ kprobe_opcode_t *code_unaligned;
+ unsigned long rel_chk;
+ unsigned long val;
+ unsigned long stack_protect = sizeof(struct pt_regs);
+
+ if (!can_optimize(orig))
+ return -EILSEQ;
+
+ /*
+ * 'code' must be 4-bytes aligned on arm, so we can use
+ * 'code[x] = y' without triggering alignment exception.
+ * Unfortunately get_optinsn_slot() uses module_alloc and
+ * doesn't ensure any alignment.
+ */
+ code_unaligned = get_optinsn_slot();
+ if (!code_unaligned)
+ return -ENOMEM;
+
+#define code ((kprobe_opcode_t *)(ALIGN((unsigned long)code_unaligned, 4)))
+
+ /*
+ * Verify if the address gap is in 32MiB range, because this uses
+ * a relative jump.
+ *
+ * kprobe opt use a 'b' instruction to branch to optinsn.insn.
+ * According to ARM manual, branch instruction is:
+ *
+ * 31 28 27 24 23 0
+ * +------+---+---+---+---+----------------+
+ * | cond | 1 | 0 | 1 | 0 | imm24 |
+ * +------+---+---+---+---+----------------+
+ *
+ * imm24 is a signed 24 bits integer. The real branch offset is computed
+ * by: imm32 = SignExtend(imm24:'00', 32);
+ *
+ * So the maximum forward branch should be:
+ * (0x007fffff << 2) = 0x01fffffc = 0x1fffffc
+ * The maximum backword branch should be:
+ * (0xff800000 << 2) = 0xfe000000 = -0x2000000
+ *
+ * We can simply check (rel & 0xfe000003):
+ * if rel is positive, (rel & 0xfe000000) shoule be 0
+ * if rel is negitive, (rel & 0xfe000000) should be 0xfe000000
+ * the last '3' is used for alignment checking.
+ */
+ rel_chk = (unsigned long)((long)code -
+ (long)orig->addr + 8) & 0xfe000003;
+
+ if ((rel_chk != 0) && (rel_chk != 0xfe000000)) {
+ /*
+ * Different from x86, we free code buf directly instead of
+ * calling __arch_remove_optimized_kprobe() because
+ * we have not fill any field in op.
+ */
+ free_optinsn_slot(code, 0);
+ return -ERANGE;
+ }
+
+ /* Copy arch-dep-instance from template. */
+ memcpy(code, &optprobe_template_entry,
+ TMPL_END_IDX * sizeof(kprobe_opcode_t));
+
+ /* Adjust buffer according to instruction. */
+ BUG_ON(orig->ainsn.stack_space < 0);
+
+ /*
+ * Add more 4 byte for potential AEABI requirement. If probing is triggered
+ * when SP % 8 == 4, we sub SP by another 4 bytes.
+ */
+ stack_protect += orig->ainsn.stack_space + 4;
+
+ /* Should have been filtered by can_optimize(). */
+ BUG_ON(stack_protect > 255);
+
+ /* Create a 'sub sp, sp, #<stack_protect>' */
+ code[TMPL_SUB_SP] = __opcode_to_mem_arm(0xe24dd000 | stack_protect);
+ /* Create a 'add r3, sp, #<stack_protect>' */
+ code[TMPL_ADD_SP] = __opcode_to_mem_arm(0xe28d3000 | stack_protect);
+
+ /* Set probe information */
+ val = (unsigned long)op;
+ code[TMPL_VAL_IDX] = val;
+
+ /* Set probe function call */
+ val = (unsigned long)optimized_callback;
+ code[TMPL_CALL_IDX] = val;
+
+ flush_icache_range((unsigned long)code,
+ (unsigned long)(&code[TMPL_END_IDX]));
+
+ /*
+ * Set op->optinsn.insn means prepared.
+ * NOTE: what we saved here is potentially unaligned.
+ */
+ op->optinsn.insn = code_unaligned;
+ return 0;
+}
+
+void arch_optimize_kprobes(struct list_head *oplist)
+{
+ struct optimized_kprobe *op, *tmp;
+
+ list_for_each_entry_safe(op, tmp, oplist, list) {
+ unsigned long insn;
+ WARN_ON(kprobe_disabled(&op->kp));
+
+ /*
+ * Backup instructions which will be replaced
+ * by jump address
+ */
+ memcpy(op->optinsn.copied_insn, op->kp.addr,
+ RELATIVEJUMP_SIZE);
+
+ insn = arm_gen_branch((unsigned long)op->kp.addr,
+ (unsigned long)op->optinsn.insn);
+ BUG_ON(insn == 0);
+
+ /*
+ * Make it a conditional branch if replaced insn
+ * is consitional
+ */
+ insn = (__mem_to_opcode_arm(
+ op->optinsn.copied_insn[0]) & 0xf0000000) |
+ (insn & 0x0fffffff);
+
+ patch_text(op->kp.addr, insn);
+
+ list_del_init(&op->list);
+ }
+}
+
+void arch_unoptimize_kprobe(struct optimized_kprobe *op)
+{
+ arch_arm_kprobe(&op->kp);
+}
+
+/*
+ * Recover original instructions and breakpoints from relative jumps.
+ * Caller must call with locking kprobe_mutex.
+ */
+void arch_unoptimize_kprobes(struct list_head *oplist,
+ struct list_head *done_list)
+{
+ struct optimized_kprobe *op, *tmp;
+
+ list_for_each_entry_safe(op, tmp, oplist, list) {
+ arch_unoptimize_kprobe(op);
+ list_move(&op->list, done_list);
+ }
+}
+
+int arch_within_optimized_kprobe(struct optimized_kprobe *op,
+ unsigned long addr)
+{
+ return ((unsigned long)op->kp.addr <= addr &&
+ (unsigned long)op->kp.addr + RELATIVEJUMP_SIZE > addr);
+}
+
+void arch_remove_optimized_kprobe(struct optimized_kprobe *op)
+{
+ __arch_remove_optimized_kprobe(op, 1);
+}
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 9f28aa7..010cbc2 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -120,6 +120,10 @@ enum kprobe_slot_state {
SLOT_USED = 2,
};
+/*
+ * FIXME: here we should ensure opcode alignment for some platform like
+ * ARM. Currently module_alloc is only 1 byte alignment.
+ */
static void *alloc_insn_page(void)
{
return module_alloc(PAGE_SIZE);
--
1.8.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v11 7/7] ARM: kprobes: enable OPTPROBES for ARM 32
2014-12-01 8:49 ` [PATCH v11 7/7] ARM: kprobes: enable OPTPROBES for ARM 32 Wang Nan
@ 2014-12-02 18:38 ` Jon Medhurst (Tixy)
2014-12-03 3:22 ` Wang Nan
0 siblings, 1 reply; 16+ messages in thread
From: Jon Medhurst (Tixy) @ 2014-12-02 18:38 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 2014-12-01 at 16:49 +0800, Wang Nan wrote:
> This patch introduce kprobeopt for ARM 32.
>
> Limitations:
> - Currently only kernel compiled with ARM ISA is supported.
>
> - Offset between probe point and optinsn slot must not larger than
> 32MiB. Masami Hiramatsu suggests replacing 2 words, it will make
> things complex. Futher patch can make such optimization.
>
> Kprobe opt on ARM is relatively simpler than kprobe opt on x86 because
> ARM instruction is always 4 bytes aligned and 4 bytes long. This patch
> replace probed instruction by a 'b', branch to trampoline code and then
> calls optimized_callback(). optimized_callback() calls opt_pre_handler()
> to execute kprobe handler. It also emulate/simulate replaced instruction.
>
> When unregistering kprobe, the deferred manner of unoptimizer may leave
> branch instruction before optimizer is called. Different from x86_64,
> which only copy the probed insn after optprobe_template_end and
> reexecute them, this patch call singlestep to emulate/simulate the insn
> directly. Futher patch can optimize this behavior.
>
> Signed-off-by: Wang Nan <wangnan0@huawei.com>
> Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> Cc: Jon Medhurst (Tixy) <tixy@linaro.org>
> Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
> Cc: Will Deacon <will.deacon@arm.com>
>
> ---
>
[...]
> v10 -> v11:
> - Move to arch/arm/probes/, insn.h is moved to arch/arm/include/asm.
> - Code cleanup.
> - Bugfix based on Tixy's test result:
> - Trampoline deal with ARM -> Thumb transision instructions and
> AEABI stack alignment requirement correctly.
> - Trampoline code buffer should start at 4 byte aligned address.
> We enforces it in this series by using macro to wrap 'code' var.
I'm wondering if this alignment is needed. I'm not familiar with the
Linux memory code but following it through...
- kernel/kprobes.c allocates memory for the instruction slots using
module_alloc()
- module_alloc calls __vmalloc_node_range and passes in an alignment of
1 byte however...
- __vmalloc_node_range has the comment "Allocate enough pages to cover
@size from the page level allocator". And it rounds size up to one page
and calls __get_vm_area_node which also makes sure the size is page
aligned and also allocates a guard page afterwards.
So it looks to me as though allocated memory would always be page
aligned.
Another reason why I think this must be true is that module_alloc seems
to be used to allocate memory for loading modules to (see move_module in
kernel/module.c) and that code doesn't seem to align things.
Though, as I already said, I'm not familiar with this code so could well
have missed something. And the thing that is giving me most worries is
that all the vmalloc code takes an alignment value in bytes.
Anyway, I'll comment on this patch on the assumption that alignment is
needed...
[...]
> diff --git a/arch/arm/probes/kprobes-opt-arm.c b/arch/arm/probes/kprobes-opt-arm.c
> new file mode 100644
> index 0000000..cc0949c
> --- /dev/null
> +++ b/arch/arm/probes/kprobes-opt-arm.c
> @@ -0,0 +1,343 @@
> +/*
> + * Kernel Probes Jump Optimization (Optprobes)
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
> + *
> + * Copyright (C) IBM Corporation, 2002, 2004
> + * Copyright (C) Hitachi Ltd., 2012
> + * Copyright (C) Huawei Inc., 2014
> + */
> +
> +#include <linux/kprobes.h>
> +#include <linux/jump_label.h>
> +#include <asm/kprobes.h>
> +#include <asm/cacheflush.h>
> +/* for arm_gen_branch */
> +#include <asm/insn.h>
> +/* for patch_text */
> +#include <asm/patch.h>
> +
> +/*
> + * NOTE: the first sub and add instruction will be modified according
> + * to the stack cost of the instruction.
> + */
> +asm (
> + ".global optprobe_template_entry\n"
> + "optprobe_template_entry:\n"
> + ".global optprobe_template_sub_sp\n"
> + "optprobe_template_sub_sp:"
> + " sub sp, sp, #0xff\n"
> + " stmia sp, {r0 - r14} \n"
> + ".global optprobe_template_add_sp\n"
> + "optprobe_template_add_sp:"
> + " add r3, sp, #0xff\n"
> + " str r3, [sp, #52]\n"
> + " mrs r4, cpsr\n"
> + " str r4, [sp, #64]\n"
> + " mov r1, sp\n"
> + " ldr r0, 1f\n"
> + " ldr r2, 2f\n"
> +
> + /*
> + * AEABI require a 8-bytes alignment stack. If
> + * SP % 8 == 4, we alloc another 4 bytes here.
> + */
> + " tst sp, #4\n"
> + " subne sp, #4\n"
> + " blx r2\n"
> +
> + /*
> + * Here is a trick: the called handler should
> + * return its second param by r0, which is
> + * happens to be SP before the above AEABI
> + * adjustment. Therefore, we don't need to save
> + * and check whether we have done the above
> + * adjustment. See optimized_callback().
> + */
> + " mov sp, r0\n"
I think this trick is a bit too tricky :-) and might cause unnecessary
problems for someone in the future. How about replacing the above 4
instruction with these 4 instead...
" and r4, sp, #4\n"
" sub sp, sp, r4\n"
" blx r2\n"
" add sp, sp, r4\n"
and that actually makes things slightly faster as optimized_callback no
longer needs to return a value.
> + " ldr r1, [sp, #64]\n"
> + " tst r1, #"__stringify(PSR_T_BIT)"\n"
> + " ldrne r2, [sp, #60]\n"
> + " orrne r2, #1\n"
> + " strne r2, [sp, #60] @ set bit0 of PC for thumb\n"
> + " msr cpsr_cxsf, r1\n"
> + " ldmia sp, {r0 - r15}\n"
> + ".global optprobe_template_val\n"
> + "optprobe_template_val:\n"
> + "1: .long 0\n"
> + ".global optprobe_template_call\n"
> + "optprobe_template_call:\n"
> + "2: .long 0\n"
> + ".global optprobe_template_end\n"
> + "optprobe_template_end:\n");
> +
[...]
> +int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *orig)
> +{
> + kprobe_opcode_t *code_unaligned;
kprobe_opcode_t is a u32 and the ABI and compiler expect this to be
aligned, so best use a void * instead.
> + unsigned long rel_chk;
> + unsigned long val;
> + unsigned long stack_protect = sizeof(struct pt_regs);
> +
> + if (!can_optimize(orig))
> + return -EILSEQ;
> +
> + /*
> + * 'code' must be 4-bytes aligned on arm, so we can use
> + * 'code[x] = y' without triggering alignment exception.
> + * Unfortunately get_optinsn_slot() uses module_alloc and
> + * doesn't ensure any alignment.
> + */
> + code_unaligned = get_optinsn_slot();
> + if (!code_unaligned)
> + return -ENOMEM;
> +
> +#define code ((kprobe_opcode_t *)(ALIGN((unsigned long)code_unaligned, 4)))
Using a macro like this doesn't seem quite right to me, why not use a
proper C variable called 'code' set to this value.
> +
> + /*
> + * Verify if the address gap is in 32MiB range, because this uses
> + * a relative jump.
> + *
> + * kprobe opt use a 'b' instruction to branch to optinsn.insn.
> + * According to ARM manual, branch instruction is:
> + *
> + * 31 28 27 24 23 0
> + * +------+---+---+---+---+----------------+
> + * | cond | 1 | 0 | 1 | 0 | imm24 |
> + * +------+---+---+---+---+----------------+
> + *
> + * imm24 is a signed 24 bits integer. The real branch offset is computed
> + * by: imm32 = SignExtend(imm24:'00', 32);
> + *
> + * So the maximum forward branch should be:
> + * (0x007fffff << 2) = 0x01fffffc = 0x1fffffc
> + * The maximum backword branch should be:
> + * (0xff800000 << 2) = 0xfe000000 = -0x2000000
> + *
> + * We can simply check (rel & 0xfe000003):
> + * if rel is positive, (rel & 0xfe000000) shoule be 0
> + * if rel is negitive, (rel & 0xfe000000) should be 0xfe000000
> + * the last '3' is used for alignment checking.
> + */
> + rel_chk = (unsigned long)((long)code -
> + (long)orig->addr + 8) & 0xfe000003;
> +
> + if ((rel_chk != 0) && (rel_chk != 0xfe000000)) {
> + /*
> + * Different from x86, we free code buf directly instead of
> + * calling __arch_remove_optimized_kprobe() because
> + * we have not fill any field in op.
> + */
> + free_optinsn_slot(code, 0);
> + return -ERANGE;
> + }
> +
> + /* Copy arch-dep-instance from template. */
> + memcpy(code, &optprobe_template_entry,
> + TMPL_END_IDX * sizeof(kprobe_opcode_t));
> +
> + /* Adjust buffer according to instruction. */
> + BUG_ON(orig->ainsn.stack_space < 0);
> +
> + /*
> + * Add more 4 byte for potential AEABI requirement. If probing is triggered
> + * when SP % 8 == 4, we sub SP by another 4 bytes.
> + */
> + stack_protect += orig->ainsn.stack_space + 4;
> +
> + /* Should have been filtered by can_optimize(). */
> + BUG_ON(stack_protect > 255);
> +
> + /* Create a 'sub sp, sp, #<stack_protect>' */
> + code[TMPL_SUB_SP] = __opcode_to_mem_arm(0xe24dd000 | stack_protect);
> + /* Create a 'add r3, sp, #<stack_protect>' */
> + code[TMPL_ADD_SP] = __opcode_to_mem_arm(0xe28d3000 | stack_protect);
> +
> + /* Set probe information */
> + val = (unsigned long)op;
> + code[TMPL_VAL_IDX] = val;
> +
> + /* Set probe function call */
> + val = (unsigned long)optimized_callback;
> + code[TMPL_CALL_IDX] = val;
> +
> + flush_icache_range((unsigned long)code,
> + (unsigned long)(&code[TMPL_END_IDX]));
> +
> + /*
> + * Set op->optinsn.insn means prepared.
> + * NOTE: what we saved here is potentially unaligned.
> + */
> + op->optinsn.insn = code_unaligned;
> + return 0;
> +}
> +
> +void arch_optimize_kprobes(struct list_head *oplist)
> +{
> + struct optimized_kprobe *op, *tmp;
> +
> + list_for_each_entry_safe(op, tmp, oplist, list) {
> + unsigned long insn;
> + WARN_ON(kprobe_disabled(&op->kp));
> +
> + /*
> + * Backup instructions which will be replaced
> + * by jump address
> + */
> + memcpy(op->optinsn.copied_insn, op->kp.addr,
> + RELATIVEJUMP_SIZE);
> +
> + insn = arm_gen_branch((unsigned long)op->kp.addr,
> + (unsigned long)op->optinsn.insn);
> + BUG_ON(insn == 0);
> +
> + /*
> + * Make it a conditional branch if replaced insn
> + * is consitional
> + */
> + insn = (__mem_to_opcode_arm(
> + op->optinsn.copied_insn[0]) & 0xf0000000) |
> + (insn & 0x0fffffff);
> +
> + patch_text(op->kp.addr, insn);
> +
> + list_del_init(&op->list);
> + }
> +}
> +
> +void arch_unoptimize_kprobe(struct optimized_kprobe *op)
> +{
> + arch_arm_kprobe(&op->kp);
> +}
> +
> +/*
> + * Recover original instructions and breakpoints from relative jumps.
> + * Caller must call with locking kprobe_mutex.
> + */
> +void arch_unoptimize_kprobes(struct list_head *oplist,
> + struct list_head *done_list)
> +{
> + struct optimized_kprobe *op, *tmp;
> +
> + list_for_each_entry_safe(op, tmp, oplist, list) {
> + arch_unoptimize_kprobe(op);
> + list_move(&op->list, done_list);
> + }
> +}
> +
> +int arch_within_optimized_kprobe(struct optimized_kprobe *op,
> + unsigned long addr)
> +{
> + return ((unsigned long)op->kp.addr <= addr &&
> + (unsigned long)op->kp.addr + RELATIVEJUMP_SIZE > addr);
> +}
> +
> +void arch_remove_optimized_kprobe(struct optimized_kprobe *op)
> +{
> + __arch_remove_optimized_kprobe(op, 1);
> +}
> diff --git a/kernel/kprobes.c b/kernel/kprobes.c
> index 9f28aa7..010cbc2 100644
> --- a/kernel/kprobes.c
> +++ b/kernel/kprobes.c
> @@ -120,6 +120,10 @@ enum kprobe_slot_state {
> SLOT_USED = 2,
> };
>
> +/*
> + * FIXME: here we should ensure opcode alignment for some platform like
> + * ARM. Currently module_alloc is only 1 byte alignment.
> + */
> static void *alloc_insn_page(void)
> {
> return module_alloc(PAGE_SIZE);
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH v11 7/7] ARM: kprobes: enable OPTPROBES for ARM 32
2014-12-02 18:38 ` Jon Medhurst (Tixy)
@ 2014-12-03 3:22 ` Wang Nan
0 siblings, 0 replies; 16+ messages in thread
From: Wang Nan @ 2014-12-03 3:22 UTC (permalink / raw)
To: linux-arm-kernel
On 2014/12/3 2:38, Jon Medhurst (Tixy) wrote:
> On Mon, 2014-12-01 at 16:49 +0800, Wang Nan wrote:
>> This patch introduce kprobeopt for ARM 32.
>>
>> Limitations:
>> - Currently only kernel compiled with ARM ISA is supported.
>>
>> - Offset between probe point and optinsn slot must not larger than
>> 32MiB. Masami Hiramatsu suggests replacing 2 words, it will make
>> things complex. Futher patch can make such optimization.
>>
>> Kprobe opt on ARM is relatively simpler than kprobe opt on x86 because
>> ARM instruction is always 4 bytes aligned and 4 bytes long. This patch
>> replace probed instruction by a 'b', branch to trampoline code and then
>> calls optimized_callback(). optimized_callback() calls opt_pre_handler()
>> to execute kprobe handler. It also emulate/simulate replaced instruction.
>>
>> When unregistering kprobe, the deferred manner of unoptimizer may leave
>> branch instruction before optimizer is called. Different from x86_64,
>> which only copy the probed insn after optprobe_template_end and
>> reexecute them, this patch call singlestep to emulate/simulate the insn
>> directly. Futher patch can optimize this behavior.
>>
>> Signed-off-by: Wang Nan <wangnan0@huawei.com>
>> Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>> Cc: Jon Medhurst (Tixy) <tixy@linaro.org>
>> Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
>> Cc: Will Deacon <will.deacon@arm.com>
>>
>> ---
>>
> [...]
>
>> v10 -> v11:
>> - Move to arch/arm/probes/, insn.h is moved to arch/arm/include/asm.
>> - Code cleanup.
>> - Bugfix based on Tixy's test result:
>> - Trampoline deal with ARM -> Thumb transision instructions and
>> AEABI stack alignment requirement correctly.
>> - Trampoline code buffer should start at 4 byte aligned address.
>> We enforces it in this series by using macro to wrap 'code' var.
>
> I'm wondering if this alignment is needed. I'm not familiar with the
> Linux memory code but following it through...
>
> - kernel/kprobes.c allocates memory for the instruction slots using
> module_alloc()
>
> - module_alloc calls __vmalloc_node_range and passes in an alignment of
> 1 byte however...
>
> - __vmalloc_node_range has the comment "Allocate enough pages to cover
> @size from the page level allocator". And it rounds size up to one page
> and calls __get_vm_area_node which also makes sure the size is page
> aligned and also allocates a guard page afterwards.
>
> So it looks to me as though allocated memory would always be page
> aligned.
>
> Another reason why I think this must be true is that module_alloc seems
> to be used to allocate memory for loading modules to (see move_module in
> kernel/module.c) and that code doesn't seem to align things.
>
> Though, as I already said, I'm not familiar with this code so could well
> have missed something. And the thing that is giving me most worries is
> that all the vmalloc code takes an alignment value in bytes.
>
> Anyway, I'll comment on this patch on the assumption that alignment is
> needed...
>
Thanks for your comments.
By checking code in mm/vmalloc.c I find that, although the algorithm it uses is possible
to get unaligned addresses, all users of alloc_vmap_area() allocate full pages, and
no-page-aligned allocation is forbidden from the first version on that functon.
Therefore, alignment requirements less than PAGE_SIZE is actually meanless.
Although module_alloc() requires only 1-byte alignment, it will get a page aligned address.
It is true for all architectures except cris, on which use module_alloc() simple kmalloc()
However, it doesn't support kprobes so we don't need to care about it.
I'll remove the alignment tricks in the next version of code.
> [...]
>> + /*
>> + * AEABI require a 8-bytes alignment stack. If
>> + * SP % 8 == 4, we alloc another 4 bytes here.
>> + */
>> + " tst sp, #4\n"
>> + " subne sp, #4\n"
>> + " blx r2\n"
>> +
>> + /*
>> + * Here is a trick: the called handler should
>> + * return its second param by r0, which is
>> + * happens to be SP before the above AEABI
>> + * adjustment. Therefore, we don't need to save
>> + * and check whether we have done the above
>> + * adjustment. See optimized_callback().
>> + */
>> + " mov sp, r0\n"
>
> I think this trick is a bit too tricky :-) and might cause unnecessary
> problems for someone in the future. How about replacing the above 4
> instruction with these 4 instead...
>
> " and r4, sp, #4\n"
> " sub sp, sp, r4\n"
> " blx r2\n"
> " add sp, sp, r4\n"
>
> and that actually makes things slightly faster as optimized_callback no
> longer needs to return a value.
>
Your code is better. AAPCS requires subroutines must preserve the contents of
the registers r4-r8, r10-r11, so we can use them freely in our asm code.
>
>> + " ldr r1, [sp, #64]\n"
>> + " tst r1, #"__stringify(PSR_T_BIT)"\n"
>> + " ldrne r2, [sp, #60]\n"
>> + " orrne r2, #1\n"
>> + " strne r2, [sp, #60] @ set bit0 of PC for thumb\n"
>> + " msr cpsr_cxsf, r1\n"
>> + " ldmia sp, {r0 - r15}\n"
>> + ".global optprobe_template_val\n"
>> + "optprobe_template_val:\n"
>> + "1: .long 0\n"
>> + ".global optprobe_template_call\n"
>> + "optprobe_template_call:\n"
>> + "2: .long 0\n"
>> + ".global optprobe_template_end\n"
>> + "optprobe_template_end:\n");
>> +
>
> [...]
>
>> +int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *orig)
>> +{
>> + kprobe_opcode_t *code_unaligned;
>
> kprobe_opcode_t is a u32 and the ABI and compiler expect this to be
> aligned, so best use a void * instead.
>
It is the return value of get_optinsn_slot() and should be that type. However
I'll remove these unaligned things.
[...]
^ permalink raw reply [flat|nested] 16+ messages in thread