From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759559AbZJGRB3 (ORCPT ); Wed, 7 Oct 2009 13:01:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759496AbZJGRB2 (ORCPT ); Wed, 7 Oct 2009 13:01:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31867 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759266AbZJGRBX (ORCPT ); Wed, 7 Oct 2009 13:01:23 -0400 From: jolsa@redhat.com To: mingo@elte.hu, rostedt@goodmis.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/2] tracing - correct module boundaries for ftrace_release Date: Wed, 7 Oct 2009 19:00:35 +0200 Message-Id: <1254934835-363-3-git-send-email-jolsa@redhat.com> In-Reply-To: <1254934835-363-1-git-send-email-jolsa@redhat.com> References: <1254934835-363-1-git-send-email-jolsa@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. wbr, jirka Signed-off-by: Jiri Olsa --- 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; }