mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: mingo@kernel.org, laijs@cn.fujitsu.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,
	dvhart@linux.intel.com, fweisbec@gmail.com, oleg@redhat.com,
	bobby.prani@gmail.com,
	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
	Davidlohr Bueso <dave@stgolabs.net>
Subject: [PATCH tip/core/rcu 05/13] locktorture: Change longdelay_us to longdelay_ms
Date: Tue, 12 May 2015 15:58:05 -0700	[thread overview]
Message-ID: <1431471493-5431-5-git-send-email-paulmck@linux.vnet.ibm.com> (raw)
In-Reply-To: <1431471493-5431-1-git-send-email-paulmck@linux.vnet.ibm.com>

From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>

The locktorture long delays are in milliseconds rather than microseconds,
so this commit changes the name of the corresponding variable from
longdelay_us to longdelay_ms.

Reported-by: Ben Goodwyn <bgoodwyn@softnas.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
---
 kernel/locking/locktorture.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
index 6a2723c88c33..32244186f1f2 100644
--- a/kernel/locking/locktorture.c
+++ b/kernel/locking/locktorture.c
@@ -122,12 +122,12 @@ static int torture_lock_busted_write_lock(void)
 
 static void torture_lock_busted_write_delay(struct torture_random_state *trsp)
 {
-	const unsigned long longdelay_us = 100;
+	const unsigned long longdelay_ms = 100;
 
 	/* We want a long delay occasionally to force massive contention.  */
 	if (!(torture_random(trsp) %
-	      (cxt.nrealwriters_stress * 2000 * longdelay_us)))
-		mdelay(longdelay_us);
+	      (cxt.nrealwriters_stress * 2000 * longdelay_ms)))
+		mdelay(longdelay_ms);
 #ifdef CONFIG_PREEMPT
 	if (!(torture_random(trsp) % (cxt.nrealwriters_stress * 20000)))
 		preempt_schedule();  /* Allow test to be preempted. */
@@ -160,14 +160,14 @@ static int torture_spin_lock_write_lock(void) __acquires(torture_spinlock)
 static void torture_spin_lock_write_delay(struct torture_random_state *trsp)
 {
 	const unsigned long shortdelay_us = 2;
-	const unsigned long longdelay_us = 100;
+	const unsigned long longdelay_ms = 100;
 
 	/* We want a short delay mostly to emulate likely code, and
 	 * we want a long delay occasionally to force massive contention.
 	 */
 	if (!(torture_random(trsp) %
-	      (cxt.nrealwriters_stress * 2000 * longdelay_us)))
-		mdelay(longdelay_us);
+	      (cxt.nrealwriters_stress * 2000 * longdelay_ms)))
+		mdelay(longdelay_ms);
 	if (!(torture_random(trsp) %
 	      (cxt.nrealwriters_stress * 2 * shortdelay_us)))
 		udelay(shortdelay_us);
-- 
1.8.1.5


  parent reply	other threads:[~2015-05-12 23:00 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-12 22:57 [PATCH tip/core/rcu 0/13] Torture-test updates for 4.2 Paul E. McKenney
2015-05-12 22:58 ` [PATCH tip/core/rcu 01/13] locktorture: fix deadlock in 'rw_lock_irq' type Paul E. McKenney
2015-05-12 22:58   ` [PATCH tip/core/rcu 02/13] rcutorture: Exchange TREE03 and TREE04 geometries Paul E. McKenney
2015-05-12 22:58   ` [PATCH tip/core/rcu 03/13] rcutorture: Exchange TREE03 and TREE08 NR_CPUS, speed up CPU hotplug Paul E. McKenney
2015-05-12 22:58   ` [PATCH tip/core/rcu 04/13] rcutorture: Allow negative values of nreaders to oversubscribe Paul E. McKenney
2015-05-13  1:03     ` josh
2015-05-13 17:23       ` Paul E. McKenney
2015-05-12 22:58   ` Paul E. McKenney [this message]
2015-05-12 22:58   ` [PATCH tip/core/rcu 06/13] rcutorture: Replace barriers with smp_store_release() and smp_load_acquire() Paul E. McKenney
2015-05-12 22:58   ` [PATCH tip/core/rcu 07/13] rcutorture: Test SRCU cleanup code path Paul E. McKenney
2015-05-12 22:58   ` [PATCH tip/core/rcu 08/13] rcutorture: TASKS_RCU set directly, so don't explicitly set it Paul E. McKenney
2015-05-12 22:58   ` [PATCH tip/core/rcu 09/13] rcutorture: Update configuration fragments for rcutree.rcu_fanout_exact Paul E. McKenney
2015-05-12 22:58   ` [PATCH tip/core/rcu 10/13] rcutorture: Make rcutorture scripts force RCU_EXPERT Paul E. McKenney
2015-05-12 22:58   ` [PATCH tip/core/rcu 11/13] rcutorture: Update TREE_RCU-kconfig.txt Paul E. McKenney
2015-05-13  1:06     ` josh
2015-05-13 17:28       ` Paul E. McKenney
2015-05-13 22:13         ` josh
2015-05-12 22:58   ` [PATCH tip/core/rcu 12/13] rcutorture: Display "make oldconfig" errors Paul E. McKenney
2015-05-12 22:58   ` [PATCH tip/core/rcu 13/13] rcutorture: Allow repetition factors in Kconfig-fragment lists Paul E. McKenney
2015-05-13  1:07 ` [PATCH tip/core/rcu 0/13] Torture-test updates for 4.2 josh

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=1431471493-5431-5-git-send-email-paulmck@linux.vnet.ibm.com \
    --to=paulmck@linux.vnet.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=bobby.prani@gmail.com \
    --cc=dave@stgolabs.net \
    --cc=dhowells@redhat.com \
    --cc=dipankar@in.ibm.com \
    --cc=dvhart@linux.intel.com \
    --cc=edumazet@google.com \
    --cc=fweisbec@gmail.com \
    --cc=josh@joshtriplett.org \
    --cc=laijs@cn.fujitsu.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=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®