]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tracing: Avoid possible softlockup in tracing_iter_reset()
authorZheng Yejian <zhengyejian@huaweicloud.com>
Tue, 27 Aug 2024 12:46:54 +0000 (20:46 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Sep 2024 09:06:43 +0000 (11:06 +0200)
commit 49aa8a1f4d6800721c7971ed383078257f12e8f9 upstream.

In __tracing_open(), when max latency tracers took place on the cpu,
the time start of its buffer would be updated, then event entries with
timestamps being earlier than start of the buffer would be skipped
(see tracing_iter_reset()).

Softlockup will occur if the kernel is non-preemptible and too many
entries were skipped in the loop that reset every cpu buffer, so add
cond_resched() to avoid it.

Cc: stable@vger.kernel.org
Fixes: 2f26ebd549b9a ("tracing: use timestamp to determine start of latency traces")
Link: https://lore.kernel.org/20240827124654.3817443-1-zhengyejian@huaweicloud.com
Suggested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Zheng Yejian <zhengyejian@huaweicloud.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/trace/trace.c

index 22e1e57118698c608c0ae66ebdbc61be661016b3..b16291f4c573191187816935cd153e77b4351eef 100644 (file)
@@ -3742,6 +3742,8 @@ void tracing_iter_reset(struct trace_iterator *iter, int cpu)
                        break;
                entries++;
                ring_buffer_iter_advance(buf_iter);
+               /* This could be a big loop */
+               cond_resched();
        }
 
        per_cpu_ptr(iter->array_buffer->data, cpu)->skipped_entries = entries;