From patchwork Mon Jan 30 07:17:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zqiang X-Patchwork-Id: 13120435 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 A4C7BC54EAA for ; Mon, 30 Jan 2023 07:12:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229728AbjA3HMq (ORCPT ); Mon, 30 Jan 2023 02:12:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229578AbjA3HMp (ORCPT ); Mon, 30 Jan 2023 02:12:45 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4789824136; Sun, 29 Jan 2023 23:12:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675062765; x=1706598765; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/kRsQekL3gSMu+18072dhX1Nw5f8rt/kMTmhQ4446YE=; b=QD7fF2CzV/2V0wocD7Hkq2P+6lR63CBBut84CQ1lmcjpMnTPOtRjAA0a cRS4yw8ZB51Xq5XgDS3JCR/M2Gt5dk8k9DXJoDa1fihN8CzRAjwqVtwT7 +byw4pCrfE3O2sxI/yM8RxWCWNB4Vm1EgUWo2ljZpJlu76xcTQ1jfEN5E Vi5mgRuCdgE/TudoSFuhyTiBZI2KavnB4ztXCRXOVaZtmMnwjyfXkpnTK 8r/zf5WEBZelxQBQ+BROiodoAPhoc296XZg8FMXTpjhcrWmywHG1+vpU2 ywq33jjzP1xEMtfoIuEXbsgyXWEAxIBrZSQES5uNrFsfWq82ABryi4zBt Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="327505407" X-IronPort-AV: E=Sophos;i="5.97,257,1669104000"; d="scan'208";a="327505407" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2023 23:12:31 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="787914039" X-IronPort-AV: E=Sophos;i="5.97,257,1669104000"; d="scan'208";a="787914039" Received: from zq-optiplex-7090.bj.intel.com ([10.238.156.129]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2023 23:12:28 -0800 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] rcu: Register rcu-lazy shrinker only CONFIG_RCU_LAZY is enabled Date: Mon, 30 Jan 2023 15:17:37 +0800 Message-Id: <20230130071737.2806534-1-qiang1.zhang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org The rcu-lazy shrinker is registered without CONFIG_RCU_LAZY enabled is meaningless, this commit therefore make rcu-lazy shrinker is registered only when CONFIG_RCU_LAZY is enabled. Signed-off-by: Zqiang Reviewed-by: Joel Fernandes (Google) --- kernel/rcu/tree_nocb.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/rcu/tree_nocb.h b/kernel/rcu/tree_nocb.h index 9e1c8caec5ce..28c1c092817b 100644 --- a/kernel/rcu/tree_nocb.h +++ b/kernel/rcu/tree_nocb.h @@ -1312,6 +1312,7 @@ int rcu_nocb_cpu_offload(int cpu) } EXPORT_SYMBOL_GPL(rcu_nocb_cpu_offload); +#ifdef CONFIG_RCU_LAZY static unsigned long lazy_rcu_shrink_count(struct shrinker *shrink, struct shrink_control *sc) { @@ -1360,6 +1361,7 @@ static struct shrinker lazy_rcu_shrinker = { .batch = 0, .seeks = DEFAULT_SEEKS, }; +#endif void __init rcu_init_nohz(void) { @@ -1391,8 +1393,10 @@ void __init rcu_init_nohz(void) if (!rcu_state.nocb_is_setup) return; +#ifdef CONFIG_RCU_LAZY if (register_shrinker(&lazy_rcu_shrinker, "rcu-lazy")) pr_err("Failed to register lazy_rcu shrinker!\n"); +#endif if (!cpumask_subset(rcu_nocb_mask, cpu_possible_mask)) { pr_info("\tNote: kernel parameter 'rcu_nocbs=', 'nohz_full', or 'isolcpus=' contains nonexistent CPUs.\n");