Re: [PATCH 5/6] rcuscale: alwaly log error message

[Paul E. McKenney]

On Fri, Oct 29, 2021 at 05:40:28PM +0800, Li Zhijian wrote:
> Generally, error message should be logged anyhow.
> 
> Signed-off-by: Li Zhijian <zhijianx.li@xxxxxxxxx>

And I queued this one, thank you!

The last patch also need to be ported to -rcu.  Please port it and
the other one and resubmit them.

							Thanx, Paul

> ---
>  kernel/rcu/rcuscale.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/kernel/rcu/rcuscale.c b/kernel/rcu/rcuscale.c
> index 2cc34a22a506..5c8449a8827a 100644
> --- a/kernel/rcu/rcuscale.c
> +++ b/kernel/rcu/rcuscale.c
> @@ -50,8 +50,8 @@ MODULE_AUTHOR("Paul E. McKenney <paulmck@xxxxxxxxxxxxx>");
>  	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;
>  	}
> -- 
> 2.32.0
>