External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-06-30 23:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Only create ACPI memory manager DSDT when resizable

Browse Source 
If using the ACPI based hotplug only memory can be added so if the
hotplug RAM size is the same as the boot RAM size then do not include
the memory manager DSDT entries.

Also: this change simplifies the code marginally by making the
HotplugMethod enum Copyable.

This was identified from the following perf output:

     1.78%     0.00%  vmm              cloud-hypervisor      [.] <vmm::memory_manager::MemorySlots as acpi_tables::aml::Aml>::append_aml_bytes
            |
            ---<vmm::memory_manager::MemorySlots as acpi_tables::aml::Aml>::append_aml_bytes
               <vmm::memory_manager::MemorySlot as acpi_tables::aml::Aml>::append_aml_bytes
               acpi_tables::aml::Name::new
               <acpi_tables::aml::Path as acpi_tables::aml::Aml>::append_aml_bytes
               __libc_malloc

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-04-25 16:21:34 +01:00 committed by Sebastien Boeuf
parent ec1679406e
commit bf9f79081a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmm/src/config.rs
View File

@ -419,7 +419,7 @@ impl<'a> VmParams<'a> {
}
}
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
#[derive(Clone, Copy, Debug, PartialEq, Deserialize, Serialize)]
pub enum HotplugMethod {
Acpi,
VirtioMem,

10
vmm/src/memory_manager.rs
View File

@ -1023,9 +1023,10 @@ impl MemoryManager {
#[cfg(feature = "tdx")]
let dynamic = !tdx_enabled;
let hotplug_method = config.hotplug_method.clone();
let acpi_address = if dynamic && hotplug_method == HotplugMethod::Acpi {
let acpi_address = if dynamic
&& config.hotplug_method == HotplugMethod::Acpi
&& (config.hotplug_size.unwrap_or_default() > 0)
{
Some(
allocator
.lock()
@ -1054,7 +1055,7 @@ impl MemoryManager {
selected_slot,
mergeable: config.mergeable,
allocator,
hotplug_method,
hotplug_method: config.hotplug_method,
boot_ram,
current_ram,
next_hotplug_slot,
@ -1068,7 +1069,6 @@ impl MemoryManager {
snapshot_memory_ranges: MemoryRangeTable::default(),
memory_zones,
guest_ram_mappings: Vec::new(),
acpi_address,
log_dirty: dynamic, // Cannot log dirty pages on a TD
arch_mem_regions,