Commit 4df002d9 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcuscale: Allow rcuscale without RCU Tasks 



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: default avatarPaul E. McKenney <paulmck@kernel.org>
parent dec86781

kernel/rcu/Kconfig.debug

+0 −1
Original line number Diff line number Diff line
@@ -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

kernel/rcu/rcuscale.c

+11 −1
Original line number Diff line number Diff line
@@ -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))

tools/testing/selftests/rcutorture/configs/rcuscale/CFcommon

+2 −2
Original line number Diff line number Diff line 
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

tools/testing/selftests/rcutorture/configs/rcuscale/TREE

+2 −0
Original line number Diff line number Diff line
@@ -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