summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Bin <huawei.libin@huawei.com>2014-12-19 14:11:17 +0800
committerJiri Kosina <jkosina@suse.cz>2014-12-22 15:40:49 +0100
commitb5bfc51707f1b56b0b733980bb4fcc0562bf02d8 (patch)
tree3b31bf562c78492f3ad304bb053426eb0f9bcbb6
parent13d1cf7e702596e0cd8ec62afa6bd49c431f2d0c (diff)
downloadlinux-sh-b5bfc51707f1b56b0b733980bb4fcc0562bf02d8.tar.gz
livepatch: move x86 specific ftrace handler code to arch/x86
The execution flow redirection related implemention in the livepatch ftrace handler is depended on the specific architecture. This patch introduces klp_arch_set_pc(like kgdb_arch_set_pc) interface to change the pt_regs. Signed-off-by: Li Bin <huawei.libin@huawei.com> Acked-by: Josh Poimboeuf <jpoimboe@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--arch/x86/include/asm/livepatch.h5
-rw-r--r--kernel/livepatch/core.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h
index d529db1b1edf..b5608d7757fd 100644
--- a/arch/x86/include/asm/livepatch.h
+++ b/arch/x86/include/asm/livepatch.h
@@ -22,6 +22,7 @@
#define _ASM_X86_LIVEPATCH_H
#include <linux/module.h>
+#include <linux/ftrace.h>
#ifdef CONFIG_LIVE_PATCHING
#ifndef CC_USING_FENTRY
@@ -30,6 +31,10 @@
extern int klp_write_module_reloc(struct module *mod, unsigned long type,
unsigned long loc, unsigned long value);
+static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
+{
+ regs->ip = ip;
+}
#else
#error Live patching support is disabled; check CONFIG_LIVE_PATCHING
#endif
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index f99fe189d596..07a2db9d01e6 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -272,7 +272,7 @@ static void notrace klp_ftrace_handler(unsigned long ip,
{
struct klp_func *func = ops->private;
- regs->ip = (unsigned long)func->new_func;
+ klp_arch_set_pc(regs, (unsigned long)func->new_func);
}
static int klp_disable_func(struct klp_func *func)