From 8d5c04e25704df0788d7a9808fd9d7594cd3ca8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Mei=C3=9Fner?= Date: Wed, 7 Jul 2021 09:50:11 +0200 Subject: [PATCH] Bump solana_rbpf to version 0.2.13 (#18068) * Moves syscall_registry into the rbpf Executable constructor. * Adds the reject_unresolved_syscalls flag which is only set when deploying programs via the CLI. --- Cargo.lock | 8 ++-- cli/Cargo.toml | 2 +- cli/src/program.rs | 10 ++++- cli/tests/fixtures/noop.so | Bin 4440 -> 1592 bytes programs/bpf/Cargo.lock | 8 ++-- programs/bpf/Cargo.toml | 2 +- programs/bpf/benches/bpf_loader.rs | 25 +++++++---- programs/bpf/tests/programs.rs | 14 +++--- programs/bpf_loader/Cargo.toml | 2 +- programs/bpf_loader/src/lib.rs | 14 ++++-- programs/bpf_loader/src/syscalls.rs | 65 +++++++++++++++------------- rbpf-cli/Cargo.toml | 2 +- rbpf-cli/src/main.rs | 12 +++-- 13 files changed, 98 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c18c0bd303..dbfb8eee8d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1661,9 +1661,9 @@ dependencies = [ [[package]] name = "goblin" -version = "0.3.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c69552f48b18aa6102ce0c82dd9bc9d3f8af5fc0a5797069b1b466b90570e39c" +checksum = "0b1800b95efee8ad4ef04517d4d69f8e209e763b1668f1179aeeedd0e454da55" dependencies = [ "log 0.4.14", "plain", @@ -5802,9 +5802,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44596a3613a44f76a7f6e5205464a1e78d1529fa19e8eacde0b9e55a6387f50" +checksum = "fc1dced9892c2b0273318ef4d8486112ea7c7a7b8eb563a20e7858ad921b4719" dependencies = [ "byteorder", "combine", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index d1e33f4acc..83204aee52 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -38,7 +38,7 @@ solana-config-program = { path = "../programs/config", version = "=1.8.0" } solana-faucet = { path = "../faucet", version = "=1.8.0" } solana-logger = { path = "../logger", version = "=1.8.0" } solana-net-utils = { path = "../net-utils", version = "=1.8.0" } -solana_rbpf = "=0.2.12" +solana_rbpf = "=0.2.13" solana-remote-wallet = { path = "../remote-wallet", version = "=1.8.0" } solana-sdk = { path = "../sdk", version = "=1.8.0" } solana-transaction-status = { path = "../transaction-status", version = "=1.8.0" } diff --git a/cli/src/program.rs b/cli/src/program.rs index 51201028a4..8e5f1b77bc 100644 --- a/cli/src/program.rs +++ b/cli/src/program.rs @@ -9,7 +9,7 @@ use bip39::{Language, Mnemonic, MnemonicType, Seed}; use clap::{App, AppSettings, Arg, ArgMatches, SubCommand}; use log::*; use solana_account_decoder::{UiAccountEncoding, UiDataSliceConfig}; -use solana_bpf_loader_program::{BpfError, ThisInstructionMeter}; +use solana_bpf_loader_program::{syscalls::register_syscalls, BpfError, ThisInstructionMeter}; use solana_clap_utils::{self, input_parsers::*, input_validators::*, keypair::*}; use solana_cli_output::{ display::new_spinner_progress_bar, CliProgram, CliProgramAccountType, CliProgramAuthority, @@ -42,6 +42,7 @@ use solana_sdk::{ loader_instruction, message::Message, native_token::Sol, + process_instruction::MockInvokeContext, pubkey::Pubkey, signature::{keypair_from_seed, read_keypair_file, Keypair, Signer}, signers::Signers, @@ -1785,12 +1786,17 @@ fn read_and_verify_elf(program_location: &str) -> Result, Box>::from_elf( &program_data, Some(|x| verifier::check(x)), - Config::default(), + Config { + reject_unresolved_syscalls: true, + ..Config::default() + }, + register_syscalls(&mut invoke_context).unwrap(), ) .map_err(|err| format!("ELF error: {}", err))?; diff --git a/cli/tests/fixtures/noop.so b/cli/tests/fixtures/noop.so index 17ea5290910bc7499fc260f32dd7c6554e8fa850..502681cf6e5f1b97b72def214afaaf144a2d1fb4 100755 GIT binary patch literal 1592 zcmb_c!EVz)5S_YBMJW=93KTe?R2&G0I*F4url+p%@M{t{Uostl-kmb$vhN9 zTjY|(-(_0LwI$yAs@p~Uq&$$W8Ny;%#Zr$zP_}XGRcbuH^F$b(&_A08jfAJ8# zKsOvU!$X%rdl-xT* R{`pQly}*A@{qO$8{}-1gbtwP< literal 4440 zcmb_fK}=j_5dOEc(poDOMUkZX;t8Adu^?=B@dCA)qT7m1No=Bl$G*qz3i}@HJ_0Xm zq8v1h@qmdY#FHGXc&x%b9?GBWn}5EU`Dgx_ zdH?_RlQ*+(9ZMvXj5hVRLaxEU2-EJTc>-iarBxd|Q{_XJ>~Z_+Ik!Vs#?5|2KP z!*AmW;!V0quo5bE#{fr@sdiE@>8&=xg`Ol<)t{$HH#q*CeIoK1#B%^6%8|Ursi^ie z4iG^ep=!^L<|o=P0>Y6BUN0c0R696CpOHhJyV{=Bcn!?-I_GKKiG;Zh;dMu=t9DRM z!nE3RPy3DIn8Iq$eT_#>S{t;(oTDg^i%(upNQY+ zHrHvL^4yiUssoEQs6KhF!;;kFThhZg{(7u9sGlSbTq(uCGOznB{6y>2$I&C| zCV7m<{cFqhIDfD&tmj>((QWEudEZK%r**!ien++657&0}dx3dvZ_!6he+%0Ek@ao# zBlSl+_j9yP{U&{O?nMX)#tHRvGrnw#_@W=^z0QNo0{uG2DS4FqMH`!Xol@r+TvpY% z7E5BcqG8qH5Pjr(>5`t*7tbw>_*@>J821D1uLg5OzCjSijbd)rDtN_wAskj0tZR#< zX|HSrGuAs^(O6~q zlgz)&l&?YNlzOmF>)&C0KAzQ<7&bK@K6whncrTgbIRIMWxZO^uaDxq+-v^M+ax@T>g#1h!S{$#E5Gbt-vNq)x1-X0{|JA};P(vvEZ|agCFOFiT-y6Kf(nO`F(@e8-aK+-MFVK9FOp827i+Mi`+8!4TIk^_$iK0?C%)- zIL9aQ9fSWg77tGE8~pn*e_C$v>6ky1uNi!A%%7GU{4$?E7$3^f9DnQvW|T)g;Rotv zi~cOUqgFP1*-G0chK0pxI~SDtpyM3hxiIHUSNi7WTpL8z^iVpJ zax-q~wSI3pGn8~Q{ex~gnaO0lWGa;#n3?fXGXn$et8thAn`3Q{t3UPG78hb)Bw#0U zM&tW}gU*G7T8(cE@E$FN)i`gOg~uz5OMeM|p79aRo8SYC?-=V0i$3RF^e-_!W#Df! zeg!ue8}I3PLaiBoZ!*4W=ua`Oi>l}J$TPlyMU0Ivael0=`9DBJK1^DjD-qzW&Y_h< zaAk+ya;WTbK$nRd`A(^rQ#MR0QHf|+R(9TBv`N)@xvPbE0alnv^kGYzx= zR|(CCD!iQFUb3?`NbLTk%3ivZoNUs5<_DM#GQG$&%``)l)dtvXh|m;~i|XMA>*VE| z*G8|7y&-vgT#DtzpOnAB3kuyb`bf@4@r$1SH=KzHHp7yCPG zFVrHl<}o1t8P<8jzhYv)%?d*0dqZA-v6ub74z`#Zv6t@wp}p)#>`gifa@>::from_elf(&elf, None, Config::default()) - .unwrap(); - executable.set_syscall_registry(register_syscalls(&mut invoke_context).unwrap()); + let mut executable = >::from_elf( + &elf, + None, + Config::default(), + register_syscalls(&mut invoke_context).unwrap(), + ) + .unwrap(); executable.jit_compile().unwrap(); let compute_meter = invoke_context.get_compute_meter(); let mut instruction_meter = ThisInstructionMeter { compute_meter }; @@ -225,10 +229,13 @@ fn bench_instruction_count_tuner(_bencher: &mut Bencher) { .unwrap(); let elf = load_elf("tuner").unwrap(); - let mut executable = - >::from_elf(&elf, None, Config::default()) - .unwrap(); - executable.set_syscall_registry(register_syscalls(&mut invoke_context).unwrap()); + let executable = >::from_elf( + &elf, + None, + Config::default(), + register_syscalls(&mut invoke_context).unwrap(), + ) + .unwrap(); let compute_meter = invoke_context.get_compute_meter(); let mut instruction_meter = ThisInstructionMeter { compute_meter }; let mut vm = create_vm( diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs index 6e7909d077..537847fc45 100644 --- a/programs/bpf/tests/programs.rs +++ b/programs/bpf/tests/programs.rs @@ -210,14 +210,16 @@ fn run_program( let mut instruction_meter = ThisInstructionMeter { compute_meter }; let config = Config { - max_call_depth: 20, - stack_frame_size: 4096, - enable_instruction_meter: true, enable_instruction_tracing: true, + ..Config::default() }; - let mut executable = - >::from_elf(&data, None, config).unwrap(); - executable.set_syscall_registry(register_syscalls(&mut invoke_context).unwrap()); + let mut executable = >::from_elf( + &data, + None, + config, + register_syscalls(&mut invoke_context).unwrap(), + ) + .unwrap(); executable.jit_compile().unwrap(); let mut instruction_count = 0; diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml index 66f3a18026..69d0b0ce08 100644 --- a/programs/bpf_loader/Cargo.toml +++ b/programs/bpf_loader/Cargo.toml @@ -23,7 +23,7 @@ sha3 = "0.9.1" solana-measure = { path = "../../measure", version = "=1.8.0" } solana-runtime = { path = "../../runtime", version = "=1.8.0" } solana-sdk = { path = "../../sdk", version = "=1.8.0" } -solana_rbpf = "=0.2.12" +solana_rbpf = "=0.2.13" thiserror = "1.0" [dev-dependencies] diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs index 1cbeed0573..6b3d91e9e8 100644 --- a/programs/bpf_loader/src/lib.rs +++ b/programs/bpf_loader/src/lib.rs @@ -82,15 +82,20 @@ pub fn create_executor( let config = Config { max_call_depth: bpf_compute_budget.max_call_depth, stack_frame_size: bpf_compute_budget.stack_frame_size, - enable_instruction_meter: true, enable_instruction_tracing: log_enabled!(Trace), + ..Config::default() }; let mut executable = { let keyed_accounts = invoke_context.get_keyed_accounts()?; let program = keyed_account_at_index(keyed_accounts, program_account_index)?; let account = program.try_account_ref()?; let data = &account.data()[program_data_offset..]; - >::from_elf(data, None, config) + >::from_elf( + data, + None, + config, + syscall_registry, + ) } .map_err(|e| map_ebpf_error(invoke_context, e))?; let (_, elf_bytes) = executable @@ -98,7 +103,6 @@ pub fn create_executor( .map_err(|e| map_ebpf_error(invoke_context, e))?; verifier::check(elf_bytes) .map_err(|e| map_ebpf_error(invoke_context, EbpfError::UserError(e.into())))?; - executable.set_syscall_registry(syscall_registry); if use_jit { if let Err(err) = executable.jit_compile() { ic_msg!(invoke_context, "Failed to compile program {:?}", err); @@ -853,6 +857,7 @@ impl Executor for BpfExecutor { mod tests { use super::*; use rand::Rng; + use solana_rbpf::vm::SyscallRegistry; use solana_runtime::{bank::Bank, bank_client::BankClient}; use solana_sdk::{ account::{ @@ -905,9 +910,10 @@ mod tests { solana_rbpf::elf::register_bpf_function(&mut bpf_functions, 0, "entrypoint").unwrap(); let program = >::from_text_bytes( program, - bpf_functions, None, Config::default(), + SyscallRegistry::default(), + bpf_functions, ) .unwrap(); let mut vm = diff --git a/programs/bpf_loader/src/syscalls.rs b/programs/bpf_loader/src/syscalls.rs index fde574c5cb..2b56ae30eb 100644 --- a/programs/bpf_loader/src/syscalls.rs +++ b/programs/bpf_loader/src/syscalls.rs @@ -2375,13 +2375,6 @@ mod tests { }; use std::str::FromStr; - const DEFAULT_CONFIG: Config = Config { - max_call_depth: 20, - stack_frame_size: 4_096, - enable_instruction_meter: true, - enable_instruction_tracing: false, - }; - macro_rules! assert_access_violation { ($result:expr, $va:expr, $len:expr) => { match $result { @@ -2397,9 +2390,10 @@ mod tests { const LENGTH: u64 = 1000; let data = vec![0u8; LENGTH as usize]; let addr = data.as_ptr() as u64; + let config = Config::default(); let memory_mapping = MemoryMapping::new::( vec![MemoryRegion::new_from_slice(&data, START, 0, false)], - &DEFAULT_CONFIG, + &config, ) .unwrap(); @@ -2436,6 +2430,7 @@ mod tests { // Pubkey let pubkey = solana_sdk::pubkey::new_rand(); let addr = &pubkey as *const _ as u64; + let config = Config::default(); let memory_mapping = MemoryMapping::new::( vec![MemoryRegion { host_addr: addr, @@ -2444,7 +2439,7 @@ mod tests { vm_gap_shift: 63, is_writable: false, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); let translated_pubkey = @@ -2466,7 +2461,7 @@ mod tests { vm_gap_shift: 63, is_writable: false, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); let translated_instruction = @@ -2485,6 +2480,7 @@ mod tests { let data: Vec = vec![]; assert_eq!(0x1 as *const u8, data.as_ptr()); let addr = good_data.as_ptr() as *const _ as u64; + let config = Config::default(); let memory_mapping = MemoryMapping::new::( vec![MemoryRegion { host_addr: addr, @@ -2493,7 +2489,7 @@ mod tests { vm_gap_shift: 63, is_writable: false, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); let translated_data = translate_slice::( @@ -2518,7 +2514,7 @@ mod tests { vm_gap_shift: 63, is_writable: false, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); let translated_data = translate_slice::( @@ -2561,7 +2557,7 @@ mod tests { vm_gap_shift: 63, is_writable: false, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); let translated_data = translate_slice::( @@ -2591,7 +2587,7 @@ mod tests { vm_gap_shift: 63, is_writable: false, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); let translated_data = translate_slice::( @@ -2611,6 +2607,7 @@ mod tests { fn test_translate_string_and_do() { let string = "Gaggablaghblagh!"; let addr = string.as_ptr() as *const _ as u64; + let config = Config::default(); let memory_mapping = MemoryMapping::new::( vec![MemoryRegion { host_addr: addr, @@ -2619,7 +2616,7 @@ mod tests { vm_gap_shift: 63, is_writable: false, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); assert_eq!( @@ -2642,9 +2639,9 @@ mod tests { #[test] #[should_panic(expected = "UserError(SyscallError(Abort))")] fn test_syscall_abort() { + let config = Config::default(); let memory_mapping = - MemoryMapping::new::(vec![MemoryRegion::default()], &DEFAULT_CONFIG) - .unwrap(); + MemoryMapping::new::(vec![MemoryRegion::default()], &config).unwrap(); let mut result: Result> = Ok(0); SyscallAbort::call( &mut SyscallAbort {}, @@ -2664,6 +2661,7 @@ mod tests { fn test_syscall_sol_panic() { let string = "Gaggablaghblagh!"; let addr = string.as_ptr() as *const _ as u64; + let config = Config::default(); let memory_mapping = MemoryMapping::new::( vec![MemoryRegion { host_addr: addr, @@ -2672,7 +2670,7 @@ mod tests { vm_gap_shift: 63, is_writable: false, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); @@ -2740,6 +2738,7 @@ mod tests { loader_id: &bpf_loader::id(), enforce_aligned_host_addrs: true, }; + let config = Config::default(); let memory_mapping = MemoryMapping::new::( vec![MemoryRegion { host_addr: addr, @@ -2748,7 +2747,7 @@ mod tests { vm_gap_shift: 63, is_writable: false, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); @@ -2853,7 +2852,8 @@ mod tests { compute_meter, logger, }; - let memory_mapping = MemoryMapping::new::(vec![], &DEFAULT_CONFIG).unwrap(); + let config = Config::default(); + let memory_mapping = MemoryMapping::new::(vec![], &config).unwrap(); let mut result: Result> = Ok(0); syscall_sol_log_u64.call(1, 2, 3, 4, 5, &memory_mapping, &mut result); @@ -2880,6 +2880,7 @@ mod tests { loader_id: &bpf_loader::id(), enforce_aligned_host_addrs: true, }; + let config = Config::default(); let memory_mapping = MemoryMapping::new::( vec![MemoryRegion { host_addr: addr, @@ -2888,7 +2889,7 @@ mod tests { vm_gap_shift: 63, is_writable: false, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); @@ -2923,6 +2924,7 @@ mod tests { #[test] fn test_syscall_sol_alloc_free() { + let config = Config::default(); // large alloc { let heap = AlignedMemory::new_with_size(100, HOST_ALIGN); @@ -2933,7 +2935,7 @@ mod tests { 0, true, )], - &DEFAULT_CONFIG, + &config, ) .unwrap(); let mut syscall = SyscallAllocFree { @@ -2960,7 +2962,7 @@ mod tests { 0, true, )], - &DEFAULT_CONFIG, + &config, ) .unwrap(); let mut syscall = SyscallAllocFree { @@ -2986,7 +2988,7 @@ mod tests { 0, true, )], - &DEFAULT_CONFIG, + &config, ) .unwrap(); let mut syscall = SyscallAllocFree { @@ -3006,6 +3008,7 @@ mod tests { fn check_alignment() { let heap = AlignedMemory::new_with_size(100, HOST_ALIGN); + let config = Config::default(); let memory_mapping = MemoryMapping::new::( vec![MemoryRegion::new_from_slice( heap.as_slice(), @@ -3013,7 +3016,7 @@ mod tests { 0, true, )], - &DEFAULT_CONFIG, + &config, ) .unwrap(); let mut syscall = SyscallAllocFree { @@ -3064,6 +3067,7 @@ mod tests { let ro_len = bytes_to_hash.len() as u64; let ro_va = 96; let rw_va = 192; + let config = Config::default(); let memory_mapping = MemoryMapping::new::( vec![ MemoryRegion { @@ -3095,7 +3099,7 @@ mod tests { is_writable: true, }, ], - &DEFAULT_CONFIG, + &config, ) .unwrap(); let compute_meter: Rc> = @@ -3161,6 +3165,7 @@ mod tests { #[test] fn test_syscall_get_sysvar() { + let config = Config::default(); // Test clock sysvar { let got_clock = Clock::default(); @@ -3174,7 +3179,7 @@ mod tests { vm_gap_shift: 63, is_writable: true, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); @@ -3216,7 +3221,7 @@ mod tests { vm_gap_shift: 63, is_writable: true, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); @@ -3266,7 +3271,7 @@ mod tests { vm_gap_shift: 63, is_writable: true, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); @@ -3306,7 +3311,7 @@ mod tests { vm_gap_shift: 63, is_writable: true, }], - &DEFAULT_CONFIG, + &config, ) .unwrap(); diff --git a/rbpf-cli/Cargo.toml b/rbpf-cli/Cargo.toml index 355fc8a829..09a6895ac3 100644 --- a/rbpf-cli/Cargo.toml +++ b/rbpf-cli/Cargo.toml @@ -15,4 +15,4 @@ serde_json = "1.0.64" solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.8.0" } solana-logger = { path = "../logger", version = "=1.8.0" } solana-sdk = { path = "../sdk", version = "=1.8.0" } -solana_rbpf = "=0.2.12" +solana_rbpf = "=0.2.13" diff --git a/rbpf-cli/src/main.rs b/rbpf-cli/src/main.rs index 0a98d59663..39ba349bdd 100644 --- a/rbpf-cli/src/main.rs +++ b/rbpf-cli/src/main.rs @@ -185,14 +185,21 @@ native machine code before execting it in the virtual machine.", file.seek(SeekFrom::Start(0)).unwrap(); let mut contents = Vec::new(); file.read_to_end(&mut contents).unwrap(); + let syscall_registry = register_syscalls(&mut invoke_context).unwrap(); let mut executable = if magic == [0x7f, 0x45, 0x4c, 0x46] { - >::from_elf(&contents, None, config) - .map_err(|err| format!("Executable constructor failed: {:?}", err)) + >::from_elf( + &contents, + None, + config, + syscall_registry, + ) + .map_err(|err| format!("Executable constructor failed: {:?}", err)) } else { assemble::( std::str::from_utf8(contents.as_slice()).unwrap(), None, config, + syscall_registry, ) } .unwrap(); @@ -201,7 +208,6 @@ native machine code before execting it in the virtual machine.", let (_, elf_bytes) = executable.get_text_bytes().unwrap(); check(elf_bytes).unwrap(); } - executable.set_syscall_registry(register_syscalls(&mut invoke_context).unwrap()); executable.jit_compile().unwrap(); let analysis = Analysis::from_executable(executable.as_ref());