Add BPF-to-BPF and PC relative call tests (#2395)

solana-labs · Jan 12, 2019 · e9a0b3a · e9a0b3a
1 parent 1724430
commit e9a0b3a
Show file tree

Hide file tree

Showing 9 changed files with 226 additions and 162 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/...rams/bpf/c/src/multiple_file/entrypoint.c → programs/bpf/c/src/bpf_to_bpf/entrypoint.c b/...rams/bpf/c/src/multiple_file/entrypoint.c → programs/bpf/c/src/bpf_to_bpf/entrypoint.c
diff --git a/programs/bpf/c/src/multiple_file/helper.c → programs/bpf/c/src/bpf_to_bpf/helper.c b/programs/bpf/c/src/multiple_file/helper.c → programs/bpf/c/src/bpf_to_bpf/helper.c
diff --git a/programs/bpf/c/src/multiple_file/helper.h → programs/bpf/c/src/bpf_to_bpf/helper.h b/programs/bpf/c/src/multiple_file/helper.h → programs/bpf/c/src/bpf_to_bpf/helper.h
diff --git a/programs/bpf/c/src/relative_call/relative_call.c b/programs/bpf/c/src/relative_call/relative_call.c
@@ -0,0 +1,16 @@
+/**
+ * @brief test program that generates BPF PC relative call instructions
+ */
+
+#include <solana_sdk.h>
+
+void __attribute__ ((noinline)) helper() {
+  sol_log(__func__);
+}
+
+extern bool entrypoint(const uint8_t *input) {
+  sol_log(__func__);
+  helper();
+  return true;
+}
+
diff --git a/programs/bpf/c/test/bench_alu.c b/programs/bpf/c/test/bench_alu.c
diff --git a/programs/native/bpf_loader/Cargo.toml b/programs/native/bpf_loader/Cargo.toml
@@ -18,7 +18,7 @@ byteorder = "1.2.1"
 elf = "0.0.10"
 libc = "0.2.46"
 log = "0.4.2"
-solana_rbpf = "=0.1.6"
+solana_rbpf = "=0.1.8"
 serde = "1.0.84"
 solana-logger = { path = "../../../logger", version = "0.12.0" }
 solana-sdk = { path = "../../../sdk", version = "0.12.0" }

diff --git a/programs/native/bpf_loader/src/lib.rs b/programs/native/bpf_loader/src/lib.rs
@@ -3,7 +3,7 @@ pub mod bpf_verifier;
 use byteorder::{ByteOrder, LittleEndian, WriteBytesExt};
 use libc::c_char;
 use log::*;
-use solana_rbpf::EbpfVmRaw;
+use solana_rbpf::{EbpfVmRaw, RegionPtrs};
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::loader_instruction::LoaderInstruction;
 use solana_sdk::native_program::ProgramError;
@@ -36,15 +36,13 @@ pub fn helper_sol_log_verify(
     unused3: u64,
     unused4: u64,
     unused5: u64,
-    ro_regions: &[&[u8]],
-    unused7: &[&[u8]],
+    ro_regions: &[RegionPtrs],
+    unused7: &[RegionPtrs],
 ) -> Result<(()), Error> {
     for region in ro_regions.iter() {
-        if region.as_ptr() as u64 <= addr
-            && addr as u64 <= region.as_ptr() as u64 + region.len() as u64
-        {
+        if region.bot <= addr && addr as u64 <= region.top {
             let c_buf: *const c_char = addr as *const c_char;
-            let max_size = (region.as_ptr() as u64 + region.len() as u64) - addr;
+            let max_size = region.top - addr;
             unsafe {
                 for i in 0..max_size {
                     if std::ptr::read(c_buf.offset(i as isize)) == 0 {

diff --git a/tests/programs.rs b/tests/programs.rs
@@ -300,9 +300,11 @@ fn test_program_bpf_c() {
     solana_logger::setup();
 
     let programs = [
+        "bpf_to_bpf",
         "multiple_static",
         "noop",
         "noop++",
+        "relative_call",
         "struct_pass",
         "struct_ret",
     ];