Visitar URL original
vmm: Set reserve=on by default when hugepages=on by poliglots · Pull Request #8770 · cloud-hypervisor/cloud-hypervisor · GitHub
Skip to content

vmm: Set reserve=on by default when hugepages=on #8770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbradford merged 2 commits into from
Aug 26, 2026
Merged

vmm: Set reserve=on by default when hugepages=on #8770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39683f1
vmm: Make Memory{Zone}Config::reserve optional
poliglots Aug 22, 2026
ae66d59
vmm: Enable reserve for hugepages when not otherwise specified
poliglots Aug 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloud-hypervisor/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@ mod unit_tests {
hugepages: false,
hugepage_size: None,
prefault: false,
reserve: false,
reserve: None,
zones: None,
thp: true,
},
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/http_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ impl RequestHandler for StubApiRequestHandler {
hugepages: false,
hugepage_size: None,
prefault: false,
reserve: false,
reserve: None,

@rbradford rbradford Aug 24, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be rolled into the commit that broke the build. Every commit needs to be buildable.

zones: None,
thp: true,
},
Expand Down
12 changes: 5 additions & 7 deletions vmm/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,8 +1153,7 @@ impl MemoryConfig {
let reserve = parser
.convert::<Toggle>("reserve")
.map_err(Error::ParseMemory)?
.unwrap_or(Toggle(false))
.0;
.map(|t| t.0);
let thp = parser
.convert::<Toggle>("thp")
.map_err(Error::ParseMemory)?
Expand Down Expand Up @@ -1221,8 +1220,7 @@ impl MemoryConfig {
let reserve = parser
.convert::<Toggle>("reserve")
.map_err(Error::ParseMemoryZone)?
.unwrap_or(Toggle(false))
.0;
.map(|t| t.0);
let mergeable = parser
.convert::<Toggle>("mergeable")
.map_err(Error::ParseMemoryZone)?
Expand Down Expand Up @@ -4219,7 +4217,7 @@ mod unit_tests {
zones: Some(vec![MemoryZoneConfig {
id: "mem0".to_string(),
size: 1 << 30,
reserve: true,
reserve: Some(true),
..Default::default()
}]),
..Default::default()
Expand Down Expand Up @@ -4295,7 +4293,7 @@ mod unit_tests {
MemoryConfig {
size: 1 << 30,
hugepages: true,
reserve: true,
reserve: Some(true),
..Default::default()
}
);
Expand Down Expand Up @@ -5813,7 +5811,7 @@ id=\"{id}\",pci_segment={pci_segment},queue_sizes={queue_sizes}"
hugepages: false,
hugepage_size: None,
prefault: false,
reserve: false,
reserve: None,
zones: None,
thp: true,
},
Expand Down
2 changes: 1 addition & 1 deletion vmm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3493,7 +3493,7 @@ mod unit_tests {
hugepages: false,
hugepage_size: None,
prefault: false,
reserve: false,
reserve: None,
zones: None,
thp: true,
},
Expand Down
10 changes: 5 additions & 5 deletions vmm/src/memory_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ pub struct MemoryManager {
hugepages: bool,
hugepage_size: Option<u64>,
prefault: bool,
reserve: bool,
reserve: Option<bool>,
thp: bool,
user_provided_zones: bool,
snapshot_memory_ranges: MemoryRangeTable,
Expand Down Expand Up @@ -710,7 +710,7 @@ impl MemoryManager {
region_start,
region_size as usize,
prefault.unwrap_or(zone.prefault),
zone.reserve,
zone.reserve.unwrap_or(zone.hugepages),
zone.shared,
zone.hugepages,
zone.hugepage_size,
Expand Down Expand Up @@ -813,7 +813,7 @@ impl MemoryManager {
GuestAddress(guest_ram_mapping.gpa),
guest_ram_mapping.size as usize,
prefault.unwrap_or(zone_config.prefault),
zone_config.reserve,
zone_config.reserve.unwrap_or(zone_config.hugepages),
zone_config.shared,
zone_config.hugepages,
zone_config.hugepage_size,
Expand Down Expand Up @@ -1825,7 +1825,7 @@ impl MemoryManager {
start_addr,
hotplug_size as usize,
prefault.unwrap_or(zone.prefault),
zone.reserve,
zone.reserve.unwrap_or(zone.hugepages),
zone.shared,
zone.hugepages,
zone.hugepage_size,
Expand Down Expand Up @@ -2395,7 +2395,7 @@ impl MemoryManager {
start_addr,
size,
self.prefault,
self.reserve,
self.reserve.unwrap_or(self.hugepages),
self.shared,
self.hugepages,
self.hugepage_size,
Expand Down
2 changes: 1 addition & 1 deletion vmm/src/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ fn is_restore_cow_supported(config: &VmConfig) -> bool {
z.host_numa_node.is_some()
|| z.hotplug_size.is_some()
|| z.hotplugged_size.is_some()
|| z.reserve
|| z.reserve.unwrap_or(false)
|| z.mergeable
})
});
Expand Down
6 changes: 3 additions & 3 deletions vmm/src/vm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ pub struct MemoryZoneConfig {
#[serde(default)]
pub prefault: bool,
#[serde(default)]
pub reserve: bool,
pub reserve: Option<bool>,
#[serde(default)]
pub mergeable: bool,
}
Expand Down Expand Up @@ -315,7 +315,7 @@ pub struct MemoryConfig {
#[serde(default)]
pub prefault: bool,
#[serde(default)]
pub reserve: bool,
pub reserve: Option<bool>,
#[serde(default)]
pub zones: Option<Vec<MemoryZoneConfig>>,
#[serde(default = "default_memoryconfig_thp")]
Expand All @@ -336,7 +336,7 @@ impl Default for MemoryConfig {
hugepages: false,
hugepage_size: None,
prefault: false,
reserve: false,
reserve: None,
zones: None,
thp: true,
}
Expand Down
Loading