From: Steven Rostedt <rostedt@goodmis.org>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: Ingo Molnar <mingo@elte.hu>, LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: [RFC][PATCH] tracing/module: Move tracepoint out of module.h
Date: Wed, 25 Jan 2012 21:41:04 -0500 [thread overview]
Message-ID: <1327545664.22710.78.camel@gandalf.stny.rr.com> (raw)
In-Reply-To: <877h0jgx80.fsf@rustcorp.com.au>
On Mon, 2012-01-23 at 09:29 +1030, Rusty Russell wrote:
> > could just move the "if" part out.
>
> Agreed. Since GCC should be able to eliminate that branch in almost all
> cases, since it's usually a literal NULL or address of a (non-weak)
> symbol.
>
> Be interesting to see the before/after sizes with this out-of-line.
Using my default test config I got:
text data bss dec hex filename
7489488 2249584 9719808 19458880 128eb40 vmlinux-prepatch
7482458 2248048 9719808 19450314 128c9ca vmlinux-postpatch
An 8k savings!
Rusty,
Can you give my your Acked-by for this patch?
Thanks!
-- Steve
diff --git a/include/linux/module.h b/include/linux/module.h
index 3cb7839..b83a687 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -21,8 +21,6 @@
#include <linux/percpu.h>
#include <asm/module.h>
-#include <trace/events/module.h>
-
/* Not Yet Implemented */
#define MODULE_SUPPORTED_DEVICE(name)
@@ -438,6 +436,7 @@ unsigned int module_refcount(struct module *mod);
void __symbol_put(const char *symbol);
#define symbol_put(x) __symbol_put(MODULE_SYMBOL_PREFIX #x)
void symbol_put_addr(void *addr);
+void inc_module(struct module *module, unsigned long ip);
/* Sometimes we know we already have a refcount, and it's easier not
to handle the error case (which only happens with rmmod --wait). */
@@ -445,8 +444,7 @@ static inline void __module_get(struct module *module)
{
if (module) {
preempt_disable();
- __this_cpu_inc(module->refptr->incs);
- trace_module_get(module, _THIS_IP_);
+ inc_module(module, _THIS_IP_);
preempt_enable();
}
}
@@ -458,10 +456,9 @@ static inline int try_module_get(struct module *module)
if (module) {
preempt_disable();
- if (likely(module_is_live(module))) {
- __this_cpu_inc(module->refptr->incs);
- trace_module_get(module, _THIS_IP_);
- } else
+ if (likely(module_is_live(module)))
+ inc_module(module, _THIS_IP_);
+ else
ret = 0;
preempt_enable();
diff --git a/kernel/module.c b/kernel/module.c
index 178333c..83c22409 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -928,6 +928,13 @@ void module_put(struct module *module)
}
EXPORT_SYMBOL(module_put);
+void inc_module(struct module *module, unsigned long ip)
+{
+ __this_cpu_inc(module->refptr->incs);
+ trace_module_get(module, ip);
+}
+EXPORT_SYMBOL(inc_module);
+
#else /* !CONFIG_MODULE_UNLOAD */
static inline void print_unload_info(struct seq_file *m, struct module *mod)
{
next prev parent reply other threads:[~2012-01-26 2:41 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-16 22:57 [PATCH][GIT PULL][v3.3] tracing: Add header wrappers event_headers_start.h and event_headers_end.h Steven Rostedt
2012-01-17 9:54 ` Ingo Molnar
2012-01-17 13:32 ` Steven Rostedt
2012-01-18 12:07 ` Ingo Molnar
2012-01-18 17:56 ` Steven Rostedt
2012-01-22 22:59 ` Rusty Russell
2012-01-26 2:41 ` Steven Rostedt [this message]
2012-01-26 2:45 ` [RFC][PATCH] tracing/module: Move tracepoint out of module.h Steven Rostedt
2012-01-26 10:28 ` Ingo Molnar
2012-01-26 13:52 ` Steven Rostedt
2012-01-26 13:55 ` Ingo Molnar
2012-01-26 14:04 ` Steven Rostedt
2012-01-26 14:07 ` Steven Rostedt
2012-01-26 14:36 ` Steven Rostedt
2012-01-26 18:39 ` Ingo Molnar
2012-01-27 3:02 ` Rusty Russell
2012-01-30 11:52 ` Steven Rostedt
2012-01-30 17:28 ` Steven Rostedt
2012-01-31 3:58 ` Rusty Russell
2012-01-31 12:20 ` Ingo Molnar
2012-01-31 12:50 ` Steven Rostedt
2012-02-01 6:48 ` Rusty Russell
2012-02-01 13:27 ` Steven Rostedt
2012-02-01 13:49 ` Ingo Molnar
2012-02-01 14:25 ` Steven Rostedt
2012-03-29 4:22 ` Eric Dumazet
2012-03-29 5:24 ` Rusty Russell
2012-02-01 1:10 ` Rusty Russell
2012-02-01 7:09 ` Ingo Molnar
2012-01-30 6:40 ` Li Zefan
2012-02-17 13:46 ` [tip:perf/core] tracing/softirq: Move __raise_softirq_irqoff() out of header tip-bot for 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=1327545664.22710.78.camel@gandalf.stny.rr.com \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rusty@rustcorp.com.au \
/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;
as well as URLs for NNTP newsgroup(s).