From: "Paul E. McKenney" <paulmck@kernel.org>
To: rcu@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com,
rostedt@goodmis.org, David Vernet <void@manifault.com>,
"Paul E . McKenney" <paulmck@kernel.org>
Subject: [PATCH rcu 5/6] rcutorture: Add missing return and use __func__ in warning
Date: Mon, 18 Apr 2022 17:07:45 -0700 [thread overview]
Message-ID: <20220419000746.3949667-5-paulmck@kernel.org> (raw)
In-Reply-To: <20220419000541.GA3949109@paulmck-ThinkPad-P17-Gen-1>
From: David Vernet <void@manifault.com>
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>
---
kernel/rcu/rcutorture.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index d5105fb6c980..f1292d9e86b5 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -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 {
--
2.31.1.189.g2e36527f23
next prev parent reply other threads:[~2022-04-19 0:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 0:05 [PATCH rcu 0/6] Torture-test updates for v5.19 Paul E. McKenney
2022-04-19 0:07 ` [PATCH rcu 1/6] torture: Add rcu_normal and rcu_expedited runs to torture.sh Paul E. McKenney
2022-04-19 0:07 ` [PATCH rcu 2/6] rcutorture: Suppress debugging grace period delays during flooding Paul E. McKenney
2022-04-19 0:07 ` [PATCH rcu 3/6] scftorture: Fix distribution of short handler delays Paul E. McKenney
2022-04-19 0:07 ` [PATCH rcu 4/6] rcutorture: Avoid corner-case #DE with nsynctypes check Paul E. McKenney
2022-04-19 0:07 ` Paul E. McKenney [this message]
2022-04-19 0:07 ` [PATCH rcu 6/6] rcutorture: Call preempt_schedule() through static call/key Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220419000746.3949667-5-paulmck@kernel.org \
--to=paulmck@kernel.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rcu@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=void@manifault.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®