implemented elf harness

Author: mjain-jump

src/flamenco/runtime/tests/fd_elf_harness.c

@@ -8,6 +8,7 @@
 #include "../../progcache/fd_prog_load.h"
 
 #include "flatbuffers/generated/elf_reader.h"
+#include "flatbuffers/generated/elf_builder.h"
 
 #define SORT_NAME        sort_ulong
 #define SORT_KEY_T       ulong
@@ -143,12 +144,92 @@ fd_solfuzz_fb_elf_loader_run( fd_solfuzz_runner_t * runner,
                               void const *          input_ ) {
   SOL_COMPAT_NS(ELFLoaderCtx_table_t) input = fd_type_pun_const( input_ );
 
-  fd_spad_t *             spad    = runner->spad;
-  flatbuffers_uint8_vec_t elf_bin = SOL_COMPAT_NS(ELFLoaderCtx_elf_data( input ));
-  ulong                   elf_sz  = flatbuffers_uint8_vec_len( elf_bin );
+  fd_spad_t *             spad     = runner->spad;
+  flatbuffers_uint8_vec_t elf_bin_ = SOL_COMPAT_NS(ELFLoaderCtx_elf_data( input ));
+  uchar const *           elf_bin  = (uchar const*)elf_bin_;
+  ulong                   elf_sz   = flatbuffers_uint8_vec_len( elf_bin_ );
 
+  /* Restore feature set */
+  fd_features_t feature_set = {0};
+  fd_solfuzz_fb_restore_features( &feature_set, SOL_COMPAT_NS(ELFLoaderCtx_features( input )));
+
+  fd_sbpf_loader_config_t config = {
+    .elf_deploy_checks = SOL_COMPAT_NS(ELFLoaderCtx_deploy_checks( input )),
+  };
+
+  fd_prog_versions_t versions = fd_prog_versions( &feature_set, UINT_MAX );
+  config.sbpf_min_version = versions.min_sbpf_version;
+  config.sbpf_max_version = versions.max_sbpf_version;
+
+  /* Peek */
   fd_sbpf_elf_info_t info;
+  int err = fd_sbpf_elf_peek( &info, elf_bin, elf_sz, &config );
+  if( err ) {
+    SOL_COMPAT_NS(ELFLoaderEffects_create)( runner->fb_builder, (uchar)(-err), NULL, 0, 0, 0, NULL );
+    return SOL_COMPAT_V2_SUCCESS;
+  }
+
+  /* Set up loading context */
+  void *               rodata         = fd_spad_alloc_check( spad, FD_SBPF_PROG_RODATA_ALIGN, info.bin_sz );
+  fd_sbpf_program_t *  prog           = fd_sbpf_program_new( fd_spad_alloc_check( spad, fd_sbpf_program_align(), fd_sbpf_program_footprint( &info ) ), &info, rodata );
+  fd_sbpf_syscalls_t * syscalls       = fd_sbpf_syscalls_new( fd_spad_alloc_check( spad, fd_sbpf_syscalls_align(), fd_sbpf_syscalls_footprint() ));
+  void *               rodata_scratch = fd_spad_alloc_check( spad, 1UL, elf_sz );
+
+  /* Register syscalls given the active feature set. We can pass in an
+     arbitrary slot as its just used to check if features should be
+     active or not. */
+  FD_TEST( !fd_vm_syscall_register_slot( syscalls, UINT_MAX, &feature_set, !!config.elf_deploy_checks ) );
+
+  /* Load */
+  err = fd_sbpf_program_load( prog, elf_bin, elf_sz, syscalls, &config, rodata_scratch, elf_sz );
+  if( err ) {
+    SOL_COMPAT_NS(ELFLoaderEffects_create)( runner->fb_builder, (uchar)(-err), NULL, 0, 0, 0, NULL );
+    return SOL_COMPAT_V2_SUCCESS;
+  }
+
+  /**** Capture effects ****/
+
+  /* Error code */
+  uchar out_err_code = FD_SBPF_ELF_SUCCESS;
+
+  /* Rodata */
+  flatbuffers_uint8_vec_ref_t out_rodata = flatbuffers_uint8_vec_create( runner->fb_builder, prog->rodata, prog->rodata_sz );
+
+  /* Text count */
+  ulong out_text_cnt = prog->info.text_cnt;
+
+  /* Text off */
+  ulong out_text_off = prog->info.text_off;
+
+  /* Entry PC */
+  ulong out_entry_pc = prog->entry_pc;
+
+  /* Calldests */
+  ulong * tmp_out_calldests = fd_spad_alloc_check( spad, alignof(ulong), sizeof(ulong)*fd_sbpf_calldests_cnt( prog->calldests)+1UL );
+  ulong   out_calldests_cnt = 0UL;
+
+  /* Add the entrypoint to the calldests */
+  tmp_out_calldests[out_calldests_cnt++] = prog->entry_pc;
+
+  /* Add the rest of the calldests */
+  if( FD_LIKELY( prog->calldests ) ) {
+    for( ulong target_pc=fd_sbpf_calldests_const_iter_init(prog->calldests);
+                        !fd_sbpf_calldests_const_iter_done(target_pc);
+               target_pc=fd_sbpf_calldests_const_iter_next(prog->calldests, target_pc) ) {
+      if( FD_LIKELY( target_pc!=prog->entry_pc ) ) {
+        tmp_out_calldests[out_calldests_cnt++] = target_pc;
+      }
+    }
+  }
+
+  /* Sort the calldests in ascending order */
+  sort_ulong_inplace( tmp_out_calldests, out_calldests_cnt );
+
+  /* Create output calldests vector */
+  flatbuffers_uint64_vec_ref_t out_calldests = flatbuffers_uint64_vec_create( runner->fb_builder, tmp_out_calldests, out_calldests_cnt );
 
+  /* Build effects */
+  SOL_COMPAT_NS(ELFLoaderEffects_create)( runner->fb_builder, out_err_code, out_rodata, out_text_cnt, out_text_off, out_entry_pc, out_calldests );
 
-  return 0UL;
+  return SOL_COMPAT_V2_SUCCESS;
 }

src/flamenco/runtime/tests/fd_harness_common.c

@@ -70,19 +70,19 @@ fd_solfuzz_pb_restore_features( fd_features_t *                    features,
   return 1;
 }
 
-int
+void
 fd_solfuzz_fb_restore_features( fd_features_t *                    features,
                                 SOL_COMPAT_NS(FeatureSet_table_t)  feature_set ) {
   fd_features_disable_all( features );
-  for( ulong j=0UL; j < feature_set->features_count; j++ ) {
-    ulong                   prefix = feature_set->features[j];
+  flatbuffers_uint64_vec_t input_features     = SOL_COMPAT_NS(FeatureSet_features( feature_set ));
+  ulong                    input_features_cnt = flatbuffers_uint64_vec_len( input_features );
+  for( ulong i=0UL; i<input_features_cnt; i++ ) {
+    ulong                   prefix = flatbuffers_uint64_vec_at( input_features, i );
     fd_feature_id_t const * id     = fd_feature_id_query( prefix );
     if( FD_UNLIKELY( !id ) ) {
-      FD_LOG_WARNING(( "unsupported feature ID 0x%016lx", prefix ));
-      return 0;
+      FD_LOG_ERR(( "unsupported feature ID 0x%016lx", prefix ));
     }
     /* Enabled since genesis */
     fd_features_set( features, id, 0UL );
   }
-  return 1;
 }

src/flamenco/runtime/tests/fd_sol_compat.h

@@ -22,9 +22,6 @@
 
 FD_PROTOTYPES_BEGIN
 
-#define SOL_COMPAT_V2_SUCCESS (0)
-#define SOL_COMPAT_V2_FAILURE (-1)
-
 /* sol_compat_init installs a new solfuzz execution context into the
    current process.  Under the hood, acquires some demand-paged memory
    (with transparent huge page hint), and initializes some reusable data

src/flamenco/runtime/tests/fd_solfuzz_private.h

@@ -18,6 +18,9 @@ FD_PROTOTYPES_BEGIN
 #undef ns
 #define SOL_COMPAT_NS(x) FLATBUFFERS_WRAP_NAMESPACE(fd_org_solana_sealevel_v2, x)
 
+#define SOL_COMPAT_V2_SUCCESS (0)
+#define SOL_COMPAT_V2_FAILURE (-1)
+
 /* Creates / overwrites an account in funk given an input account state.
    On success, loads the account into acc.  Optionally, reject any
    zero-lamport accounts from being loaded in. */
@@ -34,7 +37,10 @@ int
 fd_solfuzz_pb_restore_features( fd_features_t *                    features,
                                 fd_exec_test_feature_set_t const * feature_set );
 
-int
+/* Flatbuffers variant of the above. This function call should never
+   fail (all passed in features should be supported). Throws FD_LOG_ERR
+   if any unsupported features are inputted. */
+void
 fd_solfuzz_fb_restore_features( fd_features_t *                   features,
                                 SOL_COMPAT_NS(FeatureSet_table_t) feature_set );
 

src/flamenco/runtime/tests/flatbuffers/generated/elf_builder.h

@@ -31,7 +31,7 @@ __flatbuffers_build_table(flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderCtx,
 static const flatbuffers_voffset_t __fd_org_solana_sealevel_v2_ELFLoaderEffects_required[] = { 0 };
 typedef flatbuffers_ref_t fd_org_solana_sealevel_v2_ELFLoaderEffects_ref_t;
 static fd_org_solana_sealevel_v2_ELFLoaderEffects_ref_t fd_org_solana_sealevel_v2_ELFLoaderEffects_clone(flatbuffers_builder_t *B, fd_org_solana_sealevel_v2_ELFLoaderEffects_table_t t);
-__flatbuffers_build_table(flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects, 7)
+__flatbuffers_build_table(flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects, 6)
 
 static const flatbuffers_voffset_t __fd_org_solana_sealevel_v2_ELFLoaderFixture_required[] = { 0, 1, 2, 0 };
 typedef flatbuffers_ref_t fd_org_solana_sealevel_v2_ELFLoaderFixture_ref_t;
@@ -44,11 +44,9 @@ static inline fd_org_solana_sealevel_v2_ELFLoaderCtx_ref_t fd_org_solana_sealeve
 __flatbuffers_build_table_prolog(flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderCtx, fd_org_solana_sealevel_v2_ELFLoaderCtx_file_identifier, fd_org_solana_sealevel_v2_ELFLoaderCtx_type_identifier)
 
 #define __fd_org_solana_sealevel_v2_ELFLoaderEffects_formal_args ,\
-  uint8_t v0, flatbuffers_uint8_vec_ref_t v1, uint64_t v2, uint64_t v3,\
-  uint64_t v4, uint64_t v5, flatbuffers_uint64_vec_ref_t v6
+  uint8_t v0, flatbuffers_uint8_vec_ref_t v1, uint64_t v2, uint64_t v3, uint64_t v4, flatbuffers_uint64_vec_ref_t v5
 #define __fd_org_solana_sealevel_v2_ELFLoaderEffects_call_args ,\
-  v0, v1, v2, v3,\
-  v4, v5, v6
+  v0, v1, v2, v3, v4, v5
 static inline fd_org_solana_sealevel_v2_ELFLoaderEffects_ref_t fd_org_solana_sealevel_v2_ELFLoaderEffects_create(flatbuffers_builder_t *B __fd_org_solana_sealevel_v2_ELFLoaderEffects_formal_args);
 __flatbuffers_build_table_prolog(flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects, fd_org_solana_sealevel_v2_ELFLoaderEffects_file_identifier, fd_org_solana_sealevel_v2_ELFLoaderEffects_type_identifier)
 
@@ -86,21 +84,19 @@ static fd_org_solana_sealevel_v2_ELFLoaderCtx_ref_t fd_org_solana_sealevel_v2_EL
 
 __flatbuffers_build_scalar_field(0, flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects_err_code, flatbuffers_uint8, uint8_t, 1, 1, UINT8_C(0), fd_org_solana_sealevel_v2_ELFLoaderEffects)
 __flatbuffers_build_vector_field(1, flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects_rodata, flatbuffers_uint8, uint8_t, fd_org_solana_sealevel_v2_ELFLoaderEffects)
-__flatbuffers_build_scalar_field(2, flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects_rodata_sz, flatbuffers_uint64, uint64_t, 8, 8, UINT64_C(0), fd_org_solana_sealevel_v2_ELFLoaderEffects)
-__flatbuffers_build_scalar_field(3, flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects_text_cnt, flatbuffers_uint64, uint64_t, 8, 8, UINT64_C(0), fd_org_solana_sealevel_v2_ELFLoaderEffects)
-__flatbuffers_build_scalar_field(4, flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects_text_off, flatbuffers_uint64, uint64_t, 8, 8, UINT64_C(0), fd_org_solana_sealevel_v2_ELFLoaderEffects)
-__flatbuffers_build_scalar_field(5, flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects_entry_pc, flatbuffers_uint64, uint64_t, 8, 8, UINT64_C(0), fd_org_solana_sealevel_v2_ELFLoaderEffects)
-__flatbuffers_build_vector_field(6, flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects_calldests, flatbuffers_uint64, uint64_t, fd_org_solana_sealevel_v2_ELFLoaderEffects)
+__flatbuffers_build_scalar_field(2, flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects_text_cnt, flatbuffers_uint64, uint64_t, 8, 8, UINT64_C(0), fd_org_solana_sealevel_v2_ELFLoaderEffects)
+__flatbuffers_build_scalar_field(3, flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects_text_off, flatbuffers_uint64, uint64_t, 8, 8, UINT64_C(0), fd_org_solana_sealevel_v2_ELFLoaderEffects)
+__flatbuffers_build_scalar_field(4, flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects_entry_pc, flatbuffers_uint64, uint64_t, 8, 8, UINT64_C(0), fd_org_solana_sealevel_v2_ELFLoaderEffects)
+__flatbuffers_build_vector_field(5, flatbuffers_, fd_org_solana_sealevel_v2_ELFLoaderEffects_calldests, flatbuffers_uint64, uint64_t, fd_org_solana_sealevel_v2_ELFLoaderEffects)
 
 static inline fd_org_solana_sealevel_v2_ELFLoaderEffects_ref_t fd_org_solana_sealevel_v2_ELFLoaderEffects_create(flatbuffers_builder_t *B __fd_org_solana_sealevel_v2_ELFLoaderEffects_formal_args)
 {
     if (fd_org_solana_sealevel_v2_ELFLoaderEffects_start(B)
-        || fd_org_solana_sealevel_v2_ELFLoaderEffects_rodata_sz_add(B, v2)
-        || fd_org_solana_sealevel_v2_ELFLoaderEffects_text_cnt_add(B, v3)
-        || fd_org_solana_sealevel_v2_ELFLoaderEffects_text_off_add(B, v4)
-        || fd_org_solana_sealevel_v2_ELFLoaderEffects_entry_pc_add(B, v5)
+        || fd_org_solana_sealevel_v2_ELFLoaderEffects_text_cnt_add(B, v2)
+        || fd_org_solana_sealevel_v2_ELFLoaderEffects_text_off_add(B, v3)
+        || fd_org_solana_sealevel_v2_ELFLoaderEffects_entry_pc_add(B, v4)
         || fd_org_solana_sealevel_v2_ELFLoaderEffects_rodata_add(B, v1)
-        || fd_org_solana_sealevel_v2_ELFLoaderEffects_calldests_add(B, v6)
+        || fd_org_solana_sealevel_v2_ELFLoaderEffects_calldests_add(B, v5)
         || fd_org_solana_sealevel_v2_ELFLoaderEffects_err_code_add(B, v0)) {
         return 0;
     }
@@ -111,7 +107,6 @@ static fd_org_solana_sealevel_v2_ELFLoaderEffects_ref_t fd_org_solana_sealevel_v
 {
     __flatbuffers_memoize_begin(B, t);
     if (fd_org_solana_sealevel_v2_ELFLoaderEffects_start(B)
-        || fd_org_solana_sealevel_v2_ELFLoaderEffects_rodata_sz_pick(B, t)
         || fd_org_solana_sealevel_v2_ELFLoaderEffects_text_cnt_pick(B, t)
         || fd_org_solana_sealevel_v2_ELFLoaderEffects_text_off_pick(B, t)
         || fd_org_solana_sealevel_v2_ELFLoaderEffects_entry_pc_pick(B, t)

src/flamenco/runtime/tests/flatbuffers/generated/elf_reader.h

@@ -98,11 +98,10 @@ __flatbuffers_table_as_root(fd_org_solana_sealevel_v2_ELFLoaderEffects)
 
 __flatbuffers_define_scalar_field(0, fd_org_solana_sealevel_v2_ELFLoaderEffects, err_code, flatbuffers_uint8, uint8_t, UINT8_C(0))
 __flatbuffers_define_vector_field(1, fd_org_solana_sealevel_v2_ELFLoaderEffects, rodata, flatbuffers_uint8_vec_t, 0)
-__flatbuffers_define_scalar_field(2, fd_org_solana_sealevel_v2_ELFLoaderEffects, rodata_sz, flatbuffers_uint64, uint64_t, UINT64_C(0))
-__flatbuffers_define_scalar_field(3, fd_org_solana_sealevel_v2_ELFLoaderEffects, text_cnt, flatbuffers_uint64, uint64_t, UINT64_C(0))
-__flatbuffers_define_scalar_field(4, fd_org_solana_sealevel_v2_ELFLoaderEffects, text_off, flatbuffers_uint64, uint64_t, UINT64_C(0))
-__flatbuffers_define_scalar_field(5, fd_org_solana_sealevel_v2_ELFLoaderEffects, entry_pc, flatbuffers_uint64, uint64_t, UINT64_C(0))
-__flatbuffers_define_vector_field(6, fd_org_solana_sealevel_v2_ELFLoaderEffects, calldests, flatbuffers_uint64_vec_t, 0)
+__flatbuffers_define_scalar_field(2, fd_org_solana_sealevel_v2_ELFLoaderEffects, text_cnt, flatbuffers_uint64, uint64_t, UINT64_C(0))
+__flatbuffers_define_scalar_field(3, fd_org_solana_sealevel_v2_ELFLoaderEffects, text_off, flatbuffers_uint64, uint64_t, UINT64_C(0))
+__flatbuffers_define_scalar_field(4, fd_org_solana_sealevel_v2_ELFLoaderEffects, entry_pc, flatbuffers_uint64, uint64_t, UINT64_C(0))
+__flatbuffers_define_vector_field(5, fd_org_solana_sealevel_v2_ELFLoaderEffects, calldests, flatbuffers_uint64_vec_t, 0)
 
 struct fd_org_solana_sealevel_v2_ELFLoaderFixture_table { uint8_t unused__; };
 

src/flamenco/runtime/tests/flatbuffers/generated/elf_verifier.h

@@ -53,11 +53,10 @@ static int fd_org_solana_sealevel_v2_ELFLoaderEffects_verify_table(flatcc_table_
     int ret;
     if ((ret = flatcc_verify_field(td, 0, 1, 1) /* err_code */)) return ret;
     if ((ret = flatcc_verify_vector_field(td, 1, 0, 1, 1, INT64_C(4294967295)) /* rodata */)) return ret;
-    if ((ret = flatcc_verify_field(td, 2, 8, 8) /* rodata_sz */)) return ret;
-    if ((ret = flatcc_verify_field(td, 3, 8, 8) /* text_cnt */)) return ret;
-    if ((ret = flatcc_verify_field(td, 4, 8, 8) /* text_off */)) return ret;
-    if ((ret = flatcc_verify_field(td, 5, 8, 8) /* entry_pc */)) return ret;
-    if ((ret = flatcc_verify_vector_field(td, 6, 0, 8, 8, INT64_C(536870911)) /* calldests */)) return ret;
+    if ((ret = flatcc_verify_field(td, 2, 8, 8) /* text_cnt */)) return ret;
+    if ((ret = flatcc_verify_field(td, 3, 8, 8) /* text_off */)) return ret;
+    if ((ret = flatcc_verify_field(td, 4, 8, 8) /* entry_pc */)) return ret;
+    if ((ret = flatcc_verify_vector_field(td, 5, 0, 8, 8, INT64_C(536870911)) /* calldests */)) return ret;
     return flatcc_verify_ok;
 }