(2013/07/31 18:03), Namhyung Kim wrote:
> From: Namhyung Kim <namhyung....@lge.com>
>
> Those fetch functions need to be implemented differently for kprobes
> and uprobes. Since the symbol and deref fetch functions don't call
> those directly anymore, we can make them static and implement them
> separately.
Hmm, I think this should be done in 1/13, since this is partially
reverted it in the same series. If you concern about tweaking other
one's patch, you can add you singed-off-by to it. :)
Thank you,
>
> Cc: Masami Hiramatsu <masami.hiramatsu...@hitachi.com>
> Cc: Srikar Dronamraju <sri...@linux.vnet.ibm.com>
> Cc: Oleg Nesterov <o...@redhat.com>
> Cc: zhangwei(Jovi) <jovi.zhang...@huawei.com>
> Cc: Arnaldo Carvalho de Melo <a...@ghostprotocols.net>
> Signed-off-by: Namhyung Kim <namhy...@kernel.org>
> ---
> kernel/trace/trace_kprobe.c | 8 ++++----
> kernel/trace/trace_probe.h | 10 +---------
> 2 files changed, 5 insertions(+), 13 deletions(-)
>
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index c91eca015758..174c30e47c41 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -753,7 +753,7 @@ static const struct file_operations kprobe_profile_ops = {
> * kprobes-specific fetch functions
> */
> #define DEFINE_FETCH_stack(type) \
> -__kprobes void FETCH_FUNC_NAME(stack, type)(struct pt_regs *regs, \
> +static __kprobes void FETCH_FUNC_NAME(stack, type)(struct pt_regs *regs,\
> void *offset, void *dest) \
> { \
> *(type *)dest = (type)regs_get_kernel_stack_nth(regs, \
> @@ -765,7 +765,7 @@ DEFINE_BASIC_FETCH_FUNCS(stack)
> #define fetch_stack_string_size NULL
>
> #define DEFINE_FETCH_memory(type) \
> -__kprobes void FETCH_FUNC_NAME(memory, type)(struct pt_regs *regs, \
> +static __kprobes void FETCH_FUNC_NAME(memory, type)(struct pt_regs *regs,\
> void *addr, void *dest) \
> { \
> type retval; \
> @@ -779,7 +779,7 @@ DEFINE_BASIC_FETCH_FUNCS(memory)
> * Fetch a null-terminated string. Caller MUST set *(u32 *)dest with max
> * length and relative data location.
> */
> -__kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
> +static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
> void *addr, void *dest)
> {
> long ret;
> @@ -816,7 +816,7 @@ __kprobes void FETCH_FUNC_NAME(memory, string)(struct
> pt_regs *regs,
> }
>
> /* Return the length of string -- including null terminal byte */
> -__kprobes void FETCH_FUNC_NAME(memory, string_size)(struct pt_regs *regs,
> +static __kprobes void FETCH_FUNC_NAME(memory, string_size)(struct pt_regs
> *regs,
> void *addr, void *dest)
> {
> mm_segment_t old_fs;
> diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h
> index 1c37c813e5e5..50f152eb7ef0 100644
> --- a/kernel/trace/trace_probe.h
> +++ b/kernel/trace/trace_probe.h
> @@ -171,24 +171,16 @@ DECLARE_FETCH_FUNC(method, u32); \
> DECLARE_FETCH_FUNC(method, u64)
>
> /*
> - * Declare fetch functions
> + * Declare common fetch functions for both of kprobes and uprobes
> */
> DECLARE_BASIC_FETCH_FUNCS(reg);
> #define fetch_reg_string NULL
> #define fetch_reg_string_size NULL
>
> -DECLARE_BASIC_FETCH_FUNCS(stack);
> -#define fetch_stack_string NULL
> -#define fetch_stack_string_size NULL
> -
> DECLARE_BASIC_FETCH_FUNCS(retval);
> #define fetch_retval_string NULL
> #define fetch_retval_string_size NULL
>
> -DECLARE_BASIC_FETCH_FUNCS(memory);
> -DECLARE_FETCH_FUNC(memory, string);
> -DECLARE_FETCH_FUNC(memory, string_size);
> -
> DECLARE_BASIC_FETCH_FUNCS(symbol);
> DECLARE_FETCH_FUNC(symbol, string);
> DECLARE_FETCH_FUNC(symbol, string_size);
>
--
Masami HIRAMATSU
IT Management Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu...@hitachi.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
