diff options
author | Hyeoncheol Lee <cheol.lee@lge.com> | 2013-07-01 00:44:32 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-01-02 16:17:42 -0500 |
commit | 3925f4a5afa489e905a08edffc36a435a3434a63 (patch) | |
tree | 00fbb091d8fdf2737cd2430f10606db52353d8e7 /kernel | |
parent | 1301a44e77557e928700f91c7083c5770054c212 (diff) |
tracing/probes: Add fetch{,_size} member into deref fetch method
The deref fetch methods access a memory region but it assumes that
it's a kernel memory since uprobes does not support them.
Add ->fetch and ->fetch_size member in order to provide a proper
access methods for supporting uprobes.
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: Hyeoncheol Lee <cheol.lee@lge.com>
[namhyung@kernel.org: Split original patch into pieces as requested]
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/trace_probe.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index a31ad478b7f6..8d7231d436da 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c | |||
@@ -184,6 +184,8 @@ __kprobes void FETCH_FUNC_NAME(memory, string_size)(struct pt_regs *regs, | |||
184 | struct deref_fetch_param { | 184 | struct deref_fetch_param { |
185 | struct fetch_param orig; | 185 | struct fetch_param orig; |
186 | long offset; | 186 | long offset; |
187 | fetch_func_t fetch; | ||
188 | fetch_func_t fetch_size; | ||
187 | }; | 189 | }; |
188 | 190 | ||
189 | #define DEFINE_FETCH_deref(type) \ | 191 | #define DEFINE_FETCH_deref(type) \ |
@@ -195,13 +197,26 @@ __kprobes void FETCH_FUNC_NAME(deref, type)(struct pt_regs *regs, \ | |||
195 | call_fetch(&dprm->orig, regs, &addr); \ | 197 | call_fetch(&dprm->orig, regs, &addr); \ |
196 | if (addr) { \ | 198 | if (addr) { \ |
197 | addr += dprm->offset; \ | 199 | addr += dprm->offset; \ |
198 | fetch_memory_##type(regs, (void *)addr, dest); \ | 200 | dprm->fetch(regs, (void *)addr, dest); \ |
199 | } else \ | 201 | } else \ |
200 | *(type *)dest = 0; \ | 202 | *(type *)dest = 0; \ |
201 | } | 203 | } |
202 | DEFINE_BASIC_FETCH_FUNCS(deref) | 204 | DEFINE_BASIC_FETCH_FUNCS(deref) |
203 | DEFINE_FETCH_deref(string) | 205 | DEFINE_FETCH_deref(string) |
204 | DEFINE_FETCH_deref(string_size) | 206 | |
207 | __kprobes void FETCH_FUNC_NAME(deref, string_size)(struct pt_regs *regs, | ||
208 | void *data, void *dest) | ||
209 | { | ||
210 | struct deref_fetch_param *dprm = data; | ||
211 | unsigned long addr; | ||
212 | |||
213 | call_fetch(&dprm->orig, regs, &addr); | ||
214 | if (addr && dprm->fetch_size) { | ||
215 | addr += dprm->offset; | ||
216 | dprm->fetch_size(regs, (void *)addr, dest); | ||
217 | } else | ||
218 | *(string_size *)dest = 0; | ||
219 | } | ||
205 | 220 | ||
206 | static __kprobes void update_deref_fetch_param(struct deref_fetch_param *data) | 221 | static __kprobes void update_deref_fetch_param(struct deref_fetch_param *data) |
207 | { | 222 | { |
@@ -477,6 +492,9 @@ static int parse_probe_arg(char *arg, const struct fetch_type *t, | |||
477 | return -ENOMEM; | 492 | return -ENOMEM; |
478 | 493 | ||
479 | dprm->offset = offset; | 494 | dprm->offset = offset; |
495 | dprm->fetch = t->fetch[FETCH_MTD_memory]; | ||
496 | dprm->fetch_size = get_fetch_size_function(t, | ||
497 | dprm->fetch, ftbl); | ||
480 | ret = parse_probe_arg(arg, t2, &dprm->orig, is_return, | 498 | ret = parse_probe_arg(arg, t2, &dprm->orig, is_return, |
481 | is_kprobe); | 499 | is_kprobe); |
482 | if (ret) | 500 | if (ret) |