random32: add __init prefix to prandom_start_seed_timer
Subsystems (3)
PATCH 1/2 random32: add __init prefix to prandom_start_seed_timer
We only call that in functions annotated with __init, so add __init prefix in prandom_start_seed_timer() as well, so that the kernel can make use of this hint and we can possibly free up resources after it's usage. And since it's an internal function rename it to __prandom_start_seed_timer().
--- lib/random32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/random32.c +2 -2
@@ -222,7 +222,7 @@ static void __prandom_timer(unsigned long dontcare)add_timer (&seed_timer); } -static void prandom_start_seed_timer (void ) +static void __init __prandom_start_seed_timer (void ) {set_timer_slack (&seed_timer,HZ ); seed_timer.expires = jiffies +40 *HZ ;
@@ -270,7 +270,7 @@ void prandom_reseed_late(void)static int __init prandom_reseed (void ) {__prandom_reseed (false); -prandom_start_seed_timer (); +__prandom_start_seed_timer ();return 0 ; }late_initcall (prandom_reseed);
Signature · 1 line
1.8.3.1
PATCH 2/2 random32: use msecs_to_jiffies for reseed timer
Use msecs_to_jiffies, for these calculations as different HZ considerations are taken into account for conversion of the timer shot, and also it makes the code more readable.
--- lib/random32.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
lib/random32.c +6 -2
@@ -214,18 +214,22 @@ static DEFINE_TIMER(seed_timer, __prandom_timer, 0, 0);static void __prandom_timer (unsigned long dontcare) {u32 entropy; +unsigned long expires;get_random_bytes (&entropy,sizeof (entropy));prandom_seed (entropy); +/* reseed every ~60 seconds, in [40 .. 80) interval with slack */ - seed_timer.expires = jiffies + (40 *HZ + (prandom_u32 () % (40 *HZ ))); + expires =40 + (prandom_u32 () %40 ); + seed_timer.expires = jiffies +msecs_to_jiffies (expires *MSEC_PER_SEC ); +add_timer (&seed_timer); }static void __init __prandom_start_seed_timer (void ) {set_timer_slack (&seed_timer,HZ ); - seed_timer.expires = jiffies +40 *HZ ; + seed_timer.expires = jiffies +msecs_to_jiffies (40 *MSEC_PER_SEC );add_timer (&seed_timer); }
Signature · 1 line
1.8.3.1
Re: [PATCH 2/2] random32: use msecs_to_jiffies for reseed timer
Quoted 29 lines · On Tue, 12 Nov 2013 23:45:42 +0100 Daniel Borkmann <[email protected]> wrote:
Use
msecs_to_jiffies, for these calculations as different HZ considerations are taken into account for conversion of the timer shot, and also it makes the code more readable.Signed-off-by Daniel Borkmann <[email protected]>Signed-off-by Hannes Frederic Sowa <[email protected]>--- lib/random32.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)lib/random32.c +5
-1@@ -214,18 +214,22 @@ static DEFINE_TIMER(seed_timer, __prandom_timer, 0, 0);static void __prandom_timer (unsigned long dontcare) {u32 entropy; +unsigned long expires;get_random_bytes (&entropy,sizeof (entropy));prandom_seed (entropy); +/* reseed every ~60 seconds, in [40 .. 80) interval with slack */ - seed_timer.expires = jiffies + (40 *HZ + (prandom_u32 () % (40 *HZ ))); + expires =40 + (prandom_u32 () %40 ); + seed_timer.expires = jiffies +msecs_to_jiffies (expires *MSEC_PER_SEC ); +add_timer (&seed_timer);
lib/random32.c static DEFINE_TIMER(seed_timer, __prandom_timer, 0, 0); · line 235
Quoted 10 lines
lib/random32.c +1
-1}static void __init __prandom_start_seed_timer (void ) {set_timer_slack (&seed_timer,HZ ); - seed_timer.expires = jiffies +40 *HZ ; + seed_timer.expires = jiffies +msecs_to_jiffies (40 *MSEC_PER_SEC );add_timer (&seed_timer); }
Some questions:
1. What is the point of using msecs_to_jiffies? the older code already handled differing HZ?
2. Why the magic 40-80 sec range? What about platforms with very low entropy you will end up draining it faster.
3. I prefer using mod_timer rather than setting expires and call add_timer
4. You should also use round_jiffies to save power by making the wakeup on a second boundary.
Re: [PATCH 2/2] random32: use msecs_to_jiffies for reseed timer
Quoted 34 lines · Stephen Hemminger
Quoted 31 lines · On Tue, 12 Nov 2013 23:45:42 +0100 Daniel Borkmann <[email protected]> wrote:
Use
msecs_to_jiffies, for these calculations as different HZ considerations are taken into account for conversion of the timer shot, and also it makes the code more readable.Signed-off-by Daniel Borkmann <[email protected]>Signed-off-by Hannes Frederic Sowa <[email protected]>--- lib/random32.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)lib/random32.c +5
-1@@ -214,18 +214,22 @@ static DEFINE_TIMER(seed_timer, __prandom_timer, 0, 0);static void __prandom_timer (unsigned long dontcare) {u32 entropy; +unsigned long expires;get_random_bytes (&entropy,sizeof (entropy));prandom_seed (entropy); +/* reseed every ~60 seconds, in [40 .. 80) interval with slack */ - seed_timer.expires = jiffies + (40 *HZ + (prandom_u32 () % (40 *HZ ))); + expires =40 + (prandom_u32 () %40 ); + seed_timer.expires = jiffies +msecs_to_jiffies (expires *MSEC_PER_SEC ); +add_timer (&seed_timer); }
Quoted 12 lines
lib/random32.c static DEFINE_TIMER(seed_timer, __prandom_timer, 0, 0); · line 235
Quoted 8 lines
lib/random32.c +1
-1static void __init __prandom_start_seed_timer (void ) {set_timer_slack (&seed_timer,HZ ); - seed_timer.expires = jiffies +40 *HZ ; + seed_timer.expires = jiffies +msecs_to_jiffies (40 *MSEC_PER_SEC );add_timer (&seed_timer); }Some questions:
1. What is the point of usingmsecs_to_jiffies? the older code already handled differing HZ?
The change is not that important. It seemed a bit more readable. We could certainly drop that.
Quoted 2 lines
2. Why the magic 40-80 sec range? What about platforms with very low entropy you will end up draining it faster.
Daniel and me had a discussion about that. I originally had it even lower and Daniel warned about that. The current window seemd fine to me as we don't want to have a too big window where one could probe ports if an attacker could find a bias in the PRNG. Do you have a suggestion?
Quoted 1 line
3. I prefer using
mod_timerrather than setting expires and calladd_timer
I wanted the BUG_ON in add_timer in the code path so we can make sure no two timers are running concurrently. Would be no problem to change that.
Quoted 2 lines
4. You should also use
round_jiffiesto save power by making the wakeup on a second boundary.
We already apply slack when initializing the timer:
static void prandom_start_seed_timer(void)
{
set_timer_slack(&seed_timer, HZ);
seed_timer.expires = jiffies + 40 * HZ;
add_timer(&seed_timer);
}It thus does get rounded by apply_slack in mod_timer.
Greetings,
Hannes
Re: [PATCH 2/2] random32: use msecs_to_jiffies for reseed timer
In reply to Daniel BorkmannFrom: Daniel Borkmann <[email protected]>
Date: Tue, 12 Nov 2013 23:45:42 +0100
Quoted 6 lines
Use
msecs_to_jiffies, for these calculations as different HZ considerations are taken into account for conversion of the timer shot, and also it makes the code more readable.Signed-off-by Daniel Borkmann <[email protected]>Signed-off-by Hannes Frederic Sowa <[email protected]>
Applied.
From: Daniel Borkmann <[email protected]>
Date: Tue, 12 Nov 2013 23:45:41 +0100
Quoted 8 lines
We only call that in functions annotated with
__init, so add__initprefix inprandom_start_seed_timer()as well, so that the kernel can make use of this hint and we can possibly free up resources after it's usage. And since it's an internal function rename it to__prandom_start_seed_timer().Signed-off-by Daniel Borkmann <[email protected]>Signed-off-by Hannes Frederic Sowa <[email protected]>
Applied.