heap_size type to be consistent with request instruction #33354
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tao-stones
commented
Sep 21, 2023
| @@ -171,7 +171,7 @@ impl ComputeBudget { | |||
| curve25519_ristretto_multiply_cost: 2_208, | |||
| curve25519_ristretto_msm_base_cost: 2303, | |||
| curve25519_ristretto_msm_incremental_cost: 788, | |||
| heap_size: solana_sdk::entrypoint::HEAP_LENGTH, | |||
| heap_size: u32::try_from(solana_sdk::entrypoint::HEAP_LENGTH).unwrap(), | |||
There was a problem hiding this comment.
this unwrap should be safe since we are converting from a const, otherwise it should panic.
| @@ -281,7 +281,7 @@ macro_rules! create_vm { | |||
| >::zero_filled(stack_size); | |||
| let mut heap = solana_rbpf::aligned_memory::AlignedMemory::< | |||
| { solana_rbpf::ebpf::HOST_ALIGN }, | |||
| >::zero_filled(heap_size); | |||
| >::zero_filled(usize::try_from(heap_size).unwrap()); | |||
There was a problem hiding this comment.
this unwrap() may fail IF target is 16-bit and heap_size is too large for that. In that case, panic is proper imo
| let mut stack = AlignedMemory::<{ ebpf::HOST_ALIGN }>::zero_filled(config.stack_size()); | ||
| let mut heap = AlignedMemory::<{ ebpf::HOST_ALIGN }>::zero_filled(compute_budget.heap_size); | ||
| let mut heap = AlignedMemory::<{ ebpf::HOST_ALIGN }>::zero_filled( | ||
| usize::try_from(compute_budget.heap_size).unwrap(), |
tao-stones
force-pushed
the
heap-size-type
branch
from
5988c91 to
c35529f
Compare
apfitzge
reviewed
Sep 21, 2023
Codecov Report
@@ Coverage Diff @@
## master #33354 +/- ##
=========================================
- Coverage 81.9% 81.9% -0.1%
=========================================
Files 796 796
Lines 215861 215858 -3
=========================================
- Hits 176938 176927 -11
- Misses 38923 38931 +8 |
tao-stones
force-pushed
the
heap-size-type
branch
from
36e4eb9 to
85d985d
Compare
apfitzge
approved these changes
Sep 25, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
RequestHeapFrame(u32)requests heap size asu32,ComputeBudgetstores it asusize, it alsoasintou64in some loader functions.Summary of Changes
ComputeBudgetstores heap_size in same type as instruction defines itaswithtry_fromFixes #