diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2021-03-26 18:39:49 +0000 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2021-03-26 19:12:12 +0000 |
commit | 5f070ba29803c99a5fe94ed7632d7b8c55593df3 (patch) | |
tree | bb20e6206dec86fe9df7b07dc55366f3f7c36044 /libstdc++-v3/src | |
parent | d82797420c2238e31a7a25fe6db6bd05cd37224d (diff) | |
download | gcc-5f070ba29803c99a5fe94ed7632d7b8c55593df3.zip gcc-5f070ba29803c99a5fe94ed7632d7b8c55593df3.tar.gz gcc-5f070ba29803c99a5fe94ed7632d7b8c55593df3.tar.bz2 |
libstdc++: Add PRNG fallback to std::random_device
This makes std::random_device usable on VxWorks when running on older
x86 hardware. Since the r10-728 fix for PR libstdc++/85494 the library
will use the new code unconditionally on x86, but the cpuid checks for
RDSEED and RDRAND can fail at runtime, depending on the hardware where
the code is executing. If the OS does not provide /dev/urandom then this
means the std::random_device constructor always fails. In previous
releases if /dev/urandom is unavailable then std::mt19937 was used
unconditionally.
This patch adds a fallback for the case where the runtime cpuid checks
for x86 hardware instructions fail, and no /dev/urandom is available.
When this happens a std::linear_congruential_engine object will be used,
with a seed based on hashing the engine's address and the current time.
Distinct std::random_device objects will use different seeds, unless an
object is created and destroyed and a new object created at the same
memory location within the clock tick. This is not great, but is better
than always throwing from the constructor, and better than always using
std::mt19937 with the same seed (as GCC 9 and earlier do).
libstdc++-v3/ChangeLog:
* src/c++11/random.cc (USE_LCG): Define when a pseudo-random
fallback is needed.
[USE_LCG] (bad_seed, construct_lcg_at, destroy_lcg_at, __lcg):
New helper functions and callback.
(random_device::_M_init): Add 'prng' and 'all' enumerators.
Replace switch with fallthrough with a series of 'if' statements.
[USE_LCG]: Construct an lcg_type engine and use __lcg when cpuid
checks fail.
(random_device::_M_init_pretr1) [USE_MT19937]: Accept "prng"
token.
(random_device::_M_getval): Check for callback unconditionally
and always pass _M_file pointer.
* testsuite/26_numerics/random/random_device/85494.cc: Remove
effective-target check. Use new random_device_available helper.
* testsuite/26_numerics/random/random_device/94087.cc: Likewise.
* testsuite/26_numerics/random/random_device/cons/default-cow.cc:
Remove effective-target check.
* testsuite/26_numerics/random/random_device/cons/default.cc:
Likewise.
* testsuite/26_numerics/random/random_device/cons/token.cc: Use
new random_device_available helper. Test "prng" token.
* testsuite/util/testsuite_random.h (random_device_available):
New helper function.
Diffstat (limited to 'libstdc++-v3/src')
-rw-r--r-- | libstdc++-v3/src/c++11/random.cc | 252 |
1 files changed, 158 insertions, 94 deletions
diff --git a/libstdc++-v3/src/c++11/random.cc b/libstdc++-v3/src/c++11/random.cc index 1092299..44b9f30 100644 --- a/libstdc++-v3/src/c++11/random.cc +++ b/libstdc++-v3/src/c++11/random.cc @@ -66,14 +66,23 @@ # include <stdlib.h> #endif -#if defined USE_RDRAND || defined USE_RDSEED \ - || defined _GLIBCXX_USE_CRT_RAND_S || defined _GLIBCXX_USE_DEV_RANDOM +#if defined _GLIBCXX_USE_CRT_RAND_S || defined _GLIBCXX_USE_DEV_RANDOM +// The OS provides a source of randomness we can use. # pragma GCC poison _M_mt +#elif defined USE_RDRAND || defined USE_RDSEED +// Hardware instructions might be available, but use cpuid checks at runtime. +# pragma GCC poison _M_mt +// If the runtime cpuid checks fail we'll use a linear congruential engine. +# define USE_LCG 1 #else // Use the mt19937 member of the union, as in previous GCC releases. # define USE_MT19937 1 #endif +#ifdef USE_LCG +# include <chrono> +#endif + namespace std _GLIBCXX_VISIBILITY(default) { namespace @@ -136,6 +145,53 @@ namespace std _GLIBCXX_VISIBILITY(default) return val; } #endif + +#ifdef USE_LCG + // TODO: use this to seed std::mt19937 engine too. + unsigned + bad_seed(void* p) noexcept + { + // Poor quality seed based on hash of the current time and the address + // of the object being seeded. Better than using the same default seed + // for every object though. + const uint64_t bits[] = { + (uint64_t) chrono::system_clock::now().time_since_epoch().count(), + (uint64_t) reinterpret_cast<uintptr_t>(p) + }; + auto bytes = reinterpret_cast<const unsigned char*>(bits); + // 32-bit FNV-1a hash + uint32_t h = 2166136261u; + for (unsigned i = 0; i < sizeof(bits); ++i) + { + h ^= *bytes++; + h *= 16777619u; + } + return h; + } + + // Same as std::minstd_rand0 but using unsigned not uint_fast32_t. + using lcg_type + = linear_congruential_engine<unsigned, 16807UL, 0UL, 2147483647UL>; + + inline lcg_type* + construct_lcg_at(void* addr) noexcept + { + return ::new(addr) lcg_type(bad_seed(addr)); + } + + inline void + destroy_lcg_at(void* addr) noexcept + { + static_cast<lcg_type*>(addr)->~lcg_type(); + } + + unsigned int + __lcg(void* ptr) noexcept + { + auto& lcg = *static_cast<lcg_type*>(ptr); + return lcg(); + } +#endif } void @@ -152,25 +208,16 @@ namespace std _GLIBCXX_VISIBILITY(default) _M_fd = -1; const char* fname [[gnu::unused]] = nullptr; - bool default_token [[gnu::unused]] = false; - enum { rand_s, rdseed, rdrand, device_file } which; + enum { + rand_s = 1, rdseed = 2, rdrand = 4, device_file = 8, prng = 16, + any = 0xffff + } which; if (token == "default") { - default_token = true; + which = any; fname = "/dev/urandom"; -#if defined _GLIBCXX_USE_CRT_RAND_S - which = rand_s; -#elif defined USE_RDSEED - which = rdseed; -#elif defined USE_RDRAND - which = rdrand; -#elif defined _GLIBCXX_USE_DEV_RANDOM - which = device_file; -#else -# error "either define USE_MT19937 above or set the default device here" -#endif } #ifdef USE_RDSEED else if (token == "rdseed") @@ -191,99 +238,104 @@ namespace std _GLIBCXX_VISIBILITY(default) which = device_file; } #endif // _GLIBCXX_USE_DEV_RANDOM +#ifdef USE_LCG + else if (token == "prng") + which = prng; +#endif else std::__throw_runtime_error( __N("random_device::random_device(const std::string&):" " unsupported token")); - switch (which) - { #ifdef _GLIBCXX_USE_CRT_RAND_S - case rand_s: - { - _M_func = &__winxp_rand_s; - return; - } + if (which & rand_s) + { + _M_func = &__winxp_rand_s; + return; + } #endif // _GLIBCXX_USE_CRT_RAND_S + #ifdef USE_RDSEED - case rdseed: - { - unsigned int eax, ebx, ecx, edx; - // Check availability of cpuid and, for now at least, also the - // CPU signature for Intel and AMD. - if (__get_cpuid_max(0, &ebx) > 0 - && (ebx == signature_INTEL_ebx || ebx == signature_AMD_ebx)) - { - // CPUID.(EAX=07H, ECX=0H):EBX.RDSEED[bit 18] - __cpuid_count(7, 0, eax, ebx, ecx, edx); - if (ebx & bit_RDSEED) - { + if (which & rdseed) + { + unsigned int eax, ebx, ecx, edx; + // Check availability of cpuid and, for now at least, also the + // CPU signature for Intel and AMD. + if (__get_cpuid_max(0, &ebx) > 0 + && (ebx == signature_INTEL_ebx || ebx == signature_AMD_ebx)) + { + // CPUID.(EAX=07H, ECX=0H):EBX.RDSEED[bit 18] + __cpuid_count(7, 0, eax, ebx, ecx, edx); + if (ebx & bit_RDSEED) + { #ifdef USE_RDRAND - // CPUID.01H:ECX.RDRAND[bit 30] - __cpuid(1, eax, ebx, ecx, edx); - if (ecx & bit_RDRND) - { - _M_func = &__x86_rdseed_rdrand; - return; - } + // CPUID.01H:ECX.RDRAND[bit 30] + __cpuid(1, eax, ebx, ecx, edx); + if (ecx & bit_RDRND) + { + _M_func = &__x86_rdseed_rdrand; + return; + } #endif - _M_func = &__x86_rdseed; - return; - } - } - // If rdseed was explicitly requested then we're done here. - if (!default_token) - break; - // Otherwise fall through to try the next available option. - [[gnu::fallthrough]]; - } + _M_func = &__x86_rdseed; + return; + } + } + } #endif // USE_RDSEED + #ifdef USE_RDRAND - case rdrand: - { - unsigned int eax, ebx, ecx, edx; - // Check availability of cpuid and, for now at least, also the - // CPU signature for Intel and AMD. - if (__get_cpuid_max(0, &ebx) > 0 - && (ebx == signature_INTEL_ebx || ebx == signature_AMD_ebx)) - { - // CPUID.01H:ECX.RDRAND[bit 30] - __cpuid(1, eax, ebx, ecx, edx); - if (ecx & bit_RDRND) - { - _M_func = &__x86_rdrand; - return; - } - } - // If rdrand was explicitly requested then we're done here. - if (!default_token) - break; - // Otherwise fall through to try the next available option. - [[gnu::fallthrough]]; - } + if (which & rdrand) + { + unsigned int eax, ebx, ecx, edx; + // Check availability of cpuid and, for now at least, also the + // CPU signature for Intel and AMD. + if (__get_cpuid_max(0, &ebx) > 0 + && (ebx == signature_INTEL_ebx || ebx == signature_AMD_ebx)) + { + // CPUID.01H:ECX.RDRAND[bit 30] + __cpuid(1, eax, ebx, ecx, edx); + if (ecx & bit_RDRND) + { + _M_func = &__x86_rdrand; + return; + } + } + } #endif // USE_RDRAND + #ifdef _GLIBCXX_USE_DEV_RANDOM - case device_file: - { + if (which & device_file) + { #ifdef USE_POSIX_FILE_IO - _M_fd = ::open(fname, O_RDONLY); - if (_M_fd != -1) - { - // Set _M_file to non-null so that _M_fini() will do clean up. - _M_file = &_M_fd; - return; - } -#else // USE_POSIX_FILE_IO - _M_file = static_cast<void*>(std::fopen(fname, "rb")); - if (_M_file) + _M_fd = ::open(fname, O_RDONLY); + if (_M_fd != -1) + { + // Set _M_file to non-null so that _M_fini() will do clean up. + _M_file = &_M_fd; return; + } +#else // USE_POSIX_FILE_IO + _M_file = static_cast<void*>(std::fopen(fname, "rb")); + if (_M_file) + return; #endif // USE_POSIX_FILE_IO - [[gnu::fallthrough]]; - } + } #endif // _GLIBCXX_USE_DEV_RANDOM - default: - { } + +#ifdef USE_LCG + // Either "prng" was requested explicitly, or "default" was requested + // but nothing above worked, use a PRNG. + if (which & prng) + { + static_assert(sizeof(lcg_type) <= sizeof(_M_fd), ""); + static_assert(alignof(lcg_type) <= alignof(_M_fd), ""); + _M_file = construct_lcg_at(&_M_fd); + _M_func = &__lcg; + return; } +#endif + std::__throw_runtime_error( __N("random_device::random_device(const std::string&):" " device not available")); @@ -297,7 +349,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { #ifdef USE_MT19937 unsigned long seed = 5489UL; - if (token != "default" && token != "mt19937") + if (token != "default" && token != "mt19937" && token != "prng") { const char* nptr = token.c_str(); char* endptr; @@ -335,6 +387,14 @@ namespace std _GLIBCXX_VISIBILITY(default) if (!_M_file) return; +#if USE_LCG + if (_M_func == &__lcg) + { + destroy_lcg_at(_M_file); + return; + } +#endif + #ifdef USE_POSIX_FILE_IO ::close(_M_fd); _M_fd = -1; @@ -351,10 +411,8 @@ namespace std _GLIBCXX_VISIBILITY(default) return _M_mt(); #else -#if defined USE_RDRAND || defined USE_RDSEED || defined _GLIBCXX_USE_CRT_RAND_S if (_M_func) - return _M_func(nullptr); -#endif + return _M_func(_M_file); result_type ret; void* p = &ret; @@ -430,5 +488,11 @@ namespace std _GLIBCXX_VISIBILITY(default) 0x9d2c5680UL, 15, 0xefc60000UL, 18, 1812433253UL>; #endif // USE_MT19937 + +#ifdef USE_LCG + template class + linear_congruential_engine<unsigned, 16807UL, 0UL, 2147483647UL>; + template struct __detail::_Mod<unsigned, 2147483647UL, 16807UL, 0UL>; +#endif } #endif // _GLIBCXX_USE_C99_STDINT_TR1 |