From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1C30CE7A8A for ; Sun, 24 Sep 2023 13:20:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229690AbjIXNUz (ORCPT ); Sun, 24 Sep 2023 09:20:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230062AbjIXNUf (ORCPT ); Sun, 24 Sep 2023 09:20:35 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61534199F; Sun, 24 Sep 2023 06:18:15 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C77C0C433C9; Sun, 24 Sep 2023 13:18:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695561494; bh=saj+chGnwjh7S35CsuTJGREeeGnhXO9XJmHMQRzmDbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XpFGAEowtsG6HwrIDAnvl88+X7IlK8bzmHmcfs5k5ExpBSQF0n+xEGN9gTSgvytnB 9A0NVrqdUo2Jbghy1soMDJJbsis+iE+lwnrD+ZRAMRAvW9eqMS0xgtemw7ra2MfIiK 6ajXSv5YNlKP9NcES3Q+w3gqQcrY2aqpabaGwtJ0iQDRzbMIXgKvnWfNtxsF+LIazv 65Swky9KuRRNTRvcqP1HEvk1+d7vl9QKcqF70E+Pix/kqYANnqY71BpS0B57R7VM0C +J4w8acRZ2JxPKmhiCDYCUrlvee1/xQfwHCXFzFyHl9qvOl1IAVHPoz2OdqfVq3q4o mfEy88XoLzrdQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheng Yejian , mhiramat@kernel.org, Steven Rostedt , Sasha Levin , 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 Message-Id: <20230924131745.1275960-10-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230924131745.1275960-1-sashal@kernel.org> References: <20230924131745.1275960-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.55 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zheng Yejian [ 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: Signed-off-by: Zheng Yejian Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- 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