plumb abiv2 and dm in syscall and ix harnesses (#374)

* remove outdated comments

* wire up ABIv2 feature

* wire up direct mapping and remove toggling

Author: 0xalpharush

src/lib.rs

@@ -313,10 +313,6 @@ static SUPPORTED_FEATURES: &[u64] = feature_list![
     account_data_direct_mapping,
 ];
 
-// If `TOGGLE_DIRECT_MAPPING=1` is set, the direct mapping feature will be inverted, testing with and without direct mapping.
-// In solfuzz, this can be done by copying the shared object and configuring the environment variable in one target e.g. `TARGET0_TOGGLE_DIRECT_MAPPING=1`.
-static mut TOGGLE_DIRECT_MAPPING: bool = false;
-
 // If the `CORE_BPF_PROGRAM_ID` variable is set, declares the default compute
 // units used by the program's builtin version.
 //
@@ -1040,9 +1036,6 @@ impl TryFrom<proto::AcctState> for (Pubkey, Account) {
 pub unsafe extern "C" fn sol_compat_init(_log_level: i32) {
     env::set_var("SOLANA_RAYON_THREADS", "1");
     env::set_var("RAYON_NUM_THREADS", "1");
-    if env::var("TOGGLE_DIRECT_MAPPING").is_ok() {
-        TOGGLE_DIRECT_MAPPING = true;
-    }
     if env::var("ENABLE_SOLANA_LOGGER").is_ok() {
         /* Pairs with RUST_LOG={trace,debug,info,etc} */
         solana_logger::setup();

src/txn_fuzzer.rs

@@ -3,7 +3,6 @@ use crate::proto::{AcctState, TxnContext, TxnResult};
 use crate::utils::program::common::{
     build_versioned_message, get_dummy_bpf_native_programs, get_sysvar,
 };
-// use crate::TOGGLE_DIRECT_MAPPING;
 use agave_feature_set::*;
 use agave_precompiles::get_precompile;
 use ahash::AHashSet;

src/vm_interp.rs

@@ -4,7 +4,7 @@ use crate::{
         err_map,
         vm::{mem_regions, HEAP_MAX, STACK_SIZE},
     },
-    InstrContext, TOGGLE_DIRECT_MAPPING,
+    InstrContext,
 };
 // feature removed from feature set surface in 3.0; direct mapping toggled via SVMFeatureSet flags
 use bincode::Error;
@@ -189,12 +189,10 @@ pub fn execute_vm_interp(syscall_context: SyscallContext) -> Option<SyscallEffec
         .transaction_context
         .find_index_of_account(&instr_ctx.instruction.program_id)?;
 
-    let mut direct_mapping = false;
-    unsafe {
-        if TOGGLE_DIRECT_MAPPING {
-            direct_mapping = !direct_mapping;
-        }
-    }
+    let direct_mapping = invoke_ctx.get_feature_set().account_data_direct_mapping;
+    let stricter_abi_and_runtime_constraints = invoke_ctx
+        .get_feature_set()
+        .stricter_abi_and_runtime_constraints;
     let mask_out_rent_epoch_in_vm_serialization = invoke_ctx
         .get_feature_set()
         .mask_out_rent_epoch_in_vm_serialization;
@@ -217,7 +215,7 @@ pub fn execute_vm_interp(syscall_context: SyscallContext) -> Option<SyscallEffec
         .unwrap();
     let (_aligned_memory, input_memory_regions, acc_metadatas) = serialize_parameters(
         &caller_instr_ctx,
-        false,
+        stricter_abi_and_runtime_constraints,
         direct_mapping,
         mask_out_rent_epoch_in_vm_serialization,
     )
@@ -315,7 +313,7 @@ pub fn execute_vm_interp(syscall_context: SyscallContext) -> Option<SyscallEffec
         sbpf_version,
         invoke_ctx
             .transaction_context
-            .access_violation_handler(false, direct_mapping),
+            .access_violation_handler(stricter_abi_and_runtime_constraints, direct_mapping),
     ) else {
         return None;
     };

src/vm_syscalls.rs

@@ -4,7 +4,7 @@ use crate::{
     utils::vm::mem_regions,
     utils::vm::HEAP_MAX,
     utils::vm::STACK_SIZE,
-    InstrContext, TOGGLE_DIRECT_MAPPING,
+    InstrContext,
 };
 use prost::Message;
 use solana_compute_budget::compute_budget::SVMTransactionExecutionCost;
@@ -149,12 +149,10 @@ pub fn execute_vm_syscall(input: SyscallContext) -> Option<SyscallEffects> {
         // TransactionContext::configure_next_instruction_for_tests() crashes if program_idx > 255
         return None;
     }
-    let mut direct_mapping = false;
-    unsafe {
-        if TOGGLE_DIRECT_MAPPING {
-            direct_mapping = !direct_mapping;
-        }
-    };
+    let direct_mapping = invoke_ctx.get_feature_set().account_data_direct_mapping;
+    let stricter_abi_and_runtime_constraints = invoke_ctx
+        .get_feature_set()
+        .stricter_abi_and_runtime_constraints;
     let mask_out_rent_epoch_in_vm_serialization = invoke_ctx
         .get_feature_set()
         .mask_out_rent_epoch_in_vm_serialization;
@@ -183,9 +181,18 @@ pub fn execute_vm_syscall(input: SyscallContext) -> Option<SyscallEffects> {
         .transaction_context
         .get_current_instruction_context()
         .unwrap();
+    // Memory regions.
+    // In Agave all memory regions are AlignedMemory::<HOST_ALIGN> == AlignedMemory::<16>,
+    // i.e. they're all 16-byte aligned in the host.
+    // The memory regions are:
+    //   1. program rodata
+    //   2. stack
+    //   3. heap
+    //   4. input data aka accounts
+    // The stack gap size is 0 iff direct mapping is enabled.
     let (_aligned_memory, input_memory_regions, acc_metadatas) = serialize_parameters(
         &caller_instr_ctx,
-        false,
+        stricter_abi_and_runtime_constraints,
         direct_mapping,
         mask_out_rent_epoch_in_vm_serialization,
     )
@@ -209,24 +216,6 @@ pub fn execute_vm_syscall(input: SyscallContext) -> Option<SyscallEffects> {
         return None;
     }
 
-    // Memory regions.
-    // In Agave all memory regions are AlignedMemory::<HOST_ALIGN> == AlignedMemory::<16>,
-    // i.e. they're all 16-byte aligned in the host.
-    // The memory regions are:
-    //   1. program rodata
-    //   2. stack
-    //   3. heap
-    //   4. input data aka accounts
-    // The stack gap is size is 0 iff direct mapping is enabled.
-    // There's some extra quirks:
-    //   - heap size is MIN_HEAP_FRAME_BYTES..=MAX_HEAP_FRAME_BYTES
-    //   - input data (at least when direct mapping is off) is 1 single map of all
-    //     serialized accounts (and each account is serialized to a multiple of 16 bytes)
-    // In this implementation, however:
-    //   - heap can be smaller than MIN_HEAP_FRAME_BYTES
-    //   - input data is made of multiple regions, and regions don't necessarily have
-    //     length multiple of 16, i.e. virtual addresses may be unaligned
-    // These differences allow us to test more edge cases.
     let mut invoke_ctx = invoke_context.borrow_mut();
     let config = invoke_ctx
         .program_cache_for_tx_batch
@@ -286,7 +275,7 @@ pub fn execute_vm_syscall(input: SyscallContext) -> Option<SyscallEffects> {
         sbpf_version,
         invoke_ctx
             .transaction_context
-            .access_violation_handler(false, direct_mapping),
+            .access_violation_handler(stricter_abi_and_runtime_constraints, direct_mapping),
     ) else {
         cleanup_static_ptrs(
             transaction_context_ptr,
@@ -301,7 +290,7 @@ pub fn execute_vm_syscall(input: SyscallContext) -> Option<SyscallEffects> {
     invoke_ctx
         .set_syscall_context(solana_program_runtime::invoke_context::SyscallContext {
             allocator: solana_program_runtime::invoke_context::BpfAllocator::new(vm_ctx.heap_max),
-            accounts_metadata: acc_metadatas, // TODO: accounts metadata for direct mapping support
+            accounts_metadata: acc_metadatas,
             trace_log: Vec::new(),
         })
         .unwrap();