@@ -4,10 +4,9 @@ use crate::{
44 Error ,
55} ;
66use core:: {
7- cell:: UnsafeCell ,
87 ffi:: c_void,
98 mem:: MaybeUninit ,
10- sync:: atomic:: { AtomicUsize , Ordering :: Relaxed } ,
9+ sync:: atomic:: { AtomicUsize , Ordering } ,
1110} ;
1211
1312/// For all platforms, we use `/dev/urandom` rather than `/dev/random`.
@@ -18,6 +17,7 @@ use core::{
1817/// - On Haiku and QNX Neutrino they are identical.
1918const FILE_PATH : & [ u8 ] = b"/dev/urandom\0 " ;
2019const FD_UNINIT : usize = usize:: MAX ;
20+ const FD_ONGOING_INIT : usize = usize:: MAX - 1 ;
2121
2222// Do not inline this when it is the fallback implementation, but don't mark it
2323// `#[cold]` because it is hot when it is actually used.
@@ -35,42 +35,66 @@ pub fn getrandom_inner(dest: &mut [MaybeUninit<u8>]) -> Result<(), Error> {
3535fn get_rng_fd ( ) -> Result < libc:: c_int , Error > {
3636 static FD : AtomicUsize = AtomicUsize :: new ( FD_UNINIT ) ;
3737
38- fn get_fd ( ) -> Option < libc:: c_int > {
39- match FD . load ( Relaxed ) {
40- FD_UNINIT => None ,
41- val => Some ( val as libc:: c_int ) ,
42- }
43- }
44-
4538 #[ cold]
46- fn get_fd_locked ( ) -> Result < libc:: c_int , Error > {
47- // SAFETY: We use the mutex only in this method, and we always unlock it
48- // before returning, making sure we don't violate the pthread_mutex_t API.
49- static MUTEX : Mutex = Mutex :: new ( ) ;
50- unsafe { MUTEX . lock ( ) } ;
51- let _guard = DropGuard ( || unsafe { MUTEX . unlock ( ) } ) ;
52-
53- if let Some ( fd) = get_fd ( ) {
54- return Ok ( fd) ;
39+ fn init_or_wait_fd ( ) -> Result < libc:: c_int , Error > {
40+ // Maximum sleep time (~268 milliseconds)
41+ const MAX_SLEEP_NS : libc:: c_long = 1 << 28 ;
42+ // Starting sleep time (~4 microseconds)
43+ let mut timeout_ns = 1 << 12 ;
44+ loop {
45+ match FD . load ( Ordering :: Acquire ) {
46+ FD_UNINIT => { }
47+ FD_ONGOING_INIT => {
48+ let rqtp = libc:: timespec { tv_sec : 0 , tv_nsec : timeout_ns } ;
49+ let mut rmtp = libc:: timespec { tv_sec : 0 , tv_nsec : 0 } ;
50+ unsafe {
51+ libc:: nanosleep ( & rqtp, & mut rmtp) ;
52+ }
53+ if timeout_ns < MAX_SLEEP_NS {
54+ timeout_ns *= 2 ;
55+ }
56+ continue ;
57+ }
58+ val => return Ok ( val as libc:: c_int ) ,
59+ }
60+ let res = FD . compare_exchange_weak (
61+ FD_UNINIT ,
62+ FD_ONGOING_INIT ,
63+ Ordering :: AcqRel ,
64+ Ordering :: Relaxed ,
65+ ) ;
66+ if res. is_err ( ) {
67+ continue ;
68+ }
69+
70+ return match open_fd ( ) {
71+ Ok ( fd) => {
72+ FD . store ( fd as usize , Ordering :: Release ) ;
73+ Ok ( fd)
74+ }
75+ Err ( err) => {
76+ FD . store ( FD_UNINIT , Ordering :: Release ) ;
77+ Err ( err)
78+ }
79+ } ;
5580 }
81+ }
5682
83+ fn open_fd ( ) -> Result < libc:: c_int , Error > {
5784 // On Linux, /dev/urandom might return insecure values.
5885 #[ cfg( any( target_os = "android" , target_os = "linux" ) ) ]
5986 wait_until_rng_ready ( ) ?;
6087
6188 let fd = open_readonly ( FILE_PATH ) ?;
6289 // The fd always fits in a usize without conflicting with FD_UNINIT.
63- debug_assert ! ( fd >= 0 && ( fd as usize ) < FD_UNINIT ) ;
64- FD . store ( fd as usize , Relaxed ) ;
90+ debug_assert ! ( fd >= 0 && ( fd as usize ) < FD_ONGOING_INIT ) ;
6591
6692 Ok ( fd)
6793 }
6894
69- // Use double-checked locking to avoid acquiring the lock if possible.
70- if let Some ( fd) = get_fd ( ) {
71- Ok ( fd)
72- } else {
73- get_fd_locked ( )
95+ match FD . load ( Ordering :: Relaxed ) {
96+ FD_UNINIT | FD_ONGOING_INIT => init_or_wait_fd ( ) ,
97+ val => Ok ( val as libc:: c_int ) ,
7498 }
7599}
76100
@@ -129,24 +153,6 @@ fn wait_until_rng_ready() -> Result<(), Error> {
129153 }
130154}
131155
132- struct Mutex ( UnsafeCell < libc:: pthread_mutex_t > ) ;
133-
134- impl Mutex {
135- const fn new ( ) -> Self {
136- Self ( UnsafeCell :: new ( libc:: PTHREAD_MUTEX_INITIALIZER ) )
137- }
138- unsafe fn lock ( & self ) {
139- let r = libc:: pthread_mutex_lock ( self . 0 . get ( ) ) ;
140- debug_assert_eq ! ( r, 0 ) ;
141- }
142- unsafe fn unlock ( & self ) {
143- let r = libc:: pthread_mutex_unlock ( self . 0 . get ( ) ) ;
144- debug_assert_eq ! ( r, 0 ) ;
145- }
146- }
147-
148- unsafe impl Sync for Mutex { }
149-
150156struct DropGuard < F : FnMut ( ) > ( F ) ;
151157
152158impl < F : FnMut ( ) > Drop for DropGuard < F > {
0 commit comments