]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.6-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 15 Dec 2024 09:28:26 +0000 (10:28 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 15 Dec 2024 09:28:26 +0000 (10:28 +0100)
added patches:
rtla-timerlat-make-timerlat_hist_cpu-_count-unsigned-long-long.patch

queue-6.6/rtla-timerlat-make-timerlat_hist_cpu-_count-unsigned-long-long.patch [new file with mode: 0644]
queue-6.6/series

diff --git a/queue-6.6/rtla-timerlat-make-timerlat_hist_cpu-_count-unsigned-long-long.patch b/queue-6.6/rtla-timerlat-make-timerlat_hist_cpu-_count-unsigned-long-long.patch
new file mode 100644 (file)
index 0000000..bd96941
--- /dev/null
@@ -0,0 +1,56 @@
+From 76b3102148135945b013797fac9b206273f0f777 Mon Sep 17 00:00:00 2001
+From: Tomas Glozar <tglozar@redhat.com>
+Date: Fri, 11 Oct 2024 14:10:15 +0200
+Subject: rtla/timerlat: Make timerlat_hist_cpu->*_count unsigned long long
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/tracing/rtla/src/timerlat_hist.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- 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_h
+                       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");
index 8ae1ffc6056a90aec6d36947605ea1d631836403..56cf68543744158fba6c164913f3342b852713dd 100644 (file)
@@ -31,3 +31,4 @@ bpf-fix-theoretical-prog_array-uaf-in-__uprobe_perf_func.patch
 bpf-perf-fix-invalid-prog_array-access-in-perf_event_detach_bpf_prog.patch
 bpf-sockmap-fix-race-between-element-replace-and-close.patch
 bpf-sockmap-fix-update-element-with-same.patch
+rtla-timerlat-make-timerlat_hist_cpu-_count-unsigned-long-long.patch