External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-02 16:02:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: memory_manager: Increase robustness of MemoryManager control device

Browse Source 
See: #1289

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-09-10 10:41:38 +01:00 committed by Bo Chen
parent bdc44cd8bc
commit 171d12943d
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vmm/src/memory_manager.rs
View File

@ -315,7 +315,7 @@ impl BusDevice for MemoryManager {
} }
STATUS_OFFSET => { STATUS_OFFSET => {
// The Linux kernel, quite reasonably, doesn't zero the memory it gives us. // The Linux kernel, quite reasonably, doesn't zero the memory it gives us.
data.copy_from_slice(&[0; 8][0..data.len()]); data.fill(0);
if state.active { if state.active {
data[0] |= 1 << ENABLE_FLAG; data[0] |= 1 << ENABLE_FLAG;
} }
@ -333,6 +333,8 @@ impl BusDevice for MemoryManager {
); );
} }
} }
} else {
warn!("Out of range memory slot: {}", self.selected_slot);
} }
} }
@ -342,18 +344,22 @@ impl BusDevice for MemoryManager {
self.selected_slot = usize::from(data[0]); self.selected_slot = usize::from(data[0]);
} }
STATUS_OFFSET => { STATUS_OFFSET => {
let state = &mut self.hotplug_slots[self.selected_slot]; if self.selected_slot < self.hotplug_slots.len() {
// The ACPI code writes back a 1 to acknowledge the insertion let state = &mut self.hotplug_slots[self.selected_slot];
if (data[0] & (1 << INSERTING_FLAG) == 1 << INSERTING_FLAG) && state.inserting { // The ACPI code writes back a 1 to acknowledge the insertion
state.inserting = false; if (data[0] & (1 << INSERTING_FLAG) == 1 << INSERTING_FLAG) && state.inserting {
} state.inserting = false;
// Ditto for removal }
if (data[0] & (1 << REMOVING_FLAG) == 1 << REMOVING_FLAG) && state.removing { // Ditto for removal
state.removing = false; if (data[0] & (1 << REMOVING_FLAG) == 1 << REMOVING_FLAG) && state.removing {
} state.removing = false;
// Trigger removal of "DIMM" }
if data[0] & (1 << EJECT_FLAG) == 1 << EJECT_FLAG { // Trigger removal of "DIMM"
warn!("Ejection of memory not currently supported"); if data[0] & (1 << EJECT_FLAG) == 1 << EJECT_FLAG {
warn!("Ejection of memory not currently supported");
}
} else {
warn!("Out of range memory slot: {}", self.selected_slot);
} }
} }
_ => { _ => {