From: Paul E. McKenney Date: Wed, 17 Oct 2007 06:27:19 +0000 (-0700) Subject: Make rcutorture RNG use temporal entropy X-Git-Tag: v2.6.24-rc1~678 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c17ac85504efec5f3a9b0c5b05bffd6f30e5b655;p=linux-2.6-omap-h63xx.git Make rcutorture RNG use temporal entropy Repost of http://lkml.org/lkml/2007/8/10/472 made available by request. The locking used by get_random_bytes() can conflict with the preempt_disable() and synchronize_sched() form of RCU. This patch changes rcutorture's RNG to gather entropy from the new cpu_clock() interface (relying on interrupts, preemption, daemons, and rcutorture's reader thread's rock-bottom scheduling priority to provide useful entropy), and also adds and EXPORT_SYMBOL_GPL() to make that interface available to GPLed kernel modules such as rcutorture. Passes several hours of rcutorture. [ego@in.ibm.com: Use raw_smp_processor_id() in rcu_random()] Signed-off-by: Paul E. McKenney Cc: Ingo Molnar Signed-off-by: Gautham R Shenoy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c index dd413bf6a1d..c3e165c2318 100644 --- a/kernel/rcutorture.c +++ b/kernel/rcutorture.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -165,16 +164,14 @@ struct rcu_random_state { /* * Crude but fast random-number generator. Uses a linear congruential - * generator, with occasional help from get_random_bytes(). + * generator, with occasional help from cpu_clock(). */ 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_state += + (unsigned long)cpu_clock(raw_smp_processor_id()); rrsp->rrs_count = RCU_RANDOM_REFRESH; } rrsp->rrs_state = rrsp->rrs_state * RCU_RANDOM_MULT + RCU_RANDOM_ADD;