Skip to content

Commit 4e88ec4

Browse files
committed
rcuperf: Change rcuperf to rcuscale
This commit further avoids conflation of rcuperf with the kernel's perf feature by renaming kernel/rcu/rcuperf.c to kernel/rcu/rcuscale.c, and also by similarly renaming the functions and variables inside this file. This has the side effect of changing the names of the kernel boot parameters, so kernel-parameters.txt and ver_functions.sh are also updated. The rcutorture --torture type was also updated from rcuperf to rcuscale. [ paulmck: Fix bugs located by Stephen Rothwell. ] Reported-by: Ingo Molnar <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]>
1 parent 65bd77f commit 4e88ec4

File tree

16 files changed

+207
-206
lines changed

16 files changed

+207
-206
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4157,41 +4157,41 @@
41574157
rcu_node tree with an eye towards determining
41584158
why a new grace period has not yet started.
41594159

4160-
rcuperf.gp_async= [KNL]
4160+
rcuscale.gp_async= [KNL]
41614161
Measure performance of asynchronous
41624162
grace-period primitives such as call_rcu().
41634163

4164-
rcuperf.gp_async_max= [KNL]
4164+
rcuscale.gp_async_max= [KNL]
41654165
Specify the maximum number of outstanding
41664166
callbacks per writer thread. When a writer
41674167
thread exceeds this limit, it invokes the
41684168
corresponding flavor of rcu_barrier() to allow
41694169
previously posted callbacks to drain.
41704170

4171-
rcuperf.gp_exp= [KNL]
4171+
rcuscale.gp_exp= [KNL]
41724172
Measure performance of expedited synchronous
41734173
grace-period primitives.
41744174

4175-
rcuperf.holdoff= [KNL]
4175+
rcuscale.holdoff= [KNL]
41764176
Set test-start holdoff period. The purpose of
41774177
this parameter is to delay the start of the
41784178
test until boot completes in order to avoid
41794179
interference.
41804180

4181-
rcuperf.kfree_rcu_test= [KNL]
4181+
rcuscale.kfree_rcu_test= [KNL]
41824182
Set to measure performance of kfree_rcu() flooding.
41834183

4184-
rcuperf.kfree_nthreads= [KNL]
4184+
rcuscale.kfree_nthreads= [KNL]
41854185
The number of threads running loops of kfree_rcu().
41864186

4187-
rcuperf.kfree_alloc_num= [KNL]
4187+
rcuscale.kfree_alloc_num= [KNL]
41884188
Number of allocations and frees done in an iteration.
41894189

4190-
rcuperf.kfree_loops= [KNL]
4191-
Number of loops doing rcuperf.kfree_alloc_num number
4190+
rcuscale.kfree_loops= [KNL]
4191+
Number of loops doing rcuscale.kfree_alloc_num number
41924192
of allocations and frees.
41934193

4194-
rcuperf.nreaders= [KNL]
4194+
rcuscale.nreaders= [KNL]
41954195
Set number of RCU readers. The value -1 selects
41964196
N, where N is the number of CPUs. A value
41974197
"n" less than -1 selects N-n+1, where N is again
@@ -4200,23 +4200,23 @@
42004200
A value of "n" less than or equal to -N selects
42014201
a single reader.
42024202

4203-
rcuperf.nwriters= [KNL]
4203+
rcuscale.nwriters= [KNL]
42044204
Set number of RCU writers. The values operate
4205-
the same as for rcuperf.nreaders.
4205+
the same as for rcuscale.nreaders.
42064206
N, where N is the number of CPUs
42074207

4208-
rcuperf.perf_type= [KNL]
4208+
rcuscale.perf_type= [KNL]
42094209
Specify the RCU implementation to test.
42104210

4211-
rcuperf.shutdown= [KNL]
4211+
rcuscale.shutdown= [KNL]
42124212
Shut the system down after performance tests
42134213
complete. This is useful for hands-off automated
42144214
testing.
42154215

4216-
rcuperf.verbose= [KNL]
4216+
rcuscale.verbose= [KNL]
42174217
Enable additional printk() statements.
42184218

4219-
rcuperf.writer_holdoff= [KNL]
4219+
rcuscale.writer_holdoff= [KNL]
42204220
Write-side holdoff between grace periods,
42214221
in microseconds. The default of zero says
42224222
no holdoff.
@@ -4490,8 +4490,8 @@
44904490
refscale.shutdown= [KNL]
44914491
Shut down the system at the end of the performance
44924492
test. This defaults to 1 (shut it down) when
4493-
rcuperf is built into the kernel and to 0 (leave
4494-
it running) when rcuperf is built as a module.
4493+
refscale is built into the kernel and to 0 (leave
4494+
it running) when refscale is built as a module.
44954495

44964496
refscale.verbose= [KNL]
44974497
Enable additional printk() statements.

MAINTAINERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17510,8 +17510,9 @@ S: Supported
1751017510
T: git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
1751117511
F: Documentation/RCU/torture.rst
1751217512
F: kernel/locking/locktorture.c
17513-
F: kernel/rcu/rcuperf.c
17513+
F: kernel/rcu/rcuscale.c
1751417514
F: kernel/rcu/rcutorture.c
17515+
F: kernel/rcu/refscale.c
1751517516
F: kernel/torture.c
1751617517

1751717518
TOSHIBA ACPI EXTRAS DRIVER

kernel/rcu/Kconfig.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ config TORTURE_TEST
2323
tristate
2424
default n
2525

26-
config RCU_PERF_TEST
26+
config RCU_SCALE_TEST
2727
tristate "performance tests for RCU"
2828
depends on DEBUG_KERNEL
2929
select TORTURE_TEST

kernel/rcu/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ obj-y += update.o sync.o
1111
obj-$(CONFIG_TREE_SRCU) += srcutree.o
1212
obj-$(CONFIG_TINY_SRCU) += srcutiny.o
1313
obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o
14-
obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o
14+
obj-$(CONFIG_RCU_SCALE_TEST) += rcuscale.o
1515
obj-$(CONFIG_RCU_REF_SCALE_TEST) += refscale.o
1616
obj-$(CONFIG_TREE_RCU) += tree.o
1717
obj-$(CONFIG_TINY_RCU) += tiny.o

0 commit comments

Comments
 (0)