From 629befdb4ac65a6873064798e489dba84b2e2c75 Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Fri, 28 Aug 2020 19:36:35 +0200
Subject: [PATCH] vmm: acpi: Add CPUs to NUMA nodes

Based on the list of CPUs related to each NUMA node, Processor Local
x2APIC Affinity structures are created and included into the SRAT table.

This describes which CPUs are part of each node.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
 vmm/src/acpi.rs | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/vmm/src/acpi.rs b/vmm/src/acpi.rs
index 2984c2fcc..c7993c41d 100644
--- a/vmm/src/acpi.rs
+++ b/vmm/src/acpi.rs
@@ -40,6 +40,19 @@ struct MemoryAffinity {
     _reserved3: u64,
 }
 
+#[repr(packed)]
+#[derive(Default)]
+struct ProcessorLocalX2ApicAffinity {
+    pub type_: u8,
+    pub length: u8,
+    _reserved1: u16,
+    pub proximity_domain: u32,
+    pub x2apic_id: u32,
+    pub flags: u32,
+    pub clock_domain: u32,
+    _reserved2: u32,
+}
+
 pub fn create_dsdt_table(
     device_manager: &Arc<Mutex<DeviceManager>>,
     cpu_manager: &Arc<Mutex<CpuManager>>,
@@ -152,8 +165,9 @@ pub fn create_acpi_tables(
         assert_eq!(std::mem::size_of::<MemoryAffinity>(), 40);
 
         for (node_id, node) in numa_nodes.iter() {
+            let proximity_domain = *node_id as u32;
+
             for region in node.memory_regions() {
-                let proximity_domain = *node_id as u32;
                 let base_addr = region.start_addr().raw_value();
                 let base_addr_lo = (base_addr & 0xffff_ffff) as u32;
                 let base_addr_hi = (base_addr >> 32) as u32;
@@ -180,6 +194,25 @@ pub fn create_acpi_tables(
                     ..Default::default()
                 });
             }
+
+            for cpu in node.cpus() {
+                let x2apic_id = *cpu as u32;
+
+                // Flags
+                // - Enabled = 1 (bit 0)
+                // - Reserved bits 1-31
+                let flags = 1;
+
+                srat.append(ProcessorLocalX2ApicAffinity {
+                    type_: 2,
+                    length: 24,
+                    proximity_domain,
+                    x2apic_id,
+                    flags,
+                    clock_domain: 0,
+                    ..Default::default()
+                });
+            }
         }
 
         let srat_offset = mcfg_offset.checked_add(mcfg.len() as u64).unwrap();