From 480b050cc3d075fdb2ef9eb0e21340cbd4bbf324 Mon Sep 17 00:00:00 2001
From: SChernykh <sergey.v.chernykh@gmail.com>
Date: Wed, 11 Jan 2023 19:18:41 +0100
Subject: [PATCH 1/2] RandomX: print VM allocation warnings only once
---
src/crypto/rx-slow-hash.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/crypto/rx-slow-hash.c b/src/crypto/rx-slow-hash.c
index 8682daeb2..8ad700fd8 100644
--- a/src/crypto/rx-slow-hash.c
+++ b/src/crypto/rx-slow-hash.c
@@ -246,7 +246,11 @@ static void rx_init_full_vm(randomx_flags flags, randomx_vm** vm)
*vm = randomx_create_vm((flags | RANDOMX_FLAG_LARGE_PAGES | RANDOMX_FLAG_FULL_MEM) & ~disabled_flags(), NULL, main_dataset);
if (!*vm) {
- mwarning(RX_LOGCAT, "Couldn't allocate RandomX full VM using large pages");
+ static int shown = 0;
+ if (!shown) {
+ shown = 1;
+ mwarning(RX_LOGCAT, "Couldn't allocate RandomX full VM using large pages (will print only once)");
+ }
*vm = randomx_create_vm((flags | RANDOMX_FLAG_FULL_MEM) & ~disabled_flags(), NULL, main_dataset);
if (!*vm) {
merror(RX_LOGCAT, "Couldn't allocate RandomX full VM");
@@ -269,7 +273,11 @@ static void rx_init_light_vm(randomx_flags flags, randomx_vm** vm, randomx_cache
*vm = randomx_create_vm((flags | RANDOMX_FLAG_LARGE_PAGES) & ~disabled_flags(), cache, NULL);
if (!*vm) {
- mwarning(RX_LOGCAT, "Couldn't allocate RandomX light VM using large pages");
+ static int shown = 0;
+ if (!shown) {
+ shown = 1;
+ mwarning(RX_LOGCAT, "Couldn't allocate RandomX light VM using large pages (will print only once)");
+ }
*vm = randomx_create_vm(flags & ~disabled_flags(), cache, NULL);
if (!*vm) local_abort("Couldn't allocate RandomX light VM");
}
From f456b3f02334e3ee751fc1d845cc93b690e665c6 Mon Sep 17 00:00:00 2001
From: SChernykh <sergey.v.chernykh@gmail.com>
Date: Sat, 14 Jan 2023 15:57:52 +0100
Subject: [PATCH 2/2] Demote large pages warning to `mdebug`
---
src/crypto/rx-slow-hash.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/crypto/rx-slow-hash.c b/src/crypto/rx-slow-hash.c
index 8ad700fd8..14fb56e07 100644
--- a/src/crypto/rx-slow-hash.c
+++ b/src/crypto/rx-slow-hash.c
@@ -43,6 +43,9 @@
#define RX_LOGCAT "randomx"
+// Report large page allocation failures as debug messages
+#define alloc_err_msg(x) mdebug(RX_LOGCAT, x);
+
static CTHR_RWLOCK_TYPE main_dataset_lock = CTHR_RWLOCK_INIT;
static CTHR_RWLOCK_TYPE main_cache_lock = CTHR_RWLOCK_INIT;
@@ -212,7 +215,7 @@ static void rx_alloc_dataset(randomx_flags flags, randomx_dataset** dataset, int
*dataset = randomx_alloc_dataset((flags | RANDOMX_FLAG_LARGE_PAGES) & ~disabled_flags());
if (!*dataset) {
- mwarning(RX_LOGCAT, "Couldn't allocate RandomX dataset using large pages");
+ alloc_err_msg("Couldn't allocate RandomX dataset using large pages");
*dataset = randomx_alloc_dataset(flags & ~disabled_flags());
if (!*dataset) {
merror(RX_LOGCAT, "Couldn't allocate RandomX dataset");
@@ -228,7 +231,7 @@ static void rx_alloc_cache(randomx_flags flags, randomx_cache** cache)
*cache = randomx_alloc_cache((flags | RANDOMX_FLAG_LARGE_PAGES) & ~disabled_flags());
if (!*cache) {
- mwarning(RX_LOGCAT, "Couldn't allocate RandomX cache using large pages");
+ alloc_err_msg("Couldn't allocate RandomX cache using large pages");
*cache = randomx_alloc_cache(flags & ~disabled_flags());
if (!*cache) local_abort("Couldn't allocate RandomX cache");
}
@@ -249,7 +252,7 @@ static void rx_init_full_vm(randomx_flags flags, randomx_vm** vm)
static int shown = 0;
if (!shown) {
shown = 1;
- mwarning(RX_LOGCAT, "Couldn't allocate RandomX full VM using large pages (will print only once)");
+ alloc_err_msg("Couldn't allocate RandomX full VM using large pages (will print only once)");
}
*vm = randomx_create_vm((flags | RANDOMX_FLAG_FULL_MEM) & ~disabled_flags(), NULL, main_dataset);
if (!*vm) {
@@ -276,7 +279,7 @@ static void rx_init_light_vm(randomx_flags flags, randomx_vm** vm, randomx_cache
static int shown = 0;
if (!shown) {
shown = 1;
- mwarning(RX_LOGCAT, "Couldn't allocate RandomX light VM using large pages (will print only once)");
+ alloc_err_msg("Couldn't allocate RandomX light VM using large pages (will print only once)");
}
*vm = randomx_create_vm(flags & ~disabled_flags(), cache, NULL);
if (!*vm) local_abort("Couldn't allocate RandomX light VM");