From: Tomas Glozar tglozar@redhat.com
commit 76b3102148135945b013797fac9b206273f0f777 upstream.
Do the same fix as in previous commit also for timerlat-hist.
Link: https://lore.kernel.org/20241011121015.2868751-2-tglozar@redhat.com Reported-by: Attila Fazekas afazekas@redhat.com Signed-off-by: Tomas Glozar tglozar@redhat.com Signed-off-by: Steven Rostedt (Google) rostedt@goodmis.org [ Drop hunk fixing printf in timerlat_print_stats_all since that is not in 6.6 ] Signed-off-by: Tomas Glozar tglozar@redhat.com --- tools/tracing/rtla/src/timerlat_hist.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/tracing/rtla/src/timerlat_hist.c b/tools/tracing/rtla/src/timerlat_hist.c index 1c8ecd4ebcbd..667f12f2d67f 100644 --- a/tools/tracing/rtla/src/timerlat_hist.c +++ b/tools/tracing/rtla/src/timerlat_hist.c @@ -58,9 +58,9 @@ struct timerlat_hist_cpu { int *thread; int *user;
- int irq_count; - int thread_count; - int user_count; + unsigned long long irq_count; + unsigned long long thread_count; + unsigned long long user_count;
unsigned long long min_irq; unsigned long long sum_irq; @@ -300,15 +300,15 @@ timerlat_print_summary(struct timerlat_hist_params *params, continue;
if (!params->no_irq) - trace_seq_printf(trace->seq, "%9d ", + trace_seq_printf(trace->seq, "%9llu ", data->hist[cpu].irq_count);
if (!params->no_thread) - trace_seq_printf(trace->seq, "%9d ", + trace_seq_printf(trace->seq, "%9llu ", data->hist[cpu].thread_count);
if (params->user_hist) - trace_seq_printf(trace->seq, "%9d ", + trace_seq_printf(trace->seq, "%9llu ", data->hist[cpu].user_count); } trace_seq_printf(trace->seq, "\n");
[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 76b3102148135945b013797fac9b206273f0f777
WARNING: Author mismatch between patch and upstream commit: Backport author: tglozar@redhat.com Commit author: Tomas Glozar tglozar@redhat.com
Status in newer kernel trees: 6.12.y | Not found 6.6.y | Not found
Note: The patch differs from the upstream commit: --- 1: 76b3102148135 ! 1: 110ebadf9fee5 rtla/timerlat: Make timerlat_hist_cpu->*_count unsigned long long @@ Metadata ## Commit message ## rtla/timerlat: Make timerlat_hist_cpu->*_count unsigned long long
+ commit 76b3102148135945b013797fac9b206273f0f777 upstream. + Do the same fix as in previous commit also for timerlat-hist.
Link: https://lore.kernel.org/20241011121015.2868751-2-tglozar@redhat.com Reported-by: Attila Fazekas afazekas@redhat.com Signed-off-by: Tomas Glozar tglozar@redhat.com Signed-off-by: Steven Rostedt (Google) rostedt@goodmis.org + [ Drop hunk fixing printf in timerlat_print_stats_all since that is not + in 6.6 ] + Signed-off-by: Tomas Glozar tglozar@redhat.com
## tools/tracing/rtla/src/timerlat_hist.c ## @@ tools/tracing/rtla/src/timerlat_hist.c: struct timerlat_hist_cpu { @@ tools/tracing/rtla/src/timerlat_hist.c: timerlat_print_summary(struct timerlat_h data->hist[cpu].user_count); } trace_seq_printf(trace->seq, "\n"); -@@ tools/tracing/rtla/src/timerlat_hist.c: timerlat_print_stats_all(struct timerlat_hist_params *params, - trace_seq_printf(trace->seq, "count:"); - - if (!params->no_irq) -- trace_seq_printf(trace->seq, "%9d ", -+ trace_seq_printf(trace->seq, "%9llu ", - sum.irq_count); - - if (!params->no_thread) -- trace_seq_printf(trace->seq, "%9d ", -+ trace_seq_printf(trace->seq, "%9llu ", - sum.thread_count); - - if (params->user_hist) -- trace_seq_printf(trace->seq, "%9d ", -+ trace_seq_printf(trace->seq, "%9llu ", - sum.user_count); - - trace_seq_printf(trace->seq, "\n"); ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |
linux-stable-mirror@lists.linaro.org
-
Sasha Levin -
tglozar＠redhat.com