Rename MM_INPUT_AREA and remove SBPFv4 memory region areas from errors

Author: LucasSte

benches/vm_execution.rs

@@ -84,7 +84,7 @@ fn bench_jit_vs_interpreter(
     executable.verify::<RequisiteVerifier>().unwrap();
     executable.jit_compile().unwrap();
     let mut context_object = TestContextObject::default();
-    let mem_region = MemoryRegion::new_writable(mem, ebpf::MM_INPUT_START);
+    let mem_region = MemoryRegion::new_writable(mem, ebpf::MM_TX_AREA);
     create_vm!(
         vm,
         &executable,

cli/src/main.rs

@@ -162,7 +162,7 @@ fn main() {
             },
         ),
         MemoryRegion::new_writable(heap.as_slice_mut(), ebpf::MM_HEAP_START),
-        MemoryRegion::new_writable(&mut mem, ebpf::MM_INPUT_START),
+        MemoryRegion::new_writable(&mut mem, ebpf::MM_TX_AREA),
     ];
 
     let memory_mapping = MemoryMapping::new(regions, config, sbpf_version).unwrap();

fuzz/fuzz_targets/dumb.rs

@@ -44,7 +44,7 @@ fuzz_target!(|data: DumbFuzzData| {
         function_registry,
     )
     .unwrap();
-    let mem_region = MemoryRegion::new_writable(&mut mem, ebpf::MM_INPUT_START);
+    let mem_region = MemoryRegion::new_writable(&mut mem, ebpf::MM_TX_AREA);
     let mut context_object = TestContextObject::new(29);
     create_vm!(
         interp_vm,

fuzz/fuzz_targets/smart.rs

@@ -56,7 +56,7 @@ fuzz_target!(|data: FuzzData| {
         function_registry,
     )
     .unwrap();
-    let mem_region = MemoryRegion::new_writable(&mut mem, ebpf::MM_INPUT_START);
+    let mem_region = MemoryRegion::new_writable(&mut mem, ebpf::MM_TX_AREA);
     let mut context_object = TestContextObject::new(1 << 16);
     create_vm!(
         interp_vm,

fuzz/fuzz_targets/smart_jit_diff.rs

@@ -66,7 +66,7 @@ fuzz_target!(|data: FuzzData| {
     .unwrap();
     let mut interp_mem = data.mem.clone();
     let mut interp_context_object = TestContextObject::new(1 << 16);
-    let interp_mem_region = MemoryRegion::new_writable(&mut interp_mem, ebpf::MM_INPUT_START);
+    let interp_mem_region = MemoryRegion::new_writable(&mut interp_mem, ebpf::MM_TX_AREA);
     create_vm!(
         interp_vm,
         &executable,
@@ -83,7 +83,7 @@ fuzz_target!(|data: FuzzData| {
     if executable.jit_compile().is_ok() {
         let mut jit_mem = data.mem;
         let mut jit_context_object = TestContextObject::new(1 << 16);
-        let jit_mem_region = MemoryRegion::new_writable(&mut jit_mem, ebpf::MM_INPUT_START);
+        let jit_mem_region = MemoryRegion::new_writable(&mut jit_mem, ebpf::MM_TX_AREA);
         create_vm!(
             jit_vm,
             &executable,

fuzz/fuzz_targets/smarter_jit_diff.rs

@@ -56,7 +56,7 @@ fuzz_target!(|data: FuzzData| {
     .unwrap();
     let mut interp_mem = data.mem.clone();
     let mut interp_context_object = TestContextObject::new(1 << 16);
-    let interp_mem_region = MemoryRegion::new_writable(&mut interp_mem, ebpf::MM_INPUT_START);
+    let interp_mem_region = MemoryRegion::new_writable(&mut interp_mem, ebpf::MM_TX_AREA);
     create_vm!(
         interp_vm,
         &executable,
@@ -73,7 +73,7 @@ fuzz_target!(|data: FuzzData| {
     if executable.jit_compile().is_ok() {
         let mut jit_mem = data.mem;
         let mut jit_context_object = TestContextObject::new(1 << 16);
-        let jit_mem_region = MemoryRegion::new_writable(&mut jit_mem, ebpf::MM_INPUT_START);
+        let jit_mem_region = MemoryRegion::new_writable(&mut jit_mem, ebpf::MM_TX_AREA);
         create_vm!(
             jit_vm,
             &executable,

src/ebpf.rs

@@ -50,13 +50,13 @@ pub const MM_STACK_START: u64 = MM_REGION_SIZE * 2;
 /// Virtual address of the heap region
 pub const MM_HEAP_START: u64 = MM_REGION_SIZE * 3;
 /// Virtual address of the input region
-pub const MM_INPUT_START: u64 = MM_REGION_SIZE * 4;
+pub const MM_TX_AREA: 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_TX_INSTRUCTION_AREA: u64 = MM_REGION_SIZE * 6;
 /// Virtual address of the instruction input payload
-pub const MM_TX_INSTRUCTION_INPUT: u64 = MM_REGION_SIZE * 7;
+pub const MM_TX_INSTRUCTION_DATA: u64 = MM_REGION_SIZE * 7;
 /// Virtual address of the accounts payload area
 pub const MM_ACCOUNTS_AREA: u64 = MM_REGION_SIZE * 8;