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 B53E0C433FE for ; Tue, 18 Jan 2022 03:48:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350690AbiARDs1 (ORCPT ); Mon, 17 Jan 2022 22:48:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347086AbiARCki (ORCPT ); Mon, 17 Jan 2022 21:40:38 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECE95C07E5F8; Mon, 17 Jan 2022 18:36:19 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8A07260C74; Tue, 18 Jan 2022 02:36:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21A79C36AEF; Tue, 18 Jan 2022 02:36:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642473379; bh=1XtZLBYLo8vRVDv6RwMfDJXo36eB71DbQs/OchA+8xU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=acyHblEAmKy3DGkNKxTbQ91FPvQeQNeyJebsxkW20PQ5/gBcQlNWkaXhRZFqQxePR M6HUzT4frlXPRz5sdHxl1/mCSzTPNizM/uvvfqdldUlUMiJiplNfb+uAQaEqiYBNbJ VvgVae6MPiaWDF/HpVsscCmt9SYhx1eaqZWTcVNUNiwjW0dxjngNgiEoRGPSQ8Kw9K pycXhf5zKzfhlc3hIB809XD5zkCg1iv8mYnJALAK6oz2Vjqx5my84MzlUl9PXHwu9v F/8exNN504zR1pP76Cmuaq8/j+9H2/u93kyl8HTfSKYHYoCRSUr9bPXy0MZWxdQfqo Nur/aEcyO0W7w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wander Lairson Costa , "Paul E . McKenney" , Sasha Levin , dave@stgolabs.net, josh@joshtriplett.org, rcu@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 092/188] rcutorture: Avoid soft lockup during cpu stall Date: Mon, 17 Jan 2022 21:30:16 -0500 Message-Id: <20220118023152.1948105-92-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118023152.1948105-1-sashal@kernel.org> References: <20220118023152.1948105-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wander Lairson Costa [ Upstream commit 5ff7c9f9d7e3e0f6db5b81945fa11b69d62f433a ] If we use the module stall_cpu option, we may get a soft lockup warning in case we also don't pass the stall_cpu_block option. Introduce the stall_no_softlockup option to avoid a soft lockup on cpu stall even if we don't use the stall_cpu_block option. Signed-off-by: Wander Lairson Costa Signed-off-by: Paul E. McKenney Signed-off-by: Sasha Levin --- kernel/rcu/rcutorture.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index 968696ace8f3f..f922937eb39ad 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -46,6 +46,7 @@ #include #include #include +#include #include "rcu.h" @@ -109,6 +110,8 @@ torture_param(int, shutdown_secs, 0, "Shutdown time (s), <= zero to disable."); torture_param(int, stall_cpu, 0, "Stall duration (s), zero to disable."); torture_param(int, stall_cpu_holdoff, 10, "Time to wait before starting stall (s)."); +torture_param(bool, stall_no_softlockup, false, + "Avoid softlockup warning during cpu stall."); torture_param(int, stall_cpu_irqsoff, 0, "Disable interrupts while stalling."); torture_param(int, stall_cpu_block, 0, "Sleep while stalling."); torture_param(int, stall_gp_kthread, 0, @@ -2052,6 +2055,8 @@ static int rcu_torture_stall(void *args) #else schedule_timeout_uninterruptible(HZ); #endif + } else if (stall_no_softlockup) { + touch_softlockup_watchdog(); } if (stall_cpu_irqsoff) local_irq_enable(); -- 2.34.1