Add adjustable stack size and call depth (#12728)

programs/bpf/Cargo.lock

@@ -1798,6 +1798,13 @@ dependencies = [
  "solana-sdk",
 ]
 
+[[package]]
+name = "solana-bpf-rust-call-depth"
+version = "1.4.0"
+dependencies = [
+ "solana-sdk",
+]
+
 [[package]]
 name = "solana-bpf-rust-custom-heap"
 version = "1.5.0"
@@ -2191,9 +2198,9 @@ dependencies = [
 
 [[package]]
 name = "solana_rbpf"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "962f8f04ac7239fe4dd45fa4ce706ec78b59a0da9f41def463832857e36c60b0"
+checksum = "9a95dbe2b00920ac4e1524b7442cf5319f01e8fa5742930ac60148882fd7738b"
 dependencies = [
  "byteorder 1.3.4",
  "combine",

programs/bpf/Cargo.toml

@@ -27,7 +27,7 @@ solana-logger = { path = "../../logger", version = "1.5.0" }
 solana-measure = { path = "../../measure", version = "1.5.0" }
 solana-runtime = { path = "../../runtime", version = "1.5.0" }
 solana-sdk = { path = "../../sdk", version = "1.5.0" }
-solana_rbpf = "=0.1.31"
+solana_rbpf = "=0.1.32"
 
 [[bench]]
 name = "bpf_loader"
@@ -57,6 +57,7 @@ members = [
     "rust/ristretto",
     "rust/sanity",
     "rust/sha256",
+    "rust/call_depth",
     "rust/sysval",
 ]
 

programs/bpf/build.rs

@@ -85,6 +85,7 @@ fn main() {
             "ristretto",
             "sanity",
             "sha256",
+            "call_depth",
             "sysval",
         ];
         for program in rust_programs.iter() {

programs/bpf/rust/call_depth/Cargo.toml

@@ -0,0 +1,26 @@
+
+# Note: This crate must be built using do.sh
+
+[package]
+name = "solana-bpf-rust-call-depth"
+version = "1.4.0"
+description = "Solana BPF test program written in Rust"
+authors = ["Solana Maintainers <maintainers@solana.foundation>"]
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+homepage = "https://solana.com/"
+edition = "2018"
+
+[dependencies]
+solana-sdk = { path = "../../../../sdk/", version = "1.4.0", default-features = false }
+
+[features]
+program = ["solana-sdk/program"]
+default = ["program", "solana-sdk/default"]
+
+[lib]
+name = "solana_bpf_rust_call_depth"
+crate-type = ["cdylib"]
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]

programs/bpf/rust/call_depth/Xargo.toml

@@ -0,0 +1,2 @@
+[target.bpfel-unknown-unknown.dependencies.std]
+features = []

programs/bpf/rust/call_depth/src/lib.rs

@@ -0,0 +1,27 @@
+//! @brief Example Rust-based BPF program that tests call depth and stack usage
+
+use solana_sdk::{entrypoint::SUCCESS, info};
+
+#[inline(never)]
+pub fn recurse(data: &mut [u8]) {
+    if data.len() <= 1 {
+        return;
+    }
+    recurse(&mut data[1..]);
+    info!(line!(), 0, 0, 0, data[0]);
+}
+
+/// # Safety
+#[inline(never)]
+#[no_mangle]
+pub unsafe extern "C" fn entrypoint(input: *mut u8) -> u64 {
+    info!("Call depth");
+    let depth = *(input.add(16) as *mut u8);
+    info!(line!(), 0, 0, 0, depth);
+    let mut data = Vec::with_capacity(depth as usize);
+    for i in 0_u8..depth {
+        data.push(i);
+    }
+    recurse(&mut data);
+    SUCCESS
+}

programs/bpf/tests/programs.rs

@@ -643,6 +643,43 @@ fn test_program_bpf_invoke() {
     }
 }
 
+#[cfg(feature = "bpf_rust")]
+#[test]
+fn test_program_bpf_call_depth() {
+    solana_logger::setup();
+
+    println!("Test program: solana_bpf_rust_call_depth");
+
+    let GenesisConfigInfo {
+        genesis_config,
+        mint_keypair,
+        ..
+    } = create_genesis_config(50);
+    let mut bank = Bank::new(&genesis_config);
+    let (name, id, entrypoint) = solana_bpf_loader_program!();
+    bank.add_builtin_loader(&name, id, entrypoint);
+    let bank_client = BankClient::new(bank);
+    let program_id = load_bpf_program(
+        &bank_client,
+        &bpf_loader::id(),
+        &mint_keypair,
+        "solana_bpf_rust_call_depth",
+    );
+
+    let instruction = Instruction::new(
+        program_id,
+        &(ComputeBudget::default().max_call_depth - 1),
+        vec![],
+    );
+    let result = bank_client.send_and_confirm_instruction(&mint_keypair, instruction);
+    assert!(result.is_ok());
+
+    let instruction =
+        Instruction::new(program_id, &ComputeBudget::default().max_call_depth, vec![]);
+    let result = bank_client.send_and_confirm_instruction(&mint_keypair, instruction);
+    assert!(result.is_err());
+}
+
 #[test]
 fn assert_instruction_count() {
     solana_logger::setup();