This patch converts rcutorture's random-number generator from
get_random_bytes() (which has locking issues in some builds with patches)
to instead use local-to-rcutorture statistical counters. This involves
reading other CPUs' statistics, so the frequency of entropy addition
is simultaneously decreased by an order of magnitude.
This patch is an alternative to adding an EXPORT_SYMBOL_GPL() for the new
cpu_clock() API.
Signed-off-by: Paul E. McKenney <[email protected]>
---
rcutorture.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff -urpNa -X dontdiff linux-2.6.22.1-rt4/kernel/rcutorture.c linux-2.6.22.1-rt4-rcutorturesched/kernel/rcutorture.c
--- linux-2.6.22.1-rt4/kernel/rcutorture.c 2007-07-21 16:58:22.000000000 -0700
+++ linux-2.6.22.1-rt4-rcutorturesched/kernel/rcutorture.c 2007-08-10 08:42:41.000000000 -0700
@@ -155,26 +155,27 @@ rcu_torture_free(struct rcu_torture *p)
struct rcu_random_state {
unsigned long rrs_state;
long rrs_count;
+ int rrs_cpu;
};
#define RCU_RANDOM_MULT 39916801 /* prime */
#define RCU_RANDOM_ADD 479001701 /* prime */
-#define RCU_RANDOM_REFRESH 10000
+#define RCU_RANDOM_REFRESH 100000
#define DEFINE_RCU_RANDOM(name) struct rcu_random_state name = { 0, 0 }
/*
* Crude but fast random-number generator. Uses a linear congruential
- * generator, with occasional help from get_random_bytes().
+ * generator, with occasional help from other CPUs' fast-running statistics.
*/
static unsigned long
rcu_random(struct rcu_random_state *rrsp)
{
- long refresh;
-
if (--rrsp->rrs_count < 0) {
- get_random_bytes(&refresh, sizeof(refresh));
- rrsp->rrs_state += refresh;
+ rrsp->rrs_cpu = next_cpu(rrsp->rrs_cpu, cpu_online_map);
+ if (rrsp->rrs_cpu >= NR_CPUS)
+ rrsp->rrs_cpu = 0;
+ rrsp->rrs_state += per_cpu(rcu_torture_count, rrsp->rrs_cpu)[0];
rrsp->rrs_count = RCU_RANDOM_REFRESH;
}
rrsp->rrs_state = rrsp->rrs_state * RCU_RANDOM_MULT + RCU_RANDOM_ADD;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
