Merge branch 'dev'

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v5.4.0
+- [#1434](https://github.com/xmrig/xmrig/pull/1434) Added RandomSFX (`rx/sfx`) algorithm for Safex Cash.
+- [#1445](https://github.com/xmrig/xmrig/pull/1445) Added RandomV (`rx/v`) algorithm for *new* MoneroV.
+- [#1419](https://github.com/xmrig/xmrig/issues/1419) Added reverting MSR changes on miner exit, use `"rdmsr": false,` in `"randomx"` object to disable this feature.
+- [#1423](https://github.com/xmrig/xmrig/issues/1423) Fixed conflicts with exists WinRing0 driver service.
+- [#1425](https://github.com/xmrig/xmrig/issues/1425) Fixed crash on first generation Zen CPUs (MSR mod accidentally enable Opcache), additionally now you can disable Opcache and enable MSR mod via config `"wrmsr": ["0xc0011020:0x0", "0xc0011021:0x60", "0xc0011022:0x510000", "0xc001102b:0x1808cc16"],`.
+- Added advanced usage for `wrmsr` option, for example: `"wrmsr": ["0x1a4:0x6"],` (Intel) and `"wrmsr": ["0xc0011020:0x0", "0xc0011021:0x40:0xffffffffffffffdf", "0xc0011022:0x510000", "0xc001102b:0x1808cc16"],` (Ryzen).
+- Added new config option `"verbose"` and command line option `--verbose`.
+
 # v5.3.0
 - [#1414](https://github.com/xmrig/xmrig/pull/1414) Added native MSR support for Windows, by using signed **WinRing0 driver** (© 2007-2009 OpenLibSys.org).
 - Added new [MSR documentation](https://xmrig.com/docs/miner/randomx-optimization-guide/msr).

CMakeLists.txt

@@ -13,6 +13,7 @@ option(WITH_HTTP            "Enable HTTP protocol support (client/server)" ON)
 option(WITH_DEBUG_LOG       "Enable debug log output" OFF)
 option(WITH_TLS             "Enable OpenSSL support" ON)
 option(WITH_ASM             "Enable ASM PoW implementations" ON)
+option(WITH_MSR             "Enable MSR support" ON)
 option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
 option(WITH_OPENCL          "Enable OpenCL backend" ON)
 option(WITH_CUDA            "Enable CUDA backend" ON)

README.md

@@ -98,6 +98,7 @@ Logging:
       --print-time=N            print hashrate report every N seconds
       --health-print-time=N     print health report every N seconds
       --no-color                disable colored output
+      --verbose                 verbose output
 
 Misc:
   -c, --config=FILE             load a JSON-format configuration file

cmake/randomx.cmake

@@ -79,11 +79,22 @@ if (WITH_RANDOMX)
             )
     endif()
 
-    if (WIN32)
+    if (WITH_MSR AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (XMRIG_OS_WIN OR XMRIG_OS_LINUX))
-        list(APPEND SOURCES_CRYPTO src/crypto/rx/Rx_windows.cpp)
+        add_definitions(/DXMRIG_FEATURE_MSR)
-    elseif (XMRIG_OS_LINUX AND NOT XMRIG_ARM)
+        message("-- WITH_MSR=ON")
+
+        if (XMRIG_OS_WIN)
+            list(APPEND SOURCES_CRYPTO src/crypto/rx/Rx_win.cpp)
+        elseif (XMRIG_OS_LINUX)
             list(APPEND SOURCES_CRYPTO src/crypto/rx/Rx_linux.cpp)
         endif()
+
+        list(APPEND HEADERS_CRYPTO src/crypto/rx/msr/MsrItem.h)
+        list(APPEND SOURCES_CRYPTO src/crypto/rx/msr/MsrItem.cpp)
+    else()
+        remove_definitions(/DXMRIG_FEATURE_MSR)
+        message("-- WITH_MSR=OFF")
+    endif()
 else()
     remove_definitions(/DXMRIG_ALGO_RANDOMX)
 endif()

doc/ALGORITHMS.md

@@ -12,6 +12,8 @@ Option `coin` useful for pools without algorithm negotiation support or daemon t
 
 | Name | Memory | Version | Notes |
 |------|--------|---------|-------|
+| `rx/sfx` | 2 MB | 5.4.0+ | RandomSFX (RandomX variant for Safex). |
+| `rx/v` | 2 MB | 5.4.0+ | RandomV (RandomX variant for new MoneroV). |
 | `rx/arq` | 256 KB | 4.3.0+ | RandomARQ (RandomX variant for ArQmA). |
 | `rx/0` | 2 MB | 3.2.0+ | RandomX (Monero). |
 | `argon2/chukwa` | 512 KB | 3.1.0+ | Argon2id (Chukwa). |

src/Summary.cpp

@@ -159,7 +159,7 @@ static void print_threads(Config *config)
 
 static void print_commands(Config *)
 {
-    if (Log::colors) {
+    if (Log::isColors()) {
         Log::print(GREEN_BOLD(" * ") WHITE_BOLD("COMMANDS     ") MAGENTA_BG(WHITE_BOLD_S "h") WHITE_BOLD("ashrate, ")
                                                                      MAGENTA_BG(WHITE_BOLD_S "p") WHITE_BOLD("ause, ")
                                                                      MAGENTA_BG(WHITE_BOLD_S "r") WHITE_BOLD("esume"));

src/backend/cpu/interfaces/ICpuInfo.h

@@ -37,12 +37,20 @@ namespace xmrig {
 class ICpuInfo
 {
 public:
-    enum Vendor {
+    enum Vendor : uint32_t {
         VENDOR_UNKNOWN,
         VENDOR_INTEL,
         VENDOR_AMD
     };
 
+    enum MsrMod : uint32_t {
+        MSR_MOD_NONE,
+        MSR_MOD_RYZEN,
+        MSR_MOD_INTEL,
+        MSR_MOD_CUSTOM,
+        MSR_MOD_MAX
+    };
+
     virtual ~ICpuInfo() = default;
 
 #   if defined(__x86_64__) || defined(_M_AMD64) || defined (__arm64__) || defined (__aarch64__)
@@ -58,6 +66,7 @@ public:
     virtual const char *backend() const                                             = 0;
     virtual const char *brand() const                                               = 0;
     virtual CpuThreads threads(const Algorithm &algorithm, uint32_t limit) const    = 0;
+    virtual MsrMod msrMod() const                                                   = 0;
     virtual size_t cores() const                                                    = 0;
     virtual size_t L2() const                                                       = 0;
     virtual size_t L3() const                                                       = 0;

src/backend/cpu/platform/AdvancedCpuInfo.cpp

@@ -139,7 +139,13 @@ xmrig::AdvancedCpuInfo::AdvancedCpuInfo() :
         m_aes = true;
 
         if (m_vendor == VENDOR_AMD) {
-            m_assembly = (data.ext_family >= 23) ? Assembly::RYZEN : Assembly::BULLDOZER;
+            if (data.ext_family >= 23) {
+                m_assembly = Assembly::RYZEN;
+                m_msrMod   = MSR_MOD_RYZEN;
+            }
+            else {
+                m_assembly = Assembly::BULLDOZER;
+            }
         }
         else if (m_vendor == VENDOR_INTEL) {
             m_assembly = Assembly::INTEL;

src/backend/cpu/platform/AdvancedCpuInfo.h

@@ -46,6 +46,7 @@ protected:
     inline bool hasOneGbPages() const override      { return m_pdpe1gb; }
     inline const char *backend() const override     { return m_backend; }
     inline const char *brand() const override       { return m_brand; }
+    inline MsrMod msrMod() const override           { return m_msrMod; }
     inline size_t cores() const override            { return m_cores; }
     inline size_t L2() const override               { return m_L2; }
     inline size_t L3() const override               { return m_L3; }
@@ -62,6 +63,7 @@ private:
     char m_backend[32]{};
     char m_brand[64 + 5]{};
     const bool m_pdpe1gb  = false;
+    MsrMod m_msrMod       = MSR_MOD_NONE;
     size_t m_cores        = 0;
     size_t m_L2           = 0;
     size_t m_L3           = 0;

src/backend/cpu/platform/BasicCpuInfo.cpp

@@ -175,11 +175,18 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
             cpuid(PROCESSOR_INFO, data);
             const int32_t family = get_masked(data[EAX_Reg], 12, 8) + get_masked(data[EAX_Reg], 28, 20);
 
-            m_assembly = family >= 23 ? Assembly::RYZEN : Assembly::BULLDOZER;
+            if (family >= 23) {
+                m_assembly = Assembly::RYZEN;
+                m_msrMod   = MSR_MOD_RYZEN;
+            }
+            else {
+                m_assembly = Assembly::BULLDOZER;
+            }
         }
         else if (memcmp(vendor, "GenuineIntel", 12) == 0) {
             m_vendor   = VENDOR_INTEL;
             m_assembly = Assembly::INTEL;
+            m_msrMod   = MSR_MOD_INTEL;
         }
     }
 #   endif

src/backend/cpu/platform/BasicCpuInfo.h

@@ -46,6 +46,7 @@ protected:
     inline bool hasAVX2() const override            { return m_avx2; }
     inline bool hasOneGbPages() const override      { return m_pdpe1gb; }
     inline const char *brand() const override       { return m_brand; }
+    inline MsrMod msrMod() const override           { return m_msrMod; }
     inline size_t cores() const override            { return 0; }
     inline size_t L2() const override               { return 0; }
     inline size_t L3() const override               { return 0; }
@@ -63,6 +64,7 @@ private:
     bool m_aes              = false;
     const bool m_avx2       = false;
     const bool m_pdpe1gb    = false;
+    MsrMod m_msrMod         = MSR_MOD_NONE;
     Vendor m_vendor         = VENDOR_UNKNOWN;
 };
 

src/backend/cuda/wrappers/CudaLib.cpp

@@ -28,6 +28,7 @@
 
 
 #include "backend/cuda/wrappers/CudaLib.h"
+#include "crypto/rx/RxAlgo.h"
 
 
 namespace xmrig {
@@ -163,7 +164,7 @@ bool xmrig::CudaLib::rxPrepare(nvid_ctx *ctx, const void *dataset, size_t datase
 
 bool xmrig::CudaLib::setJob(nvid_ctx *ctx, const void *data, size_t size, const Algorithm &algorithm) noexcept
 {
-    return pSetJob(ctx, data, size, algorithm);
+    return pSetJob(ctx, data, size, RxAlgo::id(algorithm));
 }
 
 
@@ -187,7 +188,7 @@ const char *xmrig::CudaLib::pluginVersion() noexcept
 
 int xmrig::CudaLib::deviceInfo(nvid_ctx *ctx, int32_t blocks, int32_t threads, const Algorithm &algorithm, int32_t dataset_host) noexcept
 {
-    return pDeviceInfo(ctx, blocks, threads, algorithm, dataset_host);
+    return pDeviceInfo(ctx, blocks, threads, RxAlgo::id(algorithm), dataset_host);
 }
 
 

src/backend/opencl/OclLaunchData.cpp

@@ -25,7 +25,6 @@
 
 
 #include "backend/opencl/OclLaunchData.h"
-
 #include "backend/common/Tags.h"
 #include "backend/opencl/OclConfig.h"
 

src/backend/opencl/cl/cn/algorithm.cl

@@ -20,8 +20,10 @@
 #define ALGO_RX_WOW         19
 #define ALGO_RX_LOKI        20
 #define ALGO_RX_ARQMA       21
-#define ALGO_AR2_CHUKWA     22
+#define ALGO_RX_SFX         22
-#define ALGO_AR2_WRKZ       23
+#define ALGO_RX_V           23
+#define ALGO_AR2_CHUKWA     24
+#define ALGO_AR2_WRKZ       25
 
 #define FAMILY_UNKNOWN      0
 #define FAMILY_CN           1

src/backend/opencl/runners/OclRxBaseRunner.cpp

@@ -56,7 +56,7 @@ xmrig::OclRxBaseRunner::OclRxBaseRunner(size_t index, const OclLaunchData &data)
         m_gcn_version = 14;
     }
 
-    m_options += " -DALGO="             + std::to_string(m_algorithm.id());
+    m_options += " -DALGO="             + std::to_string(RxAlgo::id(m_algorithm));
     m_options += " -DWORKERS_PER_HASH=" + std::to_string(m_worksize);
     m_options += " -DGCN_VERSION="      + std::to_string(m_gcn_version);
 }

src/base/io/log/Log.cpp

@@ -92,7 +92,7 @@ public:
 
         std::lock_guard<std::mutex> lock(m_mutex);
 
-        if (Log::background && m_backends.empty()) {
+        if (Log::isBackground() && m_backends.empty()) {
             return;
         }
 
@@ -195,9 +195,10 @@ private:
 };
 
 
-bool Log::background = false;
+bool Log::m_background    = false;
-bool Log::colors     = true;
+bool Log::m_colors        = true;
 LogPrivate *Log::d      = new LogPrivate();
+uint32_t Log::m_verbose   = 0;
 
 
 } /* namespace xmrig */

src/base/io/log/Log.h

@@ -27,6 +27,9 @@
 #define XMRIG_LOG_H
 
 
+#include <cstdint>
+
+
 namespace xmrig {
 
 
@@ -54,10 +57,19 @@ public:
     static void print(const char *fmt, ...);
     static void print(Level level, const char *fmt, ...);
 
-    static bool background;
+    static inline bool isBackground()                   { return m_background; }
-    static bool colors;
+    static inline bool isColors()                       { return m_colors; }
+    static inline bool isVerbose()                      { return m_verbose > 0; }
+    static inline uint32_t verbose()                    { return m_verbose; }
+    static inline void setBackground(bool background)   { m_background = background; }
+    static inline void setColors(bool colors)           { m_colors = colors; }
+    static inline void setVerbose(uint32_t verbose)     { m_verbose = verbose; }
 
 private:
+    static bool m_background;
+    static bool m_colors;
+    static uint32_t m_verbose;
+
     static LogPrivate *d;
 };
 
@@ -126,6 +138,7 @@ private:
 #define LOG_WARN(x, ...)    xmrig::Log::print(xmrig::Log::WARNING, x, ##__VA_ARGS__)
 #define LOG_NOTICE(x, ...)  xmrig::Log::print(xmrig::Log::NOTICE,  x, ##__VA_ARGS__)
 #define LOG_INFO(x, ...)    xmrig::Log::print(xmrig::Log::INFO,    x, ##__VA_ARGS__)
+#define LOG_VERBOSE(x, ...) if (xmrig::Log::isVerbose()) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
 
 #ifdef APP_DEBUG
 #   define LOG_DEBUG(x, ...) xmrig::Log::print(xmrig::Log::DEBUG, x, ##__VA_ARGS__)

src/base/io/log/backends/ConsoleLog.cpp

@@ -35,14 +35,14 @@
 xmrig::ConsoleLog::ConsoleLog()
 {
     if (!isSupported()) {
-        Log::colors = false;
+        Log::setColors(false);
         return;
     }
 
     m_tty = new uv_tty_t;
 
     if (uv_tty_init(uv_default_loop(), m_tty, 1, 0) < 0) {
-        Log::colors = false;
+        Log::setColors(false);
         return;
     }
 
@@ -71,7 +71,7 @@ xmrig::ConsoleLog::~ConsoleLog()
 
 void xmrig::ConsoleLog::print(int, const char *line, size_t, size_t size, bool colors)
 {
-    if (!m_tty || Log::colors != colors) {
+    if (!m_tty || Log::isColors() != colors) {
         return;
     }
 

src/base/kernel/Base.cpp

@@ -177,7 +177,7 @@ int xmrig::Base::init()
     Platform::init(config()->userAgent());
 
     if (isBackground()) {
-        Log::background = true;
+        Log::setBackground(true);
     }
     else {
         Log::add(new ConsoleLog());

src/base/kernel/config/BaseConfig.cpp

@@ -23,10 +23,18 @@
  */
 
 
-#include <assert.h>
+#include "base/kernel/config/BaseConfig.h"
-#include <stdio.h>
+#include "base/io/json/Json.h"
-#include <stdlib.h>
+#include "base/io/log/Log.h"
-#include <string.h>
+#include "base/kernel/interfaces/IJsonReader.h"
+#include "rapidjson/document.h"
+#include "version.h"
+
+
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <uv.h>
 
 
@@ -38,80 +46,6 @@
 #   include "backend/cpu/Cpu.h"
 #endif
 
-#ifdef XMRIG_AMD_PROJECT
-#   if defined(__APPLE__)
-#       include <OpenCL/cl.h>
-#   else
-#       include "3rdparty/CL/cl.h"
-#   endif
-#endif
-
-
-#ifdef XMRIG_NVIDIA_PROJECT
-#   include "nvidia/cryptonight.h"
-#endif
-
-
-#include "base/io/json/Json.h"
-#include "base/io/log/Log.h"
-#include "base/kernel/config/BaseConfig.h"
-#include "base/kernel/interfaces/IJsonReader.h"
-#include "donate.h"
-#include "rapidjson/document.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/prettywriter.h"
-#include "version.h"
-
-
-void xmrig::BaseConfig::printVersions()
-{
-    char buf[256] = { 0 };
-
-#   if defined(__clang__)
-    snprintf(buf, sizeof buf, "clang/%d.%d.%d", __clang_major__, __clang_minor__, __clang_patchlevel__);
-#   elif defined(__GNUC__)
-    snprintf(buf, sizeof buf, "gcc/%d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
-#   elif defined(_MSC_VER)
-    snprintf(buf, sizeof buf, "MSVC/%d", MSVC_VERSION);
-#   endif
-
-    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%s/%s") WHITE_BOLD(" %s"), "ABOUT", APP_NAME, APP_VERSION, buf);
-
-#   if defined(XMRIG_AMD_PROJECT)
-#   if CL_VERSION_2_0
-    const char *ocl = "2.0";
-#   elif CL_VERSION_1_2
-    const char *ocl = "1.2";
-#   elif CL_VERSION_1_1
-    const char *ocl = "1.1";
-#   elif CL_VERSION_1_0
-    const char *ocl = "1.0";
-#   else
-    const char *ocl = "0.0";
-#   endif
-    int length = snprintf(buf, sizeof buf, "OpenCL/%s ", ocl);
-#   elif defined(XMRIG_NVIDIA_PROJECT)
-    const int cudaVersion = cuda_get_runtime_version();
-    int length = snprintf(buf, sizeof buf, "CUDA/%d.%d ", cudaVersion / 1000, cudaVersion % 100);
-#   endif
-
-    std::string libs;
-
-#   if defined(XMRIG_FEATURE_TLS) && defined(OPENSSL_VERSION_TEXT)
-    {
-        constexpr const char *v = OPENSSL_VERSION_TEXT + 8;
-        snprintf(buf, sizeof buf, "OpenSSL/%.*s ", static_cast<int>(strchr(v, ' ') - v), v);
-        libs += buf;
-    }
-#   endif
-
-#   if defined(XMRIG_FEATURE_HWLOC)
-    libs += Cpu::info()->backend();
-#   endif
-
-    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13slibuv/%s %s"), "LIBS", uv_version_string(), libs.c_str());
-}
-
 
 bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName)
 {
@@ -126,12 +60,13 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName)
     m_dryRun       = reader.getBool("dry-run", m_dryRun);
     m_syslog       = reader.getBool("syslog", m_syslog);
     m_watch        = reader.getBool("watch", m_watch);
-    Log::colors    = reader.getBool("colors", Log::colors);
     m_logFile      = reader.getString("log-file");
     m_userAgent    = reader.getString("user-agent");
     m_version      = reader.getUint("version");
 
+    Log::setColors(reader.getBool("colors", Log::isColors()));
     setPrintTime(reader.getUint("print-time", 60));
+    setVerbose(reader.getValue("verbose"));
 
     const rapidjson::Value &api = reader.getObject("api");
     if (api.IsObject()) {
@@ -162,3 +97,46 @@ bool xmrig::BaseConfig::save()
 
     return false;
 }
+
+
+void xmrig::BaseConfig::printVersions()
+{
+    char buf[256] = { 0 };
+
+#   if defined(__clang__)
+    snprintf(buf, sizeof buf, "clang/%d.%d.%d", __clang_major__, __clang_minor__, __clang_patchlevel__);
+#   elif defined(__GNUC__)
+    snprintf(buf, sizeof buf, "gcc/%d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
+#   elif defined(_MSC_VER)
+    snprintf(buf, sizeof buf, "MSVC/%d", MSVC_VERSION);
+#   endif
+
+    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%s/%s") WHITE_BOLD(" %s"), "ABOUT", APP_NAME, APP_VERSION, buf);
+
+    std::string libs;
+
+#   if defined(XMRIG_FEATURE_TLS) && defined(OPENSSL_VERSION_TEXT)
+    {
+        constexpr const char *v = OPENSSL_VERSION_TEXT + 8;
+        snprintf(buf, sizeof buf, "OpenSSL/%.*s ", static_cast<int>(strchr(v, ' ') - v), v);
+        libs += buf;
+    }
+#   endif
+
+#   if defined(XMRIG_FEATURE_HWLOC)
+    libs += Cpu::info()->backend();
+#   endif
+
+    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13slibuv/%s %s"), "LIBS", uv_version_string(), libs.c_str());
+}
+
+
+void xmrig::BaseConfig::setVerbose(const rapidjson::Value &value)
+{
+    if (value.IsBool()) {
+        Log::setVerbose(value.GetBool() ? 1 : 0);
+    }
+    else if (value.IsUint()) {
+        Log::setVerbose(value.GetUint());
+    }
+}

src/base/kernel/config/BaseConfig.h

@@ -82,6 +82,8 @@ protected:
 
 private:
     inline void setPrintTime(uint32_t printTime) { if (printTime <= 3600) { m_printTime = printTime; } }
+
+    void setVerbose(const rapidjson::Value &value);
 };
 
 

src/base/kernel/config/BaseTransform.cpp

@@ -222,6 +222,7 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch
     case IConfig::DryRunKey:      /* --dry-run */
     case IConfig::HttpEnabledKey: /* --http-enabled */
     case IConfig::DaemonKey:      /* --daemon */
+    case IConfig::VerboseKey:     /* --verbose */
         return transformBoolean(doc, key, true);
 
     case IConfig::ColorKey:          /* --no-color */
@@ -273,6 +274,9 @@ void xmrig::BaseTransform::transformBoolean(rapidjson::Document &doc, int key, b
     case IConfig::DryRunKey: /* --dry-run */
         return set(doc, "dry-run", enable);
 
+    case IConfig::VerboseKey: /* --verbose */
+        return set(doc, "verbose", enable);
+
     default:
         break;
     }

src/base/net/stratum/Client.cpp

@@ -79,7 +79,8 @@ static const char *states[] = {
 
 xmrig::Client::Client(int id, const char *agent, IClientListener *listener) :
     BaseClient(id, listener),
-    m_agent(agent)
+    m_agent(agent),
+    m_sendBuf(1024)
 {
     m_key = m_storage.add(this);
     m_dns = new Dns(this);
@@ -158,13 +159,18 @@ int64_t xmrig::Client::send(const rapidjson::Value &obj)
     obj.Accept(writer);
 
     const size_t size = buffer.GetSize();
-    if (size > (sizeof(m_sendBuf) - 2)) {
+    if (size > kMaxSendBufferSize) {
-        LOG_ERR("[%s] send failed: \"send buffer overflow: %zu > %zu\"", url(), size, (sizeof(m_sendBuf) - 2));
+        LOG_ERR("[%s] send failed: \"max send buffer size exceeded: %zu\"", url(), size);
         close();
+
         return -1;
     }
 
-    memcpy(m_sendBuf, buffer.GetString(), size);
+    if (size > (m_sendBuf.size() - 2)) {
+        m_sendBuf.resize(((size + 1) / 1024 + 1) * 1024);
+    }
+
+    memcpy(m_sendBuf.data(), buffer.GetString(), size);
     m_sendBuf[size]     = '\n';
     m_sendBuf[size + 1] = '\0';
 
@@ -186,8 +192,8 @@ int64_t xmrig::Client::submit(const JobResult &result)
     const char *nonce = result.nonce;
     const char *data  = result.result;
 #   else
-    char *nonce = m_sendBuf;
+    char *nonce = m_sendBuf.data();
-    char *data  = m_sendBuf + 16;
+    char *data  = m_sendBuf.data() + 16;
 
     Buffer::toHex(reinterpret_cast<const char*>(&result.nonce), 4, nonce);
     nonce[8] = '\0';
@@ -460,11 +466,7 @@ bool xmrig::Client::send(BIO *bio)
 
     bool result = false;
     if (state() == ConnectedState && uv_is_writable(m_stream)) {
-        result = uv_try_write(m_stream, &buf, 1) > 0;
+        result = write(buf);
-
-        if (!result) {
-            close();
-        }
     }
     else {
         LOG_DEBUG_ERR("[%s] send failed, invalid state: %d", url(), m_state);
@@ -505,6 +507,23 @@ bool xmrig::Client::verifyAlgorithm(const Algorithm &algorithm, const char *algo
 }
 
 
+bool xmrig::Client::write(const uv_buf_t &buf)
+{
+    const int rc = uv_try_write(m_stream, &buf, 1);
+    if (static_cast<size_t>(rc) == buf.len) {
+        return true;
+    }
+
+    if (!isQuiet()) {
+        LOG_ERR("[%s] write error: \"%s\"", url(), uv_strerror(rc));
+    }
+
+    close();
+
+    return false;
+}
+
+
 int xmrig::Client::resolve(const String &host)
 {
     setState(HostLookupState);
@@ -529,11 +548,11 @@ int xmrig::Client::resolve(const String &host)
 
 int64_t xmrig::Client::send(size_t size)
 {
-    LOG_DEBUG("[%s] send (%d bytes): \"%.*s\"", url(), size, static_cast<int>(size) - 1, m_sendBuf);
+    LOG_DEBUG("[%s] send (%d bytes): \"%.*s\"", url(), size, static_cast<int>(size) - 1, m_sendBuf.data());
 
 #   ifdef XMRIG_FEATURE_TLS
     if (isTLS()) {
-        if (!m_tls->send(m_sendBuf, size)) {
+        if (!m_tls->send(m_sendBuf.data(), size)) {
             return -1;
         }
     }
@@ -545,10 +564,9 @@ int64_t xmrig::Client::send(size_t size)
             return -1;
         }
 
-        uv_buf_t buf = uv_buf_init(m_sendBuf, (unsigned int) size);
+        uv_buf_t buf = uv_buf_init(m_sendBuf.data(), (unsigned int) size);
 
-        if (uv_try_write(m_stream, &buf, 1) < 0) {
+        if (!write(buf)) {
-            close();
             return -1;
         }
     }
@@ -795,7 +813,7 @@ void xmrig::Client::parseResponse(int64_t id, const rapidjson::Value &result, co
 
 void xmrig::Client::ping()
 {
-    send(snprintf(m_sendBuf, sizeof(m_sendBuf), "{\"id\":%" PRId64 ",\"jsonrpc\":\"2.0\",\"method\":\"keepalived\",\"params\":{\"id\":\"%s\"}}\n", m_sequence, m_rpcId.data()));
+    send(snprintf(m_sendBuf.data(), m_sendBuf.size(), "{\"id\":%" PRId64 ",\"jsonrpc\":\"2.0\",\"method\":\"keepalived\",\"params\":{\"id\":\"%s\"}}\n", m_sequence, m_rpcId.data()));
 
     m_keepAlive = 0;
 }

src/base/net/stratum/Client.h

@@ -62,12 +62,8 @@ public:
 
     constexpr static uint64_t kConnectTimeout   = 20 * 1000;
     constexpr static uint64_t kResponseTimeout  = 20 * 1000;
-
-#   ifdef XMRIG_FEATURE_TLS
     constexpr static size_t kInputBufferSize    = 1024 * 16;
-#   else
+    constexpr static size_t kMaxSendBufferSize  = 1024 * 16;
-    constexpr static size_t kInputBufferSize = 1024 * 2;
-#   endif
 
     Client(int id, const char *agent, IClientListener *listener);
     ~Client() override;
@@ -100,6 +96,7 @@ private:
     bool parseLogin(const rapidjson::Value &result, int *code);
     bool send(BIO *bio);
     bool verifyAlgorithm(const Algorithm &algorithm, const char *algo) const;
+    bool write(const uv_buf_t &buf);
     int resolve(const String &host);
     int64_t send(size_t size);
     void connect(sockaddr *addr);
@@ -128,11 +125,11 @@ private:
 
     static inline Client *getClient(void *data) { return m_storage.get(data); }
 
-    char m_sendBuf[4096] = { 0 };
     const char *m_agent;
     Dns *m_dns;
     RecvBuf<kInputBufferSize> m_recvBuf;
     std::bitset<EXT_MAX> m_extensions;
+    std::vector<char> m_sendBuf;
     String m_rpcId;
     Tls *m_tls                  = nullptr;
     uint64_t m_expire           = 0;

src/config.json

@@ -17,6 +17,7 @@
         "init": -1,
         "mode": "auto",
         "1gb-pages": false,
+        "rdmsr": true,
         "wrmsr": true,
         "numa": true
     },
@@ -74,5 +75,6 @@
     "retry-pause": 5,
     "syslog": false,
     "user-agent": null,
+    "verbose": 0,
     "watch": true
 }

src/core/config/Config.cpp

@@ -218,7 +218,7 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const
     doc.AddMember("http",              m_http.toJSON(doc), allocator);
     doc.AddMember("autosave",          isAutoSave(), allocator);
     doc.AddMember("background",        isBackground(), allocator);
-    doc.AddMember("colors",            Log::colors, allocator);
+    doc.AddMember("colors",            Log::isColors(), allocator);
 
 #   ifdef XMRIG_ALGO_RANDOMX
     doc.AddMember(StringRef(kRandomX), rx().toJSON(doc), allocator);
@@ -246,5 +246,6 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const
     doc.AddMember("retry-pause",                m_pools.retryPause(), allocator);
     doc.AddMember("syslog",                     isSyslog(), allocator);
     doc.AddMember("user-agent",                 m_userAgent.toJSON(), allocator);
+    doc.AddMember("verbose",                    Log::verbose(), allocator);
     doc.AddMember("watch",                      m_watch, allocator);
 }

src/core/config/Config_platform.h

@@ -87,6 +87,7 @@ static const option options[] = {
     { "cpu-max-threads-hint",  1, nullptr, IConfig::CPUMaxThreadsKey      },
     { "cpu-memory-pool",       1, nullptr, IConfig::MemoryPoolKey         },
     { "cpu-no-yield",          0, nullptr, IConfig::YieldKey              },
+    { "verbose",               0, nullptr, IConfig::VerboseKey            },
 #   ifdef XMRIG_FEATURE_TLS
     { "tls",                   0, nullptr, IConfig::TlsKey                },
     { "tls-fingerprint",       1, nullptr, IConfig::FingerprintKey        },

src/core/config/usage.h

@@ -136,6 +136,7 @@ static inline const std::string &usage()
     u += "      --health-print-time=N     print health report every N seconds\n";
 #   endif
     u += "      --no-color                disable colored output\n";
+    u += "      --verbose                 verbose output\n";
 
     u += "\nMisc:\n";
 

src/crypto/common/Algorithm.cpp

@@ -112,6 +112,10 @@ static AlgoName const algorithm_names[] = {
     { "RandomXL",                  nullptr,            Algorithm::RX_LOKI         },
     { "randomx/arq",               "rx/arq",           Algorithm::RX_ARQ          },
     { "RandomARQ",                 nullptr,            Algorithm::RX_ARQ          },
+    { "randomx/sfx",               "rx/sfx",           Algorithm::RX_SFX          },
+    { "RandomSFX",                 nullptr,            Algorithm::RX_SFX          },
+    { "randomx/v",                 "rx/v",             Algorithm::RX_V            },
+    { "RandomV",                   nullptr,            Algorithm::RX_V            },
 #   endif
 #   ifdef XMRIG_ALGO_ARGON2
     { "argon2/chukwa",             nullptr,            Algorithm::AR2_CHUKWA      },
@@ -138,6 +142,8 @@ size_t xmrig::Algorithm::l2() const
     switch (m_id) {
     case RX_0:
     case RX_LOKI:
+    case RX_SFX:
+    case RX_V:
         return 0x40000;
 
     case RX_WOW:
@@ -173,6 +179,8 @@ size_t xmrig::Algorithm::l3() const
         switch (m_id) {
         case RX_0:
         case RX_LOKI:
+        case RX_SFX:
+        case RX_V:
             return oneMiB * 2;
 
         case RX_WOW:
@@ -272,6 +280,8 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id)
     case RX_WOW:
     case RX_LOKI:
     case RX_ARQ:
+    case RX_SFX:
+    case RX_V:
         return RANDOM_X;
 #   endif
 

src/crypto/common/Algorithm.h

@@ -67,6 +67,8 @@ public:
         RX_WOW,        // "rx/wow"           RandomWOW (Wownero).
         RX_LOKI,       // "rx/loki"          RandomXL (Loki).
         RX_ARQ,        // "rx/arq"           RandomARQ (Arqma).
+        RX_SFX,        // "rx/sfx"           RandomSFX (Safex Cash).
+        RX_V,          // "rx/v"             RandomV (Monerov).
         AR2_CHUKWA,    // "argon2/chukwa"    Argon2id (Chukwa).
         AR2_WRKZ,      // "argon2/wrkz"      Argon2id (WRKZ)
         MAX

src/crypto/randomx/jit_compiler_x86.cpp

@@ -289,6 +289,11 @@ namespace randomx {
 
 	JitCompilerX86::JitCompilerX86() {
 		applyTweaks();
+
+		int32_t info[4];
+		cpuid(1, info);
+		hasAVX = ((info[2] & (1 << 27)) != 0) && ((info[2] & (1 << 28)) != 0);
+
 		allocatedCode = (uint8_t*)allocExecutableMemory(CodeSize * 2);
 		// Shift code base address to improve caching - all threads will use different L2/L3 cache sets
 		code = allocatedCode + (codeOffset.fetch_add(59 * 64) % CodeSize);
@@ -374,6 +379,10 @@ namespace randomx {
 		code[codePos + 5] = 0xc0 + pcfg.readReg1;
 		*(uint32_t*)(code + codePos + 10) = RandomX_CurrentConfig.ScratchpadL3Mask64_Calculated;
 		*(uint32_t*)(code + codePos + 20) = RandomX_CurrentConfig.ScratchpadL3Mask64_Calculated;
+		if (hasAVX) {
+			uint32_t* p = (uint32_t*)(code + codePos + 29);
+			*p = (*p & 0xFF000000U) | 0x0077F8C5U;
+		}
 
 		codePos = prologueSize;
 		memcpy(code + codePos - 48, &pcfg.eMask, sizeof(pcfg.eMask));

src/crypto/randomx/jit_compiler_x86.hpp

@@ -73,6 +73,7 @@ namespace randomx {
 		uint32_t vm_flags;
 
 		static bool BranchesWithin32B;
+		bool hasAVX;
 
 		static void applyTweaks();
 		void generateProgramPrologue(Program&, ProgramConfiguration&);

src/crypto/randomx/jit_compiler_x86_static.S

@@ -94,6 +94,9 @@ DECL(randomx_program_prologue_first_load):
 	ror rdx, 32
 	and edx, RANDOMX_SCRATCHPAD_MASK
 	stmxcsr dword ptr [rsp-20]
+	nop
+	nop
+	nop
 	jmp DECL(randomx_program_loop_begin)
 
 .balign 64

src/crypto/randomx/jit_compiler_x86_static.asm

@@ -82,6 +82,9 @@ randomx_program_prologue_first_load PROC
 	ror rdx, 32
 	and edx, RANDOMX_SCRATCHPAD_MASK
 	stmxcsr dword ptr [rsp-20]
+	nop
+	nop
+	nop
 	jmp randomx_program_loop_begin
 randomx_program_prologue_first_load ENDP
 

src/crypto/randomx/randomx.cpp

@@ -92,6 +92,16 @@ RandomX_ConfigurationArqma::RandomX_ConfigurationArqma()
 	ScratchpadL3_Size = 262144;
 }
 
+RandomX_ConfigurationSafex::RandomX_ConfigurationSafex()
+{
+	ArgonSalt = "RandomSFX\x01";
+}
+
+RandomX_ConfigurationV::RandomX_ConfigurationV()
+{
+	ArgonSalt = "RandomV\x03";
+}
+
 RandomX_ConfigurationBase::RandomX_ConfigurationBase()
 	: ArgonMemory(262144)
 	, ArgonIterations(3)
@@ -267,6 +277,8 @@ RandomX_ConfigurationMonero RandomX_MoneroConfig;
 RandomX_ConfigurationWownero RandomX_WowneroConfig;
 RandomX_ConfigurationLoki RandomX_LokiConfig;
 RandomX_ConfigurationArqma RandomX_ArqmaConfig;
+RandomX_ConfigurationSafex RandomX_SafexConfig;
+RandomX_ConfigurationV RandomX_VConfig;
 
 RandomX_ConfigurationBase RandomX_CurrentConfig;
 

src/crypto/randomx/randomx.h

@@ -182,11 +182,15 @@ struct RandomX_ConfigurationMonero : public RandomX_ConfigurationBase {};
 struct RandomX_ConfigurationWownero : public RandomX_ConfigurationBase { RandomX_ConfigurationWownero(); };
 struct RandomX_ConfigurationLoki : public RandomX_ConfigurationBase { RandomX_ConfigurationLoki(); };
 struct RandomX_ConfigurationArqma : public RandomX_ConfigurationBase { RandomX_ConfigurationArqma(); };
+struct RandomX_ConfigurationSafex : public RandomX_ConfigurationBase { RandomX_ConfigurationSafex(); };
+struct RandomX_ConfigurationV : public RandomX_ConfigurationBase { RandomX_ConfigurationV(); };
 
 extern RandomX_ConfigurationMonero RandomX_MoneroConfig;
 extern RandomX_ConfigurationWownero RandomX_WowneroConfig;
 extern RandomX_ConfigurationLoki RandomX_LokiConfig;
 extern RandomX_ConfigurationArqma RandomX_ArqmaConfig;
+extern RandomX_ConfigurationSafex RandomX_SafexConfig;
+extern RandomX_ConfigurationV RandomX_VConfig;
 
 extern RandomX_ConfigurationBase RandomX_CurrentConfig;
 

src/crypto/rx/Rx.cpp

@@ -73,7 +73,7 @@ bool xmrig::Rx::init(const Job &job, const RxConfig &config, const CpuConfig &cp
     }
 
     if (!osInitialized) {
-        osInit(config);
+        msrInit(config);
         osInitialized = true;
     }
 
@@ -103,6 +103,10 @@ xmrig::RxDataset *xmrig::Rx::dataset(const Job &job, uint32_t nodeId)
 
 void xmrig::Rx::destroy()
 {
+    if (osInitialized) {
+        msrDestroy();
+    }
+
     delete d_ptr;
 
     d_ptr = nullptr;
@@ -115,8 +119,16 @@ void xmrig::Rx::init(IRxListener *listener)
 }
 
 
-#if (!defined(XMRIG_OS_LINUX) && !defined(_WIN32)) || defined(XMRIG_ARM)
+#ifndef XMRIG_FEATURE_MSR
-void xmrig::Rx::osInit(const RxConfig &)
+void xmrig::Rx::msrInit(const RxConfig &)
+{
+}
+
+
+void xmrig::Rx::msrDestroy()
 {
 }
 #endif
+
+
+

src/crypto/rx/Rx.h

@@ -58,7 +58,8 @@ public:
     static void init(IRxListener *listener);
 
 private:
-    static void osInit(const RxConfig &config);
+    static void msrInit(const RxConfig &config);
+    static void msrDestroy();
 };
 
 

src/crypto/rx/RxAlgo.cpp

@@ -49,6 +49,12 @@ const RandomX_ConfigurationBase *xmrig::RxAlgo::base(Algorithm::Id algorithm)
     case Algorithm::RX_ARQ:
         return &RandomX_ArqmaConfig;
 
+    case Algorithm::RX_SFX:
+        return &RandomX_SafexConfig;
+
+    case Algorithm::RX_V:
+        return &RandomX_VConfig;
+
     default:
         break;
     }

src/crypto/rx/RxAlgo.h

@@ -51,6 +51,15 @@ public:
     static uint32_t programIterations(Algorithm::Id algorithm);
     static uint32_t programSize(Algorithm::Id algorithm);
     static uint32_t version(Algorithm::Id algorithm);
+
+    static inline Algorithm::Id id(Algorithm::Id algorithm)
+    {
+        if (algorithm == Algorithm::RX_SFX || algorithm == Algorithm::RX_V) {
+            return Algorithm::RX_0;
+        }
+
+        return algorithm;
+    }
 };
 
 

src/crypto/rx/RxConfig.cpp

@@ -49,6 +49,7 @@ namespace xmrig {
 static const char *kInit        = "init";
 static const char *kMode        = "mode";
 static const char *kOneGbPages  = "1gb-pages";
+static const char *kRdmsr       = "rdmsr";
 static const char *kWrmsr       = "wrmsr";
 
 #ifdef XMRIG_FEATURE_HWLOC
@@ -57,6 +58,23 @@ static const char *kNUMA        = "numa";
 
 static const std::array<const char *, RxConfig::ModeMax> modeNames = { "auto", "fast", "light" };
 
+
+#ifdef XMRIG_FEATURE_MSR
+constexpr size_t kMsrArraySize = 4;
+
+static const std::array<MsrItems, kMsrArraySize> msrPresets = {
+    MsrItems(),
+    MsrItems{{ 0xC0011020, 0x0 }, { 0xC0011021, 0x40, ~0x20ULL }, { 0xC0011022, 0x510000 }, { 0xC001102b, 0x1808cc16 }},
+    MsrItems{{ 0x1a4, 0x6 }},
+    MsrItems()
+};
+
+static const std::array<const char *, kMsrArraySize> modNames = { "none", "ryzen", "intel", "custom" };
+
+static_assert (kMsrArraySize == ICpuInfo::MSR_MOD_MAX, "kMsrArraySize and MSR_MOD_MAX mismatch");
+#endif
+
+
 }
 
 
@@ -65,7 +83,11 @@ bool xmrig::RxConfig::read(const rapidjson::Value &value)
     if (value.IsObject()) {
         m_threads    = Json::getInt(value, kInit, m_threads);
         m_mode       = readMode(Json::getValue(value, kMode));
-        m_wrmsr      = readMSR(Json::getValue(value, kWrmsr));
+        m_rdmsr      = Json::getBool(value, kRdmsr, m_rdmsr);
+
+#       ifdef XMRIG_FEATURE_MSR
+        readMSR(Json::getValue(value, kWrmsr));
+#       endif
 
 #       ifdef XMRIG_OS_LINUX
         m_oneGbPages = Json::getBool(value, kOneGbPages, m_oneGbPages);
@@ -109,13 +131,25 @@ rapidjson::Value xmrig::RxConfig::toJSON(rapidjson::Document &doc) const
     obj.AddMember(StringRef(kInit),         m_threads, allocator);
     obj.AddMember(StringRef(kMode),         StringRef(modeName()), allocator);
     obj.AddMember(StringRef(kOneGbPages),   m_oneGbPages, allocator);
+    obj.AddMember(StringRef(kRdmsr),        m_rdmsr, allocator);
 
-    if (m_wrmsr < 0 || m_wrmsr == 6) {
+#   ifdef XMRIG_FEATURE_MSR
-        obj.AddMember(StringRef(kWrmsr), m_wrmsr == 6, allocator);
+    if (!m_msrPreset.empty()) {
+        Value wrmsr(kArrayType);
+        wrmsr.Reserve(m_msrPreset.size(), allocator);
+
+        for (const auto &i : m_msrPreset) {
+            wrmsr.PushBack(i.toJSON(doc), allocator);
+        }
+
+        obj.AddMember(StringRef(kWrmsr), wrmsr, allocator);
     }
     else {
         obj.AddMember(StringRef(kWrmsr), m_wrmsr, allocator);
     }
+#   else
+    obj.AddMember(StringRef(kWrmsr), false, allocator);
+#   endif
 
 #   ifdef XMRIG_FEATURE_HWLOC
     if (!m_nodeset.empty()) {
@@ -168,20 +202,71 @@ uint32_t xmrig::RxConfig::threads(uint32_t limit) const
 }
 
 
-int xmrig::RxConfig::readMSR(const rapidjson::Value &value) const
+#ifdef XMRIG_FEATURE_MSR
+const char *xmrig::RxConfig::msrPresetName() const
 {
-    if (value.IsInt()) {
+    return modNames[msrMod()];
-        return std::min(value.GetInt(), 15);
-    }
-
-    if (value.IsBool() && !value.GetBool()) {
-        return -1;
-    }
-
-    return m_wrmsr;
 }
 
 
+const xmrig::MsrItems &xmrig::RxConfig::msrPreset() const
+{
+    const auto mod = msrMod();
+
+    if (mod == ICpuInfo::MSR_MOD_CUSTOM) {
+        return m_msrPreset;
+    }
+
+    return msrPresets[mod];
+}
+
+
+uint32_t xmrig::RxConfig::msrMod() const
+{
+    if (!wrmsr()) {
+        return ICpuInfo::MSR_MOD_NONE;
+    }
+
+    if (!m_msrPreset.empty()) {
+        return ICpuInfo::MSR_MOD_CUSTOM;
+    }
+
+    return Cpu::info()->msrMod();
+}
+
+
+void xmrig::RxConfig::readMSR(const rapidjson::Value &value)
+{
+    if (value.IsBool()) {
+        m_wrmsr = value.GetBool();
+
+        return;
+    }
+
+    if (value.IsInt() && Cpu::info()->vendor() == ICpuInfo::VENDOR_INTEL) {
+        const int i = std::min(value.GetInt(), 15);
+        if (i >= 0) {
+            m_msrPreset.emplace_back(0x1a4, i);
+        }
+        else {
+            m_wrmsr = false;
+        }
+    }
+
+    if (value.IsArray()) {
+        for (const auto &i : value.GetArray()) {
+            MsrItem item(i);
+            if (item.isValid()) {
+                m_msrPreset.emplace_back(item);
+            }
+        }
+
+        m_wrmsr = !m_msrPreset.empty();
+    }
+}
+#endif
+
+
 xmrig::RxConfig::Mode xmrig::RxConfig::readMode(const rapidjson::Value &value) const
 {
     if (value.IsUint()) {

src/crypto/rx/RxConfig.h

@@ -29,6 +29,11 @@
 #include "rapidjson/fwd.h"
 
 
+#ifdef XMRIG_FEATURE_MSR
+#   include "crypto/rx/msr/MsrItem.h"
+#endif
+
+
 #include <vector>
 
 
@@ -58,17 +63,32 @@ public:
     uint32_t threads(uint32_t limit = 100) const;
 
     inline bool isOneGbPages() const    { return m_oneGbPages; }
-    inline int wrmsr() const            { return m_wrmsr; }
+    inline bool rdmsr() const           { return m_rdmsr; }
+    inline bool wrmsr() const           { return m_wrmsr; }
     inline Mode mode() const            { return m_mode; }
 
+#   ifdef XMRIG_FEATURE_MSR
+    const char *msrPresetName() const;
+    const MsrItems &msrPreset() const;
+#   endif
+
 private:
-    int readMSR(const rapidjson::Value &value) const;
+#   ifdef XMRIG_FEATURE_MSR
+    uint32_t msrMod() const;
+    void readMSR(const rapidjson::Value &value);
+
+    bool m_wrmsr = true;
+    MsrItems m_msrPreset;
+#   else
+    bool m_wrmsr = false;
+#   endif
+
     Mode readMode(const rapidjson::Value &value) const;
 
     bool m_numa         = true;
     bool m_oneGbPages   = false;
+    bool m_rdmsr        = true;
     int m_threads       = -1;
-    int m_wrmsr         = 6;
     Mode m_mode         = AutoMode;
 
 #   ifdef XMRIG_FEATURE_HWLOC

src/crypto/rx/Rx_linux.cpp

@@ -48,16 +48,8 @@
 namespace xmrig {
 
 
-enum MsrMod : uint32_t {
-    MSR_MOD_NONE,
-    MSR_MOD_RYZEN,
-    MSR_MOD_INTEL,
-    MSR_MOD_MAX
-};
-
-
 static const char *tag      = YELLOW_BG_BOLD(WHITE_BOLD_S " msr ") " ";
-static const std::array<const char *, MSR_MOD_MAX> modNames = { nullptr, "Ryzen", "Intel" };
+static MsrItems savedState;
 
 
 static inline int dir_filter(const struct dirent *dirp)
@@ -66,10 +58,49 @@ static inline int dir_filter(const struct dirent *dirp)
 }
 
 
-static bool wrmsr_on_cpu(uint32_t reg, uint32_t cpu, uint64_t value)
+bool rdmsr_on_cpu(uint32_t reg, uint32_t cpu, uint64_t &value)
 {
     char msr_file_name[64]{};
 
+    sprintf(msr_file_name, "/dev/cpu/%u/msr", cpu);
+    int fd = open(msr_file_name, O_RDONLY);
+    if (fd < 0) {
+        return false;
+    }
+
+    const bool success = pread(fd, &value, sizeof value, reg) == sizeof value;
+
+    close(fd);
+
+    return success;
+}
+
+
+static MsrItem rdmsr(uint32_t reg)
+{
+    uint64_t value = 0;
+    if (!rdmsr_on_cpu(reg, 0, value)) {
+        LOG_WARN(CLEAR "%s" YELLOW_BOLD_S "cannot read MSR 0x%08" PRIx32, tag, reg);
+
+        return {};
+    }
+
+    return { reg, value };
+}
+
+
+static bool wrmsr_on_cpu(uint32_t reg, uint32_t cpu, uint64_t value, uint64_t mask)
+{
+    // If a bit in mask is set to 1, use new value, otherwise use old value
+    if (mask != MsrItem::kNoMask) {
+        uint64_t old_value;
+        if (rdmsr_on_cpu(reg, cpu, old_value)) {
+            value = (value & mask) | (old_value & ~mask);
+        }
+    }
+
+    char msr_file_name[64]{};
+
     sprintf(msr_file_name, "/dev/cpu/%d/msr", cpu);
     int fd = open(msr_file_name, O_WRONLY);
     if (fd < 0) {
@@ -84,14 +115,14 @@ static bool wrmsr_on_cpu(uint32_t reg, uint32_t cpu, uint64_t value)
 }
 
 
-static bool wrmsr_on_all_cpus(uint32_t reg, uint64_t value)
+static bool wrmsr_on_all_cpus(uint32_t reg, uint64_t value, uint64_t mask)
 {
     struct dirent **namelist;
     int dir_entries = scandir("/dev/cpu", &namelist, dir_filter, 0);
     int errors      = 0;
 
     while (dir_entries--) {
-        if (!wrmsr_on_cpu(reg, strtoul(namelist[dir_entries]->d_name, nullptr, 10), value)) {
+        if (!wrmsr_on_cpu(reg, strtoul(namelist[dir_entries]->d_name, nullptr, 10), value, mask)) {
             ++errors;
         }
 
@@ -120,42 +151,60 @@ static bool wrmsr_modprobe()
 }
 
 
+static bool wrmsr(const MsrItems &preset, bool save)
+{
+    if (!wrmsr_modprobe()) {
+        return false;
+    }
+
+    if (save) {
+        for (const auto &i : preset) {
+            auto item = rdmsr(i.reg());
+            LOG_VERBOSE(CLEAR "%s" CYAN_BOLD("0x%08" PRIx32) CYAN(":0x%016" PRIx64) CYAN_BOLD(" -> 0x%016" PRIx64), tag, i.reg(), item.value(), i.value());
+
+            if (item.isValid()) {
+                savedState.emplace_back(item);
+            }
+        }
+    }
+
+    for (const auto &i : preset) {
+        if (!wrmsr_on_all_cpus(i.reg(), i.value(), i.mask())) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+
 } // namespace xmrig
 
 
-void xmrig::Rx::osInit(const RxConfig &config)
+void xmrig::Rx::msrInit(const RxConfig &config)
 {
-    if (config.wrmsr() < 0) {
+    const auto &preset = config.msrPreset();
-        return;
+    if (preset.empty()) {
-    }
-
-    MsrMod mod = MSR_MOD_NONE;
-    if (Cpu::info()->assembly() == Assembly::RYZEN) {
-        mod = MSR_MOD_RYZEN;
-    }
-    else if (Cpu::info()->vendor() == ICpuInfo::VENDOR_INTEL) {
-        mod = MSR_MOD_INTEL;
-    }
-
-    if (mod == MSR_MOD_NONE) {
         return;
     }
 
     const uint64_t ts = Chrono::steadyMSecs();
 
-    if (!wrmsr_modprobe()) {
+    if (wrmsr(preset, config.rdmsr())) {
+        LOG_NOTICE(CLEAR "%s" GREEN_BOLD_S "register values for \"%s\" preset has been set successfully" BLACK_BOLD(" (%" PRIu64 " ms)"), tag, config.msrPresetName(), Chrono::steadyMSecs() - ts);
+    }
+}
+
+
+void xmrig::Rx::msrDestroy()
+{
+    if (savedState.empty()) {
         return;
     }
 
-    if (mod == MSR_MOD_RYZEN) {
+    const uint64_t ts = Chrono::steadyMSecs();
-        wrmsr_on_all_cpus(0xC0011020, 0);
-        wrmsr_on_all_cpus(0xC0011021, 0x40);
-        wrmsr_on_all_cpus(0xC0011022, 0x510000);
-        wrmsr_on_all_cpus(0xC001102b, 0x1808cc16);
-    }
-    else if (mod == MSR_MOD_INTEL) {
-        wrmsr_on_all_cpus(0x1a4, config.wrmsr());
-    }
 
-    LOG_NOTICE(CLEAR "%s" GREEN_BOLD_S "register values for %s has been set successfully" BLACK_BOLD(" (%" PRIu64 " ms)"), tag, modNames[mod], Chrono::steadyMSecs() - ts);
+    if (!wrmsr(savedState, false)) {
+        LOG_ERR(CLEAR "%s" RED_BOLD_S "failed to restore initial state" BLACK_BOLD(" (%" PRIu64 " ms)"), tag, Chrono::steadyMSecs() - ts);
+    }
 }

src/crypto/rx/Rx_win.cpp

@@ -0,0 +1,335 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik              <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler                   <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones              <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466                 <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee                <jayddee246@gmail.com>
+ * Copyright 2017-2019 XMR-Stak                 <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018      Lee Clagett              <https://github.com/vtnerd>
+ * Copyright 2018-2019 tevador                  <tevador@gmail.com>
+ * Copyright 2000      Transmeta Corporation    <https://github.com/intel/msr-tools>
+ * Copyright 2004-2008 H. Peter Anvin           <https://github.com/intel/msr-tools>
+ * Copyright 2007-2009 hiyohiyo                 <https://openlibsys.org>, <hiyohiyo@crystalmark.info>
+ * Copyright 2018-2019 SChernykh                <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig                    <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "crypto/rx/Rx.h"
+#include "backend/cpu/Cpu.h"
+#include "base/io/log/Log.h"
+#include "base/kernel/Platform.h"
+#include "base/tools/Chrono.h"
+#include "crypto/rx/RxConfig.h"
+
+
+#include <Windows.h>
+#include <array>
+#include <string>
+#include <thread>
+
+
+#define SERVICE_NAME L"WinRing0_1_2_0"
+
+
+namespace xmrig {
+
+
+static bool reuseDriver = false;
+static const char *tag  = YELLOW_BG_BOLD(WHITE_BOLD_S " msr ") " ";
+static MsrItems savedState;
+
+
+static SC_HANDLE hManager;
+static SC_HANDLE hService;
+
+
+static bool wrmsr_uninstall_driver()
+{
+    if (!hService) {
+        return true;
+    }
+
+    bool result = true;
+
+    if (!reuseDriver) {
+        SERVICE_STATUS serviceStatus;
+
+        if (!ControlService(hService, SERVICE_CONTROL_STOP, &serviceStatus)) {
+            result = false;
+        }
+
+        if (!DeleteService(hService)) {
+            LOG_ERR(CLEAR "%s" RED_S "failed to remove WinRing0 driver, error %u", tag, GetLastError());
+            result = false;
+        }
+    }
+
+    CloseServiceHandle(hService);
+    hService = nullptr;
+
+    return result;
+}
+
+
+static HANDLE wrmsr_install_driver()
+{
+    DWORD err = 0;
+
+    hManager = OpenSCManager(nullptr, nullptr, SC_MANAGER_ALL_ACCESS);
+    if (!hManager) {
+        err = GetLastError();
+
+        if (err == ERROR_ACCESS_DENIED) {
+            LOG_WARN(CLEAR "%s" YELLOW_BOLD_S "to write MSR registers Administrator privileges required.", tag);
+        }
+        else {
+            LOG_ERR(CLEAR "%s" RED_S "failed to open service control manager, error %u", tag, err);
+        }
+
+        return nullptr;
+    }
+
+    std::vector<wchar_t> dir;
+    dir.resize(MAX_PATH);
+    do {
+        dir.resize(dir.size() * 2);
+        GetModuleFileNameW(nullptr, dir.data(), dir.size());
+        err = GetLastError();
+    } while (err == ERROR_INSUFFICIENT_BUFFER);
+
+    if (err != ERROR_SUCCESS) {
+        LOG_ERR(CLEAR "%s" RED_S "failed to get path to driver, error %u", tag, err);
+        return nullptr;
+    }
+
+    for (auto it = dir.end(); it != dir.begin(); --it) {
+        if ((*it == L'\\') || (*it == L'/')) {
+            ++it;
+            *it = L'\0';
+            break;
+        }
+    }
+
+    std::wstring driverPath = dir.data();
+    driverPath += L"WinRing0x64.sys";
+
+    hService = OpenServiceW(hManager, SERVICE_NAME, SERVICE_ALL_ACCESS);
+    if (hService) {
+        LOG_WARN(CLEAR "%s" YELLOW("service ") YELLOW_BOLD("WinRing0_1_2_0") YELLOW(" is already exists"), tag);
+
+        SERVICE_STATUS status;
+        const auto rc = QueryServiceStatus(hService, &status);
+
+        if (rc && Log::isVerbose()) {
+            DWORD dwBytesNeeded;
+
+            QueryServiceConfigA(hService, nullptr, 0, &dwBytesNeeded);
+            if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
+                std::vector<BYTE> buffer(dwBytesNeeded);
+                auto config = reinterpret_cast<LPQUERY_SERVICE_CONFIGA>(buffer.data());
+
+                if (QueryServiceConfigA(hService, config, buffer.size(), &dwBytesNeeded)) {
+                    LOG_INFO(CLEAR "%s" YELLOW("service path: ") YELLOW_BOLD("\"%s\""), tag, config->lpBinaryPathName);
+                }
+            }
+        }
+
+        if (rc && status.dwCurrentState == SERVICE_RUNNING) {
+            reuseDriver = true;
+        }
+        else if (!wrmsr_uninstall_driver()) {
+            return nullptr;
+        }
+    }
+
+    if (!reuseDriver) {
+        hService = CreateServiceW(hManager, SERVICE_NAME, SERVICE_NAME, SERVICE_ALL_ACCESS, SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, driverPath.c_str(), nullptr, nullptr, nullptr, nullptr, nullptr);
+        if (!hService) {
+            LOG_ERR(CLEAR "%s" RED_S "failed to install WinRing0 driver, error %u", tag, GetLastError());
+
+            return nullptr;
+        }
+
+        if (!StartService(hService, 0, nullptr)) {
+            err = GetLastError();
+            if (err != ERROR_SERVICE_ALREADY_RUNNING) {
+                if (err == ERROR_FILE_NOT_FOUND) {
+                    LOG_ERR(CLEAR "%s" RED("failed to start WinRing0 driver: ") RED_BOLD("\"WinRing0x64.sys not found\""), tag);
+                }
+                else {
+                    LOG_ERR(CLEAR "%s" RED_S "failed to start WinRing0 driver, error %u", tag, err);
+                }
+
+                wrmsr_uninstall_driver();
+
+                return nullptr;
+            }
+        }
+    }
+
+    HANDLE hDriver = CreateFileW(L"\\\\.\\" SERVICE_NAME, GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
+    if (!hDriver) {
+        LOG_ERR(CLEAR "%s" RED_S "failed to connect to WinRing0 driver, error %u", tag, GetLastError());
+
+        return nullptr;
+    }
+
+    return hDriver;
+}
+
+
+#define IOCTL_READ_MSR  CTL_CODE(40000, 0x821, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_WRITE_MSR CTL_CODE(40000, 0x822, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+
+static bool rdmsr(HANDLE driver, uint32_t reg, uint64_t &value)
+{
+    DWORD size = 0;
+
+    return DeviceIoControl(driver, IOCTL_READ_MSR, &reg, sizeof(reg), &value, sizeof(value), &size, nullptr) != 0;
+}
+
+
+static MsrItem rdmsr(HANDLE driver, uint32_t reg)
+{
+    uint64_t value = 0;
+    if (!rdmsr(driver, reg, value)) {
+        LOG_WARN(CLEAR "%s" YELLOW_BOLD_S "cannot read MSR 0x%08" PRIx32, tag, reg);
+
+        return {};
+    }
+
+    return { reg, value };
+}
+
+
+static bool wrmsr(HANDLE driver, uint32_t reg, uint64_t value, uint64_t mask)
+{
+    struct {
+        uint32_t reg = 0;
+        uint32_t value[2]{};
+    } input;
+
+    static_assert(sizeof(input) == 12, "Invalid struct size for WinRing0 driver");
+
+    // If a bit in mask is set to 1, use new value, otherwise use old value
+    if (mask != MsrItem::kNoMask) {
+        uint64_t old_value;
+        if (rdmsr(driver, reg, old_value)) {
+            value = (value & mask) | (old_value & ~mask);
+        }
+    }
+
+    input.reg = reg;
+    *(reinterpret_cast<uint64_t*>(input.value)) = value;
+
+    DWORD output;
+    DWORD k;
+
+    if (!DeviceIoControl(driver, IOCTL_WRITE_MSR, &input, sizeof(input), &output, sizeof(output), &k, nullptr)) {
+        LOG_WARN(CLEAR "%s" YELLOW_BOLD_S "cannot set MSR 0x%08" PRIx32 " to 0x%08" PRIx64, tag, reg, value);
+
+        return false;
+    }
+
+    return true;
+}
+
+
+static bool wrmsr(const MsrItems &preset, bool save)
+{
+    bool success = true;
+
+    HANDLE driver = wrmsr_install_driver();
+    if (!driver) {
+        wrmsr_uninstall_driver();
+
+        if (hManager) {
+            CloseServiceHandle(hManager);
+        }
+
+        return false;
+    }
+
+    if (save) {
+        for (const auto &i : preset) {
+            auto item = rdmsr(driver, i.reg());
+            LOG_VERBOSE(CLEAR "%s" CYAN_BOLD("0x%08" PRIx32) CYAN(":0x%016" PRIx64) CYAN_BOLD(" -> 0x%016" PRIx64), tag, i.reg(), item.value(), i.value());
+
+            if (item.isValid()) {
+                savedState.emplace_back(item);
+            }
+        }
+    }
+
+    std::thread wrmsr_thread([driver, &preset, &success]() {
+        for (uint32_t i = 0, n = Cpu::info()->threads(); i < n; ++i) {
+            if (!Platform::setThreadAffinity(i)) {
+                continue;
+            }
+
+            for (const auto &i : preset) {
+                success = wrmsr(driver, i.reg(), i.value(), i.mask());
+            }
+
+            if (!success) {
+                break;
+            }
+        }
+    });
+
+    wrmsr_thread.join();
+
+    CloseHandle(driver);
+
+    wrmsr_uninstall_driver();
+    CloseServiceHandle(hManager);
+
+    return success;
+}
+
+
+} // namespace xmrig
+
+
+void xmrig::Rx::msrInit(const RxConfig &config)
+{
+    const auto &preset = config.msrPreset();
+    if (preset.empty()) {
+        return;
+    }
+
+    const uint64_t ts = Chrono::steadyMSecs();
+
+    if (wrmsr(preset, config.rdmsr())) {
+        LOG_NOTICE(CLEAR "%s" GREEN_BOLD_S "register values for \"%s\" preset has been set successfully" BLACK_BOLD(" (%" PRIu64 " ms)"), tag, config.msrPresetName(), Chrono::steadyMSecs() - ts);
+    }
+}
+
+
+void xmrig::Rx::msrDestroy()
+{
+    if (savedState.empty()) {
+        return;
+    }
+
+    const uint64_t ts = Chrono::steadyMSecs();
+
+    if (!wrmsr(savedState, false)) {
+        LOG_ERR(CLEAR "%s" RED_BOLD_S "failed to restore initial state" BLACK_BOLD(" (%" PRIu64 " ms)"), tag, Chrono::steadyMSecs() - ts);
+    }
+}

src/crypto/rx/Rx_windows.cpp

@@ -1,255 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik              <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler                   <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones              <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466                 <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee                <jayddee246@gmail.com>
- * Copyright 2017-2019 XMR-Stak                 <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018      Lee Clagett              <https://github.com/vtnerd>
- * Copyright 2018-2019 tevador                  <tevador@gmail.com>
- * Copyright 2000      Transmeta Corporation    <https://github.com/intel/msr-tools>
- * Copyright 2004-2008 H. Peter Anvin           <https://github.com/intel/msr-tools>
- * Copyright 2007-2009 hiyohiyo                 <https://openlibsys.org>, <hiyohiyo@crystalmark.info>
- * Copyright 2018-2019 SChernykh                <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig                    <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "crypto/rx/Rx.h"
-#include "backend/cpu/Cpu.h"
-#include "base/io/log/Log.h"
-#include "base/kernel/Platform.h"
-#include "base/tools/Chrono.h"
-#include "crypto/rx/RxConfig.h"
-
-
-#include <Windows.h>
-#include <array>
-#include <string>
-#include <thread>
-
-
-#define SERVICE_NAME L"WinRing0_1_2_0"
-
-
-namespace xmrig {
-
-
-enum MsrMod : uint32_t {
-    MSR_MOD_NONE,
-    MSR_MOD_RYZEN,
-    MSR_MOD_INTEL,
-    MSR_MOD_MAX
-};
-
-
-static const char *tag                                      = YELLOW_BG_BOLD(WHITE_BOLD_S " msr ") " ";
-static const std::array<const char *, MSR_MOD_MAX> modNames = { nullptr, "Ryzen", "Intel" };
-
-
-static SC_HANDLE hManager;
-static SC_HANDLE hService;
-
-
-static bool wrmsr_uninstall_driver()
-{
-    if (!hService) {
-        return true;
-    }
-
-    bool result = true;
-    SERVICE_STATUS serviceStatus;
-
-    if (!ControlService(hService, SERVICE_CONTROL_STOP, &serviceStatus)) {
-        LOG_ERR(CLEAR "%s" RED_S "failed to stop WinRing0 driver, error %u", tag, GetLastError());
-        result = false;
-    }
-
-    if (!DeleteService(hService)) {
-        LOG_ERR(CLEAR "%s" RED_S "failed to remove WinRing0 driver, error %u", tag, GetLastError());
-        result = false;
-    }
-
-    CloseServiceHandle(hService);
-    hService = nullptr;
-
-    return result;
-}
-
-
-static HANDLE wrmsr_install_driver()
-{
-    DWORD err = 0;
-
-    hManager = OpenSCManager(nullptr, nullptr, SC_MANAGER_ALL_ACCESS);
-    if (!hManager) {
-        err = GetLastError();
-
-        if (err == ERROR_ACCESS_DENIED) {
-            LOG_WARN(CLEAR "%s" YELLOW_BOLD_S "to write MSR registers Administrator privileges required.", tag);
-        }
-        else {
-            LOG_ERR(CLEAR "%s" RED_S "failed to open service control manager, error %u", tag, err);
-        }
-
-        return nullptr;
-    }
-
-    std::vector<wchar_t> dir;
-    dir.resize(MAX_PATH);
-    do {
-        dir.resize(dir.size() * 2);
-        GetModuleFileNameW(nullptr, dir.data(), dir.size());
-        err = GetLastError();
-    } while (err == ERROR_INSUFFICIENT_BUFFER);
-
-    if (err != ERROR_SUCCESS) {
-        LOG_ERR(CLEAR "%s" RED_S "failed to get path to driver, error %u", tag, err);
-        return nullptr;
-    }
-
-    for (auto it = dir.end(); it != dir.begin(); --it) {
-        if ((*it == L'\\') || (*it == L'/')) {
-            ++it;
-            *it = L'\0';
-            break;
-        }
-    }
-
-    std::wstring driverPath = dir.data();
-    driverPath += L"WinRing0x64.sys";
-
-    hService = OpenServiceW(hManager, SERVICE_NAME, SERVICE_ALL_ACCESS);
-    if (hService && !wrmsr_uninstall_driver()) {
-        return nullptr;
-    }
-
-    hService = CreateServiceW(hManager, SERVICE_NAME, SERVICE_NAME, SERVICE_ALL_ACCESS, SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, driverPath.c_str(), nullptr, nullptr, nullptr, nullptr, nullptr);
-    if (!hService) {
-        LOG_ERR(CLEAR "%s" RED_S "failed to install WinRing0 driver, error %u", tag, GetLastError());
-
-        return nullptr;
-    }
-
-    if (!StartService(hService, 0, nullptr)) {
-        err = GetLastError();
-        if (err != ERROR_SERVICE_ALREADY_RUNNING) {
-            LOG_ERR(CLEAR "%s" RED_S "failed to start WinRing0 driver, error %u", tag, err);
-
-            CloseServiceHandle(hService);
-            hService = nullptr;
-
-            return nullptr;
-        }
-    }
-
-    HANDLE hDriver = CreateFileW(L"\\\\.\\" SERVICE_NAME, GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
-    if (!hDriver) {
-        LOG_ERR(CLEAR "%s" RED_S "failed to connect to WinRing0 driver, error %u", tag, GetLastError());
-
-        return nullptr;
-    }
-
-    return hDriver;
-}
-
-
-#define IOCTL_WRITE_MSR CTL_CODE(40000, 0x822, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-
-static bool wrmsr(HANDLE hDriver, uint32_t reg, uint64_t value) {
-    struct {
-        uint32_t reg = 0;
-        uint32_t value[2]{};
-    } input;
-
-    static_assert(sizeof(input) == 12, "Invalid struct size for WinRing0 driver");
-
-    input.reg = reg;
-    *((uint64_t*)input.value) = value;
-
-    DWORD output;
-    DWORD k;
-
-    if (!DeviceIoControl(hDriver, IOCTL_WRITE_MSR, &input, sizeof(input), &output, sizeof(output), &k, nullptr)) {
-        LOG_WARN(CLEAR "%s" YELLOW_BOLD_S "cannot set MSR 0x%08" PRIx32 " to 0x%08" PRIx64, tag, reg, value);
-
-        return false;
-    }
-
-    return true;
-}
-
-
-} // namespace xmrig
-
-
-void xmrig::Rx::osInit(const RxConfig &config)
-{
-    if ((config.wrmsr() < 0) || !ICpuInfo::isX64()) {
-        return;
-    }
-
-    MsrMod mod = MSR_MOD_NONE;
-    if (Cpu::info()->assembly() == Assembly::RYZEN) {
-        mod = MSR_MOD_RYZEN;
-    }
-    else if (Cpu::info()->vendor() == ICpuInfo::VENDOR_INTEL) {
-        mod = MSR_MOD_INTEL;
-    }
-
-    if (mod == MSR_MOD_NONE) {
-        return;
-    }
-
-    const uint64_t ts = Chrono::steadyMSecs();
-
-    HANDLE hDriver = wrmsr_install_driver();
-    if (!hDriver) {
-        wrmsr_uninstall_driver();
-
-        if (hManager) {
-            CloseServiceHandle(hManager);
-        }
-
-        return;
-    }
-
-    std::thread wrmsr_thread([hDriver, mod, &config]() {
-        for (uint32_t i = 0, n = Cpu::info()->threads(); i < n; ++i) {
-            Platform::setThreadAffinity(i);
-
-            if (mod == MSR_MOD_RYZEN) {
-                wrmsr(hDriver, 0xC0011020, 0);
-                wrmsr(hDriver, 0xC0011021, 0x40);
-                wrmsr(hDriver, 0xC0011022, 0x510000);
-                wrmsr(hDriver, 0xC001102b, 0x1808cc16);
-            }
-            else if (mod == MSR_MOD_INTEL) {
-                wrmsr(hDriver, 0x1a4, config.wrmsr());
-            }
-        }
-    });
-
-    wrmsr_thread.join();
-
-    CloseHandle(hDriver);
-
-    wrmsr_uninstall_driver();
-    CloseServiceHandle(hManager);
-
-    LOG_NOTICE(CLEAR "%s" GREEN_BOLD_S "register values for %s has been set successfully" BLACK_BOLD(" (%" PRIu64 " ms)"), tag, modNames[mod], Chrono::steadyMSecs() - ts);
-}

src/crypto/rx/msr/MsrItem.cpp

@@ -0,0 +1,72 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018-2019 tevador     <tevador@gmail.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "crypto/rx/msr/MsrItem.h"
+#include "rapidjson/document.h"
+
+
+#include <cstdio>
+
+
+xmrig::MsrItem::MsrItem(const rapidjson::Value &value)
+{
+    if (!value.IsString()) {
+        return;
+    }
+
+    auto kv = String(value.GetString()).split(':');
+    if (kv.size() < 2) {
+        return;
+    }
+
+    m_reg   = strtoul(kv[0], nullptr, 0);
+    m_value = strtoull(kv[1], nullptr, 0);
+    m_mask  = (kv.size() > 2) ? strtoull(kv[2], nullptr, 0) : kNoMask;
+}
+
+
+rapidjson::Value xmrig::MsrItem::toJSON(rapidjson::Document &doc) const
+{
+    return toString().toJSON(doc);
+}
+
+
+xmrig::String xmrig::MsrItem::toString() const
+{
+    constexpr size_t size = 48;
+
+    auto buf = new char[size]();
+
+    if (m_mask != kNoMask) {
+        snprintf(buf, size, "0x%" PRIx32 ":0x%" PRIx64 ":0x%" PRIx64, m_reg, m_value, m_mask);
+    }
+    else {
+        snprintf(buf, size, "0x%" PRIx32 ":0x%" PRIx64, m_reg, m_value);
+    }
+
+    return buf;
+}

src/crypto/rx/msr/MsrItem.h

@@ -0,0 +1,76 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018-2019 tevador     <tevador@gmail.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_MSRITEM_H
+#define XMRIG_MSRITEM_H
+
+
+#include "base/tools/String.h"
+
+
+#include <limits>
+#include <vector>
+
+
+namespace xmrig
+{
+
+
+class RxDataset;
+
+
+class MsrItem
+{
+public:
+    constexpr static uint64_t kNoMask = std::numeric_limits<uint64_t>::max();
+
+    inline MsrItem() = default;
+    inline MsrItem(uint32_t reg, uint64_t value, uint64_t mask = kNoMask) : m_reg(reg), m_value(value), m_mask(mask) {}
+
+    MsrItem(const rapidjson::Value &value);
+
+    inline bool isValid() const     { return m_reg > 0; }
+    inline uint32_t reg() const     { return m_reg; }
+    inline uint64_t value() const   { return m_value; }
+    inline uint64_t mask() const    { return m_mask; }
+
+    rapidjson::Value toJSON(rapidjson::Document &doc) const;
+    String toString() const;
+
+private:
+    uint32_t m_reg      = 0;
+    uint64_t m_value    = 0;
+    uint64_t m_mask     = kNoMask;
+};
+
+
+using MsrItems = std::vector<MsrItem>;
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_MSRITEM_H */

src/version.h

@@ -28,14 +28,14 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "5.3.0"
+#define APP_VERSION   "5.4.0-dev"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com"
 #define APP_KIND      "miner"
 
 #define APP_VER_MAJOR  5
-#define APP_VER_MINOR  3
+#define APP_VER_MINOR  4
 #define APP_VER_PATCH  0
 
 #ifdef _MSC_VER