mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Zheng Yejian <zhengyejian1@huawei.com>
Subject: [for-linus][PATCH 09/15] ring-buffer: Avoid softlockup in ring_buffer_resize()
Date: Fri, 08 Sep 2023 23:16:24 -0400	[thread overview]
Message-ID: <20230909032349.854283780@goodmis.org> (raw)
In-Reply-To: <20230909031615.047488015@goodmis.org>

From: Zheng Yejian <zhengyejian1@huawei.com>

When user resize all trace ring buffer through file 'buffer_size_kb',
then in ring_buffer_resize(), kernel allocates buffer pages for each
cpu in a loop.

If the kernel preemption model is PREEMPT_NONE and there are many cpus
and there are many buffer pages to be allocated, it may not give up cpu
for a long time and finally cause a softlockup.

To avoid it, call cond_resched() after each cpu buffer allocation.

Link: https://lore.kernel.org/linux-trace-kernel/20230906081930.3939106-1-zhengyejian1@huawei.com

Cc: <mhiramat@kernel.org>
Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 kernel/trace/ring_buffer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 78502d4c7214..72ccf75defd0 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2198,6 +2198,8 @@ int ring_buffer_resize(struct trace_buffer *buffer, unsigned long size,
 				err = -ENOMEM;
 				goto out_err;
 			}
+
+			cond_resched();
 		}
 
 		cpus_read_lock();
-- 
2.40.1

  parent reply	other threads:[~2023-09-09  3:24 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-09  3:16 [for-linus][PATCH 00/15] tracing: Fixes for 6.6 Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 01/15] tracefs: Add missing lockdown check to tracefs_create_dir() Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 02/15] tracefs/eventfs: Add missing lockdown checks Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 03/15] tracefs/eventfs: Use dput to free the toplevel events directory Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 04/15] tracing: Increase trace array ref count on enable and filter files Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 05/15] tracing: Have tracing_max_latency inc the trace array ref count Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 06/15] tracing: Have current_trace " Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 07/15] tracing: Have option files " Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 08/15] tracing: Have event inject " Steven Rostedt
2023-09-09  3:16 ` Steven Rostedt [this message]
2023-09-09  3:16 ` [for-linus][PATCH 10/15] tracefs/eventfs: Free top level files on removal Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 11/15] ring-buffer: Do not attempt to read past "commit" Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 12/15] tracing: Use the new eventfs descriptor for print trigger Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 13/15] tracing: Remove unused trace_event_file dir field Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 14/15] selftests/ftrace: Fix dependencies for some of the synthetic event tests Steven Rostedt
2023-09-09  3:16 ` [for-linus][PATCH 15/15] tracing/synthetic: Fix order of struct trace_dynamic_info Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230909032349.854283780@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mhiramat@kernel.org \
    --cc=zhengyejian1@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®