From: Jason Baron <jbaron@redhat.com>
To: a.p.zijlstra@chello.nl, mingo@elte.hu
Cc: rostedt@goodmis.org, mathieu.desnoyers@efficios.com,
hpa@zytor.com, davem@davemloft.net, ddaney.cavm@gmail.com,
akpm@linux-foundation.org, fweisbec@gmail.com,
linux-kernel@vger.kernel.org
Subject: [PATCH 06/10] tracepoints: update to use very_unlikely()
Date: Tue, 21 Feb 2012 15:03:12 -0500 [thread overview]
Message-ID: <770815d6ce346fbf9b7ece4b751622e77d2f2c10.1329851692.git.jbaron@redhat.com> (raw)
In-Reply-To: <cover.1329851692.git.jbaron@redhat.com>
Update tracepoins with api change: static_branch() -> very_unlikely().
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
---
include/linux/tracepoint.h | 4 ++--
kernel/tracepoint.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index df0a779..282cf59 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -143,7 +143,7 @@ static inline void tracepoint_synchronize_unregister(void)
extern struct tracepoint __tracepoint_##name; \
static inline void trace_##name(proto) \
{ \
- if (static_branch(&__tracepoint_##name.key)) \
+ if (very_unlikely(&__tracepoint_##name.key)) \
__DO_TRACE(&__tracepoint_##name, \
TP_PROTO(data_proto), \
TP_ARGS(data_args), \
@@ -176,7 +176,7 @@ static inline void tracepoint_synchronize_unregister(void)
__attribute__((section("__tracepoints_strings"))) = #name; \
struct tracepoint __tracepoint_##name \
__attribute__((section("__tracepoints"))) = \
- { __tpstrtab_##name, JUMP_LABEL_INIT, reg, unreg, NULL };\
+ { __tpstrtab_##name, JUMP_LABEL_INIT_FALSE, reg, unreg, NULL };\
static struct tracepoint * const __tracepoint_ptr_##name __used \
__attribute__((section("__tracepoints_ptrs"))) = \
&__tracepoint_##name;
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index f1539de..ad32493 100644
--- a/kernel/tracepoint.c
+++ b/kernel/tracepoint.c
@@ -256,9 +256,9 @@ static void set_tracepoint(struct tracepoint_entry **entry,
{
WARN_ON(strcmp((*entry)->name, elem->name) != 0);
- if (elem->regfunc && !jump_label_enabled(&elem->key) && active)
+ if (elem->regfunc && !jump_label_true(&elem->key) && active)
elem->regfunc();
- else if (elem->unregfunc && jump_label_enabled(&elem->key) && !active)
+ else if (elem->unregfunc && jump_label_true(&elem->key) && !active)
elem->unregfunc();
/*
@@ -269,9 +269,9 @@ static void set_tracepoint(struct tracepoint_entry **entry,
* is used.
*/
rcu_assign_pointer(elem->funcs, (*entry)->funcs);
- if (active && !jump_label_enabled(&elem->key))
+ if (active && !jump_label_true(&elem->key))
jump_label_inc(&elem->key);
- else if (!active && jump_label_enabled(&elem->key))
+ else if (!active && jump_label_true(&elem->key))
jump_label_dec(&elem->key);
}
@@ -283,10 +283,10 @@ static void set_tracepoint(struct tracepoint_entry **entry,
*/
static void disable_tracepoint(struct tracepoint *elem)
{
- if (elem->unregfunc && jump_label_enabled(&elem->key))
+ if (elem->unregfunc && jump_label_true(&elem->key))
elem->unregfunc();
- if (jump_label_enabled(&elem->key))
+ if (jump_label_true(&elem->key))
jump_label_dec(&elem->key);
rcu_assign_pointer(elem->funcs, NULL);
}
--
1.7.7.5
next prev parent reply other threads:[~2012-02-21 20:03 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-21 20:02 [PATCH 00/10] jump label: introduce very_[un]likely + cleanups + docs Jason Baron
2012-02-21 20:02 ` [PATCH 01/10] jump label: Add a WARN() if jump label key count goes negative Jason Baron
2012-02-29 10:13 ` [tip:perf/core] " tip-bot for Jason Baron
2012-02-21 20:02 ` [PATCH 02/10] jump label: fix compiler warning Jason Baron
2012-02-29 10:14 ` [tip:perf/core] jump label: Fix " tip-bot for Jason Baron
2012-02-21 20:03 ` [PATCH 03/10] jump label: introduce very_unlikely() Jason Baron
2012-02-21 20:03 ` [PATCH 04/10] jump label: introduce very_likely() Jason Baron
2012-02-21 20:03 ` [PATCH 05/10] perf: update to use 'very_unlikely()' Jason Baron
2012-02-21 20:03 ` Jason Baron [this message]
2012-02-21 20:03 ` [PATCH 07/10] sched: update to use very_[un]likely() Jason Baron
2012-02-21 20:03 ` [PATCH 08/10] kvm: update to use very_unlikely() Jason Baron
2012-02-21 20:03 ` [PATCH 09/10] net: " Jason Baron
2012-02-21 20:03 ` [PATCH 10/10] jump label: Add docs better explaining the whole jump label mechanism Jason Baron
2012-02-29 10:15 ` [tip:perf/core] static keys: Add docs better explaining the whole 'struct static_key' mechanism tip-bot for Jason Baron
2012-02-21 20:09 ` [PATCH 00/10] jump label: introduce very_[un]likely + cleanups + docs H. Peter Anvin
2012-02-21 20:20 ` Jason Baron
2012-02-21 20:39 ` Steven Rostedt
2012-02-21 21:10 ` H. Peter Anvin
2012-02-21 21:16 ` Mathieu Desnoyers
2012-02-21 21:11 ` Mathieu Desnoyers
2012-02-22 7:32 ` Ingo Molnar
2012-02-22 7:53 ` Ingo Molnar
2012-02-22 8:01 ` H. Peter Anvin
2012-02-22 8:18 ` Ingo Molnar
2012-02-22 8:58 ` [PATCH] static keys: Introduce 'struct static_key', very_[un]likely(), static_key_slow_[inc|dec]() Ingo Molnar
2012-02-29 10:16 ` [tip:perf/core] static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]() tip-bot for Ingo Molnar
2012-02-22 9:03 ` [PATCH] jump labels: Explain the .config option better Ingo Molnar
2012-02-22 15:08 ` [PATCH 00/10] jump label: introduce very_[un]likely + cleanups + docs H. Peter Anvin
2012-02-22 15:51 ` Ingo Molnar
2012-02-22 21:33 ` Paul Mackerras
2012-02-23 10:02 ` Ingo Molnar
2012-02-23 16:21 ` Jason Baron
2012-02-23 17:10 ` H. Peter Anvin
2012-02-24 9:11 ` Ingo Molnar
2012-02-23 17:18 ` Linus Torvalds
2012-02-23 22:33 ` Ingo Molnar
2012-02-23 22:39 ` Ingo Molnar
2012-02-23 22:44 ` Steven Rostedt
2012-02-23 23:18 ` Mathieu Desnoyers
2012-02-24 2:25 ` Jason Baron
2012-02-24 9:08 ` Ingo Molnar
2012-02-24 15:35 ` Jason Baron
2012-02-27 7:40 ` Ingo Molnar
2012-02-24 15:51 ` Mathieu Desnoyers
2012-02-24 16:06 ` Steven Rostedt
2012-02-24 7:52 ` static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]() Ingo Molnar
2012-02-24 7:59 ` [PATCH] " Ingo Molnar
2012-02-24 7:54 ` [PATCH] static keys: Add docs better explaining the whole 'struct static_key' mechanism Ingo Molnar
2012-02-23 22:45 ` [PATCH 00/10] jump label: introduce very_[un]likely + cleanups + docs Linus Torvalds
2012-02-24 8:04 ` Ingo Molnar
2012-02-24 2:42 ` Jason Baron
2012-02-21 20:21 ` Steven Rostedt
2012-02-21 21:11 ` H. Peter Anvin
2012-02-22 6:50 ` Ingo Molnar
2012-02-22 7:03 ` H. Peter Anvin
2012-02-22 7:25 ` Ingo Molnar
2012-02-22 7:35 ` H. Peter Anvin
2012-02-22 7:48 ` Ingo Molnar
2012-02-22 7:55 ` H. Peter Anvin
2012-02-22 8:06 ` Ingo Molnar
2012-02-22 13:22 ` Steven Rostedt
2012-02-22 13:34 ` Ingo Molnar
2012-02-22 13:54 ` Steven Rostedt
2012-02-22 14:20 ` Mathieu Desnoyers
2012-02-22 14:36 ` Steven Rostedt
2012-02-22 14:56 ` Ingo Molnar
2012-02-22 15:11 ` H. Peter Anvin
2012-02-22 15:11 ` Peter Zijlstra
2012-02-22 15:47 ` Ingo Molnar
2012-02-22 15:12 ` Steven Rostedt
2012-02-22 15:15 ` H. Peter Anvin
2012-02-22 15:19 ` H. Peter Anvin
2012-02-22 15:42 ` Jason Baron
2012-02-22 15:54 ` Steven Rostedt
2012-02-22 15:56 ` Jason Baron
2012-02-22 16:08 ` Steven Rostedt
2012-02-22 15:19 ` Jason Baron
2012-02-22 15:40 ` H. Peter Anvin
2012-02-22 15:13 ` Peter Zijlstra
2012-02-22 15:32 ` Peter Zijlstra
2012-02-22 17:14 ` Richard Henderson
2012-02-22 18:28 ` H. Peter Anvin
2012-02-22 18:58 ` Jason Baron
2012-02-22 19:10 ` H. Peter Anvin
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=770815d6ce346fbf9b7ece4b751622e77d2f2c10.1329851692.git.jbaron@redhat.com \
--to=jbaron@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=ddaney.cavm@gmail.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@elte.hu \
--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;
as well as URLs for NNTP newsgroup(s).