Fix tests

Author: LucasSte

src/ebpf.rs

@@ -54,9 +54,9 @@ pub const MM_INPUT_START: u64 = MM_REGION_SIZE * 4;
 /// Virtual address of the scratch pad area
 pub const MM_SCRATCHPAD_AREA: u64 = MM_REGION_SIZE * 5;
 /// Virtual address of the instruction area
-pub const MM_INSTRUCTION_AREA: u64 = MM_REGION_SIZE * 6;
+pub const MM_TX_INSTRUCTION_AREA: u64 = MM_REGION_SIZE * 6;
 /// Virtual address of the instruction input payload
-pub const MM_INSTRUCTION_INPUT: u64 = MM_REGION_SIZE * 7;
+pub const MM_TX_INSTRUCTION_INPUT: u64 = MM_REGION_SIZE * 7;
 /// Virtual address of the accounts payload area
 pub const MM_ACCOUNTS_AREA: u64 = MM_REGION_SIZE * 8;
 

src/memory_region.rs

@@ -867,6 +867,12 @@ fn generate_access_violation(
             ebpf::MM_STACK_START => "stack",
             ebpf::MM_HEAP_START => "heap",
             ebpf::MM_INPUT_START => "input",
+            ebpf::MM_SCRATCHPAD_AREA if sbpf_version >= SBPFVersion::V4 => "scratchpad",
+            ebpf::MM_TX_INSTRUCTION_AREA if sbpf_version >= SBPFVersion::V4 => "tx instruction",
+            ebpf::MM_TX_INSTRUCTION_INPUT if sbpf_version >= SBPFVersion::V4 => {
+                "tx instruction input"
+            }
+            addr if addr >= ebpf::MM_ACCOUNTS_AREA && sbpf_version >= SBPFVersion::V4 => "accounts",
             _ => "unknown",
         };
         ProgramResult::Err(EbpfError::AccessViolation(

test_utils/src/lib.rs

@@ -431,7 +431,7 @@ macro_rules! test_syscall_asm {
             enable_instruction_tracing: true,
             ..Config::default()
         };
-        for sbpf_version in [SBPFVersion::V0, SBPFVersion::V3] {
+        for sbpf_version in [SBPFVersion::V0, SBPFVersion::V4] {
             config.enabled_sbpf_versions = sbpf_version..=sbpf_version;
             let mut loader = BuiltinProgram::new_loader(config.clone());
             $(test_syscall_asm!(register, loader, $syscall_name => $syscall_function);)*

tests/execution.rs

@@ -1887,7 +1887,7 @@ fn test_err_dynamic_stack_out_of_bound() {
             AccessType::Store,
             ebpf::MM_STACK_START - 1,
             1,
-            "program"
+            "rodata"
         )),
     );
 
@@ -1931,7 +1931,7 @@ fn test_err_dynamic_stack_ptr_overflow() {
             AccessType::Store,
             u64::MAX - 63,
             1,
-            "unknown"
+            "accounts"
         )),
     );
 }
@@ -2096,7 +2096,12 @@ fn test_err_mem_access_out_of_bound() {
     prog[16] = ebpf::ST_1B_IMM;
     prog[24] = ebpf::RETURN;
     let loader = Arc::new(BuiltinProgram::new_mock());
-    for address in [0x2u64, 0x8002u64, 0x80000002u64, 0x8000000000000002u64] {
+    for (address, area) in [
+        (0x2u64, "program"),
+        (0x8002u64, "program"),
+        (0x80000002u64, "program"),
+        (0x8000000000000002u64, "accounts"),
+    ] {
         LittleEndian::write_u32(&mut prog[4..], address as u32);
         LittleEndian::write_u32(&mut prog[12..], (address >> 32) as u32);
         #[allow(unused_mut)]
@@ -2115,7 +2120,7 @@ fn test_err_mem_access_out_of_bound() {
                 AccessType::Store,
                 address,
                 1,
-                "unknown"
+                area
             )),
         );
     }
@@ -2440,16 +2445,18 @@ fn test_call_save() {
 fn test_err_syscall_string() {
     test_syscall_asm!(
         "
-        mov64 r1, 0x0
+        mov64 r1, 0x3
+        lsh64 r1, 32
+        add64 r1, 0xffff
         syscall bpf_syscall_string
         mov64 r0, 0x0
         exit",
         [72, 101, 108, 108, 111],
         (
             "bpf_syscall_string" => syscalls::SyscallString::vm,
         ),
-        TestContextObject::new(2),
-        ProgramResult::Err(EbpfError::SyscallError(Box::new(EbpfError::AccessViolation(AccessType::Load, 0, 0, "unknown")))),
+        TestContextObject::new(4),
+        ProgramResult::Err(EbpfError::SyscallError(Box::new(EbpfError::AccessViolation(AccessType::Load, 0x30000FFFF, 0, "heap")))),
     );
 }