From: Namit Gupta <gupta.namit@samsung.com>
To: rostedt@goodmis.org, jeyu@kernel.org
Cc: mingo@redhat.com, linux-kernel@vger.kernel.org,
pankaj.m@samsung.com, a.sahrawat@samsung.com,
Namit Gupta <gupta.namit@samsung.com>
Subject: [PATCH v3] ftrace/module: Move ftrace_release_mod() to ddebug_cleanup label
Date: Mon, 8 Jan 2018 10:41:21 +0530 [thread overview]
Message-ID: <1515388281-7941-1-git-send-email-gupta.namit@samsung.com> (raw)
In-Reply-To: <CGME20180108051623epcas5p1a2b9d68d83fd54937d71e3d726e36d38@epcas5p1.samsung.com>
ftrace_module_init happen after dynamic_debug_setup, it is desired that
cleanup should be called after this label however in current implementation
it is called in free module label,ie:even though ftrace in not initialized,
from so many fail case ftrace_release_mod() will be called and unnecessary
traverse the whole list.
In below patch we moved ftrace_release_mod() from free_module label to
ddebug_cleanup label. that is the best possible location, other solution
is to make new label to ftrace_release_mod() but since ftrace_module_init()
is not return with minimum changes it should be in ddebug_cleanup label.
Signed-off-by: Namit Gupta <gupta.namit@samsung.com>
---
kernel/module.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/kernel/module.c b/kernel/module.c
index de66ec8..e81a6d7 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3779,6 +3779,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
module_disable_nx(mod);
ddebug_cleanup:
+ ftrace_release_mod(mod);
dynamic_debug_remove(mod, info->debug);
synchronize_sched();
kfree(mod->args);
@@ -3798,12 +3799,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
synchronize_sched();
mutex_unlock(&module_mutex);
free_module:
- /*
- * Ftrace needs to clean up what it initialized.
- * This does nothing if ftrace_module_init() wasn't called,
- * but it must be called outside of module_mutex.
- */
- ftrace_release_mod(mod);
/* Free lock-classes; relies on the preceding sync_rcu() */
lockdep_free_key_range(mod->core_layout.base, mod->core_layout.size);
--
1.9.1
next parent reply other threads:[~2018-01-08 5:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20180108051623epcas5p1a2b9d68d83fd54937d71e3d726e36d38@epcas5p1.samsung.com>
2018-01-08 5:11 ` Namit Gupta [this message]
2018-01-12 17:32 ` Jessica Yu
2018-01-12 17:50 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1515388281-7941-1-git-send-email-gupta.namit@samsung.com \
--to=gupta.namit@samsung.com \
--cc=a.sahrawat@samsung.com \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pankaj.m@samsung.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®