Commit 86e7ed1b authored by Li Zhijian's avatar Li Zhijian Committed by Paul E. McKenney
Browse files

rcuscale: 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 04cf8518

kernel/rcu/rcuscale.c

+7 −7
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ MODULE_AUTHOR("Paul E. McKenney <paulmck@linux.ibm.com>"); 
	pr_alert("%s" SCALE_FLAG " %s\n", scale_type, s)

#define VERBOSE_SCALEOUT_STRING(s) \

	do { if (verbose) pr_alert("%s" SCALE_FLAG " %s\n", scale_type, s); } while (0)

#define VERBOSE_SCALEOUT_ERRSTRING(s) \

	do { if (verbose) pr_alert("%s" SCALE_FLAG "!!! %s\n", scale_type, s); } while (0)

#define SCALEOUT_ERRSTRING(s) \

	pr_alert("%s" SCALE_FLAG "!!! %s\n", scale_type, s)



/*

 * The intended use cases for the nreaders and nwriters module parameters
@@ -514,11 +514,11 @@ rcu_scale_cleanup(void) 
	 * during the mid-boot phase, so have to wait till the end.

	 */

	if (rcu_gp_is_expedited() && !rcu_gp_is_normal() && !gp_exp)

		VERBOSE_SCALEOUT_ERRSTRING("All grace periods expedited, no normal ones to measure!");

		SCALEOUT_ERRSTRING("All grace periods expedited, no normal ones to measure!");

	if (rcu_gp_is_normal() && gp_exp)

		VERBOSE_SCALEOUT_ERRSTRING("All grace periods normal, no expedited ones to measure!");

		SCALEOUT_ERRSTRING("All grace periods normal, no expedited ones to measure!");

	if (gp_exp && gp_async)

		VERBOSE_SCALEOUT_ERRSTRING("No expedited async GPs, so went with async!");

		SCALEOUT_ERRSTRING("No expedited async GPs, so went with async!");



	if (torture_cleanup_begin())

		return;
@@ -845,7 +845,7 @@ rcu_scale_init(void) 
	reader_tasks = kcalloc(nrealreaders, sizeof(reader_tasks[0]),

			       GFP_KERNEL);

	if (reader_tasks == NULL) {

		VERBOSE_SCALEOUT_ERRSTRING("out of memory");

		SCALEOUT_ERRSTRING("out of memory");

		firsterr = -ENOMEM;

		goto unwind;

	}
@@ -865,7 +865,7 @@ rcu_scale_init(void) 
		kcalloc(nrealwriters, sizeof(*writer_n_durations),

			GFP_KERNEL);

	if (!writer_tasks || !writer_durations || !writer_n_durations) {

		VERBOSE_SCALEOUT_ERRSTRING("out of memory");

		SCALEOUT_ERRSTRING("out of memory");

		firsterr = -ENOMEM;

		goto unwind;

	}