nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

kprobes: Allow kprobes coexist with livepatch

Browse source 
Allow kprobes which do not modify regs->ip, coexist with livepatch
by dropping FTRACE_OPS_FL_IPMODIFY from ftrace_ops.

User who wants to modify regs->ip (e.g. function fault injection)
must set a dummy post_handler to its kprobes when registering.
However, if such regs->ip modifying kprobes is set on a function,
that function can not be livepatched.

Link: http://lkml.kernel.org/r/156403587671.30117.5233558741694155985.stgit@devnote2

Acked-by: Joe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Masami Hiramatsu 2019-07-25 15:24:37 +09:00 committed by Steven Rostedt (VMware)
parent c68c9ec1c5
commit 0bc11ed5ab
1 changed files with 40 additions and 16 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

56
kernel/kprobes.c
View file

@ -961,9 +961,16 @@ static struct kprobe *alloc_aggr_kprobe(struct kprobe *p)
#ifdef CONFIG_KPROBES_ON_FTRACE #ifdef CONFIG_KPROBES_ON_FTRACE
static struct ftrace_ops kprobe_ftrace_ops __read_mostly = { static struct ftrace_ops kprobe_ftrace_ops __read_mostly = {
.func = kprobe_ftrace_handler,
.flags = FTRACE_OPS_FL_SAVE_REGS,
};
static struct ftrace_ops kprobe_ipmodify_ops __read_mostly = {
.func = kprobe_ftrace_handler, .func = kprobe_ftrace_handler,
.flags = FTRACE_OPS_FL_SAVE_REGS | FTRACE_OPS_FL_IPMODIFY, .flags = FTRACE_OPS_FL_SAVE_REGS | FTRACE_OPS_FL_IPMODIFY,
}; };
static int kprobe_ipmodify_enabled;
static int kprobe_ftrace_enabled; static int kprobe_ftrace_enabled;
/* Must ensure p->addr is really on ftrace */ /* Must ensure p->addr is really on ftrace */
@ -976,58 +983,75 @@ static int prepare_kprobe(struct kprobe *p)
} }
/* Caller must lock kprobe_mutex */ /* Caller must lock kprobe_mutex */
static int arm_kprobe_ftrace(struct kprobe *p) static int __arm_kprobe_ftrace(struct kprobe *p, struct ftrace_ops *ops,
int *cnt)
{ {
int ret = 0; int ret = 0;
ret = ftrace_set_filter_ip(&kprobe_ftrace_ops, ret = ftrace_set_filter_ip(ops, (unsigned long)p->addr, 0, 0);
(unsigned long)p->addr, 0, 0);
if (ret) { if (ret) {
pr_debug("Failed to arm kprobe-ftrace at %pS (%d)\n", pr_debug("Failed to arm kprobe-ftrace at %pS (%d)\n",
p->addr, ret); p->addr, ret);
return ret; return ret;
} }
if (kprobe_ftrace_enabled == 0) { if (*cnt == 0) {
ret = register_ftrace_function(&kprobe_ftrace_ops); ret = register_ftrace_function(ops);
if (ret) { if (ret) {
pr_debug("Failed to init kprobe-ftrace (%d)\n", ret); pr_debug("Failed to init kprobe-ftrace (%d)\n", ret);
goto err_ftrace; goto err_ftrace;
} }
} }
kprobe_ftrace_enabled++; (*cnt)++;
return ret; return ret;
err_ftrace: err_ftrace:
/* /*
* Note: Since kprobe_ftrace_ops has IPMODIFY set, and ftrace requires a * At this point, sinec ops is not registered, we should be sefe from
* non-empty filter_hash for IPMODIFY ops, we're safe from an accidental * registering empty filter.
* empty filter_hash which would undesirably trace all functions.
*/ */
ftrace_set_filter_ip(&kprobe_ftrace_ops, (unsigned long)p->addr, 1, 0); ftrace_set_filter_ip(ops, (unsigned long)p->addr, 1, 0);
return ret; return ret;
} }
static int arm_kprobe_ftrace(struct kprobe *p)
{
bool ipmodify = (p->post_handler != NULL);
return __arm_kprobe_ftrace(p,
ipmodify ? &kprobe_ipmodify_ops : &kprobe_ftrace_ops,
ipmodify ? &kprobe_ipmodify_enabled : &kprobe_ftrace_enabled);
}
/* Caller must lock kprobe_mutex */ /* Caller must lock kprobe_mutex */
static int disarm_kprobe_ftrace(struct kprobe *p) static int __disarm_kprobe_ftrace(struct kprobe *p, struct ftrace_ops *ops,
int *cnt)
{ {
int ret = 0; int ret = 0;
if (kprobe_ftrace_enabled == 1) { if (*cnt == 1) {
ret = unregister_ftrace_function(&kprobe_ftrace_ops); ret = unregister_ftrace_function(ops);
if (WARN(ret < 0, "Failed to unregister kprobe-ftrace (%d)\n", ret)) if (WARN(ret < 0, "Failed to unregister kprobe-ftrace (%d)\n", ret))
return ret; return ret;
} }
kprobe_ftrace_enabled--; (*cnt)--;
ret = ftrace_set_filter_ip(&kprobe_ftrace_ops, ret = ftrace_set_filter_ip(ops, (unsigned long)p->addr, 1, 0);
(unsigned long)p->addr, 1, 0);
WARN_ONCE(ret < 0, "Failed to disarm kprobe-ftrace at %pS (%d)\n", WARN_ONCE(ret < 0, "Failed to disarm kprobe-ftrace at %pS (%d)\n",
p->addr, ret); p->addr, ret);
return ret; return ret;
} }
static int disarm_kprobe_ftrace(struct kprobe *p)
{
bool ipmodify = (p->post_handler != NULL);
return __disarm_kprobe_ftrace(p,
ipmodify ? &kprobe_ipmodify_ops : &kprobe_ftrace_ops,
ipmodify ? &kprobe_ipmodify_enabled : &kprobe_ftrace_enabled);
}
#else /* !CONFIG_KPROBES_ON_FTRACE */ #else /* !CONFIG_KPROBES_ON_FTRACE */
#define prepare_kprobe(p) arch_prepare_kprobe(p) #define prepare_kprobe(p) arch_prepare_kprobe(p)
#define arm_kprobe_ftrace(p) (-ENODEV) #define arm_kprobe_ftrace(p) (-ENODEV)