Commit 8e4ec3d0 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

refperf: Rename RCU_REF_PERF_TEST to RCU_REF_SCALE_TEST 



The old Kconfig option name is all too easy to conflate with the
unrelated "perf" feature, so this commit renames RCU_REF_PERF_TEST to
RCU_REF_SCALE_TEST.

Reported-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent c7dcf810

kernel/rcu/Kconfig.debug

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ config RCU_TORTURE_TEST 
	  Say M if you want the RCU torture tests to build as a module.

	  Say N if you are unsure.



config RCU_REF_PERF_TEST

	tristate "Performance tests for read-side synchronization (RCU and others)"

config RCU_REF_SCALE_TEST

	tristate "Scalability tests for read-side synchronization (RCU and others)"

	depends on DEBUG_KERNEL

	select TORTURE_TEST

	select SRCU

kernel/rcu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ obj-$(CONFIG_TREE_SRCU) += srcutree.o 
obj-$(CONFIG_TINY_SRCU) += srcutiny.o

obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o

obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o

obj-$(CONFIG_RCU_REF_PERF_TEST) += refperf.o

obj-$(CONFIG_RCU_REF_SCALE_TEST) += refperf.o

obj-$(CONFIG_TREE_RCU) += tree.o

obj-$(CONFIG_TINY_RCU) += tiny.o

obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.o

kernel/rcu/refperf.c

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

//

// Performance test comparing RCU vs other mechanisms

// Scalability test comparing RCU vs other mechanisms

// for acquiring references on objects.

//

// Copyright (C) Google, 2020.
@@ -59,7 +59,7 @@ MODULE_PARM_DESC(perf_type, "Type of test (rcu, srcu, refcnt, rwsem, rwlock."); 
torture_param(int, verbose, 0, "Enable verbose debugging printk()s");



// Wait until there are multiple CPUs before starting test.

torture_param(int, holdoff, IS_BUILTIN(CONFIG_RCU_REF_PERF_TEST) ? 10 : 0,

torture_param(int, holdoff, IS_BUILTIN(CONFIG_RCU_REF_SCALE_TEST) ? 10 : 0,

	      "Holdoff time before test start (s)");

// Number of loops per experiment, all readers execute operations concurrently.

torture_param(long, loops, 10000, "Number of loops per experiment.");
@@ -656,7 +656,7 @@ ref_perf_init(void) 
		for (i = 0; i < ARRAY_SIZE(perf_ops); i++)

			pr_cont(" %s", perf_ops[i]->name);

		pr_cont("\n");

		WARN_ON(!IS_MODULE(CONFIG_RCU_REF_PERF_TEST));

		WARN_ON(!IS_MODULE(CONFIG_RCU_REF_SCALE_TEST));

		firsterr = -EINVAL;

		cur_ops = NULL;

		goto unwind;

tools/testing/selftests/rcutorture/configs/refperf/CFcommon

+1 −1
Original line number Diff line number Diff line 
CONFIG_RCU_REF_PERF_TEST=y

CONFIG_RCU_REF_SCALE_TEST=y

CONFIG_PRINTK_TIME=y