From: "Paul E. McKenney" <paulmck@kernel.org>
To: rcu@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com,
mingo@kernel.org, jiangshanlai@gmail.com,
akpm@linux-foundation.org, mathieu.desnoyers@efficios.com,
josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org,
rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com,
fweisbec@gmail.com, oleg@redhat.com, joel@joelfernandes.org,
Li Zhijian <zhijianx.li@intel.com>,
Davidlohr Bueso <dbueso@suse.de>,
"Paul E . McKenney" <paulmck@kernel.org>
Subject: [PATCH rcu 12/17] locktorture,rcutorture,torture: Always log error message
Date: Wed, 1 Dec 2021 16:43:31 -0800 [thread overview]
Message-ID: <20211202004337.3130175-12-paulmck@kernel.org> (raw)
In-Reply-To: <20211202004245.GA3129966@paulmck-ThinkPad-P17-Gen-1>
From: Li Zhijian <zhijianx.li@intel.com>
Unconditionally log messages corresponding to errors.
Acked-by: Davidlohr Bueso <dbueso@suse.de>
Signed-off-by: Li Zhijian <zhijianx.li@intel.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
include/linux/torture.h | 9 ++-------
kernel/locking/locktorture.c | 4 ++--
kernel/rcu/rcutorture.c | 8 ++++----
kernel/torture.c | 4 ++--
4 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/include/linux/torture.h b/include/linux/torture.h
index 24f58e50a94b8..63fa4196e51cb 100644
--- a/include/linux/torture.h
+++ b/include/linux/torture.h
@@ -38,13 +38,8 @@ do { \
pr_alert("%s" TORTURE_FLAG " %s\n", torture_type, s); \
} \
} while (0)
-#define VERBOSE_TOROUT_ERRSTRING(s) \
-do { \
- if (verbose) { \
- verbose_torout_sleep(); \
- pr_alert("%s" TORTURE_FLAG "!!! %s\n", torture_type, s); \
- } \
-} while (0)
+#define TOROUT_ERRSTRING(s) \
+ pr_alert("%s" TORTURE_FLAG "!!! %s\n", torture_type, s)
void verbose_torout_sleep(void);
#define torture_init_error(firsterr) \
diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
index 397ac13d2ef75..9c2fb613a55d2 100644
--- a/kernel/locking/locktorture.c
+++ b/kernel/locking/locktorture.c
@@ -1047,7 +1047,7 @@ static int __init lock_torture_init(void)
sizeof(writer_tasks[0]),
GFP_KERNEL);
if (writer_tasks == NULL) {
- VERBOSE_TOROUT_ERRSTRING("writer_tasks: Out of memory");
+ TOROUT_ERRSTRING("writer_tasks: Out of memory");
firsterr = -ENOMEM;
goto unwind;
}
@@ -1058,7 +1058,7 @@ static int __init lock_torture_init(void)
sizeof(reader_tasks[0]),
GFP_KERNEL);
if (reader_tasks == NULL) {
- VERBOSE_TOROUT_ERRSTRING("reader_tasks: Out of memory");
+ TOROUT_ERRSTRING("reader_tasks: Out of memory");
kfree(writer_tasks);
writer_tasks = NULL;
firsterr = -ENOMEM;
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 503e14e62e8f2..36a273589a35c 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -2774,7 +2774,7 @@ static int rcu_torture_read_exit(void *unused)
&trs, "%s",
"rcu_torture_read_exit_child");
if (IS_ERR(tsp)) {
- VERBOSE_TOROUT_ERRSTRING("out of memory");
+ TOROUT_ERRSTRING("out of memory");
errexit = true;
tsp = NULL;
break;
@@ -3101,7 +3101,7 @@ rcu_torture_init(void)
sizeof(fakewriter_tasks[0]),
GFP_KERNEL);
if (fakewriter_tasks == NULL) {
- VERBOSE_TOROUT_ERRSTRING("out of memory");
+ TOROUT_ERRSTRING("out of memory");
firsterr = -ENOMEM;
goto unwind;
}
@@ -3117,7 +3117,7 @@ rcu_torture_init(void)
rcu_torture_reader_mbchk = kcalloc(nrealreaders, sizeof(*rcu_torture_reader_mbchk),
GFP_KERNEL);
if (!reader_tasks || !rcu_torture_reader_mbchk) {
- VERBOSE_TOROUT_ERRSTRING("out of memory");
+ TOROUT_ERRSTRING("out of memory");
firsterr = -ENOMEM;
goto unwind;
}
@@ -3136,7 +3136,7 @@ rcu_torture_init(void)
if (nrealnocbers > 0) {
nocb_tasks = kcalloc(nrealnocbers, sizeof(nocb_tasks[0]), GFP_KERNEL);
if (nocb_tasks == NULL) {
- VERBOSE_TOROUT_ERRSTRING("out of memory");
+ TOROUT_ERRSTRING("out of memory");
firsterr = -ENOMEM;
goto unwind;
}
diff --git a/kernel/torture.c b/kernel/torture.c
index bb8f411c974b8..ef27a6c824514 100644
--- a/kernel/torture.c
+++ b/kernel/torture.c
@@ -570,7 +570,7 @@ int torture_shuffle_init(long shuffint)
shuffle_idle_cpu = -1;
if (!alloc_cpumask_var(&shuffle_tmp_mask, GFP_KERNEL)) {
- VERBOSE_TOROUT_ERRSTRING("Failed to alloc mask");
+ TOROUT_ERRSTRING("Failed to alloc mask");
return -ENOMEM;
}
@@ -934,7 +934,7 @@ int _torture_create_kthread(int (*fn)(void *arg), void *arg, char *s, char *m,
*tp = kthread_run(fn, arg, "%s", s);
if (IS_ERR(*tp)) {
ret = PTR_ERR(*tp);
- VERBOSE_TOROUT_ERRSTRING(f);
+ TOROUT_ERRSTRING(f);
*tp = NULL;
}
torture_shuffle_task_register(*tp);
--
2.31.1.189.g2e36527f23
next prev parent reply other threads:[~2021-12-02 0:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-02 0:42 [PATCH rcu 0/17] Torture-test updates for v5.17 Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 01/17] rcutorture: Sanitize RCUTORTURE_RDR_MASK Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 02/17] rcutorture: More thoroughly test nested readers Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 03/17] rcutorture: Suppress pi-lock-across read-unlock testing for Tiny SRCU Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 04/17] refscale: Simplify the errexit checkpoint Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 05/17] refscale: Prevent buffer to pr_alert() being too long Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 06/17] refscale: Always log the error message Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 07/17] refscale: Add missing '\n' to flush message Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 08/17] scftorture: " Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 09/17] scftorture: Remove unused SCFTORTOUT Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 10/17] rcuscale: Always log error message Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 11/17] scftorture: " Paul E. McKenney
2021-12-02 0:43 ` Paul E. McKenney [this message]
2021-12-02 0:43 ` [PATCH rcu 13/17] rcutorture: Avoid soft lockup during cpu stall Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 14/17] rcutorture: Test RCU-tasks multiqueue callback queueing Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 15/17] rcutorture: Enable multiple concurrent callback-flood kthreads Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 16/17] rcutorture: Add ability to limit callback-flood intensity Paul E. McKenney
2021-12-02 0:43 ` [PATCH rcu 17/17] rcutorture: Combine n_max_cbs from all kthreads in a callback flood 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=20211202004337.3130175-12-paulmck@kernel.org \
--to=paulmck@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=dbueso@suse.de \
--cc=dhowells@redhat.com \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=jiangshanlai@gmail.com \
--cc=joel@joelfernandes.org \
--cc=josh@joshtriplett.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rcu@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=zhijianx.li@intel.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