[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-65c10553552b487a71bf5e4676743435046fae6f@git.kernel.org>
Date: Mon, 18 Mar 2013 04:10:18 -0700
From: tip-bot for Masami Hiramatsu <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
torvalds@...ux-foundation.org, xemul@...allels.com,
jkosina@...e.cz, davem@...emloft.net, nyc@...omorphy.com,
ananth@...ibm.com, masami.hiramatsu.pt@...achi.com,
tglx@...utronix.de, timo.lindfors@....fi
Subject: [tip:perf/urgent] kprobes: Make hash_64() as always inlined
Commit-ID: 65c10553552b487a71bf5e4676743435046fae6f
Gitweb: http://git.kernel.org/tip/65c10553552b487a71bf5e4676743435046fae6f
Author: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
AuthorDate: Thu, 14 Mar 2013 20:52:30 +0900
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 18 Mar 2013 10:21:23 +0100
kprobes: Make hash_64() as always inlined
Because hash_64() is called from the get_kprobe() inside
int3 handler, kernel causes int3 recursion and crashes if
kprobes user puts a probe on it.
Usually hash_64() is inlined into caller function, but in
some cases, it has instances by gcc's interprocedural
constant propagation.
This patch uses __always_inline instead of inline to
prevent gcc from doing such things.
Reported-by: Timo Juhani Lindfors <timo.lindfors@....fi>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
Acked-by: Ananth N Mavinakayanahalli <ananth@...ibm.com>
Cc: Pavel Emelyanov <xemul@...allels.com>
Cc: Jiri Kosina <jkosina@...e.cz>
Cc: Nadia Yvette Chambers <nyc@...omorphy.com>
Cc: yrl.pp-manager.tt@...achi.com
Cc: David S. Miller <davem@...emloft.net>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Link: http://lkml.kernel.org/r/20130314115230.19690.39387.stgit@mhiramat-M0-7522
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
include/linux/hash.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/hash.h b/include/linux/hash.h
index 61c97ae..f09a0ae 100644
--- a/include/linux/hash.h
+++ b/include/linux/hash.h
@@ -15,6 +15,7 @@
*/
#include <asm/types.h>
+#include <linux/compiler.h>
/* 2^31 + 2^29 - 2^25 + 2^22 - 2^19 - 2^16 + 1 */
#define GOLDEN_RATIO_PRIME_32 0x9e370001UL
@@ -31,7 +32,7 @@
#error Wordsize not 32 or 64
#endif
-static inline u64 hash_64(u64 val, unsigned int bits)
+static __always_inline u64 hash_64(u64 val, unsigned int bits)
{
u64 hash = val;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists