flamenco, vm: add bpf loader test fixtures

Author: topointon-jump

src/flamenco/runtime/program/Local.mk

@@ -48,3 +48,8 @@ $(call add-objs,fd_zk_elgamal_proof_program,fd_flamenco)
 
 $(call add-hdrs,fd_native_cpi.h)
 $(call add-objs,fd_native_cpi,fd_flamenco)
+
+### Unit tests
+
+$(call make-unit-test,test_bpf_loader_serialization,test_bpf_loader_serialization,fd_flamenco fd_funk fd_ballet fd_util)
+$(call run-unit-test,test_bpf_loader_serialization)

src/flamenco/runtime/program/fd_bpf_loader_program.c

@@ -435,7 +435,7 @@ fd_bpf_execute( fd_exec_instr_ctx_t *      instr_ctx,
                            instr_ctx->runtime->log.capture_ctx->dump_syscall_to_pb;
 
   /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/bpf_loader/src/lib.rs#L1525-L1528 */
-  ulong r2_initial_value = provide_instruction_data_offset_in_vm_r2 ? FD_VM_MEM_MAP_INPUT_REGION_START + instruction_data_offset : 0UL;
+  ulong r2_initial_value = provide_instruction_data_offset_in_vm_r2 ? instruction_data_offset : 0UL;
 
   /* TODO: (topointon): correctly set check_size in vm setup */
   vm = fd_vm_init(

src/flamenco/runtime/program/fd_bpf_loader_serialization.c

@@ -1,6 +1,7 @@
 #include "fd_bpf_loader_serialization.h"
 #include "../fd_borrowed_account.h"
 #include "../fd_runtime.h"
+#include "../../vm/fd_vm_base.h"
 
 /* This file is responsible for serializing and deserializing
    the input region of the BPF virtual machine. The input region contains
@@ -292,6 +293,10 @@ fd_bpf_loader_input_serialize_aligned( fd_exec_instr_ctx_t *     ctx,
       FD_STORE( ulong, serialized_params, 0UL );
       FD_STORE( uchar, serialized_params, (uchar)dup_acc_idx[acc_idx] );
       serialized_params += sizeof(ulong);
+
+      /* Clone the account metadata from the original account
+         https://github.com/anza-xyz/agave/blob/v3.0.0/program-runtime/src/serialization.rs#L552 */
+      acc_region_metas[i] = acc_region_metas[dup_acc_idx[acc_idx]];
     } else {
       acc_idx_seen[acc_idx] = 1;
       dup_acc_idx[acc_idx]  = i;
@@ -332,22 +337,30 @@ fd_bpf_loader_input_serialize_aligned( fd_exec_instr_ctx_t *     ctx,
       FD_STORE( uint, serialized_params, padding_0 );
       serialized_params += sizeof(uint);
 
+      /* Compute current region vaddr base for VM address calculation */
+      ulong curr_region_vaddr = *input_mem_regions_cnt == 0U ? 0UL :
+        input_mem_regions[*input_mem_regions_cnt-1U].vaddr_offset +
+        input_mem_regions[*input_mem_regions_cnt-1U].address_space_reserved;
+
       /* https://github.com/anza-xyz/agave/blob/v3.0.0/program-runtime/src/serialization.rs#L532 */
       fd_pubkey_t key = *acc;
+      acc_region_metas[i].vm_key_addr = FD_VM_MEM_MAP_INPUT_REGION_START + curr_region_vaddr +
+        (ulong)(serialized_params - curr_serialized_params_start);
       FD_STORE( fd_pubkey_t, serialized_params, key );
-      acc_region_metas[i].expected_pubkey_offset = (uint)(serialized_params - curr_serialized_params_start);
       serialized_params += sizeof(fd_pubkey_t);
 
       /* https://github.com/anza-xyz/agave/blob/v3.0.0/program-runtime/src/serialization.rs#L533 */
       fd_pubkey_t owner = *(fd_pubkey_t *)&metadata->owner;
+      acc_region_metas[i].vm_owner_addr = FD_VM_MEM_MAP_INPUT_REGION_START + curr_region_vaddr +
+        (ulong)(serialized_params - curr_serialized_params_start);
       FD_STORE( fd_pubkey_t, serialized_params, owner );
-      acc_region_metas[i].expected_owner_offset = (uint)(serialized_params - curr_serialized_params_start);
       serialized_params += sizeof(fd_pubkey_t);
 
       /* https://github.com/anza-xyz/agave/blob/v3.0.0/program-runtime/src/serialization.rs#L534 */
       ulong lamports = metadata->lamports;
+      acc_region_metas[i].vm_lamports_addr = FD_VM_MEM_MAP_INPUT_REGION_START + curr_region_vaddr +
+        (ulong)(serialized_params - curr_serialized_params_start);
       FD_STORE( ulong, serialized_params, lamports );
-      acc_region_metas[i].expected_lamports_offset = (uint)(serialized_params - curr_serialized_params_start);
       serialized_params += sizeof(ulong);
 
       ulong acc_data_len = metadata->dlen;
@@ -358,6 +371,10 @@ fd_bpf_loader_input_serialize_aligned( fd_exec_instr_ctx_t *     ctx,
       FD_STORE( ulong, serialized_params, data_len );
       serialized_params += sizeof(ulong);
 
+      /* vm_data_addr: data is written immediately after the data_len field */
+      acc_region_metas[i].vm_data_addr = FD_VM_MEM_MAP_INPUT_REGION_START + curr_region_vaddr +
+        (ulong)(serialized_params - curr_serialized_params_start);
+
       /* https://github.com/anza-xyz/agave/blob/v3.0.0/program-runtime/src/serialization.rs#L536 */
       write_account(
         &view_acc,
@@ -389,7 +406,7 @@ fd_bpf_loader_input_serialize_aligned( fd_exec_instr_ctx_t *     ctx,
     region_vaddr_offset = input_mem_regions[*input_mem_regions_cnt-1U].vaddr_offset +
                           input_mem_regions[*input_mem_regions_cnt-1U].address_space_reserved;
   }
-  *instr_data_offset = region_vaddr_offset + (ulong)(serialized_params - curr_serialized_params_start);
+  *instr_data_offset = FD_VM_MEM_MAP_INPUT_REGION_START + region_vaddr_offset + (ulong)(serialized_params - curr_serialized_params_start);
 
   /* https://github.com/anza-xyz/agave/blob/v3.0.0/program-runtime/src/serialization.rs#L559 */
   uchar * instr_data = ctx->instr->data;
@@ -570,6 +587,10 @@ fd_bpf_loader_input_serialize_unaligned( fd_exec_instr_ctx_t *     ctx,
       // Duplicate
       FD_STORE( uchar, serialized_params, (uchar)dup_acc_idx[acc_idx] );
       serialized_params += sizeof(uchar);
+
+      /* Clone the account metadata from the original account
+         https://github.com/anza-xyz/agave/blob/v3.0.0/program-runtime/src/serialization.rs#L376 */
+      acc_region_metas[i] = acc_region_metas[dup_acc_idx[acc_idx]];
     } else {
       acc_idx_seen[acc_idx] = 1;
       dup_acc_idx[acc_idx]  = i;
@@ -597,28 +618,45 @@ fd_bpf_loader_input_serialize_unaligned( fd_exec_instr_ctx_t *     ctx,
       FD_STORE( uchar, serialized_params, is_writable );
       serialized_params += sizeof(uchar);
 
+      /* Compute current region vaddr base for VM address calculation */
+      ulong curr_region_vaddr = *input_mem_regions_cnt == 0U ? 0UL :
+        input_mem_regions[*input_mem_regions_cnt-1U].vaddr_offset +
+        input_mem_regions[*input_mem_regions_cnt-1U].address_space_reserved;
+
       fd_pubkey_t key = *acc;
+      acc_region_metas[i].vm_key_addr = FD_VM_MEM_MAP_INPUT_REGION_START + curr_region_vaddr +
+        (ulong)(serialized_params - curr_serialized_params_start);
       FD_STORE( fd_pubkey_t, serialized_params, key );
-      acc_region_metas[i].expected_pubkey_offset = (uint)(serialized_params - curr_serialized_params_start);
       serialized_params += sizeof(fd_pubkey_t);
 
       ulong lamports = metadata->lamports;
+      acc_region_metas[i].vm_lamports_addr = FD_VM_MEM_MAP_INPUT_REGION_START + curr_region_vaddr +
+        (ulong)(serialized_params - curr_serialized_params_start);
       FD_STORE( ulong, serialized_params, lamports );
-      acc_region_metas[i].expected_lamports_offset = (uint)(serialized_params - curr_serialized_params_start);
       serialized_params += sizeof(ulong);
 
       ulong acc_data_len = metadata->dlen;
       FD_STORE( ulong, serialized_params, acc_data_len );
       serialized_params += sizeof(ulong);
 
-      ulong next_region_offset = write_account( &view_acc, (uchar)i,
+      /* vm_data_addr: data is written immediately after the data_len field */
+      acc_region_metas[i].vm_data_addr = FD_VM_MEM_MAP_INPUT_REGION_START + curr_region_vaddr +
+        (ulong)(serialized_params - curr_serialized_params_start);
+
+      write_account( &view_acc, (uchar)i,
         &serialized_params, &curr_serialized_params_start,
         input_mem_regions, input_mem_regions_cnt, acc_region_metas, 1,
         stricter_abi_and_runtime_constraints, direct_mapping );
 
+      /* After write_account, we may be in a new region, so recompute */
+      ulong owner_region_vaddr = *input_mem_regions_cnt == 0U ? 0UL :
+        input_mem_regions[*input_mem_regions_cnt-1U].vaddr_offset +
+        input_mem_regions[*input_mem_regions_cnt-1U].address_space_reserved;
+
       fd_pubkey_t owner = *(fd_pubkey_t *)&metadata->owner;
+      acc_region_metas[i].vm_owner_addr = FD_VM_MEM_MAP_INPUT_REGION_START + owner_region_vaddr +
+        (ulong)(serialized_params - curr_serialized_params_start);
       FD_STORE( fd_pubkey_t, serialized_params, owner );
-      acc_region_metas[i].expected_owner_offset = (uint)next_region_offset;
       serialized_params += sizeof(fd_pubkey_t);
 
       uchar is_executable = (uchar)metadata->executable;
@@ -640,7 +678,7 @@ fd_bpf_loader_input_serialize_unaligned( fd_exec_instr_ctx_t *     ctx,
     region_vaddr_offset = input_mem_regions[*input_mem_regions_cnt-1U].vaddr_offset +
                           input_mem_regions[*input_mem_regions_cnt-1U].address_space_reserved;
   }
-  *instr_data_offset = region_vaddr_offset + (ulong)(serialized_params - curr_serialized_params_start);
+  *instr_data_offset = FD_VM_MEM_MAP_INPUT_REGION_START + region_vaddr_offset + (ulong)(serialized_params - curr_serialized_params_start);
 
   uchar * instr_data = (uchar *)ctx->instr->data;
   fd_memcpy( serialized_params, instr_data, instr_data_len );