Skip to content

Commit

Permalink
scftorture: Add smp_call_function() memory-ordering checks
Browse files Browse the repository at this point in the history
This commit adds checks for memory misordering across calls to and
returns from smp_call_function() in the case where the caller waits.
Misordering results in a splat.

Note that in contrast to smp_call_function_single(), this code does not
test memory ordering into the handler in the no-wait case because none
of the handlers would be able to free the scf_check structure without
introducing heavy synchronization to work out which was last.

[ paulmck: s/GFP_KERNEL/GFP_ATOMIC/ per kernel test robot feedback. ]
Signed-off-by: Paul E. McKenney <[email protected]>
  • Loading branch information
paulmckrcu committed Aug 25, 2020
1 parent 980205e commit 34e8c48
Showing 1 changed file with 17 additions and 8 deletions.
25 changes: 17 additions & 8 deletions kernel/scftorture.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,13 @@ static void scftorture_invoke_one(struct scf_statistics *scfp, struct torture_ra
cpus_read_lock();
else
preempt_disable();
switch (scfsp->scfs_prim) {
case SCF_PRIM_SINGLE:
if (scfsp->scfs_prim == SCF_PRIM_SINGLE || scfsp->scfs_wait) {
scfcp = kmalloc(sizeof(*scfcp), GFP_ATOMIC);
if (WARN_ON_ONCE(!scfcp))
atomic_inc(&n_alloc_errs);
}
switch (scfsp->scfs_prim) {
case SCF_PRIM_SINGLE:
cpu = torture_random(trsp) % nr_cpu_ids;
if (scfsp->scfs_wait)
scfp->n_single_wait++;
Expand All @@ -328,11 +330,6 @@ static void scftorture_invoke_one(struct scf_statistics *scfp, struct torture_ra
}
break;
case SCF_PRIM_MANY:
if (scfsp->scfs_wait) {
scfcp = kmalloc(sizeof(*scfcp), GFP_ATOMIC);
if (WARN_ON_ONCE(!scfcp))
atomic_inc(&n_alloc_errs);
}
if (scfsp->scfs_wait)
scfp->n_many_wait++;
else
Expand All @@ -356,7 +353,19 @@ static void scftorture_invoke_one(struct scf_statistics *scfp, struct torture_ra
scfp->n_all_wait++;
else
scfp->n_all++;
smp_call_function(scf_handler, NULL, scfsp->scfs_wait);
if (scfcp) {
scfcp->scfc_cpu = -1;
scfcp->scfc_wait = true;
scfcp->scfc_out = false;
scfcp->scfc_in = true;
}
smp_call_function(scf_handler, scfcp, scfsp->scfs_wait);
if (scfcp) {
if (WARN_ON_ONCE(!scfcp->scfc_out))
atomic_inc(&n_mb_out_errs); // Leak rather than trash!
else
kfree(scfcp);
}
break;
}
if (use_cpus_read_lock)
Expand Down

0 comments on commit 34e8c48

Please sign in to comment.