Skip to content

feat(node): Test disable MADV_HUGEPAGE #8782

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

Draft
andrewbattat wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat(node): Test disable MADV_HUGEPAGE #8782

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 30 additions & 21 deletions rs/replicated_state/src/page_map/page_allocator/mmap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@ use std::os::unix::io::RawFd;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::{Arc, Mutex};

// TODO(EXC-XXXX): MADV_HUGEPAGE disabled; these are temporarily unused.
#[cfg(target_os = "linux")]
#[allow(unused_imports)]
use ic_sys::HUGE_PAGE_SIZE;
#[cfg(target_os = "linux")]
#[allow(unused_imports)]
use ic_types::NumOsPages;
/// The minimum number of huge pages where the actual huge page optimization
/// will kick in. This corresponds to 64 MiB of memory (because the huge page size is 2 MiB)
#[cfg(target_os = "linux")]
#[allow(dead_code)]
const MIN_NUM_HUGE_PAGES_FOR_OPTIMIZATION: NumOsPages = NumOsPages::new(32);

const MIN_PAGES_TO_FREE: usize = 10000;
Expand Down Expand Up @@ -622,28 +626,33 @@ impl MmapBasedPageAllocatorCore {
)
}) as *mut u8;

// TODO(EXC-XXXX): Disabled MADV_HUGEPAGE to work around a suspected
// kernel 6.17 regression where MADV_REMOVE (hole-punching) on large
// folios in shmem-backed memfd mappings can silently zero adjacent
// pages, causing PageValidation assertion failures and replica crashes.
//
// Do madvise transparent huge page performance optimization only on Linux.
#[cfg(target_os = "linux")]
{
// Huge pages are 2MiB on x86_64. We only use huge pages for
// memory allocations that are at least MIN_NUM_HUGE_PAGES_FOR_OPTIMIZATION huge pages (i.e., 64 MiB).
if mmap_size >= MIN_NUM_HUGE_PAGES_FOR_OPTIMIZATION.get() as usize * HUGE_PAGE_SIZE {
unsafe {
madvise(
mmap_ptr as *mut c_void,
mmap_size,
MmapAdvise::MADV_HUGEPAGE,
)
}.unwrap_or_else(|err| {
// We don't need to panic, madvise failing is not a problem,
// it will only mean that we are not using huge pages.
println!(
"MmapPageAllocator failed to madvise {} bytes at address {:?} for memory file #{}: {}",
mmap_size, mmap_ptr, self.file_descriptor, err
)
});
}
}
// #[cfg(target_os = "linux")]
// {
// // Huge pages are 2MiB on x86_64. We only use huge pages for
// // memory allocations that are at least MIN_NUM_HUGE_PAGES_FOR_OPTIMIZATION huge pages (i.e., 64 MiB).
// if mmap_size >= MIN_NUM_HUGE_PAGES_FOR_OPTIMIZATION.get() as usize * HUGE_PAGE_SIZE {
// unsafe {
// madvise(
// mmap_ptr as *mut c_void,
// mmap_size,
// MmapAdvise::MADV_HUGEPAGE,
// )
// }.unwrap_or_else(|err| {
// // We don't need to panic, madvise failing is not a problem,
// // it will only mean that we are not using huge pages.
// println!(
// "MmapPageAllocator failed to madvise {} bytes at address {:?} for memory file #{}: {}",
// mmap_size, mmap_ptr, self.file_descriptor, err
// )
// });
// }
// }

self.chunks.push(Chunk {
ptr: mmap_ptr,
Expand Down
Loading