Commit 81faa4f6 authored by Li Zhijian's avatar Li Zhijian Committed by Paul E. McKenney
Browse files

locktorture,rcutorture,torture: Always log error message 



Unconditionally log messages corresponding to errors.

Acked-by: default avatarDavidlohr Bueso <dbueso@suse.de>
Signed-off-by: default avatarLi Zhijian <zhijianx.li@intel.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 809da9bf

include/linux/torture.h

+2 −7
Original line number Diff line number Diff line
@@ -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)						\

kernel/locking/locktorture.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

kernel/rcu/rcutorture.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

		}

kernel/torture.c

+2 −2
Original line number Diff line number Diff line
@@ -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);