Skip to contentSkip to conversation

tracing: Some small updates for 4.12

PATCH New Steven Rostedt 1 participant 4 messages May 5, 2017

Subsystems (2)
lore
Share & tools
lore

Steven Rostedt

author maintainer
#0 lore raw

cover tracing: Some small updates for 4.12

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next

Head SHA1: 77c0eddeeeee14bf0fb0c0bb97e782981bbcf084

Amey Telawane (1):
tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline()

Dan Carpenter (1):
ftrace: Remove an unneeded condition

Steven Rostedt (VMware) (1):
ftrace: Simplify ftrace_match_record() even more

----

 kernel/trace/ftrace.c | 20 +++++++++-----------
 kernel/trace/trace.c  |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)
author maintainer
#1 lore raw

PATCH 1/3 tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline()

From: Amey Telawane <[email protected]>

Strcpy is inherently not safe, and strlcpy() should be used instead. __trace_find_cmdline() uses strcpy() because the comms saved must have a terminating nul character, but it doesn't hurt to add the extra protection of using strlcpy() instead of strcpy().

[AmitP: Cherry-picked this commit from CodeAurora kernel/msm-3.10
https://source.codeaurora.org/quic/la/kernel/msm-3.10/commit/?id=2161ae9a70b12cf18ac8e5952a20161ffbccb477]

[ Updated change log and removed the "- 1" from len parameter ]
---
 kernel/trace/trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace.c +1 -1
index 80eda7d254ed..4ad4420b33d6 100644
@@ -1976,7 +1976,7 @@ static void __trace_find_cmdline(int pid, char comm[])
 
 	map = savedcmd->map_pid_to_cmdline[pid];
 	if (map != NO_CMDLINE_MAP)
-		strcpy(comm, get_saved_cmdlines(map));
+		strlcpy(comm, get_saved_cmdlines(map), TASK_COMM_LEN);
 	else
 		strcpy(comm, "<...>");
 }
Signature · 1 line
2.10.2
author maintainer
#2 lore raw

PATCH 2/3 ftrace: Remove an unneeded condition

In reply to Steven Rostedt

From: Dan Carpenter <[email protected]>

We know that "mod_matches" is true here so there is no need to check again.

---
 kernel/trace/ftrace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/ftrace.c +1 -1
index 00077a57b746..84286d347cd8 100644
@@ -3644,7 +3644,7 @@ ftrace_match_record(struct dyn_ftrace *rec, struct ftrace_glob *func_g,
 				return 0;
 		}
 
-		if (mod_matches && exclude_mod)
+		if (exclude_mod)
 			return 0;
 
 func_match:
Signature · 1 line
2.10.2
author maintainer
#3 lore raw

PATCH 3/3 ftrace: Simplify ftrace_match_record() even more

In reply to Steven Rostedt

From: "Steven Rostedt (VMware)" <[email protected]>

Dan Carpenter sent a patch to remove a check in ftrace_match_record() because the logic of the code made the check redundant. I looked deeper into the code, and made the following logic table, with the three variables and the result of the original code.

modname        mod_matches     exclude_mod         result
-------        -----------     -----------         ------
  0                 0               0              return 0
  0                 0               1              func_match
  0                 1               *             < cannot exist >
  1                 0               0              return 0
  1                 0               1              func_match
  1                 1               0              func_match
  1                 1               1              return 0

Notice that when mod_matches == exclude mod, the result is always to return 0, and when mod_matches != exclude_mod, then the result is to test the function. This means we only need test if mod_matches is equal to exclude_mod.

---
 kernel/trace/ftrace.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)
kernel/trace/ftrace.c +9 -11
index 84286d347cd8..39dca4e86a94 100644
@@ -3631,22 +3631,20 @@ ftrace_match_record(struct dyn_ftrace *rec, struct ftrace_glob *func_g,
 		/* blank module name to match all modules */
 		if (!mod_g->len) {
 			/* blank module globbing: modname xor exclude_mod */
-			if ((!exclude_mod) != (!modname))
+			if (!exclude_mod != !modname)
 				goto func_match;
 			return 0;
 		}
 
-		/* not matching the module */
-		if (!modname || !mod_matches) {
-			if (exclude_mod)
-				goto func_match;
-			else
-				return 0;
-		}
-
-		if (exclude_mod)
+		/*
+		 * exclude_mod is set to trace everything but the given
+		 * module. If it is set and the module matches, then
+		 * return 0. If it is not set, and the module doesn't match
+		 * also return 0. Otherwise, check the function to see if
+		 * that matches.
+		 */
+		if (!mod_matches == !exclude_mod)
 			return 0;
-
 func_match:
 		/* blank search means to match all funcs in the mod */
 		if (!func_g->len)
Signature · 1 line
2.10.2