From 768dbd1fb00909e951d43ea09ca89938f15bdce2 Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Thu, 27 Aug 2020 13:06:40 +0200
Subject: [PATCH] vmm: Add 'guest_numa_node' option to 'memory-zone'

With the introduction of this new option, the user will be able to
describe if a particular memory zone should belong to a specific NUMA
node from a guest perspective.

For instance, using '--memory-zone size=1G,guest_numa_node=2' would let
the user describe that a memory zone of 1G in the guest should be
exposed as being associated with the NUMA node 2.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
 src/main.rs                               | 3 ++-
 vmm/src/api/openapi/cloud-hypervisor.yaml | 3 +++
 vmm/src/config.rs                         | 9 ++++++++-
 vmm/src/memory_manager.rs                 | 1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 0b05c257d..aa40ac9e7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -120,7 +120,8 @@ fn create_app<'a, 'b>(
                 .help(
                     "User defined memory zone parameters \
                      \"size=<guest_memory_region_size>,file=<backing_file>,\
-                     shared=on|off,hugepages=on|off,host_numa_node=<node_id>\"",
+                     shared=on|off,hugepages=on|off,host_numa_node=<node_id>,\
+                     guest_numa_node=<node_id>\"",
                 )
                 .takes_value(true)
                 .min_values(1)
diff --git a/vmm/src/api/openapi/cloud-hypervisor.yaml b/vmm/src/api/openapi/cloud-hypervisor.yaml
index ef4f34c11..07b067a07 100644
--- a/vmm/src/api/openapi/cloud-hypervisor.yaml
+++ b/vmm/src/api/openapi/cloud-hypervisor.yaml
@@ -470,6 +470,9 @@ components:
         host_numa_node:
           type: integer
           format: uint32
+        guest_numa_node:
+          type: integer
+          format: uint32
 
     MemoryConfig:
       required:
diff --git a/vmm/src/config.rs b/vmm/src/config.rs
index 540a0cdf8..f30f12155 100644
--- a/vmm/src/config.rs
+++ b/vmm/src/config.rs
@@ -354,6 +354,8 @@ pub struct MemoryZoneConfig {
     pub hugepages: bool,
     #[serde(default)]
     pub host_numa_node: Option<u32>,
+    #[serde(default)]
+    pub guest_numa_node: Option<u32>,
 }
 
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
@@ -434,7 +436,8 @@ impl MemoryConfig {
                     .add("file")
                     .add("shared")
                     .add("hugepages")
-                    .add("host_numa_node");
+                    .add("host_numa_node")
+                    .add("guest_numa_node");
                 parser.parse(memory_zone).map_err(Error::ParseMemoryZone)?;
 
                 let size = parser
@@ -456,6 +459,9 @@ impl MemoryConfig {
                 let host_numa_node = parser
                     .convert::<u32>("host_numa_node")
                     .map_err(Error::ParseMemoryZone)?;
+                let guest_numa_node = parser
+                    .convert::<u32>("guest_numa_node")
+                    .map_err(Error::ParseMemoryZone)?;
 
                 zones.push(MemoryZoneConfig {
                     size,
@@ -463,6 +469,7 @@ impl MemoryConfig {
                     shared,
                     hugepages,
                     host_numa_node,
+                    guest_numa_node,
                 });
             }
             Some(zones)
diff --git a/vmm/src/memory_manager.rs b/vmm/src/memory_manager.rs
index 3c9309314..5010d44f6 100644
--- a/vmm/src/memory_manager.rs
+++ b/vmm/src/memory_manager.rs
@@ -379,6 +379,7 @@ impl MemoryManager {
                 shared: config.shared,
                 hugepages: config.hugepages,
                 host_numa_node: None,
+                guest_numa_node: None,
             }];
 
             (config.size, zones)