2021-11-03 08:36:20

by Li Zhijian

Subject: [PATCH v2 1/2] scftorture: Always log error message

Unconditionally log messages corresponding to errors.

Acked-by: Davidlohr Bueso <[email protected]>
Signed-off-by: Li Zhijian <[email protected]>

---
V2: rebase against rcu tree
---
kernel/scftorture.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/kernel/scftorture.c b/kernel/scftorture.c
index a0df767897a1..dcb0410950e4 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 <[email protected]>");
@@ -584,14 +583,14 @@ static int __init scf_torture_init(void)
if (weight_resched1 == 0 && 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);
@@ -622,7 +621,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

2021-11-03 18:09:24

by Paul E. McKenney

Subject: Re: [PATCH v2 1/2] scftorture: Always log error message

On Wed, Nov 03, 2021 at 04:30:27PM +0800, Li Zhijian wrote:
> Unconditionally log messages corresponding to errors.
>
> Acked-by: Davidlohr Bueso <[email protected]>
> Signed-off-by: Li Zhijian <[email protected]>

I have queued both for the v5.17 (not current, but next) merge window.
Thank you!

Thanx, Paul

> ---
> V2: rebase against rcu tree
> ---
> kernel/scftorture.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/scftorture.c b/kernel/scftorture.c
> index a0df767897a1..dcb0410950e4 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 <[email protected]>");
> @@ -584,14 +583,14 @@ static int __init scf_torture_init(void)
> if (weight_resched1 == 0 && 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);
> @@ -622,7 +621,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
>