Commit 4feeb9d5 authored by Li Zhijian's avatar Li Zhijian Committed by Paul E. McKenney
Browse files

refscale: Always log the error message 



An OOM is a serious error that should be logged even in non-verbose runs.
This commit therefore adds an unconditional SCALEOUT_ERRSTRING() macro
and uses it instead of VERBOSE_SCALEOUT_ERRSTRING() when reporting an OOM.

[ paulmck: Drop do-while from SCALEOUT_ERRSTRING() due to only single statement. ]

Signed-off-by: default avatarLi Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 9880eb87

kernel/rcu/refscale.c

+3 −4
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ do { \ 
	}										\

} while (0)



#define VERBOSE_SCALEOUT_ERRSTRING(s, x...) \

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

#define SCALEOUT_ERRSTRING(s, x...) pr_alert("%s" SCALE_FLAG "!!! " s, scale_type, ## x)



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Joel Fernandes (Google) <joel@joelfernandes.org>");
@@ -651,7 +650,7 @@ static int main_func(void *arg) 
	result_avg = kzalloc(nruns * sizeof(*result_avg), GFP_KERNEL);

	buf = kzalloc(800 + 64, GFP_KERNEL);

	if (!result_avg || !buf) {

		VERBOSE_SCALEOUT_ERRSTRING("out of memory");

		SCALEOUT_ERRSTRING("out of memory");

		goto oom_exit;

	}

	if (holdoff)
@@ -837,7 +836,7 @@ ref_scale_init(void) 
	reader_tasks = kcalloc(nreaders, sizeof(reader_tasks[0]),

			       GFP_KERNEL);

	if (!reader_tasks) {

		VERBOSE_SCALEOUT_ERRSTRING("out of memory");

		SCALEOUT_ERRSTRING("out of memory");

		firsterr = -ENOMEM;

		goto unwind;

	}