From: paulmck@kernel.org
To: rcu@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com,
mingo@kernel.org, jiangshanlai@gmail.com, dipankar@in.ibm.com,
akpm@linux-foundation.org, mathieu.desnoyers@efficios.com,
josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org,
rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com,
fweisbec@gmail.com, oleg@redhat.com, joel@joelfernandes.org,
"Paul E. McKenney" <paulmck@kernel.org>
Subject: [PATCH tip/core/rcu 11/19] scftorture: Consolidate scftorture_invoke_one() scf_check initialization
Date: Mon, 31 Aug 2020 11:07:41 -0700 [thread overview]
Message-ID: <20200831180749.843-11-paulmck@kernel.org> (raw)
In-Reply-To: <20200831180731.GA582@paulmck-ThinkPad-P72>
From: "Paul E. McKenney" <paulmck@kernel.org>
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>
---
kernel/scftorture.c | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/kernel/scftorture.c b/kernel/scftorture.c
index f220cd3..8ab72e5 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;
}
--
2.9.5
next prev parent reply other threads:[~2020-08-31 18:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-31 18:07 [PATCH tip/core/rcu 0/19] New smp_call_function() torture test for v5.10 Paul E. McKenney
2020-08-31 18:07 ` [PATCH tip/core/rcu 01/19] scftorture: Add smp_call_function() torture test paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 02/19] torture: Declare parse-console.sh independence from rcutorture paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 03/19] torture: Add scftorture to the rcutorture scripting paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 04/19] scftorture: Implement weighted primitive selection paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 05/19] tick-sched: Clarify "NOHZ: local_softirq_pending" warning paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 06/19] scftorture: Summarize per-thread statistics paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 07/19] scftorture: Add smp_call_function_single() memory-ordering checks paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 08/19] scftorture: Add smp_call_function_many() " paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 09/19] scftorture: Add smp_call_function() " paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 10/19] scftorture: Consolidate scftorture_invoke_one() check and kfree() paulmck
2020-08-31 18:07 ` paulmck [this message]
2020-08-31 18:07 ` [PATCH tip/core/rcu 12/19] scftorture: Flag errors in torture-compatible manner paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 13/19] scftorture: Prevent compiler from reducing race probabilities paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 14/19] scftorture: Make symbol 'scf_torture_rand' static paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 15/19] scftorture: Check unexpected "switch" statement value paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 16/19] scftorture: Block scftorture_invoker() kthreads for offline CPUs paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 17/19] scftorture: Adapt memory-ordering test to UP operation paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 18/19] scftorture: Add cond_resched() to test loop paulmck
2020-08-31 18:07 ` [PATCH tip/core/rcu 19/19] rcuperf: Change rcuperf to rcuscale paulmck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200831180749.843-11-paulmck@kernel.org \
--to=paulmck@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=dipankar@in.ibm.com \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=jiangshanlai@gmail.com \
--cc=joel@joelfernandes.org \
--cc=josh@joshtriplett.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rcu@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®