init: call time_init() before rand_initialize()
PATCH 1/1 init: call time_init() before rand_initialize()
Currently time_init() is called before rand_initialize(), but rand_initialize() makes use of the timer on various platforms, and sometimes this timer needs to be initialized by time_init() first. In order to not return zero, reverse the order of these two calls. The block doing random initialization was right before time_init() before, so changing the order shouldn't have any complicated effects.
---
Andrew - this file has no formal maintainer, but you've signed the most commits, so I'm CC'ing you. This has some interactions with my random.git tree, so unless there are objections, I'll queue it up there. -Jason
init/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
init/main.c +1 -1
@@ -1035,6 +1035,7 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)softirq_init ();timekeeping_init ();kfence_init (); +time_init ();/* * For best initial stack canary entropy, prepare it after:
@@ -1049,7 +1050,6 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)add_device_randomness (command_line,strlen (command_line));boot_init_stack_canary (); -time_init ();perf_event_init ();profile_init ();call_function_init ();
Signature · 1 line
2.35.1
Quoted 1 line · On Thu, 5 May 2022 02:31:14 +0200 "Jason A. Donenfeld" <[email protected]> wrote:
Currently
time_init()is called beforerand_initialize(), but
You mean "after"! Changelog was really confusing until I went and looked at the code.
Quoted 3 lines
rand_initialize()makes use of the timer on various platforms, and sometimes this timer needs to be initialized bytime_init()first. In order to not return zero,
return zero from what?
Quoted 3 lines
reverse the order of these two calls. The
block doing random initialization was right beforetime_init()before, so changing the order shouldn't have any complicated effects.
I hope you're right. Moving these things around tends to fix one thing and break another.
Quoted 3 lines
Andrew - this file has no formal maintainer, but you've signed the most commits, so I'm CC'ing you. This has some interactions with my random.git tree, so unless there are objections, I'll queue it up there.
No probs. Plenty of testing in linux-next, please.
Hi Andrew,
Quoted 6 lines · Andrew Morton
Quoted 1 line · On Thu, 5 May 2022 02:31:14 +0200 "Jason A. Donenfeld" <[email protected]> wrote:
Currently
time_init()is called beforerand_initialize(), butYou mean "after"! Changelog was really confusing until I went and looked at the code.
Oh dear, yes. Will fix that.
Quoted 6 lines
Quoted 4 lines
rand_initialize()makes use of the timer on various platforms, and sometimes this timer needs to be initialized bytime_init()first. In order to not return zero,return zero from what?
random_get_entropy_fallback(). I'll fix that in the commit message.
Quoted 6 lines
Quoted 3 lines
reverse the order of these two calls. The
block doing random initialization was right beforetime_init()before, so changing the order shouldn't have any complicated effects.I hope you're right. Moving these things around tends to fix one thing and break another.
I hope so too. Reading the platform code for every arch I can't see where breakage would be. Nothing in the time init functions relies on the rng being available, and actually, the rng is already quasi functional before the call to rand_initialize(), so I think it should be good. Nonetheless:
Quoted 1 line
No probs. Plenty of testing in linux-next, please.
Exactly this. Plus the CI on build.wireguard.com and such is churning on it on a variety of different archs.
Jason
PATCH v2 1/1 init: call time_init() before rand_initialize()
Currently time_init() is called after rand_initialize(), but rand_initialize() makes use of the timer on various platforms, and sometimes this timer needs to be initialized by time_init() first. In order for random_get_entropy() to not return zero during early boot when it's potentially used as an entropy source, reverse the order of these two calls. The block doing random initialization was right before time_init() before, so changing the order shouldn't have any complicated effects.
---
Changes v1->v2:
- Clarified commit message; code remains the same.
This lives in random.git and will be in linux-next for testing.
init/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
init/main.c +1 -1
@@ -1035,6 +1035,7 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)softirq_init ();timekeeping_init ();kfence_init (); +time_init ();/* * For best initial stack canary entropy, prepare it after:
@@ -1049,7 +1050,6 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)add_device_randomness (command_line,strlen (command_line));boot_init_stack_canary (); -time_init ();perf_event_init ();profile_init ();call_function_init ();
Signature · 1 line
2.35.1
Quoted 10 lines · Jason A. Donenfeld
Currently
time_init()is called beforerand_initialize(), butrand_initialize()makes use of the timer on various platforms, and sometimes this timer needs to be initialized bytime_init()first. In order to not return zero, reverse the order of these two calls. The block doing random initialization was right beforetime_init()before, so changing the order shouldn't have any complicated effects.Cc Stafford Horne <[email protected]>Cc Andrew Morton <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>
I was thinking along the same lines when I looked into the OpenRISC issue that we fixed discussed here:
- https://lore.kernel.org/all/Ym27sFdFZEt5QV0i@antec/
Though, I was not sure as to any dependency issues caused by changing the order. Having it in -next and testing for a while should be able to bring out any bug.
As for this patch:
Quoted 32 lines
---
Andrew - this file has no formal maintainer, but you've signed the most commits, so I'm CC'ing you. This has some interactions with my random.git tree, so unless there are objections, I'll queue it up there.(quoted diff) +0
-1-Jason init/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)init/main.c +1
-1@@ -1035,6 +1035,7 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)softirq_init ();timekeeping_init ();kfence_init (); +time_init ();/* * For best initial stack canary entropy, prepare it after: @@ -1049,7 +1050,6 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)add_device_randomness (command_line,strlen (command_line));boot_init_stack_canary (); -time_init ();perf_event_init ();profile_init ();call_function_init ();Signature · 1 line
2.35.1