From 7928a697dce6c50481b3a5d40c45ece62fea4865 Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Thu, 4 Feb 2021 16:50:37 +0000
Subject: [PATCH] vmm: Support configurable huge pages in MemoryManager

Use the newly added hugepages_size option if provided by the user to
pick a huge page size when creating the memfd region. If none is
specified use the system default.

Sadly different huge pages cannot be tested by an integration test as
creating a pool of the non-default size cannot be done at runtime
(requires kernel to be booted with certain parameters.)

TETS=Manually tested with a kernel booted with both 1GiB and 2MiB huge
pages (hugepagesz=1G hugepages=1 hugepagesz=2M hugepages=512)

Fixes: #2230

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 vmm/src/memory_manager.rs | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/vmm/src/memory_manager.rs b/vmm/src/memory_manager.rs
index 37db174e4..c20febec4 100644
--- a/vmm/src/memory_manager.rs
+++ b/vmm/src/memory_manager.rs
@@ -131,6 +131,7 @@ pub struct MemoryManager {
     snapshot: Mutex<Option<GuestMemoryLoadGuard<GuestMemoryMmap>>>,
     shared: bool,
     hugepages: bool,
+    hugepage_size: Option<u64>,
     #[cfg(target_arch = "x86_64")]
     sgx_epc_region: Option<SgxEpcRegion>,
     user_provided_zones: bool,
@@ -426,6 +427,7 @@ impl MemoryManager {
                     prefault,
                     zone.shared,
                     zone.hugepages,
+                    zone.hugepage_size,
                     zone.host_numa_node,
                 )?;
 
@@ -679,6 +681,7 @@ impl MemoryManager {
                             false,
                             zone.shared,
                             zone.hugepages,
+                            zone.hugepage_size,
                             zone.host_numa_node,
                         )?;
 
@@ -756,6 +759,7 @@ impl MemoryManager {
             snapshot: Mutex::new(None),
             shared: config.shared,
             hugepages: config.hugepages,
+            hugepage_size: config.hugepage_size,
             #[cfg(target_arch = "x86_64")]
             sgx_epc_region: None,
             user_provided_zones,
@@ -928,6 +932,7 @@ impl MemoryManager {
         prefault: bool,
         shared: bool,
         hugepages: bool,
+        hugepage_size: Option<u64>,
         host_numa_node: Option<u32>,
     ) -> Result<Arc<GuestRegionMmap>, Error> {
         let (f, f_off) = match backing_file {
@@ -962,7 +967,23 @@ impl MemoryManager {
                 let fd = Self::memfd_create(
                     &ffi::CString::new("ch_ram").unwrap(),
                     if hugepages {
-                        libc::MFD_HUGETLB | libc::MAP_HUGE_2MB as u32
+                        libc::MFD_HUGETLB
+                            | if let Some(hugepage_size) = hugepage_size {
+                                /*
+                                 * From the Linux kernel:
+                                 * Several system calls take a flag to request "hugetlb" huge pages.
+                                 * Without further specification, these system calls will use the
+                                 * system's default huge page size.  If a system supports multiple
+                                 * huge page sizes, the desired huge page size can be specified in
+                                 * bits [26:31] of the flag arguments.  The value in these 6 bits
+                                 * will encode the log2 of the huge page size.
+                                 */
+
+                                hugepage_size.trailing_zeros() << 26
+                            } else {
+                                // Use the system default huge page size
+                                0
+                            }
                     } else {
                         0
                     },
@@ -1100,6 +1121,7 @@ impl MemoryManager {
             false,
             self.shared,
             self.hugepages,
+            self.hugepage_size,
             None,
         )?;