From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
To: Ingo Molnar <mingo@redhat.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org
Cc: Timo Juhani Lindfors <timo.lindfors@iki.fi>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Pavel Emelyanov <xemul@parallels.com>,
Jiri Kosina <jkosina@suse.cz>, Ingo Molnar <mingo@kernel.org>,
Nadia Yvette Chambers <nyc@holomorphy.com>,
yrl.pp-manager.tt@hitachi.com,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH -tip v2 1/2] [BUGFIX] kprobes: make hash_64() as always inlined
Date: Thu, 14 Mar 2013 20:52:30 +0900 [thread overview]
Message-ID: <20130314115230.19690.39387.stgit@mhiramat-M0-7522> (raw)
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.
Changes in v2:
- Use __always_inline instead of using __kprobes
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Reported-by: Timo Juhani Lindfors <timo.lindfors@iki.fi>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Nadia Yvette Chambers <nyc@holomorphy.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.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;
next reply other threads:[~2013-03-14 11:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-14 11:52 Masami Hiramatsu [this message]
2013-03-14 11:52 ` [PATCH -tip v2 2/2] [BUGFIX] kprobes/x86: Check Interrupt Flag modifier when registering probe Masami Hiramatsu
2013-03-15 4:40 ` Ananth N Mavinakayanahalli
2013-03-18 11:11 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2013-03-15 4:40 ` [PATCH -tip v2 1/2] [BUGFIX] kprobes: make hash_64() as always inlined Ananth N Mavinakayanahalli
2013-03-18 11:10 ` [tip:perf/urgent] kprobes: Make " tip-bot for Masami Hiramatsu
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=20130314115230.19690.39387.stgit@mhiramat-M0-7522 \
--to=masami.hiramatsu.pt@hitachi.com \
--cc=ananth@in.ibm.com \
--cc=davem@davemloft.net \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=nyc@holomorphy.com \
--cc=timo.lindfors@iki.fi \
--cc=torvalds@linux-foundation.org \
--cc=xemul@parallels.com \
--cc=yrl.pp-manager.tt@hitachi.com \
/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).