* [GIT PULL] tracing/probe: Fix same probe event argument matching
@ 2019-09-26 9:09 Steven Rostedt
2019-09-26 20:20 ` pr-tracker-bot
0 siblings, 1 reply; 2+ messages in thread
From: Steven Rostedt @ 2019-09-26 9:09 UTC (permalink / raw)
To: Linus Torvalds
Cc: LKML, Ingo Molnar, Andrew Morton, Masami Hiramatsu, Srikar Dronamraju
Linus,
Srikar Dronamraju fixed a bug in the new multi probe code.
Please pull the latest trace-v5.4-2 tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v5.4-2
Tag SHA1: ba75d3b05b6e1e995b9c934f8e387c93e879c18b
Head SHA1: f8d7ab2bded897607bff6324d5c6ea6b4aecca0c
Srikar Dronamraju (1):
tracing/probe: Fix same probe event argument matching
----
kernel/trace/trace_kprobe.c | 5 +++--
kernel/trace/trace_uprobe.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
---------------------------
commit f8d7ab2bded897607bff6324d5c6ea6b4aecca0c
Author: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Date: Tue Sep 24 17:19:06 2019 +0530
tracing/probe: Fix same probe event argument matching
Commit fe60b0ce8e73 ("tracing/probe: Reject exactly same probe event")
tries to reject a event which matches an already existing probe.
However it currently continues to match arguments and rejects adding a
probe even when the arguments don't match. Fix this by only rejecting a
probe if and only if all the arguments match.
Link: http://lkml.kernel.org/r/20190924114906.14038-1-srikar@linux.vnet.ibm.com
Fixes: fe60b0ce8e73 ("tracing/probe: Reject exactly same probe event")
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index a6697e28ddda..402dc3ce88d3 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -549,10 +549,11 @@ static bool trace_kprobe_has_same_kprobe(struct trace_kprobe *orig,
for (i = 0; i < orig->tp.nr_args; i++) {
if (strcmp(orig->tp.args[i].comm,
comp->tp.args[i].comm))
- continue;
+ break;
}
- return true;
+ if (i == orig->tp.nr_args)
+ return true;
}
return false;
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 34dd6d0016a3..dd884341f5c5 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -431,10 +431,11 @@ static bool trace_uprobe_has_same_uprobe(struct trace_uprobe *orig,
for (i = 0; i < orig->tp.nr_args; i++) {
if (strcmp(orig->tp.args[i].comm,
comp->tp.args[i].comm))
- continue;
+ break;
}
- return true;
+ if (i == orig->tp.nr_args)
+ return true;
}
return false;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [GIT PULL] tracing/probe: Fix same probe event argument matching
2019-09-26 9:09 [GIT PULL] tracing/probe: Fix same probe event argument matching Steven Rostedt
@ 2019-09-26 20:20 ` pr-tracker-bot
0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2019-09-26 20:20 UTC (permalink / raw)
To: Steven Rostedt
Cc: Linus Torvalds, LKML, Ingo Molnar, Andrew Morton,
Masami Hiramatsu, Srikar Dronamraju
The pull request you sent on Thu, 26 Sep 2019 05:09:26 -0400:
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git trace-v5.4-2
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7897c04ad09f815aea1f2dbb05825887d4494a74
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-26 20:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-26 9:09 [GIT PULL] tracing/probe: Fix same probe event argument matching Steven Rostedt
2019-09-26 20:20 ` pr-tracker-bot
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).