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 21B9CEB64D9 for ; Sun, 2 Jul 2023 19:41:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231715AbjGBTlY (ORCPT ); Sun, 2 Jul 2023 15:41:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231633AbjGBTlB (ORCPT ); Sun, 2 Jul 2023 15:41:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E5CE1725; Sun, 2 Jul 2023 12:40:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 524AA60CE8; Sun, 2 Jul 2023 19:39:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0301C433C7; Sun, 2 Jul 2023 19:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688326754; bh=pexP+Ju7knjMu0xJI9XrT5m97IMWiJu/StdvZHL0Ky4=; h=From:To:Cc:Subject:Date:From; b=fDSs3vJxBYeegINu47d4CyjN6kYUuN07aB8d7aCZFJgDgvx31O+PZnEf+tXob7LCl MSEoiQasZlJP8l87GpJFpm5UaYva1raWDPbB9p7LknfbeSFFpqr7FC3NkSn0Rh2OFd 17wxPEulAOg8FIZI4w9Qr2uQP/kWeMoe55bF7vkJ8Hpd86T6Faz08NLeYn3RBcu84p BcJHvyWFklhjIe6lJZFVj3nOvi6BaGlnz6bVIpOAeaarZQJwmm7WlCFgbuCEiQtzKg 59Yq10On4YWcQHpmnpjIR6j7Jh9QQY5s7Eo0WplkryXBYNddZhMPBjhoAb9Uig06jf fKgYZmpi/U2IQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Paul E. McKenney" , Boqun Feng , Sasha Levin , dave@stgolabs.net, josh@joshtriplett.org, frederic@kernel.org, quic_neeraju@quicinc.com, joel@joelfernandes.org, rcu@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 1/2] refscale: Move shutdown from wait_event() to wait_event_idle() Date: Sun, 2 Jul 2023 15:39:10 -0400 Message-Id: <20230702193911.1776189-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.119 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Paul E. McKenney" [ Upstream commit 6bc6e6b27524304aadb9c04611ddb1c84dd7617a ] The ref_scale_shutdown() kthread/function uses wait_event() to wait for the refscale test to complete. However, although the read-side tests are normally extremely fast, there is no law against specifying a very large value for the refscale.loops module parameter or against having a slow read-side primitive. Either way, this might well trigger the hung-task timeout. This commit therefore replaces those wait_event() calls with calls to wait_event_idle(), which do not trigger the hung-task timeout. Signed-off-by: Paul E. McKenney Signed-off-by: Boqun Feng Signed-off-by: Sasha Levin --- kernel/rcu/refscale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/rcu/refscale.c b/kernel/rcu/refscale.c index 66dc14cf5687e..5abb0cf52803a 100644 --- a/kernel/rcu/refscale.c +++ b/kernel/rcu/refscale.c @@ -777,7 +777,7 @@ ref_scale_cleanup(void) static int ref_scale_shutdown(void *arg) { - wait_event(shutdown_wq, shutdown_start); + wait_event_idle(shutdown_wq, shutdown_start); smp_mb(); // Wake before output. ref_scale_cleanup(); -- 2.39.2