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 X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A3E5C43219 for ; Wed, 23 Dec 2020 03:09:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DAE6420825 for ; Wed, 23 Dec 2020 03:09:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731769AbgLWDJX (ORCPT ); Tue, 22 Dec 2020 22:09:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:45396 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728195AbgLWCSi (ORCPT ); Tue, 22 Dec 2020 21:18:38 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id E386B23381; Wed, 23 Dec 2020 02:17:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608689847; bh=TqoOyum1PkdTKYoqs4bkCyAYkItNvacG/4fXDadPbp4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DWih1jsw5Zfb9CyxAIiQqaPkKRsUB1GhSwgzsNZnrrKaJuRT5gl2Wvye8N0STfGxo xg65oM3oINoLXAJIQv8dHwxuthhU9dHpLO/+kbAXa6XmR0bQeAF5vEjHFx+kukaGFx 6rAzikaYxo9D9M/lXflRLONY4zQyK+uWGdHFS8FxwtTcfi7cz1lI39k1qW28A0IK6i Jn4/G042Sbf0Shrp2snyoYldlj6Tn1LP9FYBtjcAZJl/d1WfiX3YzV+7zA+MsfsbKM e0xV1HHazmlVuwk1M1yFP1Sy1qlUqMBE20D78K77JCpcVOeIhGzdJEU0v1oidez7LN rx5OiIKQLchIQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Paul E. McKenney" , Sasha Levin , rcu@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 047/217] rcutorture: Prevent hangs for invalid arguments Date: Tue, 22 Dec 2020 21:13:36 -0500 Message-Id: <20201223021626.2790791-47-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021626.2790791-1-sashal@kernel.org> References: <20201223021626.2790791-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: "Paul E. McKenney" [ Upstream commit 4994684ce10924a0302567c315c91b0a64eeef46 ] If an rcutorture torture-test run is given a bad kvm.sh argument, the test will complain to the console, which is good. What is bad is that from the user's perspective, it will just hang for the time specified by the --duration argument. This commit therefore forces an immediate kernel shutdown if a rcu_torture_init()-time error occurs, thus avoiding the appearance of a hang. It also forces a console splat in this case to clearly indicate the presence of an error. Signed-off-by: Paul E. McKenney Signed-off-by: Sasha Levin --- kernel/rcu/rcutorture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index 916ea4f66e4b2..db3767110c608 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -2647,7 +2647,6 @@ rcu_torture_init(void) for (i = 0; i < ARRAY_SIZE(torture_ops); i++) pr_cont(" %s", torture_ops[i]->name); pr_cont("\n"); - WARN_ON(!IS_MODULE(CONFIG_RCU_TORTURE_TEST)); firsterr = -EINVAL; cur_ops = NULL; goto unwind; @@ -2815,6 +2814,10 @@ rcu_torture_init(void) unwind: torture_init_end(); rcu_torture_cleanup(); + if (shutdown_secs) { + WARN_ON(!IS_MODULE(CONFIG_RCU_TORTURE_TEST)); + kernel_power_off(); + } return firsterr; } -- 2.27.0