From: "Paul E. McKenney" <paulmck@kernel.org>
To: rcu@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com,
rostedt@goodmis.org, "Paul E. McKenney" <paulmck@kernel.org>
Subject: [PATCH rcu 10/12] rcuscale: Allow rcuscale without RCU Tasks
Date: Mon, 18 Apr 2022 17:12:31 -0700 [thread overview]
Message-ID: <20220419001233.3950188-10-paulmck@kernel.org> (raw)
In-Reply-To: <20220419001123.GA3949851@paulmck-ThinkPad-P17-Gen-1>
Currently, a CONFIG_PREEMPT_NONE=y kernel substitutes normal RCU for
RCU Tasks. Unless that kernel builds rcuscale, whether built-in or as
a module, in which case RCU Tasks is (unnecessarily) built. This both
increases kernel size and increases the complexity of certain tracing
operations. This commit therefore decouples the presence of rcuscale
from the presence of RCU Tasks.
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
kernel/rcu/Kconfig.debug | 1 -
kernel/rcu/rcuscale.c | 12 +++++++++++-
.../selftests/rcutorture/configs/rcuscale/CFcommon | 4 ++--
.../selftests/rcutorture/configs/rcuscale/TREE | 2 ++
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/kernel/rcu/Kconfig.debug b/kernel/rcu/Kconfig.debug
index dceaa3e754e5..71e73fceff87 100644
--- a/kernel/rcu/Kconfig.debug
+++ b/kernel/rcu/Kconfig.debug
@@ -28,7 +28,6 @@ config RCU_SCALE_TEST
depends on DEBUG_KERNEL
select TORTURE_TEST
select SRCU
- select TASKS_RCU
select TASKS_RUDE_RCU
select TASKS_TRACE_RCU
default n
diff --git a/kernel/rcu/rcuscale.c b/kernel/rcu/rcuscale.c
index 5e4f1f83d38e..311dbcb064ed 100644
--- a/kernel/rcu/rcuscale.c
+++ b/kernel/rcu/rcuscale.c
@@ -268,6 +268,8 @@ static struct rcu_scale_ops srcud_ops = {
.name = "srcud"
};
+#ifdef CONFIG_TASKS_RCU
+
/*
* Definitions for RCU-tasks scalability testing.
*/
@@ -295,6 +297,14 @@ static struct rcu_scale_ops tasks_ops = {
.name = "tasks"
};
+#define TASKS_OPS &tasks_ops,
+
+#else // #ifdef CONFIG_TASKS_RCU
+
+#define TASKS_OPS
+
+#endif // #else // #ifdef CONFIG_TASKS_RCU
+
/*
* Definitions for RCU-tasks-trace scalability testing.
*/
@@ -797,7 +807,7 @@ rcu_scale_init(void)
long i;
int firsterr = 0;
static struct rcu_scale_ops *scale_ops[] = {
- &rcu_ops, &srcu_ops, &srcud_ops, &tasks_ops, &tasks_tracing_ops
+ &rcu_ops, &srcu_ops, &srcud_ops, TASKS_OPS &tasks_tracing_ops
};
if (!torture_init_begin(scale_type, verbose))
diff --git a/tools/testing/selftests/rcutorture/configs/rcuscale/CFcommon b/tools/testing/selftests/rcutorture/configs/rcuscale/CFcommon
index 90942bb5bebc..2ed3b46a9c37 100644
--- a/tools/testing/selftests/rcutorture/configs/rcuscale/CFcommon
+++ b/tools/testing/selftests/rcutorture/configs/rcuscale/CFcommon
@@ -1,5 +1,5 @@
CONFIG_RCU_SCALE_TEST=y
CONFIG_PRINTK_TIME=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
-CONFIG_TASKS_TRACE_RCU=y
+CONFIG_FORCE_TASKS_RCU=y
+#CHECK#CONFIG_TASKS_RCU=y
diff --git a/tools/testing/selftests/rcutorture/configs/rcuscale/TREE b/tools/testing/selftests/rcutorture/configs/rcuscale/TREE
index f110d9ffbe4c..b10706fd03a4 100644
--- a/tools/testing/selftests/rcutorture/configs/rcuscale/TREE
+++ b/tools/testing/selftests/rcutorture/configs/rcuscale/TREE
@@ -16,3 +16,5 @@ CONFIG_RCU_BOOST=n
CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
CONFIG_RCU_EXPERT=y
CONFIG_RCU_TRACE=y
+CONFIG_KPROBES=n
+CONFIG_FTRACE=n
--
2.31.1.189.g2e36527f23
next prev parent reply other threads:[~2022-04-19 0:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 0:11 [PATCH rcu 0/12] RCU-tasks torture-test updates Paul E. McKenney
2022-04-19 0:12 ` [PATCH rcu 01/12] rcu: Make TASKS_RUDE_RCU select IRQ_WORK Paul E. McKenney
2022-04-19 0:12 ` [PATCH rcu 02/12] rcu: Make the TASKS_RCU Kconfig option be selected Paul E. McKenney
2022-04-19 14:13 ` Masami Hiramatsu
2022-04-19 14:25 ` Paul E. McKenney
2022-04-19 0:12 ` [PATCH rcu 03/12] rcutorture: Allow rcutorture without RCU Tasks Trace Paul E. McKenney
2022-04-19 0:12 ` [PATCH rcu 04/12] rcutorture: Allow rcutorture without RCU Tasks Paul E. McKenney
2022-04-19 0:12 ` [PATCH rcu 05/12] rcutorture: Allow rcutorture without RCU Tasks Rude Paul E. McKenney
2022-04-19 0:12 ` [PATCH rcu 06/12] rcutorture: Add CONFIG_PREEMPT_DYNAMIC=n to TASKS02 scenario Paul E. McKenney
2022-04-19 0:12 ` [PATCH rcu 07/12] rcutorture: Allow specifying per-scenario stat_interval Paul E. McKenney
2022-04-19 0:12 ` [PATCH rcu 08/12] refscale: Allow refscale without RCU Tasks Paul E. McKenney
2022-04-19 0:12 ` [PATCH rcu 09/12] refscale: Allow refscale without RCU Tasks Rude/Trace Paul E. McKenney
2022-04-19 0:12 ` Paul E. McKenney [this message]
2022-04-19 0:12 ` [PATCH rcu 11/12] rcuscale: Allow rcuscale " Paul E. McKenney
2022-04-19 0:12 ` [PATCH rcu 12/12] scftorture: Adjust for TASKS_RCU Kconfig option being selected Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220419001233.3950188-10-paulmck@kernel.org \
--to=paulmck@kernel.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rcu@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®