From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Zheng Yejian <zhengyejian1@huawei.com>,
mhiramat@kernel.org, Steven Rostedt <rostedt@goodmis.org>,
Sasha Levin <sashal@kernel.org>,
linux-trace-kernel@vger.kernel.org
Subject: [PATCH AUTOSEL 6.1 10/28] ring-buffer: Avoid softlockup in ring_buffer_resize()
Date: Sun, 24 Sep 2023 09:17:27 -0400 [thread overview]
Message-ID: <20230924131745.1275960-10-sashal@kernel.org> (raw)
In-Reply-To: <20230924131745.1275960-1-sashal@kernel.org>
From: Zheng Yejian <zhengyejian1@huawei.com>
[ Upstream commit f6bd2c92488c30ef53b5bd80c52f0a7eee9d545a ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.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 de55107aef5d5..42ad59a002365 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2212,6 +2212,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
next prev parent reply other threads:[~2023-09-24 13:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-24 13:17 [PATCH AUTOSEL 6.1 01/28] nvme-fc: Prevent null pointer dereference in nvme_fc_io_getuuid() Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 02/28] parisc: sba: Fix compile warning wrt list of SBA devices Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 03/28] parisc: iosapic.c: Fix sparse warnings Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 04/28] parisc: drivers: Fix sparse warning Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 05/28] parisc: irq: Make irq_stack_union static to avoid " Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 06/28] scsi: qedf: Add synchronization between I/O completions and abort Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 07/28] scsi: ufs: core: Move __ufshcd_send_uic_cmd() outside host_lock Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 08/28] scsi: ufs: core: Poll HCS.UCRDY before issuing a UIC command Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 09/28] selftests/ftrace: Correctly enable event in instance-event.tc Sasha Levin
2023-09-24 13:17 ` Sasha Levin [this message]
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 11/28] btrfs: improve error message after failure to add delayed dir index item Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 12/28] btrfs: assert delayed node locked when removing delayed item Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 13/28] selftests: fix dependency checker script Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 14/28] ring-buffer: Do not attempt to read past "commit" Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 15/28] net/smc: bugfix for smcr v2 server connect success statistic Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 16/28] ata: sata_mv: Fix incorrect string length computation in mv_dump_mem() Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 17/28] platform/mellanox: mlxbf-bootctl: add NET dependency into Kconfig Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 18/28] platform/x86: asus-wmi: Support 2023 ROG X16 tablet mode Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 19/28] thermal/of: add missing of_node_put() Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 20/28] drm/amd/display: Don't check registers, if using AUX BL control Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 21/28] drm/amdgpu/soc21: don't remap HDP registers for SR-IOV Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 22/28] drm/amdgpu/nbio4.3: set proper rmmio_remap.reg_offset " Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 23/28] drm/amdgpu: Handle null atom context in VBIOS info ioctl Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 24/28] riscv: errata: fix T-Head dcache.cva encoding Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 25/28] scsi: pm80xx: Use phy-specific SAS address when sending PHY_START command Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 26/28] scsi: pm80xx: Avoid leaking tags when processing OPC_INB_SET_CONTROLLER_CONFIG command Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 27/28] smb3: correct places where ENOTSUPP is used instead of preferred EOPNOTSUPP Sasha Levin
2023-09-24 13:17 ` [PATCH AUTOSEL 6.1 28/28] ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset() Sasha Levin
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=20230924131745.1275960-10-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=rostedt@goodmis.org \
--cc=stable@vger.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