Commit 80dcee69 authored Mar 07, 2022 by David Vernet Committed by Paul E. McKenney Apr 11, 2022

rcutorture: Add missing return and use func in warning



The rcutorture module has an rcu_torture_writer task that repeatedly
performs writes, synchronizations, and deletes. There is a corner-case
check in rcu_torture_writer() wherein if nsynctypes is 0, a warning is
issued and the task waits to be stopped via a call to
torture_kthread_stopping() rather than performing any work.

There should be a return statement following this call to
torture_kthread_stopping(), as the intention with issuing the call to
torture_kthread_stopping() in the first place is to avoid the
rcu_torture_writer task from performing any work. Some of the work may even
be dangerous to perform, such as potentially causing a #DE due to
nsynctypes being used in a modulo operator when querying for sync updates
to issue.

This patch adds the missing return call.  As a bonus, it also fixes a
checkpatch warning that was emitted due to the WARN_ONCE() call using the
name of the function rather than __func__.

Signed-off-by: David Vernet <void@manifault.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

parent 39b3cab9

kernel/rcu/rcutorture.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1178,7 +1178,7 @@ rcu_torture_writer(void *arg)
		" GP expediting controlled from boot/sysfs for %s.\n",
		torture_type, cur_ops->name);
		if (WARN_ONCE(nsynctypes == 0,
		"rcu_torture_writer: No update-side primitives.\n")) {
		"%s: No update-side primitives.\n", __func__)) {
		/*
		* No updates primitives, so don't try updating.
		* The resulting test won't be testing much, hence the
		@@ -1186,6 +1186,7 @@ rcu_torture_writer(void *arg)
		*/
		rcu_torture_writer_state = RTWS_STOPPING;
		torture_kthread_stopping("rcu_torture_writer");
		return 0;
		}

		do {