forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
scftorture: Always log error message
Unconditionally log messages corresponding to errors. Acked-by: Davidlohr Bueso <[email protected]> Signed-off-by: Li Zhijian <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]>
- Loading branch information
1 parent
86e7ed1
commit 809da9b
Showing
1 changed file
with
4 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
} | ||
|