Skip to content

Resolve issues for unit tests on 32 bits #1095

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
merged 6 commits into from
Mar 21, 2024
Merged

Resolve issues for unit tests on 32 bits #1095

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c8a0b44
Make raw_memory_freelist 64bits only
qinsoon Mar 21, 2024
12202aa
Debug: Run tests with 1 single test thread
qinsoon Mar 21, 2024
d1a1841
Change the MMAP test address. After the tests, unmap exactly what we
qinsoon Mar 21, 2024
3fe8e54
Revert "Debug: Run tests with 1 single test thread"
qinsoon Mar 21, 2024
d1453cc
Still compile raw_memory_freelist and its tests for 32 bits
qinsoon Mar 21, 2024
266026f
Minor refactoring in tests
qinsoon Mar 21, 2024
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
39 changes: 22 additions & 17 deletions src/util/heap/layout/byte_map_mmapper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,16 +229,16 @@ mod tests {
#[test]
fn ensure_mapped_1page() {
serial_test(|| {
let pages = 1;
let start_chunk = ByteMapMmapper::address_to_mmap_chunks_down(FIXED_ADDRESS);
let end_chunk =
ByteMapMmapper::address_to_mmap_chunks_up(FIXED_ADDRESS + pages_to_bytes(pages));
let test_memory_size = (end_chunk - start_chunk) * MMAP_CHUNK_BYTES;
with_cleanup(
|| {
let mmapper = ByteMapMmapper::new();
let pages = 1;
mmapper.ensure_mapped(FIXED_ADDRESS, pages).unwrap();

let start_chunk = ByteMapMmapper::address_to_mmap_chunks_down(FIXED_ADDRESS);
let end_chunk = ByteMapMmapper::address_to_mmap_chunks_up(
FIXED_ADDRESS + pages_to_bytes(pages),
);
for chunk in start_chunk..end_chunk {
assert_eq!(
mmapper.mapped[chunk].load(Ordering::Relaxed),
Expand All @@ -247,7 +247,7 @@ mod tests {
}
},
|| {
memory::munmap(FIXED_ADDRESS, MAX_SIZE).unwrap();
memory::munmap(FIXED_ADDRESS, test_memory_size).unwrap();
},
)
})
Expand All @@ -256,16 +256,16 @@ mod tests {
#[test]
fn ensure_mapped_1chunk() {
serial_test(|| {
let pages = MMAP_CHUNK_BYTES >> LOG_BYTES_IN_PAGE as usize;
let start_chunk = ByteMapMmapper::address_to_mmap_chunks_down(FIXED_ADDRESS);
let end_chunk =
ByteMapMmapper::address_to_mmap_chunks_up(FIXED_ADDRESS + pages_to_bytes(pages));
let test_memory_size = (end_chunk - start_chunk) * MMAP_CHUNK_BYTES;
with_cleanup(
|| {
let mmapper = ByteMapMmapper::new();
let pages = MMAP_CHUNK_BYTES >> LOG_BYTES_IN_PAGE as usize;
mmapper.ensure_mapped(FIXED_ADDRESS, pages).unwrap();

let start_chunk = ByteMapMmapper::address_to_mmap_chunks_down(FIXED_ADDRESS);
let end_chunk = ByteMapMmapper::address_to_mmap_chunks_up(
FIXED_ADDRESS + pages_to_bytes(pages),
);
for chunk in start_chunk..end_chunk {
assert_eq!(
mmapper.mapped[chunk].load(Ordering::Relaxed),
Expand All @@ -274,7 +274,7 @@ mod tests {
}
},
|| {
memory::munmap(FIXED_ADDRESS, MAX_SIZE).unwrap();
memory::munmap(FIXED_ADDRESS, test_memory_size).unwrap();
},
)
})
Expand All @@ -283,11 +283,14 @@ mod tests {
#[test]
fn ensure_mapped_more_than_1chunk() {
serial_test(|| {
let pages = (MMAP_CHUNK_BYTES + MMAP_CHUNK_BYTES / 2) >> LOG_BYTES_IN_PAGE as usize;
let start_chunk = ByteMapMmapper::address_to_mmap_chunks_down(FIXED_ADDRESS);
let end_chunk =
ByteMapMmapper::address_to_mmap_chunks_up(FIXED_ADDRESS + pages_to_bytes(pages));
let test_memory_size = (end_chunk - start_chunk) * MMAP_CHUNK_BYTES;
with_cleanup(
|| {
let mmapper = ByteMapMmapper::new();
let pages =
(MMAP_CHUNK_BYTES + MMAP_CHUNK_BYTES / 2) >> LOG_BYTES_IN_PAGE as usize;
mmapper.ensure_mapped(FIXED_ADDRESS, pages).unwrap();

let start_chunk = ByteMapMmapper::address_to_mmap_chunks_down(FIXED_ADDRESS);
Expand All @@ -303,7 +306,7 @@ mod tests {
}
},
|| {
memory::munmap(FIXED_ADDRESS, MAX_SIZE).unwrap();
memory::munmap(FIXED_ADDRESS, test_memory_size).unwrap();
},
)
})
Expand All @@ -312,6 +315,7 @@ mod tests {
#[test]
fn protect() {
serial_test(|| {
let test_memory_size = MMAP_CHUNK_BYTES * 2;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Inside the with_cleanup( || { ... }) block, it computes the number of pages to mmap separately (the expression pages_per_chunk * 2). We have to manually make sure this size is the same as MMAP_CHUNK_BYTES * 2 which is the definition of test_memory_size.

It is better if we can hoist the computations before the invocation of with_cleanup, like how you changed other test cases, and compute the number of pages to mmap and mprotect from the test_memory_size. That will make the two values dependent on each other, and make the test case more robust. For example:

let test_memory_bytes = MMAP_CHUNK_BYTES * 2;
let protect_memory_bytes = test_memory_bytes / 2; // Now this depends on test_memory_bytes
let test_memory_pages = test_memory_bytes >> LOG_BYTES_IN_PAGE as usize; // This also depends on test_memory_bytes
let protect_memory_pages = protect_memory_bytes >> LOG_BYTES_IN_PAGE as usize; // This also depends on test_memory_bytes
with_cleanup(|| {
    // ...
    mmapper.ensure_mapped(FIXED_ADDRESS, test_memory_pages).unwrap();
    mmapper.protect(FIXED_ADDRESS, protect_memory_pages);
    // ...
}, || {
    memory::munmap(FIXED_ADDRESS, test_memory_pages).unwrap();
})

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

with_cleanup(
|| {
// map 2 chunks
Expand All @@ -335,7 +339,7 @@ mod tests {
);
},
|| {
memory::munmap(FIXED_ADDRESS, MAX_SIZE).unwrap();
memory::munmap(FIXED_ADDRESS, test_memory_size).unwrap();
},
)
})
Expand All @@ -344,6 +348,7 @@ mod tests {
#[test]
fn ensure_mapped_on_protected_chunks() {
serial_test(|| {
let test_memory_size = MMAP_CHUNK_BYTES * 2;
with_cleanup(
|| {
// map 2 chunks
Expand Down Expand Up @@ -380,7 +385,7 @@ mod tests {
);
},
|| {
memory::munmap(FIXED_ADDRESS, MAX_SIZE).unwrap();
memory::munmap(FIXED_ADDRESS, test_memory_size).unwrap();
},
)
})
Expand Down
4 changes: 2 additions & 2 deletions src/util/test_util/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ mod test {
}
}

// Test with an address that works for 32bits.
// Test with an address that works for 32bits. The address is chosen empirically.
#[cfg(target_os = "linux")]
const TEST_ADDRESS: Address =
crate::util::conversions::chunk_align_down(unsafe { Address::from_usize(0x6000_0000) });
crate::util::conversions::chunk_align_down(unsafe { Address::from_usize(0x7000_0000) });
#[cfg(target_os = "macos")]
const TEST_ADDRESS: Address =
crate::util::conversions::chunk_align_down(unsafe { Address::from_usize(0x2_0000_0000) });
Expand Down