progcache: shared memory concurrency

Author: riptl

src/app/firedancer-dev/commands/backtest.c

@@ -25,6 +25,7 @@
 #include "../../../discof/restore/utils/fd_ssmsg.h"
 #include "../../../discof/tower/fd_tower_tile.h"
 #include "../../../discof/replay/fd_exec.h" /* FD_RUNTIME_PUBLIC_ACCOUNT_UPDATE_MSG_MTU */
+#include "../../../flamenco/progcache/fd_progcache_admin.h"
 
 #include "../main.h"
 

src/app/firedancer/topology.c

@@ -20,6 +20,7 @@
 #include "../../discof/restore/utils/fd_ssmsg.h"
 #include "../../flamenco/gossip/fd_gossip.h"
 #include "../../flamenco/runtime/context/fd_capture_ctx.h"
+#include "../../flamenco/progcache/fd_progcache_admin.h"
 
 #include <sys/random.h>
 #include <sys/types.h>

src/discof/replay/fd_replay_tile.c

@@ -17,6 +17,7 @@
 #include "../../util/pod/fd_pod.h"
 #include "../../flamenco/rewards/fd_rewards.h"
 #include "../../flamenco/leaders/fd_multi_epoch_leaders.h"
+#include "../../flamenco/progcache/fd_progcache_admin.h"
 #include "../../disco/metrics/fd_metrics.h"
 
 #include <errno.h>
@@ -127,7 +128,7 @@ struct fd_replay_tile {
   int tx_metadata_storage;
 
   fd_funk_t funk[1];
-  fd_progcache_t progcache[1];
+  fd_progcache_admin_t progcache_admin[1];
 
   fd_txncache_t * txncache;
   fd_store_t *    store;
@@ -613,8 +614,8 @@ replay_block_start( fd_replay_tile_t *  ctx,
 
   fd_funk_txn_xid_t xid        = { .ul = { slot, slot } };
   fd_funk_txn_xid_t parent_xid = { .ul = { parent_slot, parent_slot } };
-  fd_funk_txn_prepare( ctx->funk,            &parent_xid, &xid );
-  fd_funk_txn_prepare( ctx->progcache->funk, &parent_xid, &xid );
+  fd_funk_txn_prepare     ( ctx->funk,            &parent_xid, &xid );
+  fd_progcache_txn_prepare( ctx->progcache_admin, &parent_xid, &xid );
 
   /* Update any required runtime state and handle any potential epoch
      boundary change. */
@@ -823,8 +824,8 @@ prepare_leader_bank( fd_replay_tile_t *  ctx,
   /* prepare the funk transaction for the leader bank */
   fd_funk_txn_xid_t xid        = { .ul = { slot, slot } };
   fd_funk_txn_xid_t parent_xid = { .ul = { parent_slot, parent_slot } };
-  fd_funk_txn_prepare( ctx->funk,            &parent_xid, &xid );
-  fd_funk_txn_prepare( ctx->progcache->funk, &parent_xid, &xid );
+  fd_funk_txn_prepare     ( ctx->funk,            &parent_xid, &xid );
+  fd_progcache_txn_prepare( ctx->progcache_admin, &parent_xid, &xid );
 
   fd_bank_execution_fees_set( ctx->leader_bank, 0UL );
   fd_bank_priority_fees_set( ctx->leader_bank, 0UL );
@@ -977,12 +978,12 @@ init_funk( fd_replay_tile_t * ctx,
   /* The program cache tracks the account database's fork graph at all
      times.  Perform initial synchronization: pivot from funk 'root' (a
      sentinel XID) to 'last publish' (the bootstrap root slot). */
-  if( FD_UNLIKELY( !ctx->progcache->funk->shmem ) ) {
+  if( FD_UNLIKELY( !ctx->progcache_admin->funk->shmem ) ) {
     FD_LOG_CRIT(( "failed to initialize account database: replay tile is not joined to program cache" ));
   }
-  fd_progcache_clear( ctx->progcache );
-  fd_funk_txn_prepare( ctx->progcache->funk, fd_funk_root( ctx->progcache->funk ), fd_funk_last_publish( ctx->funk ) );
-  fd_funk_txn_publish( ctx->progcache->funk, fd_funk_last_publish( ctx->funk ) );
+  fd_progcache_clear( ctx->progcache_admin );
+  fd_progcache_txn_prepare( ctx->progcache_admin, fd_funk_root( ctx->progcache_admin->funk ), fd_funk_last_publish( ctx->funk ) );
+  fd_progcache_txn_publish( ctx->progcache_admin, fd_funk_last_publish( ctx->funk ) );
 }
 
 static void
@@ -1448,10 +1449,6 @@ replay( fd_replay_tile_t *  ctx,
       FD_LOG_CRIT(( "invariant violation: bank is NULL for bank index %lu", ready_txn->bank_idx ));
     }
 
-    fd_funk_txn_xid_t xid = { .ul = { ready_txn->slot, ready_txn->slot } };
-
-    fd_runtime_update_program_cache( bank, ctx->progcache, ctx->funk, &xid, txn_p, ctx->runtime_spad );
-
     /* At this point, we are going to send the txn down the execution
         pipeline.  Increment the refcnt so we don't prematurely prune a
         bank that's needed by an in-flight txn. */
@@ -1602,8 +1599,8 @@ funk_publish( fd_replay_tile_t * ctx,
   /* This is the standard case.  Publish all transactions up to and
      including the watermark.  This will publish any in-prep ancestors
      of root_txn as well. */
-  if( FD_UNLIKELY( !fd_funk_txn_publish( ctx->funk,            &xid ) ) ) FD_LOG_CRIT(( "failed to root slot %lu: fd_funk_txn_publish(accdb) failed",     slot ));
-  if( FD_UNLIKELY( !fd_funk_txn_publish( ctx->progcache->funk, &xid ) ) ) FD_LOG_CRIT(( "failed to root slot %lu: fd_funk_txn_publish(progcache) failed", slot ));
+  if( FD_UNLIKELY( !fd_funk_txn_publish( ctx->funk, &xid ) ) ) FD_LOG_CRIT(( "failed to root slot %lu: fd_funk_txn_publish(accdb) failed",     slot ));
+  fd_progcache_txn_publish( ctx->progcache_admin, &xid );
 }
 
 static int
@@ -2052,7 +2049,9 @@ unprivileged_init( fd_topo_t *      topo,
   fd_features_enable_one_offs( features, one_off_features, (uint)tile->replay.enable_features_cnt, 0UL );
 
   FD_TEST( fd_funk_join( ctx->funk, fd_topo_obj_laddr( topo, tile->replay.funk_obj_id ) ) );
-  FD_TEST( fd_progcache_join( ctx->progcache, fd_topo_obj_laddr( topo, tile->replay.progcache_obj_id ) ) );
+  FD_TEST( fd_progcache_admin_join(
+      ctx->progcache_admin,
+      fd_topo_obj_laddr( topo, tile->replay.progcache_obj_id ) ) );
 
   void * _txncache_shmem = fd_topo_obj_laddr( topo, tile->replay.txncache_obj_id );
   fd_txncache_shmem_t * txncache_shmem = fd_txncache_shmem_join( _txncache_shmem );

src/flamenco/progcache/Local.mk

@@ -1,8 +1,21 @@
 ifdef FD_HAS_INT128
+
+# Public APIs
+
 $(call add-hdrs,fd_prog_load.h)
 $(call add-objs,fd_prog_load,fd_flamenco)
-$(call add-hdrs,fd_progcache.h fd_progcache_rec.h)
-$(call add-objs,fd_progcache fd_progcache_rec fd_progcache_evict,fd_flamenco)
+
+$(call add-hdrs,fd_progcache_admin.h)
+$(call add-objs,fd_progcache_admin,fd_flamenco)
+
+$(call add-hdrs,fd_progcache_user.h)
+$(call add-objs,fd_progcache_user,fd_flamenco)
+
 $(call make-unit-test,test_progcache,test_progcache,fd_flamenco fd_funk fd_ballet fd_util)
 $(call run-unit-test,test_progcache)
+
+# Internals
+
+$(call add-objs,fd_progcache_rec,fd_flamenco)
+
 endif

src/flamenco/progcache/fd_prog_load.c

@@ -1,6 +1,7 @@
 #include "fd_prog_load.h"
 #include "../runtime/program/fd_bpf_loader_program.h"
 #include "../runtime/program/fd_loader_v4_program.h"
+#include "../runtime/sysvar/fd_sysvar_epoch_schedule.h"
 
 /* Similar to the below function, but gets the executable program content for the v4 loader.
    Unlike the v3 loader, the programdata is stored in a single program account. The program must
@@ -167,3 +168,17 @@ fd_prog_versions( fd_features_t const * features,
   }
   return v;
 }
+
+
+fd_prog_load_env_t *
+fd_prog_load_env_from_bank( fd_prog_load_env_t * env,
+                            fd_bank_t const *    bank ) {
+  *env = (fd_prog_load_env_t) {
+    .features      = fd_bank_features_query( bank ),
+    .slot          = fd_bank_slot_get      ( bank ),
+    .epoch         = fd_bank_epoch_get     ( bank ),
+    .epoch_slot0   = fd_epoch_slot0( fd_bank_epoch_schedule_query( bank ), fd_bank_epoch_get( bank ) ),
+    .gen           = 1UL,
+  };
+  return env;
+}

src/flamenco/progcache/fd_prog_load.h

@@ -42,4 +42,24 @@ fd_prog_versions( fd_features_t const * features,
 
 FD_PROTOTYPES_END
 
+struct fd_prog_load_env {
+  fd_features_t const * features;
+
+  ulong slot;         /* current slot */
+  ulong epoch;        /* current epoch */
+  ulong epoch_slot0;  /* slot0 of current epoch */
+
+  ulong gen;
+};
+
+typedef struct fd_prog_load_env fd_prog_load_env_t;
+
+FD_PROTOTYPES_BEGIN
+
+fd_prog_load_env_t *
+fd_prog_load_env_from_bank( fd_prog_load_env_t * env,
+                            fd_bank_t const *    bank );
+
+FD_PROTOTYPES_END
+
 #endif /* HEADER_fd_src_flamenco_fd_progcache_fd_prog_load_h */