From patchwork Tue Jul 12 08:26:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zqiang X-Patchwork-Id: 12914621 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 4C178CCA480 for ; Tue, 12 Jul 2022 08:26:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231991AbiGLI0v (ORCPT ); Tue, 12 Jul 2022 04:26:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231847AbiGLI0r (ORCPT ); Tue, 12 Jul 2022 04:26:47 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2710D9FE32; Tue, 12 Jul 2022 01:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657614407; x=1689150407; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hEG3bam6mQkAnbScvVr12FW+q7oVU3bFp38DqJk5n6Q=; b=UO1+z+obfPnMN8rIHa1N3Q07iDWyoMB+2VbhLrjBeinRo491Q53Jd9sN kBAD5NPtMNls1F0mEIk35VCQ1bQ1x6cDMMZAfHS89ilNyWHaQIEh93ACk kxkItz4DpB5uShX2sJRm8JNncjWpLEFLLmSyeJkneXfT1xpOxHPyiTqdC hwgtUIK1/NxLfMgG41v1wRHg1QscDrzWsbPmFtdVibudVpyjasA9yxivk Prt9TAETTbNEy3mUyzeDKWoBrn/qNgz+uwO4+2w1pIm81kyAayS94kjjw sHAUiSniEU+RWw5AWt5FedsGpLcdBxH2XgPzmsJY0h7EzPD16tqi+jIZr g==; X-IronPort-AV: E=McAfee;i="6400,9594,10405"; a="346556759" X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="346556759" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2022 01:26:46 -0700 X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="622418031" Received: from zq-optiplex-7090.bj.intel.com ([10.238.156.125]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2022 01:26:43 -0700 From: Zqiang To: paulmck@kernel.org, frederic@kernel.org, quic_neeraju@quicinc.com, joel@joelfernandes.org Cc: rcu@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] rcu-tasks: Convert RCU_LOCKDEP_WARN() to WARN_ONCE() Date: Tue, 12 Jul 2022 16:26:05 +0800 Message-Id: <20220712082606.3662616-2-qiang1.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220712082606.3662616-1-qiang1.zhang@intel.com> References: <20220712082606.3662616-1-qiang1.zhang@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org For kernel build with CONFIG_PROVE_RCU=y and CONFIG_DEBUG_LOCK_ALLOC=y, when the synchronize_rcu_tasks_generic() called occurs during the rcu_scheduler_active variable is RCU_SCHEDULER_INACTIVE, the warnings will be trigger, however the warnings is not actually triggered because the debug_lockdep_rcu_enabled() return false(the rcu_scheduler_active != RCU_SCHEDULER_INACTIVE condition is false). This commit replace RCU_LOCKDEP_WARN() with WARN_ONCE() to trigger warnings. Signed-off-by: Zqiang --- kernel/rcu/tasks.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/rcu/tasks.h b/kernel/rcu/tasks.h index 83c7e6620d40..469bf2a3b505 100644 --- a/kernel/rcu/tasks.h +++ b/kernel/rcu/tasks.h @@ -560,7 +560,7 @@ static int __noreturn rcu_tasks_kthread(void *arg) static void synchronize_rcu_tasks_generic(struct rcu_tasks *rtp) { /* Complain if the scheduler has not started. */ - RCU_LOCKDEP_WARN(rcu_scheduler_active == RCU_SCHEDULER_INACTIVE, + WARN_ONCE(rcu_scheduler_active == RCU_SCHEDULER_INACTIVE, "synchronize_rcu_tasks called too soon"); // If the grace-period kthread is running, use it. From patchwork Tue Jul 12 08:26:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zqiang X-Patchwork-Id: 12914622 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 A61E5CCA47C for ; Tue, 12 Jul 2022 08:26:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232172AbiGLI0v (ORCPT ); Tue, 12 Jul 2022 04:26:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232100AbiGLI0t (ORCPT ); Tue, 12 Jul 2022 04:26:49 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34E4B79EC3; Tue, 12 Jul 2022 01:26:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657614409; x=1689150409; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=raPMXH9QSNw3E3vaUMbJH7s6s1TJ9z6kiv/MTcKgZRE=; b=ikgYxNTXueBadD8ofvd2ILIodkKgCBqpDZbojYYb/ifz97oN66rg+GaK q2fGKDAUvb6klrcWQGfmYiFFgoaliN27bQJXYmGKDtZp52rLILI3H3RNt DfPdyD0MxhBO5IOibHzof1V//kVGplLWFqKq8TF88ZwafEsCKiBj9Q9TC CCJ29VIZIIm4fBwhZxuskX9foWf4A6MTQLSze0+9TuKwIzjfWefAh8lH1 p2QJp1AwrSfwe2Dj0MXQB5a8QRfVLdcY2o7sLZmK5xCn8dVQFR5S8xlFd oGrvIBX0KNnj/pPY/W3fE/AHEdp9PbVTmdSO6sn4dGRwiZio2aMjz4laf w==; X-IronPort-AV: E=McAfee;i="6400,9594,10405"; a="346556766" X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="346556766" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2022 01:26:48 -0700 X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="622418047" Received: from zq-optiplex-7090.bj.intel.com ([10.238.156.125]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2022 01:26:45 -0700 From: Zqiang To: paulmck@kernel.org, frederic@kernel.org, quic_neeraju@quicinc.com, joel@joelfernandes.org Cc: rcu@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] rcu-tasks: Make synchronize_rcu_tasks_generic() no-ops on early booting Date: Tue, 12 Jul 2022 16:26:06 +0800 Message-Id: <20220712082606.3662616-3-qiang1.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220712082606.3662616-1-qiang1.zhang@intel.com> References: <20220712082606.3662616-1-qiang1.zhang@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org When the rcu_scheduler_active variable is RCU_SCHEDULER_INACTIVE and not yet converted to RCU_SCHEDULER_INIT, there is only idle task, any legal call synchronize_rcu_tasks_generic() is a quiescent state. this commit make synchronize_rcu_tasks_generic() no-ops when the rcu_scheduler_active variable is RCU_SCHEDULER_INACTIVE. Signed-off-by: Zqiang --- kernel/rcu/tasks.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/rcu/tasks.h b/kernel/rcu/tasks.h index 469bf2a3b505..0237e765c28e 100644 --- a/kernel/rcu/tasks.h +++ b/kernel/rcu/tasks.h @@ -560,8 +560,9 @@ static int __noreturn rcu_tasks_kthread(void *arg) static void synchronize_rcu_tasks_generic(struct rcu_tasks *rtp) { /* Complain if the scheduler has not started. */ - WARN_ONCE(rcu_scheduler_active == RCU_SCHEDULER_INACTIVE, - "synchronize_rcu_tasks called too soon"); + if (WARN_ONCE(rcu_scheduler_active == RCU_SCHEDULER_INACTIVE, + "synchronize_rcu_tasks called too soon")) + return; // If the grace-period kthread is running, use it. if (READ_ONCE(rtp->kthread_ptr)) {