From: John Stultz <jstultz@google.com>
To: LKML <linux-kernel@vger.kernel.org>
Cc: John Stultz <jstultz@google.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>, Will Deacon <will@kernel.org>,
Waiman Long <longman@redhat.com>,
Boqun Feng <boqun.feng@gmail.com>,
"Paul E . McKenney" <paulmck@kernel.org>,
Joel Fernandes <joelaf@google.com>,
Li Zhijian <zhijianx.li@intel.com>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
kernel-team@android.com
Subject: [RFC][PATCH 1/3] test-ww_mutex: Use prng instead of rng to avoid hangs at bootup
Date: Tue, 8 Aug 2023 06:26:41 +0000 [thread overview]
Message-ID: <20230808062658.391595-2-jstultz@google.com> (raw)
In-Reply-To: <20230808062658.391595-1-jstultz@google.com>
Booting w/ qemu without kvm, I noticed we'd sometimes seem to get
stuck in get_random_u32_below(). This seems potentially to be
entropy exhaustion (with the test module linked statically, it
runs pretty early in the bootup).
I'm not 100% sure on this, but this patch switches to use the
prng instead since we don't need true randomness, just mixed up
orders for testing ww_mutex lock acquisitions.
With this patch, I no longer see hangs in get_random_u32_below()
Feedback would be appreciated!
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Will Deacon <will@kernel.org>
Cc: Waiman Long <longman@redhat.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: "Paul E . McKenney" <paulmck@kernel.org>
Cc: Joel Fernandes <joelaf@google.com>
Cc: Li Zhijian <zhijianx.li@intel.com>
Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>
Cc: kernel-team@android.com
Signed-off-by: John Stultz <jstultz@google.com>
---
kernel/locking/test-ww_mutex.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c
index 93cca6e69860..9bceba65858a 100644
--- a/kernel/locking/test-ww_mutex.c
+++ b/kernel/locking/test-ww_mutex.c
@@ -9,7 +9,7 @@
#include <linux/delay.h>
#include <linux/kthread.h>
#include <linux/module.h>
-#include <linux/random.h>
+#include <linux/prandom.h>
#include <linux/slab.h>
#include <linux/ww_mutex.h>
@@ -386,6 +386,19 @@ struct stress {
int nlocks;
};
+struct rnd_state rng;
+DEFINE_SPINLOCK(rng_lock);
+
+static inline u32 prandom_u32_below(u32 ceil)
+{
+ u32 ret;
+
+ spin_lock(&rng_lock);
+ ret = prandom_u32_state(&rng) % ceil;
+ spin_unlock(&rng_lock);
+ return ret;
+}
+
static int *get_random_order(int count)
{
int *order;
@@ -399,7 +412,7 @@ static int *get_random_order(int count)
order[n] = n;
for (n = count - 1; n > 1; n--) {
- r = get_random_u32_below(n + 1);
+ r = prandom_u32_below(n + 1);
if (r != n) {
tmp = order[n];
order[n] = order[r];
@@ -625,6 +638,8 @@ static int __init test_ww_mutex_init(void)
printk(KERN_INFO "Beginning ww mutex selftests\n");
+ prandom_seed_state(&rng, get_random_u64());
+
wq = alloc_workqueue("test-ww_mutex", WQ_UNBOUND, 0);
if (!wq)
return -ENOMEM;
--
2.41.0.640.ga95def55d0-goog
next prev parent reply other threads:[~2023-08-08 17:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-08 6:26 [RFC][PATCH 0/3] Fixes for test-ww_mutex stress test John Stultz
2023-08-08 6:26 ` John Stultz [this message]
2023-08-08 10:36 ` [RFC][PATCH 1/3] test-ww_mutex: Use prng instead of rng to avoid hangs at bootup Peter Zijlstra
2023-08-08 14:03 ` Jason A. Donenfeld
2023-08-08 18:20 ` John Stultz
2023-08-08 19:46 ` John Stultz
2023-08-08 6:26 ` [RFC][PATCH 2/3] test-ww_mutex: Fix potential workqueue corruption John Stultz
2023-08-08 6:26 ` [RFC][PATCH 3/3] test-ww_mutex: Make sure we bail out instead of livelock John Stultz
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=20230808062658.391595-2-jstultz@google.com \
--to=jstultz@google.com \
--cc=boqun.feng@gmail.com \
--cc=dietmar.eggemann@arm.com \
--cc=joelaf@google.com \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=mingo@redhat.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=will@kernel.org \
--cc=zhijianx.li@intel.com \
/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