flamenco, runtime: set original_data_len for non-DM CPI

Also a minor drive-by fix for update_caller_account() in the CPI return edge.
Use the correct source for prev_len.

Author: yufeng-jump

src/flamenco/runtime/program/fd_bpf_loader_serialization.c

@@ -82,6 +82,7 @@ write_account( fd_borrowed_account_t *   account,
   uchar const * data = account ? fd_borrowed_account_get_data( account )     : NULL;
   ulong         dlen = account ? fd_borrowed_account_get_data_len( account ) : 0UL;
 
+  acc_region_metas[instr_acc_idx].original_data_len = dlen;
   if( copy_account_data ) {
     /* Copy the account data into input region buffer */
     fd_memcpy( *serialized_params, data, dlen );
@@ -93,6 +94,11 @@ write_account( fd_borrowed_account_t *   account,
       fd_memset( *serialized_params, 0, MAX_PERMITTED_DATA_INCREASE + align_offset );
       *serialized_params += MAX_PERMITTED_DATA_INCREASE + align_offset;
     }
+    /* In the non-DM case, we don't bother with setting up mem regions.
+       So has_data_region and has_resizing_region are set to 0. */
+    acc_region_metas[instr_acc_idx].region_idx          = UINT_MAX;
+    acc_region_metas[instr_acc_idx].has_data_region     = 0U;
+    acc_region_metas[instr_acc_idx].has_resizing_region = 0U;
   } else { /* direct_mapping == true */
     /* First, push on the region for the metadata that has just been serialized.
        This function will push the metadata in the serialized_params from

src/flamenco/runtime/tests/run_backtest_ci.sh

@@ -17,3 +17,4 @@ src/flamenco/runtime/tests/run_ledger_backtest.sh -l mainnet-331691646-v2.2.16 -
 src/flamenco/runtime/tests/run_ledger_backtest.sh -l mainnet-257039990-v2.2.16 -s snapshot-257039990-BSgErEc6ppN4p91meqPvUiXPiEhbakBNHMQQ4wKmceYv.tar.zst -y 5 -m 10000000 -e 257040003 -c 2.2.16
 src/flamenco/runtime/tests/run_ledger_backtest.sh -l testnet-336218682-v2.2.16 -s snapshot-336218681-BDsErdHkqa5iQGCNkSvQpeon8GLFsgeNEkckrMKboJ4N.tar.zst -y 5 -m 2000000 -e 336218683 -c 2.2.16
 src/flamenco/runtime/tests/run_ledger_backtest.sh -l testnet-340269866 -s snapshot-340269865-7kiU4fCQMuf97vs3827n1vn1oScnkYYvvQ1sGGa1QKVE.tar.zst -y 5 -m 2000000 -e 340269872 -c 2.2.16
+src/flamenco/runtime/tests/run_ledger_backtest.sh -l devnet-390056400 -s snapshot-390056399-6JQvYEDzQqcrjF4EoxkWUMuskm9aGoGRG94twEqXuuri.tar.zst -y 10 -m 2000000 -e 390056406 -c 2.2.16

src/flamenco/runtime/tests/run_backtest_tests_all.sh

@@ -83,3 +83,4 @@ src/flamenco/runtime/tests/run_ledger_backtest.sh -l devnet-380592002-v2.2.16 -s
 src/flamenco/runtime/tests/run_ledger_backtest.sh -l testnet-336218682-v2.2.16 -s snapshot-336218681-BDsErdHkqa5iQGCNkSvQpeon8GLFsgeNEkckrMKboJ4N.tar.zst -y 5 -m 2000000 -e 336218683 -c 2.2.16
 src/flamenco/runtime/tests/run_ledger_backtest.sh -l testnet-340269866 -s snapshot-340269865-7kiU4fCQMuf97vs3827n1vn1oScnkYYvvQ1sGGa1QKVE.tar.zst -y 5 -m 2000000 -e 340269872 -c 2.2.16
 src/flamenco/runtime/tests/run_ledger_backtest.sh -l testnet-340272018 -s snapshot-340272017-SoJMtGKERj3xMB6jB7bumiHe96q4xVjHVN4kz2MGbqn.tar.zst -y 5 -m 2000000 -e 340272024 -c 2.2.16
+src/flamenco/runtime/tests/run_ledger_backtest.sh -l devnet-390056400 -s snapshot-390056399-6JQvYEDzQqcrjF4EoxkWUMuskm9aGoGRG94twEqXuuri.tar.zst -y 10 -m 2000000 -e 390056406 -c 2.2.16

src/flamenco/vm/fd_vm.h

@@ -41,6 +41,11 @@ struct __attribute((aligned(8UL))) fd_vm_acc_region_meta {
    /* offset of the accounts metadata region, relative to the start of the input region.
       importantly, this excludes any duplicate account markers at the beginning of the "full" metadata region. */
    ulong                               metadata_region_offset;
+   /* FIXME: We can get rid of this field once DM is activated.  This is
+      only a hack to make the non-DM code path happy.  When DM is
+      activated, we could query the input_mem_region array for the
+      original data len. */
+   ulong                               original_data_len;
 };
 typedef struct fd_vm_acc_region_meta fd_vm_acc_region_meta_t;
 

src/flamenco/vm/syscall/fd_vm_syscall_cpi_common.c

@@ -480,7 +480,7 @@ VM_SYSCALL_CPI_TRANSLATE_AND_UPDATE_ACCOUNTS_FUNC(
         caller_account->serialized_data_len = data_haddr_len;
       }
 
-      caller_account->orig_data_len = acc_region_meta->has_data_region ? vm->input_mem_regions[ acc_region_meta->region_idx ].region_sz : 0U;
+      caller_account->orig_data_len = acc_region_meta->original_data_len;
 
       ////// END from_account_info
 
@@ -557,7 +557,8 @@ VM_SYSCALL_CPI_UPDATE_CALLER_ACC_FUNC( fd_vm_t *                          vm,
 
     ulong const updated_data_len = callee_acc->vt->get_data_len( callee_acc );
     if( !updated_data_len ) fd_memset( (void*)caller_acc_data, 0, caller_acc_data_len );
-    if( caller_acc_data_len != updated_data_len ) {
+    ulong * ref_to_len = caller_account->ref_to_len_in_vm.translated;
+    if( *ref_to_len != updated_data_len ) {
       ulong max_increase = (vm->direct_mapping && vm->is_deprecated) ? 0UL : MAX_PERMITTED_DATA_INCREASE;
       // https://github.com/anza-xyz/agave/blob/7f3a6cf6d3c2dcc81bb38e49a5c9ef998a6f4dd9/programs/bpf_loader/src/syscalls/cpi.rs#L1387-L1397
       if( FD_UNLIKELY( updated_data_len>fd_ulong_sat_add( caller_account->orig_data_len, max_increase ) ) ) {
@@ -573,7 +574,6 @@ VM_SYSCALL_CPI_UPDATE_CALLER_ACC_FUNC( fd_vm_t *                          vm,
        */
       caller_acc_data = FD_VM_MEM_SLICE_HADDR_ST( vm, caller_acc_data_vm_addr, alignof(uchar), updated_data_len );
 
-      ulong * ref_to_len = caller_account->ref_to_len_in_vm.translated;
       *ref_to_len = updated_data_len;
 
       /* Update the serialized len field