From 52268f5cc289fa6d208fbd024bf42607f45b80fc Mon Sep 17 00:00:00 2001
From: Chenli Wei <chenli.wei@intel.com>
Date: Tue, 12 Apr 2022 19:42:34 +0800
Subject: [PATCH] config_tools: refine memory setting for HPAn

1. Update the data structure of vm/memory in scenario and schema files.
The scenario will look like this.

<hpa_region>
  <start_hpa>xxx</start_hpa>
  <size_hpa>xxx</size_hpa>
</hpa_region>

2. Update xsl files to generate the related struct.

Tracked-On: #6690
Signed-off-by: Chenli Wei <chenli.wei@intel.com>
Signed-off-by: Kunhui-Li <kunhuix.li@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
---
 .../launch_config/launch_cfg_gen.py           |  2 +-
 misc/config_tools/schema/VMtypes.xsd          | 43 ++++++++++---------
 misc/config_tools/schema/config.xsd           |  6 +--
 .../xforms/vm_configurations.c.xsl            | 31 +++++++------
 .../xforms/vm_configurations.h.xsl            | 12 ------
 5 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/misc/config_tools/launch_config/launch_cfg_gen.py b/misc/config_tools/launch_config/launch_cfg_gen.py
index b688b7473..0dbd4c986 100755
--- a/misc/config_tools/launch_config/launch_cfg_gen.py
+++ b/misc/config_tools/launch_config/launch_cfg_gen.py
@@ -211,7 +211,7 @@ def generate_for_one_vm(board_etree, hv_scenario_etree, vm_scenario_etree, vm_id
     if lapic_ids:
         script.add_dynamic_dm_parameter("add_cpus", f"{' '.join([str(x) for x in sorted(lapic_ids)])}")
 
-    script.add_plain_dm_parameter(f"-m {eval_xpath(vm_scenario_etree, './/memory/whole/text()')}M")
+    script.add_plain_dm_parameter(f"-m {eval_xpath(vm_scenario_etree, './/memory/size/text()')}M")
 
     if eval_xpath(vm_scenario_etree, "//SSRAM_ENABLED") == "y" and \
        eval_xpath(vm_scenario_etree, ".//vm_type/text()") == "RTVM":
diff --git a/misc/config_tools/schema/VMtypes.xsd b/misc/config_tools/schema/VMtypes.xsd
index b3122ae44..674ba6551 100644
--- a/misc/config_tools/schema/VMtypes.xsd
+++ b/misc/config_tools/schema/VMtypes.xsd
@@ -100,31 +100,32 @@ CLOSID 0 and the second is mapped to virtual CLOSID 1, etc.</xs:documentation>
   </xs:sequence>
 </xs:complexType>
 
+<xs:complexType name="HPARegionType">
+  <xs:sequence>
+    <xs:element name="start_hpa" type="HexFormat">
+      <xs:annotation acrn:title="Start physical address">
+        <xs:documentation>Specify the starting address for non-contiguous allocation.</xs:documentation>
+      </xs:annotation>
+    </xs:element>
+    <xs:element name="size_hpa" type="xs:integer">
+      <xs:annotation acrn:title="Size (MB)">
+        <xs:documentation>Specify the physical memory size for non-contiguous allocation in megabytes.
+The size is a subset of the VM's total memory size specified on the Basic tab.</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+  </xs:sequence>
+</xs:complexType>
+
 <xs:complexType name="MemoryInfo">
   <xs:all>
-    <xs:element name="whole" type="xs:integer" default="256">
-      <xs:annotation acrn:title="Memory size (MB)" acrn:views="basic" acrn:applicable-vms="post-launched">
-	<xs:documentation>Specify the physical memory size allocated to this VM in megabytes.</xs:documentation>
+    <xs:element name="size" type="xs:integer" minOccurs="0" default="256">
+      <xs:annotation acrn:title="Memory size (MB)" acrn:views="basic" acrn:applicable-vms="pre-launched, post-launched">
+       <xs:documentation>Specify the physical memory size allocated to this VM in megabytes.</xs:documentation>
       </xs:annotation>
     </xs:element>
-    <xs:element name="start_hpa" type="HexFormat" default="0x100000000">
-      <xs:annotation acrn:views="advanced" acrn:applicable-vms="pre-launched, service-vm">
-        <xs:documentation>The starting physical address in host for the VM.</xs:documentation>
-      </xs:annotation>
-    </xs:element>
-    <xs:element name="size" type="MemorySizeType" default="0x20000000" minOccurs="0">
-      <xs:annotation acrn:views="advanced" acrn:applicable-vms="pre-launched, service-vm">
-        <xs:documentation>The memory size in bytes for the VM. Default value is ``0x200000000``.</xs:documentation>
-      </xs:annotation>
-    </xs:element>
-    <xs:element name="start_hpa2" type="HexFormat" default="0x0" minOccurs="0">
-      <xs:annotation acrn:views="advanced" acrn:applicable-vms="pre-launched, service-vm">
-        <xs:documentation>Start of second HPA for non-contiguous allocations in host for the VM.</xs:documentation>
-      </xs:annotation>
-    </xs:element>
-    <xs:element name="size_hpa2" type="MemorySizeType" default="0x0" minOccurs="0">
-      <xs:annotation acrn:views="advanced" acrn:applicable-vms="pre-launched, service-vm">
-        <xs:documentation>Memory size of second HPA for non-contiguous allocations in Bytes for the VM.</xs:documentation>
+    <xs:element name="hpa_region" type="HPARegionType" minOccurs="0" maxOccurs="unbounded">
+      <xs:annotation acrn:title="Physical memory segmentation" acrn:views="advanced" acrn:applicable-vms="pre-launched" >
+        <xs:documentation>Specify Physical memory information for Prelaunched VM </xs:documentation>
       </xs:annotation>
     </xs:element>
   </xs:all>
diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd
index 642dc516e..3d4884e46 100644
--- a/misc/config_tools/schema/config.xsd
+++ b/misc/config_tools/schema/config.xsd
@@ -358,9 +358,9 @@ Refer SDM 17.19.2 for details, and use with caution.</xs:documentation>
         <xs:documentation>Specify the Intel Software Guard Extensions (SGX) enclave page cache (EPC) section settings.</xs:documentation>
       </xs:annotation>
     </xs:element>
-    <xs:element name="memory" type="MemoryInfo">
-      <xs:annotation acrn:views="basic, advanced">
-        <xs:documentation>Specify memory information for Service and User VMs.</xs:documentation>
+    <xs:element name="memory" type="MemoryInfo" minOccurs="0">
+      <xs:annotation acrn:views="basic, advanced" acrn:applicable-vms="pre-launched, post-launched">
+        <xs:documentation>Specify memory information for User VMs.</xs:documentation>
       </xs:annotation>
     </xs:element>
     <xs:element name="priority" type="PriorityType"  default="PRIO_LOW">
diff --git a/misc/config_tools/xforms/vm_configurations.c.xsl b/misc/config_tools/xforms/vm_configurations.c.xsl
index 6ba2360cb..7a4dcb5d8 100644
--- a/misc/config_tools/xforms/vm_configurations.c.xsl
+++ b/misc/config_tools/xforms/vm_configurations.c.xsl
@@ -28,6 +28,7 @@
   <xsl:template match="config-data/acrn-config">
     <!-- Declaration of pci_devs -->
     <xsl:for-each select="vm">
+      <xsl:variable name="vm_id" select="@id" />
       <xsl:choose>
         <xsl:when test="acrn:is-service-vm(load_order)">
           <xsl:value-of select="acrn:extern('struct acrn_vm_pci_dev_config', 'sos_pci_devs', 'CONFIG_MAX_PCI_DEV_NUM')" />
@@ -39,7 +40,6 @@
 
       <!-- Declaration of pt_intx -->
       <xsl:if test="acrn:is-pre-launched-vm(load_order)">
-	<xsl:variable name="vm_id" select="@id" />
 	<xsl:variable name="length" select="count(acrn:get-intx-mapping(//vm[@id=$vm_id]//pt_intx))" />
 	<xsl:choose>
 	  <xsl:when test="$length">
@@ -49,6 +49,17 @@
             <xsl:value-of select="acrn:extern('struct pt_intx_config', concat('vm', @id, '_pt_intx'), '1U')" />
 	  </xsl:otherwise>
 	</xsl:choose>
+
+        <!-- Initializer of memory  -->
+        <xsl:value-of select="concat('static struct vm_hpa_regions ', concat('vm', @id, '_hpa'), '[] = {')" />
+        <xsl:for-each select="//allocation-data/acrn-config/vm[@id=$vm_id]/memory/hpa_region" >
+          <xsl:variable name="pos" select="position()" />
+          <xsl:variable name="start_hpa" select="acrn:initializer('start_hpa', ./start_hpa, 'UL')" />
+          <xsl:variable name="size_hpa" select="acrn:initializer('size_hpa', ./size_hpa, 'UL')" />
+          <xsl:value-of select="concat('{', $start_hpa, ', ',  $size_hpa, '}', ',')" />
+        </xsl:for-each>
+        <xsl:text>};</xsl:text>
+        <xsl:value-of select="$newline" />
       </xsl:if>
     </xsl:for-each>
 
@@ -99,7 +110,9 @@
 
     <xsl:call-template name="cpu_affinity" />
     <xsl:apply-templates select="epc_section" />
-    <xsl:apply-templates select="memory" />
+    <xsl:if test="acrn:is-pre-launched-vm(load_order)">
+      <xsl:apply-templates select="memory" />
+    </xsl:if>
     <xsl:apply-templates select="os_config" />
     <xsl:call-template name="acpi_config" />
     <xsl:apply-templates select="console_vuart" />
@@ -185,18 +198,10 @@
   </xsl:template>
 
   <xsl:template match="memory">
+    <xsl:variable name="vm_id" select="../@id" />
     <xsl:value-of select="acrn:initializer('memory', '{', true())" />
-    <xsl:choose>
-      <xsl:when test="acrn:is-pre-launched-vm(../load_order)">
-        <xsl:value-of select="acrn:initializer('start_hpa', concat('VM', ../@id, '_CONFIG_MEM_START_HPA'))" />
-        <xsl:value-of select="acrn:initializer('size', concat('VM', ../@id, '_CONFIG_MEM_SIZE'))" />
-        <xsl:value-of select="acrn:initializer('start_hpa2', concat('VM', ../@id, '_CONFIG_MEM_START_HPA2'))" />
-        <xsl:value-of select="acrn:initializer('size_hpa2', concat('VM', ../@id, '_CONFIG_MEM_SIZE_HPA2'))" />
-      </xsl:when>
-      <xsl:when test="acrn:is-service-vm(../load_order)">
-        <xsl:value-of select="acrn:initializer('start_hpa', concat(start_hpa, 'UL'))" />
-      </xsl:when>
-    </xsl:choose>
+    <xsl:value-of select="acrn:initializer('region_num', count(//allocation-data/acrn-config/vm[@id=$vm_id]/memory/hpa_region))" />
+    <xsl:value-of select="acrn:initializer('host_regions', concat('vm', ../@id, '_hpa'))" />
     <xsl:text>},</xsl:text>
     <xsl:value-of select="$newline" />
   </xsl:template>
diff --git a/misc/config_tools/xforms/vm_configurations.h.xsl b/misc/config_tools/xforms/vm_configurations.h.xsl
index 5db755349..b596ef692 100644
--- a/misc/config_tools/xforms/vm_configurations.h.xsl
+++ b/misc/config_tools/xforms/vm_configurations.h.xsl
@@ -31,7 +31,6 @@
 
   <xsl:template match="config-data/acrn-config">
     <xsl:call-template name="vm_count" />
-    <xsl:call-template name="pre_launched_vm_hpa" />
     <xsl:call-template name="sos_vm_bootarges" />
   </xsl:template>
 
@@ -52,15 +51,4 @@
     </xsl:if>
   </xsl:template>
 
-  <xsl:template name ="pre_launched_vm_hpa">
-    <xsl:for-each select="vm">
-      <xsl:if test="acrn:is-pre-launched-vm(load_order)">
-        <xsl:value-of select="acrn:define(concat('VM', @id, '_CONFIG_MEM_START_HPA'), memory/start_hpa, 'UL')" />
-        <xsl:value-of select="acrn:define(concat('VM', @id, '_CONFIG_MEM_SIZE'), memory/size, 'UL')" />
-        <xsl:value-of select="acrn:define(concat('VM', @id, '_CONFIG_MEM_START_HPA2'), memory/start_hpa2, 'UL')" />
-        <xsl:value-of select="acrn:define(concat('VM', @id, '_CONFIG_MEM_SIZE_HPA2'), memory/size_hpa2, 'UL')" />
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:template>
-
 </xsl:stylesheet>