From a83c5df8dfc2646a13c78e787bedd72012accb59 Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Fri, 13 Dec 2019 11:59:37 -0800
Subject: [PATCH 01/10] src: make --use-largepages a runtime option

Moves the option that instructs Node.js to-remap its static code to
large pages from a configure-time option to a runtime option. This
should make it easy to assess the performance impact of such a change
without having to custom-build.
---
 configure.py                              | 33 -----------------------
 doc/api/cli.md                            | 10 +++++++
 doc/node.1                                |  5 ++++
 node.gyp                                  |  2 +-
 node.gypi                                 |  6 ++---
 src/large_pages/node_large_page.cc        |  6 ++---
 src/node.cc                               | 18 ++++++-------
 src/node_options.cc                       |  4 +++
 src/node_options.h                        |  1 +
 test/parallel/test-startup-large-pages.js | 19 +++++++++++++
 10 files changed, 53 insertions(+), 51 deletions(-)
 create mode 100644 test/parallel/test-startup-large-pages.js

diff --git a/configure.py b/configure.py
index 95766d405a3f0a..de27bb340385e6 100755
--- a/configure.py
+++ b/configure.py
@@ -404,17 +404,6 @@
     dest='with_etw',
     help='build with ETW (default is true on Windows)')
 
-parser.add_option('--use-largepages',
-    action='store_true',
-    dest='node_use_large_pages',
-    help='build with Large Pages support. This feature is supported only on Linux kernel' +
-         '>= 2.6.38 with Transparent Huge pages enabled and FreeBSD')
-
-parser.add_option('--use-largepages-script-lld',
-    action='store_true',
-    dest='node_use_large_pages_script_lld',
-    help='link against the LLVM ld linker script. Implies -fuse-ld=lld in the linker flags')
-
 intl_optgroup.add_option('--with-intl',
     action='store',
     dest='with_intl',
@@ -1068,28 +1057,6 @@ def configure_node(o):
   else:
     o['variables']['node_use_dtrace'] = 'false'
 
-  if options.node_use_large_pages and not flavor in ('linux', 'freebsd', 'mac'):
-    raise Exception(
-      'Large pages are supported only on Linux, FreeBSD and MacOS Systems.')
-  if options.node_use_large_pages and flavor in ('linux', 'freebsd', 'mac'):
-    if options.shared or options.enable_static:
-      raise Exception(
-        'Large pages are supported only while creating node executable.')
-    if target_arch!="x64":
-      raise Exception(
-        'Large pages are supported only x64 platform.')
-    if flavor == 'mac':
-      info('macOS server with 32GB or more is recommended')
-    if flavor == 'linux':
-      # Example full version string: 2.6.32-696.28.1.el6.x86_64
-      FULL_KERNEL_VERSION=os.uname()[2]
-      KERNEL_VERSION=FULL_KERNEL_VERSION.split('-')[0]
-      if KERNEL_VERSION < "2.6.38" and flavor == 'linux':
-        raise Exception(
-          'Large pages need Linux kernel version >= 2.6.38')
-  o['variables']['node_use_large_pages'] = b(options.node_use_large_pages)
-  o['variables']['node_use_large_pages_script_lld'] = b(options.node_use_large_pages_script_lld)
-
   if options.no_ifaddrs:
     o['defines'] += ['SUNOS_NO_IFADDRS']
 
diff --git a/doc/api/cli.md b/doc/api/cli.md
index 171f6b8ad29780..4c549e3375760f 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -863,6 +863,15 @@ environment variables.
 
 See `SSL_CERT_DIR` and `SSL_CERT_FILE`.
 
+### `--use-largepages`
+<!-- YAML
+added: REPLACEME
+-->
+
+Re-map the Node.js static code to large memory pages at startup. If supported on
+the target system, this will cause the Node.js static code to be moved onto 2
+MiB pages instead of 4 KiB pages.
+
 ### `--v8-options`
 <!-- YAML
 added: v0.1.3
@@ -1119,6 +1128,7 @@ Node.js options that are allowed are:
 * `--track-heap-objects`
 * `--unhandled-rejections`
 * `--use-bundled-ca`
+* `--use-largepages`
 * `--use-openssl-ca`
 * `--v8-pool-size`
 * `--zero-fill-buffers`
diff --git a/doc/node.1 b/doc/node.1
index 5ea38be56e9f37..91912fd0c165e6 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -398,6 +398,11 @@ See
 and
 .Ev SSL_CERT_FILE .
 .
+.It Fl -use-largepages
+Re-map the Node.js static code to large memory pages at startup. If supported on
+the target system, this will cause the Node.js static code to be moved onto 2
+MiB pages instead of 4 KiB pages.
+.
 .It Fl -v8-options
 Print V8 command-line options.
 .
diff --git a/node.gyp b/node.gyp
index 1eb26729679de0..428286ba2104f3 100644
--- a/node.gyp
+++ b/node.gyp
@@ -833,7 +833,7 @@
             }],
           ],
         }],
-        [ 'node_use_large_pages=="true" and OS in "linux freebsd mac"', {
+        [ 'OS in "linux freebsd mac"', {
           'defines': [ 'NODE_ENABLE_LARGE_CODE_PAGES=1' ],
           # The current implementation of Large Pages is under Linux.
           # Other implementations are possible but not currently supported.
diff --git a/node.gypi b/node.gypi
index b811829f4f507e..0751416c887c28 100644
--- a/node.gypi
+++ b/node.gypi
@@ -308,8 +308,7 @@
     }],
     [ 'OS=="linux" and '
       'target_arch=="x64" and '
-      'node_use_large_pages=="true" and '
-      'node_use_large_pages_script_lld=="false"', {
+      'llvm_version=="0.0"', {
       'ldflags': [
         '-Wl,-T',
         '<!(realpath src/large_pages/ld.implicit.script)',
@@ -317,8 +316,7 @@
     }],
     [ 'OS=="linux" and '
       'target_arch=="x64" and '
-      'node_use_large_pages=="true" and '
-      'node_use_large_pages_script_lld=="true"', {
+      'llvm_version!="0.0"', {
       'ldflags': [
         '-Wl,-T',
         '<!(realpath src/large_pages/ld.implicit.script.lld)',
diff --git a/src/large_pages/node_large_page.cc b/src/large_pages/node_large_page.cc
index 68fa178b40b6cd..abf27a75e1aa4d 100644
--- a/src/large_pages/node_large_page.cc
+++ b/src/large_pages/node_large_page.cc
@@ -62,7 +62,7 @@
 // Map a new area and copy the original code there
 // Use mmap using the start address with MAP_FIXED so we get exactly the
 // same virtual address
-// Use madvise with MADV_HUGE_PAGE to use Anonymous 2M Pages
+// Use madvise with MADV_HUGEPAGE to use Anonymous 2M Pages
 // If successful copy the code there and unmap the original region.
 
 extern char __nodetext;
@@ -308,7 +308,7 @@ static bool IsSuperPagesEnabled() {
 // a. map a new area and copy the original code there
 // b. mmap using the start address with MAP_FIXED so we get exactly
 //    the same virtual address (except on macOS).
-// c. madvise with MADV_HUGE_PAGE
+// c. madvise with MADV_HUGEPAGE
 // d. If successful copy the code there and unmap the original region
 int
 #if !defined(__APPLE__)
@@ -352,7 +352,7 @@ MoveTextRegionToLargePages(const text_region& r) {
     return -1;
   }
 
-  ret = madvise(tmem, size, MADV_HUGEPAGE);
+  ret = madvise(tmem, size, 14 /* MADV_HUGEPAGE */);
   if (ret == -1) {
     PrintSystemError(errno);
     ret = munmap(tmem, size);
diff --git a/src/node.cc b/src/node.cc
index d8da205b681edb..7ba9935e4873a5 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -64,9 +64,7 @@
 #include "inspector/worker_inspector.h"  // ParentInspectorHandle
 #endif
 
-#ifdef NODE_ENABLE_LARGE_CODE_PAGES
 #include "large_pages/node_large_page.h"
-#endif
 
 #ifdef NODE_REPORT
 #include "node_report.h"
@@ -967,14 +965,6 @@ InitializationResult InitializeOncePerProcess(int argc, char** argv) {
 
   CHECK_GT(argc, 0);
 
-#ifdef NODE_ENABLE_LARGE_CODE_PAGES
-  if (node::IsLargePagesEnabled()) {
-    if (node::MapStaticCodeToLargePages() != 0) {
-      fprintf(stderr, "Reverting to default page size\n");
-    }
-  }
-#endif
-
   // Hack around with the argv pointer. Used for process.title = "blah".
   argv = uv_setup_args(argc, argv);
 
@@ -994,6 +984,14 @@ InitializationResult InitializeOncePerProcess(int argc, char** argv) {
     }
   }
 
+  if (per_process::cli_options->use_largepages) {
+    if (node::IsLargePagesEnabled()) {
+      if (node::MapStaticCodeToLargePages() != 0) {
+        fprintf(stderr, "Reverting to default page size\n");
+      }
+    }
+  }
+
   if (per_process::cli_options->print_version) {
     printf("%s\n", NODE_VERSION);
     result.exit_code = 0;
diff --git a/src/node_options.cc b/src/node_options.cc
index 831540f993fcb5..1c3b3f7aa39ece 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -748,6 +748,10 @@ PerProcessOptionsParser::PerProcessOptionsParser(
             kAllowedInEnvironment);
 #endif
 #endif
+  AddOption("--use-largepages",
+            "Map the Node.js static code to large pages",
+            &PerProcessOptions::use_largepages,
+            kAllowedInEnvironment);
 
   Insert(iop, &PerProcessOptions::get_per_isolate_options);
 }
diff --git a/src/node_options.h b/src/node_options.h
index 7b3ae19fe6c8ad..3db8d41c400f95 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -235,6 +235,7 @@ class PerProcessOptions : public Options {
   bool force_fips_crypto = false;
 #endif
 #endif
+  bool use_largepages = false;
 
 #ifdef NODE_REPORT
   std::vector<std::string> cmdline;
diff --git a/test/parallel/test-startup-large-pages.js b/test/parallel/test-startup-large-pages.js
new file mode 100644
index 00000000000000..351b250ea0776b
--- /dev/null
+++ b/test/parallel/test-startup-large-pages.js
@@ -0,0 +1,19 @@
+'use strict';
+
+// A sanity check: Make sure that Node.js runs correctly when running with the
+// --use-largepages option.
+
+require('../common');
+const assert = require('assert');
+const { spawnSync } = require('child_process');
+
+const child = spawnSync(process.execPath, [ '--use-largepages', '-p', '42' ]);
+const stdout = child.stdout.toString().match(/\S+/g);
+
+assert.strictEqual(child.status, 0);
+assert.strictEqual(child.signal, null);
+assert.strictEqual(stdout.length, 1);
+assert.strictEqual(stdout[0], '42');
+
+// TODO(gabrielschulhof): Make assertions about the stderr, which may or may not
+// contain a message indicating that mapping to large pages has failed.

From 65622bf0e59a560a4363a9178d920303b7d4ee4c Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Sat, 14 Dec 2019 22:21:12 -0800
Subject: [PATCH 02/10] src: make --use-largepages a three-valued option

---
 doc/api/cli.md      | 9 ++++++++-
 doc/node.1          | 4 +++-
 src/node.cc         | 6 ++++--
 src/node_options.cc | 3 +++
 src/node_options.h  | 2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 4c549e3375760f..c2942d91931371 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -863,7 +863,7 @@ environment variables.
 
 See `SSL_CERT_DIR` and `SSL_CERT_FILE`.
 
-### `--use-largepages`
+### `--use-largepages=num`
 <!-- YAML
 added: REPLACEME
 -->
@@ -872,6 +872,13 @@ Re-map the Node.js static code to large memory pages at startup. If supported on
 the target system, this will cause the Node.js static code to be moved onto 2
 MiB pages instead of 4 KiB pages.
 
+The following values are valid for `num`:
+* 0: No mapping will be attempted. This is the default.
+* 1: If supported by the OS, mapping will be attempted. Failure to map will be
+  ignored and will not be reported.
+* 2: If supported by the OS, mapping will be attempted. Failure to map will be
+  ignored and a message will be printed to standard error.
+
 ### `--v8-options`
 <!-- YAML
 added: v0.1.3
diff --git a/doc/node.1 b/doc/node.1
index 91912fd0c165e6..892193631813fd 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -398,10 +398,12 @@ See
 and
 .Ev SSL_CERT_FILE .
 .
-.It Fl -use-largepages
+.It Fl -use-largepages Ns = Ns Ar num
 Re-map the Node.js static code to large memory pages at startup. If supported on
 the target system, this will cause the Node.js static code to be moved onto 2
 MiB pages instead of 4 KiB pages.
+.Pp
+The following values are valid: 0 (do not map), 1 (map, ignore failure, and do not report it), and 2 (map, ignore failure, but report it to standard error).
 .
 .It Fl -v8-options
 Print V8 command-line options.
diff --git a/src/node.cc b/src/node.cc
index 7ba9935e4873a5..0c97a4bd4c8b49 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -984,9 +984,11 @@ InitializationResult InitializeOncePerProcess(int argc, char** argv) {
     }
   }
 
-  if (per_process::cli_options->use_largepages) {
+  if (per_process::cli_options->use_largepages == 1 ||
+      per_process::cli_options->use_largepages == 2) {
     if (node::IsLargePagesEnabled()) {
-      if (node::MapStaticCodeToLargePages() != 0) {
+      if (node::MapStaticCodeToLargePages() != 0 &&
+          per_process::cli_options->use_largepages == 2) {
         fprintf(stderr, "Reverting to default page size\n");
       }
     }
diff --git a/src/node_options.cc b/src/node_options.cc
index 1c3b3f7aa39ece..4806c6fafff3fd 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -63,6 +63,9 @@ void PerProcessOptions::CheckOptions(std::vector<std::string>* errors) {
                       "used, not both");
   }
 #endif
+  if (!(use_largepages >= 0 && use_largepages <= 2)) {
+    errors->push_back("--use-largepages must be one of 0, 1, or 2");
+  }
   per_isolate->CheckOptions(errors);
 }
 
diff --git a/src/node_options.h b/src/node_options.h
index 3db8d41c400f95..1cde4f46644770 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -235,7 +235,7 @@ class PerProcessOptions : public Options {
   bool force_fips_crypto = false;
 #endif
 #endif
-  bool use_largepages = false;
+  uint64_t use_largepages = 0;
 
 #ifdef NODE_REPORT
   std::vector<std::string> cmdline;

From 6e0fd1c7a9a25edca9bd3f03a2d6b3f480010e29 Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Sat, 14 Dec 2019 22:42:40 -0800
Subject: [PATCH 03/10] update test

---
 test/parallel/test-startup-large-pages.js | 28 ++++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/test/parallel/test-startup-large-pages.js b/test/parallel/test-startup-large-pages.js
index 351b250ea0776b..5e74088c00e1c5 100644
--- a/test/parallel/test-startup-large-pages.js
+++ b/test/parallel/test-startup-large-pages.js
@@ -7,13 +7,25 @@ require('../common');
 const assert = require('assert');
 const { spawnSync } = require('child_process');
 
-const child = spawnSync(process.execPath, [ '--use-largepages', '-p', '42' ]);
-const stdout = child.stdout.toString().match(/\S+/g);
+{
+  const child = spawnSync(process.execPath,
+                          [ '--use-largepages=1', '-p', '42' ]);
+  const stdout = child.stdout.toString().match(/\S+/g);
+  assert.strictEqual(child.status, 0);
+  assert.strictEqual(child.signal, null);
+  assert.strictEqual(stdout.length, 1);
+  assert.strictEqual(stdout[0], '42');
+}
 
-assert.strictEqual(child.status, 0);
-assert.strictEqual(child.signal, null);
-assert.strictEqual(stdout.length, 1);
-assert.strictEqual(stdout[0], '42');
+{
+  const child = spawnSync(process.execPath,
+                          [ '--use-largepages=3', '-p', '42' ]);
+  assert.strictEqual(child.status, 9);
+  assert.strictEqual(child.signal, null);
+  assert.strictEqual(child.stderr.toString().match(/\S+/g).slice(1).join(' '),
+                     '--use-largepages must be one of 0, 1, or 2');
+}
 
-// TODO(gabrielschulhof): Make assertions about the stderr, which may or may not
-// contain a message indicating that mapping to large pages has failed.
+// TODO(gabrielschulhof): Run with --use-largepages=2 and make assertions about
+// the stderr, which may or may not contain a message indicating that mapping to
+// large pages has failed.

From a93064db81577630a5309872f567c88e8df97c09 Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Mon, 16 Dec 2019 18:11:02 -0800
Subject: [PATCH 04/10] heed review comments

---
 src/node.cc                               | 12 +++++++++++-
 test/parallel/test-startup-large-pages.js |  3 +--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/node.cc b/src/node.cc
index 0c97a4bd4c8b49..8d88d0e6360c3c 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -984,15 +984,25 @@ InitializationResult InitializeOncePerProcess(int argc, char** argv) {
     }
   }
 
+#if defined(NODE_ENABLE_LARGE_CODE_PAGES) && NODE_ENABLE_LARGE_CODE_PAGES
   if (per_process::cli_options->use_largepages == 1 ||
       per_process::cli_options->use_largepages == 2) {
     if (node::IsLargePagesEnabled()) {
       if (node::MapStaticCodeToLargePages() != 0 &&
           per_process::cli_options->use_largepages == 2) {
-        fprintf(stderr, "Reverting to default page size\n");
+        fprintf(stderr,
+                "Mapping code to large pages failed. Reverting to default page "
+                "size.\n");
       }
+    } else if (per_process::cli_options->use_largepages == 2) {
+      fprintf(stderr, "Large pages are not enabled.\n");
     }
   }
+#else
+  if (per_process::cli_options->use_largepages == 2) {
+    fprintf(stderr, "Mapping to large pages is not supported.\n");
+  }
+#endif  // NODE_ENABLE_LARGE_CODE_PAGES
 
   if (per_process::cli_options->print_version) {
     printf("%s\n", NODE_VERSION);
diff --git a/test/parallel/test-startup-large-pages.js b/test/parallel/test-startup-large-pages.js
index 5e74088c00e1c5..3b39037624da9b 100644
--- a/test/parallel/test-startup-large-pages.js
+++ b/test/parallel/test-startup-large-pages.js
@@ -1,7 +1,6 @@
 'use strict';
 
-// A sanity check: Make sure that Node.js runs correctly when running with the
-// --use-largepages option.
+// Make sure that Node.js runs correctly with the --use-largepages option.
 
 require('../common');
 const assert = require('assert');

From 764c1096a7a3d1e3580ff8b555b20999626b69ce Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Mon, 16 Dec 2019 19:21:47 -0800
Subject: [PATCH 05/10] convert values to strings

---
 doc/api/cli.md                            | 14 +++++++-------
 doc/node.1                                |  7 +++++--
 src/node.cc                               | 10 +++++-----
 src/node_options.cc                       |  6 ++++--
 src/node_options.h                        |  2 +-
 test/parallel/test-startup-large-pages.js |  6 +++---
 6 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index c2942d91931371..81538aa5a56dcc 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -863,7 +863,7 @@ environment variables.
 
 See `SSL_CERT_DIR` and `SSL_CERT_FILE`.
 
-### `--use-largepages=num`
+### `--use-largepages=mode`
 <!-- YAML
 added: REPLACEME
 -->
@@ -872,12 +872,12 @@ Re-map the Node.js static code to large memory pages at startup. If supported on
 the target system, this will cause the Node.js static code to be moved onto 2
 MiB pages instead of 4 KiB pages.
 
-The following values are valid for `num`:
-* 0: No mapping will be attempted. This is the default.
-* 1: If supported by the OS, mapping will be attempted. Failure to map will be
-  ignored and will not be reported.
-* 2: If supported by the OS, mapping will be attempted. Failure to map will be
-  ignored and a message will be printed to standard error.
+The following values are valid for `mode`:
+* `off`: No mapping will be attempted. This is the default.
+* `silent`: If supported by the OS, mapping will be attempted. Failure to map
+  will be ignored and will not be reported.
+* `verbose`: If supported by the OS, mapping will be attempted. Failure to map
+  will be ignored and a message will be printed to standard error.
 
 ### `--v8-options`
 <!-- YAML
diff --git a/doc/node.1 b/doc/node.1
index 892193631813fd..f65a877caa15da 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -398,12 +398,15 @@ See
 and
 .Ev SSL_CERT_FILE .
 .
-.It Fl -use-largepages Ns = Ns Ar num
+.It Fl -use-largepages Ns = Ns Ar mode
 Re-map the Node.js static code to large memory pages at startup. If supported on
 the target system, this will cause the Node.js static code to be moved onto 2
 MiB pages instead of 4 KiB pages.
 .Pp
-The following values are valid: 0 (do not map), 1 (map, ignore failure, and do not report it), and 2 (map, ignore failure, but report it to standard error).
+.Ar mode
+must have one of the following values:
+`off` (do not map), `silent` (map and ignore failure without reporting it), or
+`verbose` (map and ignore failure, but report it to standard error).
 .
 .It Fl -v8-options
 Print V8 command-line options.
diff --git a/src/node.cc b/src/node.cc
index 8d88d0e6360c3c..bb59dc831f2991 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -985,21 +985,21 @@ InitializationResult InitializeOncePerProcess(int argc, char** argv) {
   }
 
 #if defined(NODE_ENABLE_LARGE_CODE_PAGES) && NODE_ENABLE_LARGE_CODE_PAGES
-  if (per_process::cli_options->use_largepages == 1 ||
-      per_process::cli_options->use_largepages == 2) {
+  if (per_process::cli_options->use_largepages == "silent" ||
+      per_process::cli_options->use_largepages == "verbose") {
     if (node::IsLargePagesEnabled()) {
       if (node::MapStaticCodeToLargePages() != 0 &&
-          per_process::cli_options->use_largepages == 2) {
+          per_process::cli_options->use_largepages == "verbose") {
         fprintf(stderr,
                 "Mapping code to large pages failed. Reverting to default page "
                 "size.\n");
       }
-    } else if (per_process::cli_options->use_largepages == 2) {
+    } else if (per_process::cli_options->use_largepages == "verbose") {
       fprintf(stderr, "Large pages are not enabled.\n");
     }
   }
 #else
-  if (per_process::cli_options->use_largepages == 2) {
+  if (per_process::cli_options->use_largepages == "verbose") {
     fprintf(stderr, "Mapping to large pages is not supported.\n");
   }
 #endif  // NODE_ENABLE_LARGE_CODE_PAGES
diff --git a/src/node_options.cc b/src/node_options.cc
index 4806c6fafff3fd..ed611c6b11aac5 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -63,8 +63,10 @@ void PerProcessOptions::CheckOptions(std::vector<std::string>* errors) {
                       "used, not both");
   }
 #endif
-  if (!(use_largepages >= 0 && use_largepages <= 2)) {
-    errors->push_back("--use-largepages must be one of 0, 1, or 2");
+  if (use_largepages != "off" &&
+      use_largepages != "silent" &&
+      use_largepages != "verbose") {
+    errors->push_back("invalid value for --use-largepages");
   }
   per_isolate->CheckOptions(errors);
 }
diff --git a/src/node_options.h b/src/node_options.h
index 1cde4f46644770..e286174890c0e4 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -235,7 +235,7 @@ class PerProcessOptions : public Options {
   bool force_fips_crypto = false;
 #endif
 #endif
-  uint64_t use_largepages = 0;
+  std::string use_largepages = "off";
 
 #ifdef NODE_REPORT
   std::vector<std::string> cmdline;
diff --git a/test/parallel/test-startup-large-pages.js b/test/parallel/test-startup-large-pages.js
index 3b39037624da9b..840885bbb94abd 100644
--- a/test/parallel/test-startup-large-pages.js
+++ b/test/parallel/test-startup-large-pages.js
@@ -8,7 +8,7 @@ const { spawnSync } = require('child_process');
 
 {
   const child = spawnSync(process.execPath,
-                          [ '--use-largepages=1', '-p', '42' ]);
+                          [ '--use-largepages=silent', '-p', '42' ]);
   const stdout = child.stdout.toString().match(/\S+/g);
   assert.strictEqual(child.status, 0);
   assert.strictEqual(child.signal, null);
@@ -18,11 +18,11 @@ const { spawnSync } = require('child_process');
 
 {
   const child = spawnSync(process.execPath,
-                          [ '--use-largepages=3', '-p', '42' ]);
+                          [ '--use-largepages=xyzzy', '-p', '42' ]);
   assert.strictEqual(child.status, 9);
   assert.strictEqual(child.signal, null);
   assert.strictEqual(child.stderr.toString().match(/\S+/g).slice(1).join(' '),
-                     '--use-largepages must be one of 0, 1, or 2');
+                     'invalid value for --use-largepages');
 }
 
 // TODO(gabrielschulhof): Run with --use-largepages=2 and make assertions about

From 67bc99412e94abe8325091f83c2603b9d517905b Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Mon, 16 Dec 2019 22:45:24 -0800
Subject: [PATCH 06/10] only add sources if arch is x64

---
 node.gyp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/node.gyp b/node.gyp
index 428286ba2104f3..32ecafd0f41eba 100644
--- a/node.gyp
+++ b/node.gyp
@@ -833,10 +833,9 @@
             }],
           ],
         }],
-        [ 'OS in "linux freebsd mac"', {
+        [ 'OS in "linux freebsd mac" and '
+          'target_arch=="x64"', {
           'defines': [ 'NODE_ENABLE_LARGE_CODE_PAGES=1' ],
-          # The current implementation of Large Pages is under Linux.
-          # Other implementations are possible but not currently supported.
           'sources': [
             'src/large_pages/node_large_page.cc',
             'src/large_pages/node_large_page.h'

From cc5436312b70b75ffba8ed1f477edeacca1a7d52 Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Mon, 16 Dec 2019 22:47:17 -0800
Subject: [PATCH 07/10] update test comment

---
 test/parallel/test-startup-large-pages.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/parallel/test-startup-large-pages.js b/test/parallel/test-startup-large-pages.js
index 840885bbb94abd..eb7e6b8dfd5936 100644
--- a/test/parallel/test-startup-large-pages.js
+++ b/test/parallel/test-startup-large-pages.js
@@ -25,6 +25,6 @@ const { spawnSync } = require('child_process');
                      'invalid value for --use-largepages');
 }
 
-// TODO(gabrielschulhof): Run with --use-largepages=2 and make assertions about
-// the stderr, which may or may not contain a message indicating that mapping to
-// large pages has failed.
+// TODO(gabrielschulhof): Run with --use-largepages=verbose and make assertions
+// about the stderr, which may or may not contain a message indicating that
+// mapping to large pages has failed.

From 52d025b9433f0f2870549d678c9e9e9071a224d8 Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Tue, 17 Dec 2019 10:30:09 -0800
Subject: [PATCH 08/10] rename "silent" to "on"

---
 doc/api/cli.md                            | 4 ++--
 doc/node.1                                | 5 +++--
 src/node.cc                               | 2 +-
 src/node_options.cc                       | 2 +-
 test/parallel/test-startup-large-pages.js | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 81538aa5a56dcc..71f4391a0a3924 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -874,8 +874,8 @@ MiB pages instead of 4 KiB pages.
 
 The following values are valid for `mode`:
 * `off`: No mapping will be attempted. This is the default.
-* `silent`: If supported by the OS, mapping will be attempted. Failure to map
-  will be ignored and will not be reported.
+* `on`: If supported by the OS, mapping will be attempted. Failure to map will
+  be ignored and will not be reported.
 * `verbose`: If supported by the OS, mapping will be attempted. Failure to map
   will be ignored and a message will be printed to standard error.
 
diff --git a/doc/node.1 b/doc/node.1
index f65a877caa15da..a9bd1e6517d239 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -405,8 +405,9 @@ MiB pages instead of 4 KiB pages.
 .Pp
 .Ar mode
 must have one of the following values:
-`off` (do not map), `silent` (map and ignore failure without reporting it), or
-`verbose` (map and ignore failure, but report it to standard error).
+`off` (the default value, meaning do not map), `on` (map and ignore failure
+without reporting it), or `verbose` (map and ignore failure, but report it to
+standard error).
 .
 .It Fl -v8-options
 Print V8 command-line options.
diff --git a/src/node.cc b/src/node.cc
index bb59dc831f2991..4f1e4e63b8bcc7 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -985,7 +985,7 @@ InitializationResult InitializeOncePerProcess(int argc, char** argv) {
   }
 
 #if defined(NODE_ENABLE_LARGE_CODE_PAGES) && NODE_ENABLE_LARGE_CODE_PAGES
-  if (per_process::cli_options->use_largepages == "silent" ||
+  if (per_process::cli_options->use_largepages == "on" ||
       per_process::cli_options->use_largepages == "verbose") {
     if (node::IsLargePagesEnabled()) {
       if (node::MapStaticCodeToLargePages() != 0 &&
diff --git a/src/node_options.cc b/src/node_options.cc
index ed611c6b11aac5..19af3ab3a06b50 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -64,7 +64,7 @@ void PerProcessOptions::CheckOptions(std::vector<std::string>* errors) {
   }
 #endif
   if (use_largepages != "off" &&
-      use_largepages != "silent" &&
+      use_largepages != "on" &&
       use_largepages != "verbose") {
     errors->push_back("invalid value for --use-largepages");
   }
diff --git a/test/parallel/test-startup-large-pages.js b/test/parallel/test-startup-large-pages.js
index eb7e6b8dfd5936..247aa85359cd64 100644
--- a/test/parallel/test-startup-large-pages.js
+++ b/test/parallel/test-startup-large-pages.js
@@ -8,7 +8,7 @@ const { spawnSync } = require('child_process');
 
 {
   const child = spawnSync(process.execPath,
-                          [ '--use-largepages=silent', '-p', '42' ]);
+                          [ '--use-largepages=on', '-p', '42' ]);
   const stdout = child.stdout.toString().match(/\S+/g);
   assert.strictEqual(child.status, 0);
   assert.strictEqual(child.signal, null);

From 764f45e3137e5ecc278e1675083ac80e1c42f008 Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Tue, 17 Dec 2019 10:54:31 -0800
Subject: [PATCH 09/10] make "on" verbose, and retain "silent"

---
 doc/api/cli.md                            | 6 +++---
 doc/node.1                                | 5 ++---
 src/node.cc                               | 8 ++++----
 src/node_options.cc                       | 2 +-
 test/parallel/test-startup-large-pages.js | 5 ++---
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 71f4391a0a3924..df37bd39e59c5c 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -875,9 +875,9 @@ MiB pages instead of 4 KiB pages.
 The following values are valid for `mode`:
 * `off`: No mapping will be attempted. This is the default.
 * `on`: If supported by the OS, mapping will be attempted. Failure to map will
-  be ignored and will not be reported.
-* `verbose`: If supported by the OS, mapping will be attempted. Failure to map
-  will be ignored and a message will be printed to standard error.
+  be ignored and a message will be printed to standard error.
+* `silent`: If supported by the OS, mapping will be attempted. Failure to map
+  will be ignored and will not be reported.
 
 ### `--v8-options`
 <!-- YAML
diff --git a/doc/node.1 b/doc/node.1
index a9bd1e6517d239..77cf2b67ba9297 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -405,9 +405,8 @@ MiB pages instead of 4 KiB pages.
 .Pp
 .Ar mode
 must have one of the following values:
-`off` (the default value, meaning do not map), `on` (map and ignore failure
-without reporting it), or `verbose` (map and ignore failure, but report it to
-standard error).
+`off` (the default value, meaning do not map), `on` (map and ignore failure,
+reporting it to stderr), or `silent` (map and silently ignore failure).
 .
 .It Fl -v8-options
 Print V8 command-line options.
diff --git a/src/node.cc b/src/node.cc
index 4f1e4e63b8bcc7..5ca8ee831e673d 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -986,20 +986,20 @@ InitializationResult InitializeOncePerProcess(int argc, char** argv) {
 
 #if defined(NODE_ENABLE_LARGE_CODE_PAGES) && NODE_ENABLE_LARGE_CODE_PAGES
   if (per_process::cli_options->use_largepages == "on" ||
-      per_process::cli_options->use_largepages == "verbose") {
+      per_process::cli_options->use_largepages == "silent") {
     if (node::IsLargePagesEnabled()) {
       if (node::MapStaticCodeToLargePages() != 0 &&
-          per_process::cli_options->use_largepages == "verbose") {
+          per_process::cli_options->use_largepages != "silent") {
         fprintf(stderr,
                 "Mapping code to large pages failed. Reverting to default page "
                 "size.\n");
       }
-    } else if (per_process::cli_options->use_largepages == "verbose") {
+    } else if (per_process::cli_options->use_largepages != "silent") {
       fprintf(stderr, "Large pages are not enabled.\n");
     }
   }
 #else
-  if (per_process::cli_options->use_largepages == "verbose") {
+  if (per_process::cli_options->use_largepages == "on") {
     fprintf(stderr, "Mapping to large pages is not supported.\n");
   }
 #endif  // NODE_ENABLE_LARGE_CODE_PAGES
diff --git a/src/node_options.cc b/src/node_options.cc
index 19af3ab3a06b50..a8350bbcdcaede 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -65,7 +65,7 @@ void PerProcessOptions::CheckOptions(std::vector<std::string>* errors) {
 #endif
   if (use_largepages != "off" &&
       use_largepages != "on" &&
-      use_largepages != "verbose") {
+      use_largepages != "silent") {
     errors->push_back("invalid value for --use-largepages");
   }
   per_isolate->CheckOptions(errors);
diff --git a/test/parallel/test-startup-large-pages.js b/test/parallel/test-startup-large-pages.js
index 247aa85359cd64..d5589ee547f760 100644
--- a/test/parallel/test-startup-large-pages.js
+++ b/test/parallel/test-startup-large-pages.js
@@ -25,6 +25,5 @@ const { spawnSync } = require('child_process');
                      'invalid value for --use-largepages');
 }
 
-// TODO(gabrielschulhof): Run with --use-largepages=verbose and make assertions
-// about the stderr, which may or may not contain a message indicating that
-// mapping to large pages has failed.
+// TODO(gabrielschulhof): Make assertions about the stderr, which may or may not
+// contain a message indicating that mapping to large pages has failed.

From c504237dd447e87a988ccf720535f0f0ceb1f562 Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Sun, 22 Dec 2019 09:20:57 -0800
Subject: [PATCH 10/10] fix FreeBSD

Co-authored-by: David Carlier <devnexen@gmail.com>
---
 src/large_pages/node_large_page.cc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/large_pages/node_large_page.cc b/src/large_pages/node_large_page.cc
index abf27a75e1aa4d..3897b819e81bad 100644
--- a/src/large_pages/node_large_page.cc
+++ b/src/large_pages/node_large_page.cc
@@ -333,9 +333,6 @@ MoveTextRegionToLargePages(const text_region& r) {
     PrintSystemError(errno);
     return -1;
   }
-  auto munmap_on_return = OnScopeLeave([nmem, size]() {
-    if (-1 == munmap(nmem, size)) PrintSystemError(errno);
-  });
 
   memcpy(nmem, r.from, size);
 
@@ -359,6 +356,7 @@ MoveTextRegionToLargePages(const text_region& r) {
     if (ret == -1) {
       PrintSystemError(errno);
     }
+    if (-1 == munmap(nmem, size)) PrintSystemError(errno);
     return -1;
   }
   memcpy(start, nmem, size);
@@ -369,6 +367,7 @@ MoveTextRegionToLargePages(const text_region& r) {
               MAP_ALIGNED_SUPER, -1 , 0);
   if (tmem == MAP_FAILED) {
     PrintSystemError(errno);
+    if (-1 == munmap(nmem, size)) PrintSystemError(errno);
     return -1;
   }
 #elif defined(__APPLE__)
@@ -383,6 +382,7 @@ MoveTextRegionToLargePages(const text_region& r) {
               VM_FLAGS_SUPERPAGE_SIZE_2MB, 0);
   if (tmem == MAP_FAILED) {
     PrintSystemError(errno);
+    if (-1 == munmap(nmem, size)) PrintSystemError(errno);
     return -1;
   }
   memcpy(tmem, nmem, size);
@@ -393,6 +393,7 @@ MoveTextRegionToLargePages(const text_region& r) {
     if (ret == -1) {
       PrintSystemError(errno);
     }
+    if (-1 == munmap(nmem, size)) PrintSystemError(errno);
     return -1;
   }
   memcpy(start, tmem, size);
@@ -405,8 +406,10 @@ MoveTextRegionToLargePages(const text_region& r) {
     if (ret == -1) {
       PrintSystemError(errno);
     }
+    if (-1 == munmap(nmem, size)) PrintSystemError(errno);
     return -1;
   }
+  if (-1 == munmap(nmem, size)) PrintSystemError(errno);
   return ret;
 }
 
@@ -418,12 +421,12 @@ int MapStaticCodeToLargePages() {
     return -1;
   }
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__FreeBSD__)
   if (r.from > reinterpret_cast<void*>(&MoveTextRegionToLargePages))
     return MoveTextRegionToLargePages(r);
 
   return -1;
-#elif defined(__FreeBSD__) || defined(__APPLE__)
+#elif defined(__APPLE__)
   return MoveTextRegionToLargePages(r);
 #endif
 }