Generic Linux architectural discussions
 help / color / mirror / Atom feed
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-arch@vger.kernel.org,
	Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
	Sandeepa Prabhu <sandeepa.prabhu@linaro.org>,
	x86@kernel.org, lkml <linux-kernel@vger.kernel.org>,
	"Steven Rostedt (Red Hat)" <rostedt@goodmis.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	systemtap@sourceware.org, "David S. Miller" <davem@davemloft.net>
Subject: [PATCH -tip v5 14/18] sched: Use NOKPROBE_SYMBOL macro in sched
Date: Mon, 09 Dec 2013 10:47:51 +0000	[thread overview]
Message-ID: <20131209104751.13397.42096.stgit@kbuild-fedora.novalocal> (raw)
In-Reply-To: <20131209104717.13397.8864.stgit@kbuild-fedora.novalocal>

Use NOKPROBE_SYMBOL macro to protect functions from
kprobes instead of __kprobes annotation in sched/core.c.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
---
 kernel/sched/core.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 05e7595..ba89bda 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2345,7 +2345,7 @@ notrace unsigned long get_parent_ip(unsigned long addr)
 #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \
 				defined(CONFIG_PREEMPT_TRACER))
 
-void __kprobes preempt_count_add(int val)
+void preempt_count_add(int val)
 {
 #ifdef CONFIG_DEBUG_PREEMPT
 	/*
@@ -2366,8 +2366,9 @@ void __kprobes preempt_count_add(int val)
 		trace_preempt_off(CALLER_ADDR0, get_parent_ip(CALLER_ADDR1));
 }
 EXPORT_SYMBOL(preempt_count_add);
+NOKPROBE_SYMBOL(preempt_count_add);
 
-void __kprobes preempt_count_sub(int val)
+void preempt_count_sub(int val)
 {
 #ifdef CONFIG_DEBUG_PREEMPT
 	/*
@@ -2388,6 +2389,7 @@ void __kprobes preempt_count_sub(int val)
 	__preempt_count_sub(val);
 }
 EXPORT_SYMBOL(preempt_count_sub);
+NOKPROBE_SYMBOL(preempt_count_sub);
 
 #endif
 

  parent reply	other threads:[~2013-12-09 10:53 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-09 10:47 [PATCH -tip v5 00/18] kprobes: introduce NOKPROBE_SYMBOL(), cleanup and fixes crash bugs Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 01/18] kprobes: Prohibit probing on .entry.text code Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 02/18] kprobes: Introduce NOKPROBE_SYMBOL() macro for blacklist Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 03/18] [BUGFIX] kprobes/x86: Prohibit probing on debug_stack_* Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 04/18] [BUGFIX] x86: Prohibit probing on native_set_debugreg Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 05/18] [BUGFIX] x86: Prohibit probing on thunk functions and restore Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 06/18] kprobes/x86: Call exception handlers directly from do_int3/do_debug Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 07/18] kprobes/x86: Allow probe on some kprobe preparation functions Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 08/18] kprobes: Allow probe on some kprobe functions Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 09/18] ftrace/kprobes: Allow probing on some preparation functions Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 10/18] x86: Use NOKPROBE_SYMBOL() instead of __kprobes annotation Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 11/18] kprobes: Use NOKPROBE_SYMBOL macro instead of __kprobes Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 12/18] ftrace/kprobes: Use NOKPROBE_SYMBOL macro in ftrace Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-09 17:04   ` Steven Rostedt
2013-12-10  8:54     ` Masami Hiramatsu
2013-12-10  9:57     ` [PATCH -tip v5.1 " Masami Hiramatsu
2013-12-12  1:34       ` Steven Rostedt
2013-12-12  4:13         ` Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 13/18] notifier: Use NOKPROBE_SYMBOL macro in notifier Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-11  2:58   ` Masami Hiramatsu
2013-12-11  3:04     ` Masami Hiramatsu
2013-12-09 10:47 ` Masami Hiramatsu [this message]
2013-12-09 10:47 ` [PATCH -tip v5 15/18] kprobes: Show blacklist entries via debugfs Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 16/18] kprobes: Support blacklist functions in module Masami Hiramatsu
2013-12-09 10:47 ` [PATCH -tip v5 17/18] kprobes: Use NOKPROBE_SYMBOL() in sample modules Masami Hiramatsu
2013-12-09 10:47   ` Masami Hiramatsu
2013-12-09 10:48 ` [PATCH -tip v5 18/18] kprobes/x86: Use kprobe_blacklist for .kprobes.text and .entry.text Masami Hiramatsu
2013-12-09 10:48   ` 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=20131209104751.13397.42096.stgit@kbuild-fedora.novalocal \
    --to=masami.hiramatsu.pt@hitachi.com \
    --cc=ananth@in.ibm.com \
    --cc=davem@davemloft.net \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=sandeepa.prabhu@linaro.org \
    --cc=systemtap@sourceware.org \
    --cc=x86@kernel.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