Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 13 Feb 2019 01:02:39 -0800
From:   tip-bot for Masami Hiramatsu <tipbot@zytor.com>
Message-ID: <tip-984640ce427fa67c7c1f8550ab53495733bd11fc@git.kernel.org>
Cc:     mingo@kernel.org, righi.andrea@gmail.com,
        torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
        mhiramat@kernel.org, tglx@linutronix.de,
        alexander.shishkin@linux.intel.com, mathieu.desnoyers@efficios.com,
        acme@redhat.com, peterz@infradead.org, rostedt@goodmis.org,
        hpa@zytor.com, jolsa@redhat.com
Reply-To: jolsa@redhat.com, hpa@zytor.com, peterz@infradead.org,
          rostedt@goodmis.org, acme@redhat.com,
          alexander.shishkin@linux.intel.com,
          mathieu.desnoyers@efficios.com, linux-kernel@vger.kernel.org,
          tglx@linutronix.de, mhiramat@kernel.org, mingo@kernel.org,
          righi.andrea@gmail.com, torvalds@linux-foundation.org
In-Reply-To: <154998804911.31052.3541963527929117920.stgit@devbox>
References: <154998804911.31052.3541963527929117920.stgit@devbox>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:perf/core] kprobes: Prohibit probing on preemption checking
 debug functions
Git-Commit-ID: 984640ce427fa67c7c1f8550ab53495733bd11fc
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  984640ce427fa67c7c1f8550ab53495733bd11fc
Gitweb:     https://git.kernel.org/tip/984640ce427fa67c7c1f8550ab53495733bd11fc
Author:     Masami Hiramatsu <mhiramat@kernel.org>
AuthorDate: Wed, 13 Feb 2019 01:14:09 +0900
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 13 Feb 2019 08:16:40 +0100

kprobes: Prohibit probing on preemption checking debug functions

Since kprobes depends on preempt disable/enable, probing
on the preempt debug routines can cause recursive breakpoint
bugs.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andrea Righi <righi.andrea@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/154998804911.31052.3541963527929117920.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 lib/smp_processor_id.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
index 85925aaa4fff..157d9e31f6c2 100644
--- a/lib/smp_processor_id.c
+++ b/lib/smp_processor_id.c
@@ -5,10 +5,11 @@
  * DEBUG_PREEMPT variant of smp_processor_id().
  */
 #include <linux/export.h>
+#include <linux/kprobes.h>
 #include <linux/sched.h>
 
-notrace static unsigned int check_preemption_disabled(const char *what1,
-							const char *what2)
+notrace static nokprobe_inline
+unsigned int check_preemption_disabled(const char *what1, const char *what2)
 {
 	int this_cpu = raw_smp_processor_id();
 
@@ -56,9 +57,11 @@ notrace unsigned int debug_smp_processor_id(void)
 	return check_preemption_disabled("smp_processor_id", "");
 }
 EXPORT_SYMBOL(debug_smp_processor_id);
+NOKPROBE_SYMBOL(debug_smp_processor_id);
 
 notrace void __this_cpu_preempt_check(const char *op)
 {
 	check_preemption_disabled("__this_cpu_", op);
 }
 EXPORT_SYMBOL(__this_cpu_preempt_check);
+NOKPROBE_SYMBOL(__this_cpu_preempt_check);