[GIT PULL] Tracing: Fixes for 5.12

[GIT PULL] Tracing: Fixes for 5.12

[Steven Rostedt]

Linus,

Tracing: Fixes for 5.12

Two fixes:

 - Fix an unsafe printf string usage in a kmem trace event
 - Fix spelling in output from the latency-collector tool

Note, since the broken commit was not in my tree, nor was it in any of
your tags, I just based this on top of the broken commit.

I also included a spelling fix patch to the latency-collector tool as
it doesn't affect any other part of the kernel.

Please pull the latest trace-v5.12-2 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v5.12-2

Tag SHA1: c07e93a2a5d138b7efadb97045f77d736d5079b8
Head SHA1: c1d96fa61eb74b1e211f1653acc5b68ac62c8ef4


Colin Ian King (1):
      tracing/tools: fix a couple of spelling mistakes

Steven Rostedt (VMware) (1):
      mm, tracing: Fix kmem_cache_free trace event to not print stale pointers

----
 include/trace/events/kmem.h               | 6 +++---
 tools/tracing/latency/latency-collector.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
---------------------------
diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index 40845b0d5dad..3a60b6b6db32 100644
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -144,17 +144,17 @@ TRACE_EVENT(kmem_cache_free,
 	TP_STRUCT__entry(
 		__field(	unsigned long,	call_site	)
 		__field(	const void *,	ptr		)
-		__field(	const char *,	name		)
+		__string(	name,	name	)
 	),
 
 	TP_fast_assign(
 		__entry->call_site	= call_site;
 		__entry->ptr		= ptr;
-		__entry->name		= name;
+		__assign_str(name, name);
 	),
 
 	TP_printk("call_site=%pS ptr=%p name=%s",
-		  (void *)__entry->call_site, __entry->ptr, __entry->name)
+		  (void *)__entry->call_site, __entry->ptr, __get_str(name))
 );
 
 TRACE_EVENT(mm_page_free,
diff --git a/tools/tracing/latency/latency-collector.c b/tools/tracing/latency/latency-collector.c
index 57b20802e71b..b69de9263ee6 100644
--- a/tools/tracing/latency/latency-collector.c
+++ b/tools/tracing/latency/latency-collector.c
@@ -1650,7 +1650,7 @@ static void start_printthread(void)
 		if (ufd <  0 ||
 		    read(ufd, seed, sizeof(*seed)) != sizeof(*seed)) {
 			printf(
-"Warning! Using trivial random nummer seed, since %s not available\n",
+"Warning! Using trivial random number seed, since %s not available\n",
 			DEV_URANDOM);
 			fflush(stdout);
 			*seed = i;
@@ -1711,8 +1711,8 @@ static void show_usage(void)
 "\t\t\tbeginning, end, and backtrace.\n\n"
 
 "-g, --graph\t\tEnable the display-graph option in trace_option. This\n"
-"\t\t\toption causes ftrace to show the functionph of how\n"
-"\t\t\tfunctions are calling other functions.\n\n"
+"\t\t\toption causes ftrace to show the graph of how functions\n"
+"\t\t\tare calling other functions.\n\n"
 
 "-c, --policy POL\tRun the program with scheduling policy POL. POL can be\n"
 "\t\t\tother, batch, idle, rr or fifo. The default is rr. When\n"

Re: [GIT PULL] Tracing: Fixes for 5.12

[pr-tracker-bot]

The pull request you sent on Thu, 25 Feb 2021 21:54:17 -0500:

> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git trace-v5.12-2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8b1e2c50bce9f3cc4422c3ed087252b8347da77a

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html