Skip to content

fix: lazy_update_boundary_heights needs to handle uninitialized memory #2286

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
jonathanpwang merged 3 commits into from
Nov 30, 2025
Merged

fix: lazy_update_boundary_heights needs to handle uninitialized memory #2286

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ab2d0e
fix: lazy_update_boundary_heights needs to handle large initial accesses
jonathanpwang Nov 30, 2025
ddd45da
Revert "fix: lazy_update_boundary_heights needs to handle large initi…
jonathanpwang Nov 30, 2025
a35cd12
better fix
jonathanpwang Nov 30, 2025
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
7 changes: 5 additions & 2 deletions crates/vm/src/arch/execution_mode/metered/memory_ctx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,15 @@ impl<const PAGE_BITS: usize> MemoryCtx<PAGE_BITS> {
// SAFETY: address_space is from 0 to len(), guaranteed to be in bounds
let x = unsafe { *self.addr_space_access_count.get_unchecked(address_space) };
if x > 0 {
// After finalize, we'll need to read it in chunk-sized units for the merkle chip
// Initial **and** final handling of touched pages requires send (resp. receive) in
// chunk-sized units for the merkle chip
// Corresponds to `handle_uninitialized_memory` and `handle_touched_blocks` in
// online.rs
self.update_adapter_heights_batch(
trace_heights,
address_space as u32,
self.chunk_bits,
(x << PAGE_BITS) as u32,
(x << (PAGE_BITS + 1)) as u32,
);
// SAFETY: address_space is from 0 to len(), guaranteed to be in bounds
unsafe {
Expand Down
Loading