Bumps solana_rbpf to v0.2.27 (#24694)
This commit is contained in:
parent
6bbfef7069
commit
f3d27cc400
|
@ -6141,9 +6141,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solana_rbpf"
|
name = "solana_rbpf"
|
||||||
version = "0.2.25"
|
version = "0.2.27"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ccd266a6c58aa37380b52e6ee627762d794840116d796879867e7419445e6fe5"
|
checksum = "3dec11db92171a996e44d36fb1d223233f2cefacf9ba6884b33e5baa92a81d37"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"byteorder",
|
"byteorder",
|
||||||
"combine",
|
"combine",
|
||||||
|
|
|
@ -42,7 +42,7 @@ solana-sdk = { path = "../sdk", version = "=1.11.0" }
|
||||||
solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
|
solana-transaction-status = { path = "../transaction-status", version = "=1.11.0" }
|
||||||
solana-version = { path = "../version", version = "=1.11.0" }
|
solana-version = { path = "../version", version = "=1.11.0" }
|
||||||
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
|
solana-vote-program = { path = "../programs/vote", version = "=1.11.0" }
|
||||||
solana_rbpf = "=0.2.25"
|
solana_rbpf = "=0.2.27"
|
||||||
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
|
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
|
||||||
thiserror = "1.0.30"
|
thiserror = "1.0.30"
|
||||||
tiny-bip39 = "0.8.2"
|
tiny-bip39 = "0.8.2"
|
||||||
|
|
|
@ -5376,9 +5376,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solana_rbpf"
|
name = "solana_rbpf"
|
||||||
version = "0.2.25"
|
version = "0.2.27"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ccd266a6c58aa37380b52e6ee627762d794840116d796879867e7419445e6fe5"
|
checksum = "3dec11db92171a996e44d36fb1d223233f2cefacf9ba6884b33e5baa92a81d37"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"byteorder 1.4.3",
|
"byteorder 1.4.3",
|
||||||
"combine",
|
"combine",
|
||||||
|
|
|
@ -33,7 +33,7 @@ solana-bpf-rust-realloc-invoke = { path = "rust/realloc_invoke", version = "=1.1
|
||||||
solana-cli-output = { path = "../../cli-output", version = "=1.11.0" }
|
solana-cli-output = { path = "../../cli-output", version = "=1.11.0" }
|
||||||
solana-logger = { path = "../../logger", version = "=1.11.0" }
|
solana-logger = { path = "../../logger", version = "=1.11.0" }
|
||||||
solana-measure = { path = "../../measure", version = "=1.11.0" }
|
solana-measure = { path = "../../measure", version = "=1.11.0" }
|
||||||
solana_rbpf = "=0.2.25"
|
solana_rbpf = "=0.2.27"
|
||||||
solana-runtime = { path = "../../runtime", version = "=1.11.0" }
|
solana-runtime = { path = "../../runtime", version = "=1.11.0" }
|
||||||
solana-program-runtime = { path = "../../program-runtime", version = "=1.11.0" }
|
solana-program-runtime = { path = "../../program-runtime", version = "=1.11.0" }
|
||||||
solana-sdk = { path = "../../sdk", version = "=1.11.0" }
|
solana-sdk = { path = "../../sdk", version = "=1.11.0" }
|
||||||
|
|
|
@ -264,7 +264,7 @@ fn run_program(name: &str) -> u64 {
|
||||||
if config.enable_instruction_tracing {
|
if config.enable_instruction_tracing {
|
||||||
if i == 1 {
|
if i == 1 {
|
||||||
if !Tracer::compare(tracer.as_ref().unwrap(), vm.get_tracer()) {
|
if !Tracer::compare(tracer.as_ref().unwrap(), vm.get_tracer()) {
|
||||||
let analysis = Analysis::from_executable(&executable);
|
let analysis = Analysis::from_executable(&executable).unwrap();
|
||||||
let stdout = std::io::stdout();
|
let stdout = std::io::stdout();
|
||||||
println!("TRACE (interpreted):");
|
println!("TRACE (interpreted):");
|
||||||
tracer
|
tracer
|
||||||
|
@ -278,7 +278,7 @@ fn run_program(name: &str) -> u64 {
|
||||||
.unwrap();
|
.unwrap();
|
||||||
assert!(false);
|
assert!(false);
|
||||||
} else if log_enabled!(Trace) {
|
} else if log_enabled!(Trace) {
|
||||||
let analysis = Analysis::from_executable(&executable);
|
let analysis = Analysis::from_executable(&executable).unwrap();
|
||||||
let mut trace_buffer = Vec::<u8>::new();
|
let mut trace_buffer = Vec::<u8>::new();
|
||||||
tracer
|
tracer
|
||||||
.as_ref()
|
.as_ref()
|
||||||
|
|
|
@ -19,7 +19,7 @@ solana-metrics = { path = "../../metrics", version = "=1.11.0" }
|
||||||
solana-program-runtime = { path = "../../program-runtime", version = "=1.11.0" }
|
solana-program-runtime = { path = "../../program-runtime", version = "=1.11.0" }
|
||||||
solana-sdk = { path = "../../sdk", version = "=1.11.0" }
|
solana-sdk = { path = "../../sdk", version = "=1.11.0" }
|
||||||
solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=1.11.0" }
|
solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=1.11.0" }
|
||||||
solana_rbpf = "=0.2.25"
|
solana_rbpf = "=0.2.27"
|
||||||
thiserror = "1.0"
|
thiserror = "1.0"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
|
|
@ -28,9 +28,10 @@ use {
|
||||||
},
|
},
|
||||||
solana_rbpf::{
|
solana_rbpf::{
|
||||||
aligned_memory::AlignedMemory,
|
aligned_memory::AlignedMemory,
|
||||||
ebpf::HOST_ALIGN,
|
ebpf::{HOST_ALIGN, MM_INPUT_START},
|
||||||
elf::Executable,
|
elf::Executable,
|
||||||
error::{EbpfError, UserDefinedError},
|
error::{EbpfError, UserDefinedError},
|
||||||
|
memory_region::MemoryRegion,
|
||||||
static_analysis::Analysis,
|
static_analysis::Analysis,
|
||||||
verifier::{self, VerifierError},
|
verifier::{self, VerifierError},
|
||||||
vm::{Config, EbpfVm, InstructionMeter},
|
vm::{Config, EbpfVm, InstructionMeter},
|
||||||
|
@ -146,6 +147,9 @@ pub fn create_executor(
|
||||||
reject_callx_r10: invoke_context
|
reject_callx_r10: invoke_context
|
||||||
.feature_set
|
.feature_set
|
||||||
.is_active(&reject_callx_r10::id()),
|
.is_active(&reject_callx_r10::id()),
|
||||||
|
dynamic_stack_frames: false,
|
||||||
|
enable_sdiv: false,
|
||||||
|
optimize_rodata: false,
|
||||||
// Warning, do not use `Config::default()` so that configuration here is explicit.
|
// Warning, do not use `Config::default()` so that configuration here is explicit.
|
||||||
};
|
};
|
||||||
let mut create_executor_metrics = executor_metrics::CreateMetrics::default();
|
let mut create_executor_metrics = executor_metrics::CreateMetrics::default();
|
||||||
|
@ -259,7 +263,8 @@ pub fn create_vm<'a, 'b>(
|
||||||
}
|
}
|
||||||
let mut heap =
|
let mut heap =
|
||||||
AlignedMemory::new_with_size(compute_budget.heap_size.unwrap_or(HEAP_LENGTH), HOST_ALIGN);
|
AlignedMemory::new_with_size(compute_budget.heap_size.unwrap_or(HEAP_LENGTH), HOST_ALIGN);
|
||||||
let mut vm = EbpfVm::new(program, heap.as_slice_mut(), parameter_bytes)?;
|
let parameter_region = MemoryRegion::new_writable(parameter_bytes, MM_INPUT_START);
|
||||||
|
let mut vm = EbpfVm::new(program, heap.as_slice_mut(), vec![parameter_region])?;
|
||||||
syscalls::bind_syscall_context_objects(&mut vm, invoke_context, heap)?;
|
syscalls::bind_syscall_context_objects(&mut vm, invoke_context, heap)?;
|
||||||
Ok(vm)
|
Ok(vm)
|
||||||
}
|
}
|
||||||
|
@ -1194,7 +1199,7 @@ impl Executor for BpfExecutor {
|
||||||
);
|
);
|
||||||
if log_enabled!(Trace) {
|
if log_enabled!(Trace) {
|
||||||
let mut trace_buffer = Vec::<u8>::new();
|
let mut trace_buffer = Vec::<u8>::new();
|
||||||
let analysis = Analysis::from_executable(&self.executable);
|
let analysis = Analysis::from_executable(&self.executable).unwrap();
|
||||||
vm.get_tracer().write(&mut trace_buffer, &analysis).unwrap();
|
vm.get_tracer().write(&mut trace_buffer, &analysis).unwrap();
|
||||||
let trace_string = String::from_utf8(trace_buffer).unwrap();
|
let trace_string = String::from_utf8(trace_buffer).unwrap();
|
||||||
trace!("BPF Program Instruction Trace:\n{}", trace_string);
|
trace!("BPF Program Instruction Trace:\n{}", trace_string);
|
||||||
|
@ -1355,7 +1360,7 @@ mod tests {
|
||||||
0x05, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, // goto -2
|
0x05, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, // goto -2
|
||||||
0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // exit
|
0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // exit
|
||||||
];
|
];
|
||||||
let input = &mut [0x00];
|
let mut input_mem = [0x00];
|
||||||
let config = Config::default();
|
let config = Config::default();
|
||||||
let syscall_registry = SyscallRegistry::default();
|
let syscall_registry = SyscallRegistry::default();
|
||||||
let mut bpf_functions = std::collections::BTreeMap::<u32, (usize, String)>::new();
|
let mut bpf_functions = std::collections::BTreeMap::<u32, (usize, String)>::new();
|
||||||
|
@ -1375,8 +1380,10 @@ mod tests {
|
||||||
bpf_functions,
|
bpf_functions,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
let input_region = MemoryRegion::new_writable(&mut input_mem, MM_INPUT_START);
|
||||||
let mut vm =
|
let mut vm =
|
||||||
EbpfVm::<BpfError, TestInstructionMeter>::new(&program, &mut [], input).unwrap();
|
EbpfVm::<BpfError, TestInstructionMeter>::new(&program, &mut [], vec![input_region])
|
||||||
|
.unwrap();
|
||||||
let mut instruction_meter = TestInstructionMeter { remaining: 10 };
|
let mut instruction_meter = TestInstructionMeter { remaining: 10 };
|
||||||
vm.execute_program_interpreted(&mut instruction_meter)
|
vm.execute_program_interpreted(&mut instruction_meter)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
|
@ -3559,7 +3559,7 @@ mod tests {
|
||||||
let memory_mapping = MemoryMapping::new::<UserError>(
|
let memory_mapping = MemoryMapping::new::<UserError>(
|
||||||
vec![
|
vec![
|
||||||
MemoryRegion::default(),
|
MemoryRegion::default(),
|
||||||
MemoryRegion::new_from_slice(&data, START, 0, false),
|
MemoryRegion::new_readonly(&data, START),
|
||||||
],
|
],
|
||||||
&config,
|
&config,
|
||||||
)
|
)
|
||||||
|
@ -4126,14 +4126,14 @@ mod tests {
|
||||||
program_id,
|
program_id,
|
||||||
bpf_loader::id(),
|
bpf_loader::id(),
|
||||||
);
|
);
|
||||||
let heap = AlignedMemory::new_with_size(100, HOST_ALIGN);
|
let mut heap = AlignedMemory::new_with_size(100, HOST_ALIGN);
|
||||||
let memory_mapping = MemoryMapping::new::<UserError>(
|
let memory_mapping = MemoryMapping::new::<UserError>(
|
||||||
vec![
|
vec![
|
||||||
MemoryRegion::default(),
|
MemoryRegion::default(),
|
||||||
MemoryRegion::new_from_slice(&[], ebpf::MM_PROGRAM_START, 0, false),
|
MemoryRegion::new_readonly(&[], ebpf::MM_PROGRAM_START),
|
||||||
MemoryRegion::new_from_slice(&[], ebpf::MM_STACK_START, 4096, true),
|
MemoryRegion::new_writable_gapped(&mut [], ebpf::MM_STACK_START, 4096),
|
||||||
MemoryRegion::new_from_slice(heap.as_slice(), ebpf::MM_HEAP_START, 0, true),
|
MemoryRegion::new_writable(heap.as_slice_mut(), ebpf::MM_HEAP_START),
|
||||||
MemoryRegion::new_from_slice(&[], ebpf::MM_INPUT_START, 0, true),
|
MemoryRegion::new_writable(&mut [], ebpf::MM_INPUT_START),
|
||||||
],
|
],
|
||||||
&config,
|
&config,
|
||||||
)
|
)
|
||||||
|
@ -4166,14 +4166,14 @@ mod tests {
|
||||||
program_id,
|
program_id,
|
||||||
bpf_loader::id(),
|
bpf_loader::id(),
|
||||||
);
|
);
|
||||||
let heap = AlignedMemory::new_with_size(100, HOST_ALIGN);
|
let mut heap = AlignedMemory::new_with_size(100, HOST_ALIGN);
|
||||||
let memory_mapping = MemoryMapping::new::<UserError>(
|
let memory_mapping = MemoryMapping::new::<UserError>(
|
||||||
vec![
|
vec![
|
||||||
MemoryRegion::default(),
|
MemoryRegion::default(),
|
||||||
MemoryRegion::new_from_slice(&[], ebpf::MM_PROGRAM_START, 0, false),
|
MemoryRegion::new_readonly(&[], ebpf::MM_PROGRAM_START),
|
||||||
MemoryRegion::new_from_slice(&[], ebpf::MM_STACK_START, 4096, true),
|
MemoryRegion::new_writable_gapped(&mut [], ebpf::MM_STACK_START, 4096),
|
||||||
MemoryRegion::new_from_slice(heap.as_slice(), ebpf::MM_HEAP_START, 0, true),
|
MemoryRegion::new_writable(heap.as_slice_mut(), ebpf::MM_HEAP_START),
|
||||||
MemoryRegion::new_from_slice(&[], ebpf::MM_INPUT_START, 0, true),
|
MemoryRegion::new_writable(&mut [], ebpf::MM_INPUT_START),
|
||||||
],
|
],
|
||||||
&config,
|
&config,
|
||||||
)
|
)
|
||||||
|
@ -4206,14 +4206,14 @@ mod tests {
|
||||||
program_id,
|
program_id,
|
||||||
bpf_loader::id(),
|
bpf_loader::id(),
|
||||||
);
|
);
|
||||||
let heap = AlignedMemory::new_with_size(100, HOST_ALIGN);
|
let mut heap = AlignedMemory::new_with_size(100, HOST_ALIGN);
|
||||||
let memory_mapping = MemoryMapping::new::<UserError>(
|
let memory_mapping = MemoryMapping::new::<UserError>(
|
||||||
vec![
|
vec![
|
||||||
MemoryRegion::default(),
|
MemoryRegion::default(),
|
||||||
MemoryRegion::new_from_slice(&[], ebpf::MM_PROGRAM_START, 0, false),
|
MemoryRegion::new_readonly(&[], ebpf::MM_PROGRAM_START),
|
||||||
MemoryRegion::new_from_slice(&[], ebpf::MM_STACK_START, 4096, true),
|
MemoryRegion::new_writable_gapped(&mut [], ebpf::MM_STACK_START, 4096),
|
||||||
MemoryRegion::new_from_slice(heap.as_slice(), ebpf::MM_HEAP_START, 0, true),
|
MemoryRegion::new_writable(heap.as_slice_mut(), ebpf::MM_HEAP_START),
|
||||||
MemoryRegion::new_from_slice(&[], ebpf::MM_INPUT_START, 0, true),
|
MemoryRegion::new_writable(&mut [], ebpf::MM_INPUT_START),
|
||||||
],
|
],
|
||||||
&config,
|
&config,
|
||||||
)
|
)
|
||||||
|
@ -4246,15 +4246,15 @@ mod tests {
|
||||||
program_id,
|
program_id,
|
||||||
bpf_loader::id(),
|
bpf_loader::id(),
|
||||||
);
|
);
|
||||||
let heap = AlignedMemory::new_with_size(100, HOST_ALIGN);
|
let mut heap = AlignedMemory::new_with_size(100, HOST_ALIGN);
|
||||||
let config = Config::default();
|
let config = Config::default();
|
||||||
let memory_mapping = MemoryMapping::new::<UserError>(
|
let memory_mapping = MemoryMapping::new::<UserError>(
|
||||||
vec![
|
vec![
|
||||||
MemoryRegion::default(),
|
MemoryRegion::default(),
|
||||||
MemoryRegion::new_from_slice(&[], ebpf::MM_PROGRAM_START, 0, false),
|
MemoryRegion::new_readonly(&[], ebpf::MM_PROGRAM_START),
|
||||||
MemoryRegion::new_from_slice(&[], ebpf::MM_STACK_START, 4096, true),
|
MemoryRegion::new_writable_gapped(&mut [], ebpf::MM_STACK_START, 4096),
|
||||||
MemoryRegion::new_from_slice(heap.as_slice(), ebpf::MM_HEAP_START, 0, true),
|
MemoryRegion::new_writable(heap.as_slice_mut(), ebpf::MM_HEAP_START),
|
||||||
MemoryRegion::new_from_slice(&[], ebpf::MM_INPUT_START, 0, true),
|
MemoryRegion::new_writable(&mut [], ebpf::MM_INPUT_START),
|
||||||
],
|
],
|
||||||
&config,
|
&config,
|
||||||
)
|
)
|
||||||
|
|
|
@ -17,4 +17,4 @@ solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.11.
|
||||||
solana-logger = { path = "../logger", version = "=1.11.0" }
|
solana-logger = { path = "../logger", version = "=1.11.0" }
|
||||||
solana-program-runtime = { path = "../program-runtime", version = "=1.11.0" }
|
solana-program-runtime = { path = "../program-runtime", version = "=1.11.0" }
|
||||||
solana-sdk = { path = "../sdk", version = "=1.11.0" }
|
solana-sdk = { path = "../sdk", version = "=1.11.0" }
|
||||||
solana_rbpf = "=0.2.25"
|
solana_rbpf = "=0.2.27"
|
||||||
|
|
|
@ -382,6 +382,6 @@ impl<'a> LazyAnalysis<'a> {
|
||||||
return analysis;
|
return analysis;
|
||||||
}
|
}
|
||||||
self.analysis
|
self.analysis
|
||||||
.insert(Analysis::from_executable(self.executable))
|
.insert(Analysis::from_executable(self.executable).unwrap())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue