[PATCH 0/2] [GIT PULL] tracing: more update for 2.6.32

[PATCH 0/2] [GIT PULL] tracing: more update for 2.6.32

[Steven Rostedt]

Ingo,

These patches are still for v2.6.32. They fix bugs and add documentation.
Including the patches in core, core2, and core3, which this is built upon.

Please pull the latest tip/tracing/core4 tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/core4


Atsushi Tsuji (1):
      tracing: Fix minor bugs for __unregister_ftrace_function_probe

Steven Rostedt (1):
      tracing: remove notrace from __kprobes annotation

----
 include/linux/kprobes.h |    4 ++--
 kernel/trace/ftrace.c   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

[PATCH 1/2] [PATCH 1/2] tracing: remove notrace from __kprobes annotation

[Steven Rostedt]

[-- Attachment #1: 0001-tracing-remove-notrace-from-__kprobes-annotation.patch --]
[-- Type: text/plain, Size: 1105 bytes --]

From: Steven Rostedt <srostedt@redhat.com>

When ftrace had issues with NMIs, it was needed to annotate all
the areas that kprobes had issues with notrace. Now that ftrace is
NMI safe, the functions that limit ftrace from tracing are just a
small few.

Kprobes is too big of a set for ftrace not to trace. Remove the
coupling.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 include/linux/kprobes.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index bcd9c07..3a46b7b 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -48,13 +48,13 @@
 #define KPROBE_HIT_SSDONE	0x00000008
 
 /* Attach to insert probes on any functions which should be ignored*/
-#define __kprobes	__attribute__((__section__(".kprobes.text"))) notrace
+#define __kprobes	__attribute__((__section__(".kprobes.text")))
 #else /* CONFIG_KPROBES */
 typedef int kprobe_opcode_t;
 struct arch_specific_insn {
 	int dummy;
 };
-#define __kprobes	notrace
+#define __kprobes
 #endif /* CONFIG_KPROBES */
 
 struct kprobe;
-- 
1.6.3.3

[PATCH 2/2] [PATCH 2/2] tracing: Fix minor bugs for __unregister_ftrace_function_probe

[Steven Rostedt]

[-- Attachment #1: 0002-tracing-Fix-minor-bugs-for-__unregister_ftrace_funct.patch --]
[-- Type: text/plain, Size: 905 bytes --]

From: Atsushi Tsuji <a-tsuji@bk.jp.nec.com>

Fix the condition of strcmp for "*".
Also fix NULL pointer dereference when glob is NULL.

Signed-off-by: Atsushi Tsuji <a-tsuji@bk.jp.nec.com>
LKML-Reference: <4AAF6726.5090905@bk.jp.nec.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 kernel/trace/ftrace.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 8b23d56..f7ab7fc 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2062,9 +2062,9 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
 	int i, len = 0;
 	char *search;
 
-	if (glob && (strcmp(glob, "*") || !strlen(glob)))
+	if (glob && (strcmp(glob, "*") == 0 || !strlen(glob)))
 		glob = NULL;
-	else {
+	else if (glob) {
 		int not;
 
 		type = ftrace_setup_glob(glob, strlen(glob), &search, &not);
-- 
1.6.3.3

Re: [PATCH 0/2] [GIT PULL] tracing: more update for 2.6.32

[Ingo Molnar]

* Steven Rostedt <rostedt@goodmis.org> wrote:

> Ingo,
> 
> These patches are still for v2.6.32. They fix bugs and add documentation.
> Including the patches in core, core2, and core3, which this is built upon.
> 
> Please pull the latest tip/tracing/core4 tree, which can be found at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> tip/tracing/core4
> 
> 
> Atsushi Tsuji (1):
>       tracing: Fix minor bugs for __unregister_ftrace_function_probe
> 
> Steven Rostedt (1):
>       tracing: remove notrace from __kprobes annotation
> 
> ----
>  include/linux/kprobes.h |    4 ++--
>  kernel/trace/ftrace.c   |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)

Pulled, thanks Steve!

	Ingo