gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add adjustable stack size and call depth (bp #12728) (#12769)

Browse Source 
* Add adjustable stack size and call depth (#12728)

(cherry picked from commit c3907be623)

# Conflicts:
#	programs/bpf/Cargo.lock
#	programs/bpf/Cargo.toml
#	programs/bpf/build.rs
#	programs/bpf_loader/Cargo.toml
#	programs/bpf_loader/src/lib.rs
#	runtime/src/feature_set.rs
#	runtime/src/process_instruction.rs

* resolve conflicts

Co-authored-by: Jack May <jack@solana.com>
This commit is contained in:
mergify[bot]
2020-10-09 23:27:59 +00:00
committed by GitHub
parent 079ea91d6f
commit ad31768dd9
12 changed files with 140 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
programs/bpf_loader/src/lib.rs
View File

@@ -14,7 +14,7 @@ use num_derive::{FromPrimitive, ToPrimitive};
use solana_rbpf::{
error::{EbpfError, UserDefinedError},
memory_region::MemoryRegion,
vm::{EbpfVm, Executable, InstructionMeter},
vm::{Config, EbpfVm, Executable, InstructionMeter},
};
use solana_runtime::{
feature_set::compute_budget_balancing,
@@ -116,7 +116,14 @@ pub fn create_vm<'a>(
parameter_accounts: &'a [KeyedAccount<'a>],
invoke_context: &'a mut dyn InvokeContext,
) -> Result<(EbpfVm<'a, BPFError>, MemoryRegion), EbpfError<BPFError>> {
let mut vm = EbpfVm::new(executable)?;
let compute_budget = invoke_context.get_compute_budget();
let mut vm = EbpfVm::new(
executable,
Config {
max_call_depth: compute_budget.max_call_depth,
stack_frame_size: compute_budget.stack_frame_size,
},
)?;
let heap_region =
syscalls::register_syscalls(loader_id, &mut vm, parameter_accounts, invoke_context)?;
Ok((vm, heap_region))
@@ -404,7 +411,7 @@ mod tests {
let input = &mut [0x00];
let executable = EbpfVm::create_executable_from_text_bytes(program, None).unwrap();
let mut vm = EbpfVm::<BPFError>::new(executable.as_ref()).unwrap();
let mut vm = EbpfVm::<BPFError>::new(executable.as_ref(), Config::default()).unwrap();
let instruction_meter = TestInstructionMeter { remaining: 10 };
vm.execute_program_metered(input, &[], &[], instruction_meter)
.unwrap();
@@ -601,6 +608,8 @@ mod tests {
create_program_address_units: 1500,
invoke_units: 1000,
max_invoke_depth: 2,
max_call_depth: 20,
stack_frame_size: 4096,
},
Rc::new(RefCell::new(Executors::default())),
None,