locktorture,rcutorture,torture: Always log error message

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>

diff --git a/include/linux/torture.h b/include/linux/torture.h
index 24f58e50a94b87d6d6a16bc97821aa8f46ca1d90..63fa4196e51cb2522704ec1f542817e8eb29d0f0 100644 (file)
--- 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 397ac13d2ef75a075660742d0c85db2e6a3bd714..9c2fb613a55d25068ef8bfabe1d36f6387ee29f5 100644 (file)
--- 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 503e14e62e8f2fb087e50503128b7562cdcdaede..36a273589a35c60eb7941a1c1686d6aeae1478c5 100644 (file)
--- 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 bb8f411c974b8d51297708f51dedc41c46c11757..ef27a6c8245146699393e6bb8039f3a46abee16a 100644 (file)
--- 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);