summaryrefslogtreecommitdiff
path: root/kernel/scftorture.c
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@kernel.org>2020-07-09 23:58:32 +0300
committerPaul E. McKenney <paulmck@kernel.org>2020-08-25 04:38:35 +0300
commit4df55bddc1a360e94c86e227fe417ac9422cb615 (patch)
treefa1af555cf130c1e49b1ba9446665444b098d9a3 /kernel/scftorture.c
parent676e5469643e716df7f39ef77ba8f09c85b0c4f8 (diff)
downloadlinux-4df55bddc1a360e94c86e227fe417ac9422cb615.tar.xz
scftorture: Consolidate scftorture_invoke_one() scf_check initialization
This commit hoists much of the initialization of the scf_check structure out of the switch statement, thus saving a few lines of code. The initialization of the ->scfc_in field remains in each leg of the switch statement in order to more heavily stress memory ordering. Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'kernel/scftorture.c')
-rw-r--r--kernel/scftorture.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/kernel/scftorture.c b/kernel/scftorture.c
index f220cd364e23..8ab72e545a61 100644
--- a/kernel/scftorture.c
+++ b/kernel/scftorture.c
@@ -299,8 +299,13 @@ static void scftorture_invoke_one(struct scf_statistics *scfp, struct torture_ra
preempt_disable();
if (scfsp->scfs_prim == SCF_PRIM_SINGLE || scfsp->scfs_wait) {
scfcp = kmalloc(sizeof(*scfcp), GFP_ATOMIC);
- if (WARN_ON_ONCE(!scfcp))
+ if (WARN_ON_ONCE(!scfcp)) {
atomic_inc(&n_alloc_errs);
+ } else {
+ scfcp->scfc_cpu = -1;
+ scfcp->scfc_wait = scfsp->scfs_wait;
+ scfcp->scfc_out = false;
+ }
}
switch (scfsp->scfs_prim) {
case SCF_PRIM_SINGLE:
@@ -311,8 +316,6 @@ static void scftorture_invoke_one(struct scf_statistics *scfp, struct torture_ra
scfp->n_single++;
if (scfcp) {
scfcp->scfc_cpu = cpu;
- scfcp->scfc_wait = scfsp->scfs_wait;
- scfcp->scfc_out = false;
scfcp->scfc_in = true;
}
ret = smp_call_function_single(cpu, scf_handler_1, (void *)scfcp, scfsp->scfs_wait);
@@ -330,12 +333,8 @@ static void scftorture_invoke_one(struct scf_statistics *scfp, struct torture_ra
scfp->n_many_wait++;
else
scfp->n_many++;
- if (scfcp) {
- scfcp->scfc_cpu = -1;
- scfcp->scfc_wait = true;
- scfcp->scfc_out = false;
+ if (scfcp)
scfcp->scfc_in = true;
- }
smp_call_function_many(cpu_online_mask, scf_handler, scfcp, scfsp->scfs_wait);
break;
case SCF_PRIM_ALL:
@@ -343,12 +342,8 @@ static void scftorture_invoke_one(struct scf_statistics *scfp, struct torture_ra
scfp->n_all_wait++;
else
scfp->n_all++;
- if (scfcp) {
- scfcp->scfc_cpu = -1;
- scfcp->scfc_wait = true;
- scfcp->scfc_out = false;
+ if (scfcp)
scfcp->scfc_in = true;
- }
smp_call_function(scf_handler, scfcp, scfsp->scfs_wait);
break;
}