Bumps solana_rbpf to v0.2.32 (#27059)

cli/Cargo.toml

@@ -42,7 +42,7 @@ solana-sdk = { path = "../sdk", version = "=1.12.0" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.12.0" }
 solana-version = { path = "../version", version = "=1.12.0" }
 solana-vote-program = { path = "../programs/vote", version = "=1.12.0" }
-solana_rbpf = "=0.2.31"
+solana_rbpf = "=0.2.32"
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0.31"
 tiny-bip39 = "0.8.2"

programs/bpf/Cargo.toml

@@ -38,7 +38,7 @@ solana-program-runtime = { path = "../../program-runtime", version = "=1.12.0" }
 solana-runtime = { path = "../../runtime", version = "=1.12.0" }
 solana-sdk = { path = "../../sdk", version = "=1.12.0" }
 solana-transaction-status = { path = "../../transaction-status", version = "=1.12.0" }
-solana_rbpf = "=0.2.31"
+solana_rbpf = "=0.2.32"
 
 [dev-dependencies]
 solana-ledger = { path = "../../ledger", version = "=1.12.0" }

programs/bpf_loader/Cargo.toml

@@ -19,7 +19,7 @@ solana-metrics = { path = "../../metrics", version = "=1.12.0" }
 solana-program-runtime = { path = "../../program-runtime", version = "=1.12.0" }
 solana-sdk = { path = "../../sdk", version = "=1.12.0" }
 solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=1.12.0" }
-solana_rbpf = "=0.2.31"
+solana_rbpf = "=0.2.32"
 thiserror = "1.0"
 
 [dev-dependencies]

programs/bpf_loader/src/allocator_bump.rs

@@ -2,21 +2,21 @@
 
 use {
     solana_program_runtime::invoke_context::{Alloc, AllocErr},
-    solana_rbpf::aligned_memory::AlignedMemory,
+    solana_rbpf::{aligned_memory::AlignedMemory, ebpf::HOST_ALIGN},
     std::alloc::Layout,
 };
 
 #[derive(Debug)]
 pub struct BpfAllocator {
     #[allow(dead_code)]
-    heap: AlignedMemory,
+    heap: AlignedMemory<HOST_ALIGN>,
     start: u64,
     len: u64,
     pos: u64,
 }
 
 impl BpfAllocator {
-    pub fn new(heap: AlignedMemory, virtual_address: u64) -> Self {
+    pub fn new(heap: AlignedMemory<HOST_ALIGN>, virtual_address: u64) -> Self {
         let len = heap.len() as u64;
         Self {
             heap,

programs/bpf_loader/src/lib.rs

@@ -42,7 +42,6 @@ use {
         entrypoint::{HEAP_LENGTH, SUCCESS},
         feature_set::{
             cap_accounts_data_len, cap_bpf_program_instruction_accounts,
-            disable_bpf_deprecated_load_instructions, disable_bpf_unresolved_symbols_at_runtime,
             disable_deploy_of_alloc_free_syscall, disable_deprecated_loader,
             enable_bpf_loader_extend_program_data_ix,
             error_on_syscall_bpf_function_hash_collisions, reject_callx_r10,
@@ -167,17 +166,10 @@ pub fn create_executor(
         enable_instruction_meter: true,
         enable_instruction_tracing: log_enabled!(Trace),
         enable_symbol_and_section_labels: false,
-        disable_unresolved_symbols_at_runtime: invoke_context
-            .feature_set
-            .is_active(&disable_bpf_unresolved_symbols_at_runtime::id()),
         reject_broken_elfs: reject_deployment_of_broken_elfs,
         noop_instruction_rate: 256,
         sanitize_user_provided_values: true,
         encrypt_environment_registers: true,
-        disable_deprecated_load_instructions: reject_deployment_of_broken_elfs
-            && invoke_context
-                .feature_set
-                .is_active(&disable_bpf_deprecated_load_instructions::id()),
         syscall_bpf_function_hash_collision: invoke_context
             .feature_set
             .is_active(&error_on_syscall_bpf_function_hash_collisions::id()),
@@ -189,6 +181,8 @@ pub fn create_executor(
         optimize_rodata: false,
         static_syscalls: false,
         enable_elf_vaddr: false,
+        reject_rodata_stack_overlap: false,
+        new_elf_parser: false,
         // Warning, do not use `Config::default()` so that configuration here is explicit.
     };
     let mut create_executor_metrics = executor_metrics::CreateMetrics::default();
@@ -303,7 +297,7 @@ pub fn create_vm<'a, 'b>(
             .saturating_mul(compute_budget.heap_cost),
     );
     let mut heap =
-        AlignedMemory::new_with_size(compute_budget.heap_size.unwrap_or(HEAP_LENGTH), HOST_ALIGN);
+        AlignedMemory::<HOST_ALIGN>::zero_filled(compute_budget.heap_size.unwrap_or(HEAP_LENGTH));
     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, orig_account_lengths)?;

programs/bpf_loader/src/serialization.rs

@@ -22,7 +22,7 @@ pub fn serialize_parameters(
     transaction_context: &TransactionContext,
     instruction_context: &InstructionContext,
     should_cap_ix_accounts: bool,
-) -> Result<(AlignedMemory, Vec<usize>), InstructionError> {
+) -> Result<(AlignedMemory<HOST_ALIGN>, Vec<usize>), InstructionError> {
     let num_ix_accounts = instruction_context.get_number_of_instruction_accounts();
     if should_cap_ix_accounts && num_ix_accounts > usize::from(MAX_INSTRUCTION_ACCOUNTS) {
         return Err(InstructionError::MaxAccountsExceeded);
@@ -80,7 +80,7 @@ pub fn deserialize_parameters(
 pub fn serialize_parameters_unaligned(
     transaction_context: &TransactionContext,
     instruction_context: &InstructionContext,
-) -> Result<AlignedMemory, InstructionError> {
+) -> Result<AlignedMemory<HOST_ALIGN>, InstructionError> {
     // Calculate size in order to alloc once
     let mut size = size_of::<u64>();
     for instruction_account_index in 0..instruction_context.get_number_of_instruction_accounts() {
@@ -106,7 +106,7 @@ pub fn serialize_parameters_unaligned(
     size += size_of::<u64>() // instruction data len
          + instruction_context.get_instruction_data().len() // instruction data
          + size_of::<Pubkey>(); // program id
-    let mut v = AlignedMemory::new(size, HOST_ALIGN);
+    let mut v = AlignedMemory::<HOST_ALIGN>::with_capacity(size);
 
     v.write_u64::<LittleEndian>(instruction_context.get_number_of_instruction_accounts() as u64)
         .map_err(|_| InstructionError::InvalidArgument)?;
@@ -208,7 +208,7 @@ pub fn deserialize_parameters_unaligned(
 pub fn serialize_parameters_aligned(
     transaction_context: &TransactionContext,
     instruction_context: &InstructionContext,
-) -> Result<AlignedMemory, InstructionError> {
+) -> Result<AlignedMemory<HOST_ALIGN>, InstructionError> {
     // Calculate size in order to alloc once
     let mut size = size_of::<u64>();
     for instruction_account_index in 0..instruction_context.get_number_of_instruction_accounts() {
@@ -239,7 +239,7 @@ pub fn serialize_parameters_aligned(
     size += size_of::<u64>() // data len
     + instruction_context.get_instruction_data().len()
     + size_of::<Pubkey>(); // program id;
-    let mut v = AlignedMemory::new(size, HOST_ALIGN);
+    let mut v = AlignedMemory::<HOST_ALIGN>::with_capacity(size);
 
     // Serialize into the buffer
     v.write_u64::<LittleEndian>(instruction_context.get_number_of_instruction_accounts() as u64)
@@ -275,7 +275,7 @@ pub fn serialize_parameters_aligned(
                 .map_err(|_| InstructionError::InvalidArgument)?;
             v.write_all(borrowed_account.get_data())
                 .map_err(|_| InstructionError::InvalidArgument)?;
-            v.resize(
+            v.fill_write(
                 MAX_PERMITTED_DATA_INCREASE
                     + (v.write_index() as *const u8).align_offset(BPF_ALIGN_OF_U128),
                 0,

programs/bpf_loader/src/syscalls/mod.rs

@@ -20,7 +20,7 @@ use {
     },
     solana_rbpf::{
         aligned_memory::AlignedMemory,
-        ebpf,
+        ebpf::{self, HOST_ALIGN},
         error::EbpfError,
         memory_region::{AccessType, MemoryMapping},
         question_mark,
@@ -362,7 +362,7 @@ pub fn register_syscalls(
 pub fn bind_syscall_context_objects<'a, 'b>(
     vm: &mut EbpfVm<'a, RequisiteVerifier, BpfError, crate::ThisInstructionMeter>,
     invoke_context: &'a mut InvokeContext<'b>,
-    heap: AlignedMemory,
+    heap: AlignedMemory<HOST_ALIGN>,
     orig_account_lengths: Vec<usize>,
 ) -> Result<(), EbpfError<BpfError>> {
     let check_aligned = bpf_loader_deprecated::id()
@@ -2488,7 +2488,7 @@ mod tests {
                 program_id,
                 bpf_loader::id(),
             );
-            let mut heap = AlignedMemory::new_with_size(100, HOST_ALIGN);
+            let mut heap = AlignedMemory::<HOST_ALIGN>::zero_filled(100);
             let mut memory_mapping = MemoryMapping::new::<UserError>(
                 vec![
                     MemoryRegion::default(),
@@ -2530,7 +2530,7 @@ mod tests {
                 program_id,
                 bpf_loader::id(),
             );
-            let mut heap = AlignedMemory::new_with_size(100, HOST_ALIGN);
+            let mut heap = AlignedMemory::<HOST_ALIGN>::zero_filled(100);
             let mut memory_mapping = MemoryMapping::new::<UserError>(
                 vec![
                     MemoryRegion::default(),
@@ -2571,7 +2571,7 @@ mod tests {
                 program_id,
                 bpf_loader::id(),
             );
-            let mut heap = AlignedMemory::new_with_size(100, HOST_ALIGN);
+            let mut heap = AlignedMemory::<HOST_ALIGN>::zero_filled(100);
             let mut memory_mapping = MemoryMapping::new::<UserError>(
                 vec![
                     MemoryRegion::default(),
@@ -2613,7 +2613,7 @@ mod tests {
                 program_id,
                 bpf_loader::id(),
             );
-            let mut heap = AlignedMemory::new_with_size(100, HOST_ALIGN);
+            let mut heap = AlignedMemory::<HOST_ALIGN>::zero_filled(100);
             let config = Config::default();
             let mut memory_mapping = MemoryMapping::new::<UserError>(
                 vec![

rbpf-cli/Cargo.toml

@@ -17,4 +17,4 @@ solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.12.
 solana-logger = { path = "../logger", version = "=1.12.0" }
 solana-program-runtime = { path = "../program-runtime", version = "=1.12.0" }
 solana-sdk = { path = "../sdk", version = "=1.12.0" }
-solana_rbpf = "=0.2.31"
+solana_rbpf = "=0.2.32"