elf: add error code capturing (#370)

Author: mjain-jump

src/elf_loader.rs

@@ -1,5 +1,6 @@
 use crate::proto;
 use crate::proto::{ElfLoaderCtx, ElfLoaderEffects};
+use crate::utils::err_map::elf_err_to_num;
 use agave_feature_set::*;
 use agave_syscalls::create_program_runtime_environment_v1;
 use prost::Message;
@@ -26,11 +27,17 @@ pub fn load_elf(
     let mut elf_effects = ElfLoaderEffects::default();
 
     // load the elf
-    let Ok(elf_exec) = Executable::load(
+    let elf_exec = match Executable::load(
         elf_bytes,
         std::sync::Arc::new(program_runtime_environment_v1),
-    ) else {
-        return Some(elf_effects);
+    ) {
+        Ok(exec) => exec,
+        Err(err) => {
+            return Some(ElfLoaderEffects {
+                error: elf_err_to_num(&err),
+                ..Default::default()
+            });
+        }
     };
 
     let ro_section = elf_exec.get_ro_section();
@@ -46,6 +53,7 @@ pub fn load_elf(
         calldests.insert(fn_addr as u64);
     }
 
+    elf_effects.error = 0;
     elf_effects.rodata = ro_section.to_vec();
     elf_effects.rodata_sz = ro_section.len() as u64;
     elf_effects.entry_pc = elf_exec.get_entrypoint_instruction_offset() as u64;

src/utils/err_map.rs

@@ -2,7 +2,10 @@ use crate::proto::ErrKind;
 use agave_syscalls::SyscallError;
 use solana_poseidon::PoseidonSyscallError;
 use solana_program_runtime::{invoke_context::InvokeContext, stable_log};
-use solana_sbpf::error::{EbpfError, StableResult};
+use solana_sbpf::{
+    elf::ElfError,
+    error::{EbpfError, StableResult},
+};
 
 use solana_instruction::error::InstructionError;
 use solana_pubkey::Pubkey;
@@ -15,6 +18,34 @@ use solana_pubkey::Pubkey;
 //   When an err str is truncated in Firedancer, it should be explicit in this mapping,
 //   otherwise error.to_string() is the expected value.
 
+pub fn elf_err_to_num(error: &ElfError) -> i32 {
+    match error {
+        ElfError::FailedToParse(_) => 1,
+        ElfError::EntrypointOutOfBounds => 2,
+        ElfError::InvalidEntrypoint => 3,
+        ElfError::FailedToGetSection(_) => 4,
+        ElfError::UnresolvedSymbol(_, _, _) => 5,
+        ElfError::SectionNotFound(_) => 6,
+        ElfError::RelativeJumpOutOfBounds(_) => 7,
+        ElfError::SymbolHashCollision(_) => 8,
+        ElfError::WrongEndianess => 9,
+        ElfError::WrongAbi => 10,
+        ElfError::WrongMachine => 11,
+        ElfError::WrongClass => 12,
+        ElfError::NotOneTextSection => 13,
+        ElfError::WritableSectionNotSupported(_) => 14,
+        ElfError::AddressOutsideLoadableSection(_) => 15,
+        ElfError::InvalidVirtualAddress(_) => 16,
+        ElfError::UnknownRelocation(_) => 17,
+        ElfError::FailedToReadRelocationInfo => 18,
+        ElfError::WrongType => 19,
+        ElfError::UnknownSymbol(_) => 20,
+        ElfError::ValueOutOfBounds => 21,
+        ElfError::UnsupportedSBPFVersion => 22,
+        ElfError::InvalidProgramHeader => 23,
+    }
+}
+
 pub fn instr_err_to_num(error: &InstructionError) -> i32 {
     let serialized_err = bincode::serialize(error).unwrap();
     i32::from_le_bytes((&serialized_err[0..4]).try_into().unwrap()).saturating_add(1)