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.

Paul E. McKenney committed 6 years ago

Commit 8e4ec3d1 parent c7dcf814 files · +7 −7Browse files

Unified · Split

4 files

kernel/rcu/Kconfig.debug +2 −2
kernel/rcu/Makefile +1 −1
kernel/rcu/refperf.c +3 −3
tools/testing/selftests/rcutorture/configs/refperf/CFcommon +1 −1

kernel/rcu/Kconfig.debug+2−2

@@ -61,8 +61,8 @@ config RCU_TORTURE_TEST · 60 unmodified lines
61	Say M if you want the RCU torture tests to build as a module.	61	Say M if you want the RCU torture tests to build as a module.
62	Say N if you are unsure.	62	Say N if you are unsure.
63		63
64	config RCU_REF_PERF_TEST	64	config RCU_REF_SCALE_TEST
65	tristate "Performance tests for read-side synchronization (RCU and others)"	65	tristate "Scalability tests for read-side synchronization (RCU and others)"
66	depends on DEBUG_KERNEL	66	depends on DEBUG_KERNEL
67	select TORTURE_TEST	67	select TORTURE_TEST
68	select SRCU	68	select SRCU

kernel/rcu/Makefile+1−1

@@ -12,7 +12,7 @@ obj-$(CONFIG_TREE_SRCU) += srcutree.o · 11 unmodified lines
12	obj-$(CONFIG_TINY_SRCU) += srcutiny.o	12	obj-$(CONFIG_TINY_SRCU) += srcutiny.o
13	obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o	13	obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o
14	obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o	14	obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o
15	obj-$(CONFIG_RCU_REF_PERF_TEST) += refperf.o	15	obj-$(CONFIG_RCU_REF_SCALE_TEST) += refperf.o
16	obj-$(CONFIG_TREE_RCU) += tree.o	16	obj-$(CONFIG_TREE_RCU) += tree.o
17	obj-$(CONFIG_TINY_RCU) += tiny.o	17	obj-$(CONFIG_TINY_RCU) += tiny.o
18	obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.o	18	obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.o

kernel/rcu/refperf.c+3−3

@@ -1,6 +1,6 @@
1	// SPDX-License-Identifier: GPL-2.0+	1	// SPDX-License-Identifier: GPL-2.0+
2	//	2	//
3	// Performance test comparing RCU vs other mechanisms	3	// Scalability test comparing RCU vs other mechanisms
4	// for acquiring references on objects.	4	// for acquiring references on objects.
5	//	5	//
6	// Copyright (C) Google, 2020.	6	// Copyright (C) Google, 2020.
@@ -59,7 +59,7 @@ MODULE_PARM_DESC(perf_type, "Type of test (rcu, srcu, refcnt, rwsem, rwlock."); · 52 unmodified lines
59	torture_param(int, verbose, 0, "Enable verbose debugging printk()s");	59	torture_param(int, verbose, 0, "Enable verbose debugging printk()s");
60		60
61	// Wait until there are multiple CPUs before starting test.	61	// Wait until there are multiple CPUs before starting test.
62	torture_param(int, holdoff, IS_BUILTIN(CONFIG_RCU_REF_PERF_TEST) ? 10 : 0,	62	torture_param(int, holdoff, IS_BUILTIN(CONFIG_RCU_REF_SCALE_TEST) ? 10 : 0,
63	"Holdoff time before test start (s)");	63	"Holdoff time before test start (s)");
64	// Number of loops per experiment, all readers execute operations concurrently.	64	// Number of loops per experiment, all readers execute operations concurrently.
65	torture_param(long, loops, 10000, "Number of loops per experiment.");	65	torture_param(long, loops, 10000, "Number of loops per experiment.");
@@ -656,7 +656,7 @@ ref_perf_init(void) · 590 unmodified lines
656	for (i = 0; i < ARRAY_SIZE(perf_ops); i++)	656	for (i = 0; i < ARRAY_SIZE(perf_ops); i++)
657	pr_cont(" %s", perf_ops[i]->name);	657	pr_cont(" %s", perf_ops[i]->name);
658	pr_cont("\n");	658	pr_cont("\n");
659	WARN_ON(!IS_MODULE(CONFIG_RCU_REF_PERF_TEST));	659	WARN_ON(!IS_MODULE(CONFIG_RCU_REF_SCALE_TEST));
660	firsterr = -EINVAL;	660	firsterr = -EINVAL;
661	cur_ops = NULL;	661	cur_ops = NULL;
662	goto unwind;	662	goto unwind;

tools/testing/selftests/rcutorture/configs/refperf/CFcommon+1−1

@@ -1,2 +1,2 @@
1	CONFIG_RCU_REF_PERF_TEST=y	1	CONFIG_RCU_REF_SCALE_TEST=y
2	CONFIG_PRINTK_TIME=y	2	CONFIG_PRINTK_TIME=y

refperf: Rename RCU_REF_PERF_TEST to RCU_REF_SCALE_TEST

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code