Re: [PATCH 4/6] scftorture: always log error message

[Paul E. McKenney]

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

I have queued the patches up to this point for the v5.17 merge window
(not the current one, but the next one).

This one does not apply.  It looks like you created it against mainline
rather than -rcu.  You can learn about the -rcu tree and its habits here:

https://mirrors.edge.kernel.org/pub/linux/kernel/people/paulmck/rcutodo.html

Please port this patch to -rcu so that I can pull it in without
conflicting with patches in -rcu.

							Thanx, Paul

> ---
>  kernel/scftorture.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/kernel/scftorture.c b/kernel/scftorture.c
> index 5fb15492999b..8ef7888d78cc 100644
> --- a/kernel/scftorture.c
> +++ b/kernel/scftorture.c
> @@ -41,8 +41,7 @@
>  #define VERBOSE_SCFTORTOUT(s, x...) \
>  	do { if (verbose) pr_alert(SCFTORT_FLAG s "\n", ## x); } while (0)
>  
> -#define VERBOSE_SCFTORTOUT_ERRSTRING(s, x...) \
> -	do { if (verbose) pr_alert(SCFTORT_FLAG "!!! " s "\n", ## x); } while (0)
> +#define SCFTORTOUT_ERRSTRING(s, x...) pr_alert(SCFTORT_FLAG "!!! " s "\n", ## x)
>  
>  MODULE_LICENSE("GPL");
>  MODULE_AUTHOR("Paul E. McKenney <paulmck@xxxxxxxxxx>");
> @@ -583,14 +582,14 @@ static int __init scf_torture_init(void)
>  	if (weight_single1 == 0 && weight_single_rpc1 == 0 && weight_single_wait1 == 0 &&
>  	    weight_many1 == 0 && weight_many_wait1 == 0 &&
>  	    weight_all1 == 0 && weight_all_wait1 == 0) {
> -		VERBOSE_SCFTORTOUT_ERRSTRING("all zero weights makes no sense");
> +		SCFTORTOUT_ERRSTRING("all zero weights makes no sense");
>  		firsterr = -EINVAL;
>  		goto unwind;
>  	}
>  	if (IS_BUILTIN(CONFIG_SCF_TORTURE_TEST))
>  		scf_sel_add(weight_resched1, SCF_PRIM_RESCHED, false);
>  	else if (weight_resched1)
> -		VERBOSE_SCFTORTOUT_ERRSTRING("built as module, weight_resched ignored");
> +		SCFTORTOUT_ERRSTRING("built as module, weight_resched ignored");
>  	scf_sel_add(weight_single1, SCF_PRIM_SINGLE, false);
>  	scf_sel_add(weight_single_rpc1, SCF_PRIM_SINGLE_RPC, true);
>  	scf_sel_add(weight_single_wait1, SCF_PRIM_SINGLE, true);
> @@ -621,7 +620,7 @@ static int __init scf_torture_init(void)
>  		nthreads = num_online_cpus();
>  	scf_stats_p = kcalloc(nthreads, sizeof(scf_stats_p[0]), GFP_KERNEL);
>  	if (!scf_stats_p) {
> -		VERBOSE_SCFTORTOUT_ERRSTRING("out of memory");
> +		SCFTORTOUT_ERRSTRING("out of memory");
>  		firsterr = -ENOMEM;
>  		goto unwind;
>  	}
> -- 
> 2.32.0
>