From a162431a1fbd88e9787a73f39c71c9e4fdd324f6 Mon Sep 17 00:00:00 2001
From: Liu Xiaodong <xiaodong.liu@intel.com>
Date: Thu, 12 May 2022 16:43:02 +0800
Subject: [PATCH] chore(hugepage): add 1GB Hugepage checking

In some enviroment, Hugepage is enabled on size 1GB.

Signed-off-by: Liu Xiaodong <xiaodong.liu@intel.com>
---
 mayastor/src/bin/mayastor.rs | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/mayastor/src/bin/mayastor.rs b/mayastor/src/bin/mayastor.rs
index a4b81f48c..8627be1e9 100644
--- a/mayastor/src/bin/mayastor.rs
+++ b/mayastor/src/bin/mayastor.rs
@@ -67,23 +67,39 @@ fn start_tokio_runtime(args: &MayastorCliArgs) {
     });
 }
 
-fn hugepage_check() {
-    let hugepage_path = Path::new("/sys/kernel/mm/hugepages/hugepages-2048kB");
+fn hugepage_get_nr(hugepage_path: &Path) -> (u32, u32) {
     let nr_pages: u32 = sysfs::parse_value(hugepage_path, "nr_hugepages")
         .expect("failed to read the number of pages");
     let free_pages: u32 = sysfs::parse_value(hugepage_path, "free_hugepages")
         .expect("failed to read the number of free pages");
-    if nr_pages < PAGES_NEEDED {
-        error!(?PAGES_NEEDED, ?nr_pages, "insufficient pages available");
+
+    (nr_pages, free_pages)
+}
+
+fn hugepage_check() {
+    let (nr_pages, free_pages) =
+        hugepage_get_nr(Path::new("/sys/kernel/mm/hugepages/hugepages-2048kB"));
+    let (nr_1g_pages, free_1g_pages) = hugepage_get_nr(Path::new(
+        "/sys/kernel/mm/hugepages/hugepages-1048576kB",
+    ));
+
+    if nr_pages + nr_1g_pages * 512 < PAGES_NEEDED {
+        error!(
+            ?PAGES_NEEDED,
+            ?nr_pages,
+            ?nr_1g_pages,
+            "insufficient pages available"
+        );
         if !cfg!(debug_assertions) {
             std::process::exit(1)
         }
     }
 
-    if free_pages < PAGES_NEEDED {
+    if free_pages + free_1g_pages * 512 < PAGES_NEEDED {
         error!(
             ?PAGES_NEEDED,
-            ?nr_pages,
+            ?free_pages,
+            ?free_1g_pages,
             "insufficient free pages available"
         );
         if !cfg!(debug_assertions) {
@@ -91,7 +107,11 @@ fn hugepage_check() {
         }
     }
 
-    info!("free_pages: {} nr_pages: {}", free_pages, nr_pages);
+    info!("free_pages 2MB: {} nr_pages 2MB: {}", free_pages, nr_pages);
+    info!(
+        "free_pages 1GB: {} nr_pages 1GB: {}",
+        free_1g_pages, nr_1g_pages
+    );
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {