Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-22 08:53:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Init RNG with rdrand directly (without getrandom)

Browse Source
This commit is contained in:
Qingsong Chen
2024-07-02 02:12:06 +00:00
committed by Tate, Hongliang Tian
parent 9932ea0797
commit 98619f3482
4 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/aster-nix/Cargo.toml
View File

@ -61,7 +61,7 @@ lru = "0.12.3"
log = "0.4"
bitvec = { version = "1.0", default-features = false, features = ["alloc"] }
hashbrown = "0.14"
rand = { version = "0.8.5", default-features = false, features = ["getrandom", "small_rng", "std_rng"] }
rand = { version = "0.8.5", default-features = false, features = ["small_rng", "std_rng"] }
static_assertions = "1.1.0"
inherit-methods-macro = { git = "https://github.com/asterinas/inherit-methods-macro", rev = "98f7e3e" }
getset = "0.1.2"
@ -71,11 +71,6 @@ bytemuck_derive = "1.5.0"
takeable = "0.2.2"
cfg-if = "1.0"
[target.x86_64-unknown-none.dependencies]
getrandom = { version = "0.2.10", default-features = false, features = [
"rdrand",
] }
[dependencies.lazy_static]
version = "1.0"
features = ["spin_no_std"]

16
kernel/aster-nix/src/util/random.rs
View File

@ -22,8 +22,22 @@ pub fn init() {
cfg_if::cfg_if! {
if #[cfg(target_arch = "x86_64")] {
use rand::SeedableRng;
use ostd::arch::read_random;
RNG.call_once(|| SpinLock::new(StdRng::from_entropy()));
let mut seed = <StdRng as SeedableRng>::Seed::default();
let mut chunks = seed.as_mut().chunks_exact_mut(size_of::<u64>());
for chunk in chunks.by_ref() {
let src = read_random().expect("read_random failed multiple times").to_ne_bytes();
chunk.copy_from_slice(&src);
}
let tail = chunks.into_remainder();
let n = tail.len();
if n > 0 {
let src = read_random().expect("read_random failed multiple times").to_ne_bytes();
tail.copy_from_slice(&src[..n]);
}
RNG.call_once(|| SpinLock::new(StdRng::from_seed(seed)));
} else {
compile_error!("unsupported target");
}