lkml.org 
[lkml]   [2009]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 2/2] tracing - correct module boundaries for ftrace_release
From
Date
On Wed, 2009-10-07 at 19:00 +0200, jolsa@redhat.com wrote:
> When the module is about the unload we release its call records.
> The ftrace_release function was given wrong values representing
> the module core boundaries, thus not releasing its call records.
>
> Plus making ftrace_release function module specific.
>

I'll take this version. Thanks! I'll get this ready for mainline urgent,
as well as push it off to stable.

-- Steve

> wbr,
> jirka
>
>
> Signed-off-by: Jiri Olsa <jolsa@redhat.com>
> ---
> include/linux/ftrace.h | 2 +-
> kernel/trace/ftrace.c | 12 ++++--------
> 2 files changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
> index cd3d2ab..0b4f97d 100644
> --- a/include/linux/ftrace.h
> +++ b/include/linux/ftrace.h
> @@ -241,7 +241,7 @@ extern void ftrace_enable_daemon(void);
> # define ftrace_set_filter(buf, len, reset) do { } while (0)
> # define ftrace_disable_daemon() do { } while (0)
> # define ftrace_enable_daemon() do { } while (0)
> -static inline void ftrace_release(void *start, unsigned long size) { }
> +static inline void ftrace_release_mod(struct module *mod) {}
> static inline int register_ftrace_command(struct ftrace_func_command *cmd)
> {
> return -EINVAL;
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 9a72853..559e552 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -2608,19 +2608,17 @@ static int ftrace_convert_nops(struct module *mod,
> }
>
> #ifdef CONFIG_MODULES
> -void ftrace_release(void *start, void *end)
> +void ftrace_release_mod(struct module *mod)
> {
> struct dyn_ftrace *rec;
> struct ftrace_page *pg;
> - unsigned long s = (unsigned long)start;
> - unsigned long e = (unsigned long)end;
>
> - if (ftrace_disabled || !start || start == end)
> + if (ftrace_disabled)
> return;
>
> mutex_lock(&ftrace_lock);
> do_for_each_ftrace_rec(pg, rec) {
> - if ((rec->ip >= s) && (rec->ip < e)) {
> + if (within_module_core(rec->ip, mod)) {
> /*
> * rec->ip is changed in ftrace_free_rec()
> * It should not between s and e if record was freed.
> @@ -2652,9 +2650,7 @@ static int ftrace_module_notify(struct notifier_block *self,
> mod->num_ftrace_callsites);
> break;
> case MODULE_STATE_GOING:
> - ftrace_release(mod->ftrace_callsites,
> - mod->ftrace_callsites +
> - mod->num_ftrace_callsites);
> + ftrace_release_mod(mod);
> break;
> }
>



\
 
 \ /
  Last update: 2009-10-07 19:23    [W:0.050 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site