External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 05:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: memory_manager: Fix bound checks for memory hotplug

Browse Source 
Bound checks for virtio-mem and ACPI memory hotplug are off by
one and two, respectively. This prevents users to fully use the reserved
memory hotplug size.

For ACPI, if we specific `--memory size=2G,hotplug_size=4G` and run
`ch-remote resize --memory 6G`, cloud-hypervisor will report the
following error because of the incorrect bound check:

`<vmm> ERROR:vmm/src/lib.rs:1631 -- Error when resizing VM:
MemoryManager(InsufficientHotplugRam)`

Similarly, for virtio-mem, cloud-hypervisor will fail the incorrect
bound check and abort the resize. The VM will see the following error
in dmesg:

`virtio_mem virtio3: unknown error, marking device broken: -22`

This patch has fixed both bound checks and ensure that users can
hot add memory up to the reserved hotplug size.

Signed-off-by: Yuhong Zhong <yz@cs.columbia.edu>
This commit is contained in:
Yuhong Zhong 2024-09-18 12:42:32 -05:00 committed by Rob Bradford
parent 1103d531b7
commit 2ad8fac624
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtio-devices/src/mem.rs
View File

@ -270,7 +270,7 @@ impl VirtioMemConfig {
// in the usable region. // in the usable region.
if addr % self.block_size != 0 if addr % self.block_size != 0
|| size == 0 || size == 0
|| (addr < self.addr || addr + size >= self.addr + self.usable_region_size) || (addr < self.addr || addr + size > self.addr + self.usable_region_size)
{ {
return false; return false;
} }

6
vmm/src/memory_manager.rs
View File

@ -1675,7 +1675,11 @@ impl MemoryManager {
let start_addr = MemoryManager::start_addr(self.guest_memory.memory().last_addr(), true)?; let start_addr = MemoryManager::start_addr(self.guest_memory.memory().last_addr(), true)?;
if start_addr.checked_add(size.try_into().unwrap()).unwrap() >= self.end_of_ram_area { if start_addr
.checked_add((size - 1).try_into().unwrap())
.unwrap()
> self.end_of_ram_area
{
return Err(Error::InsufficientHotplugRam); return Err(Error::InsufficientHotplugRam);
} }