Refactor sigverify to stage for signing shreds on the GPU (#6635)
automerge
This commit is contained in:
committed by
Grimes
parent
ec50c20400
commit
67f636545a
@ -11,10 +11,23 @@ edition = "2018"
|
||||
[dependencies]
|
||||
rand = "0.6.5"
|
||||
dlopen = "0.1.8"
|
||||
bincode = "1.2.0"
|
||||
rayon = "1.2.0"
|
||||
serde = "1.0.102"
|
||||
serde_derive = "1.0.102"
|
||||
dlopen_derive = "0.1.4"
|
||||
log = "0.4.8"
|
||||
solana-sdk = { path = "../sdk", version = "0.21.0" }
|
||||
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.21.0" }
|
||||
solana-budget-api = { path = "../programs/budget_api", version = "0.21.0" }
|
||||
solana-logger = { path = "../logger", version = "0.21.0" }
|
||||
solana-metrics = { path = "../metrics", version = "0.21.0" }
|
||||
|
||||
[lib]
|
||||
name = "solana_perf"
|
||||
|
||||
[dev-dependencies]
|
||||
matches = "0.1.6"
|
||||
|
||||
[[bench]]
|
||||
name = "sigverify"
|
||||
|
44
perf/benches/sigverify.rs
Normal file
44
perf/benches/sigverify.rs
Normal file
@ -0,0 +1,44 @@
|
||||
#![feature(test)]
|
||||
|
||||
extern crate test;
|
||||
|
||||
use solana_perf::packet::to_packets;
|
||||
use solana_perf::recycler::Recycler;
|
||||
use solana_perf::sigverify;
|
||||
use solana_perf::test_tx::test_tx;
|
||||
use test::Bencher;
|
||||
|
||||
#[bench]
|
||||
fn bench_sigverify(bencher: &mut Bencher) {
|
||||
let tx = test_tx();
|
||||
|
||||
// generate packet vector
|
||||
let batches = to_packets(&vec![tx; 128]);
|
||||
|
||||
let recycler = Recycler::default();
|
||||
let recycler_out = Recycler::default();
|
||||
// verify packets
|
||||
bencher.iter(|| {
|
||||
let _ans = sigverify::ed25519_verify(&batches, &recycler, &recycler_out);
|
||||
})
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_get_offsets(bencher: &mut Bencher) {
|
||||
let tx = test_tx();
|
||||
|
||||
// generate packet vector
|
||||
let batches = to_packets(&vec![tx; 1024]);
|
||||
|
||||
let recycler = Recycler::default();
|
||||
// verify packets
|
||||
bencher.iter(|| {
|
||||
let ans = sigverify::generate_offsets(&batches, &recycler);
|
||||
assert!(ans.is_ok());
|
||||
let ans = ans.unwrap();
|
||||
recycler.recycle(ans.0);
|
||||
recycler.recycle(ans.1);
|
||||
recycler.recycle(ans.2);
|
||||
recycler.recycle(ans.3);
|
||||
})
|
||||
}
|
@ -1,6 +1,16 @@
|
||||
pub mod cuda_runtime;
|
||||
pub mod packet;
|
||||
pub mod perf_libs;
|
||||
pub mod recycler;
|
||||
pub mod sigverify;
|
||||
pub mod test_tx;
|
||||
|
||||
#[macro_use]
|
||||
extern crate log;
|
||||
|
||||
#[cfg(test)]
|
||||
#[macro_use]
|
||||
extern crate matches;
|
||||
|
||||
#[macro_use]
|
||||
extern crate solana_metrics;
|
||||
|
139
perf/src/packet.rs
Normal file
139
perf/src/packet.rs
Normal file
@ -0,0 +1,139 @@
|
||||
//! The `packet` module defines data structures and methods to pull data from the network.
|
||||
use crate::{
|
||||
cuda_runtime::PinnedVec,
|
||||
recycler::{Recycler, Reset},
|
||||
};
|
||||
use serde::Serialize;
|
||||
pub use solana_sdk::packet::{Meta, Packet, PACKET_DATA_SIZE};
|
||||
use std::{io, mem, net::SocketAddr};
|
||||
|
||||
pub const NUM_PACKETS: usize = 1024 * 8;
|
||||
|
||||
pub const PACKETS_PER_BATCH: usize = 256;
|
||||
pub const NUM_RCVMMSGS: usize = 128;
|
||||
pub const PACKETS_BATCH_SIZE: usize = (PACKETS_PER_BATCH * PACKET_DATA_SIZE);
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Packets {
|
||||
pub packets: PinnedVec<Packet>,
|
||||
|
||||
recycler: Option<PacketsRecycler>,
|
||||
}
|
||||
|
||||
impl Drop for Packets {
|
||||
fn drop(&mut self) {
|
||||
if let Some(ref recycler) = self.recycler {
|
||||
let old = mem::replace(&mut self.packets, PinnedVec::default());
|
||||
recycler.recycle(old)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Reset for Packets {
|
||||
fn reset(&mut self) {
|
||||
self.packets.resize(0, Packet::default());
|
||||
}
|
||||
}
|
||||
|
||||
//auto derive doesn't support large arrays
|
||||
impl Default for Packets {
|
||||
fn default() -> Packets {
|
||||
let packets = PinnedVec::with_capacity(NUM_RCVMMSGS);
|
||||
Packets {
|
||||
packets,
|
||||
recycler: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub type PacketsRecycler = Recycler<PinnedVec<Packet>>;
|
||||
|
||||
impl Packets {
|
||||
pub fn new(packets: Vec<Packet>) -> Self {
|
||||
let packets = PinnedVec::from_vec(packets);
|
||||
Self {
|
||||
packets,
|
||||
recycler: None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_with_recycler(recycler: PacketsRecycler, size: usize, name: &'static str) -> Self {
|
||||
let mut packets = recycler.allocate(name);
|
||||
packets.reserve_and_pin(size);
|
||||
Packets {
|
||||
packets,
|
||||
recycler: Some(recycler),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set_addr(&mut self, addr: &SocketAddr) {
|
||||
for m in self.packets.iter_mut() {
|
||||
m.meta.set_addr(&addr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn to_packets_chunked<T: Serialize>(xs: &[T], chunks: usize) -> Vec<Packets> {
|
||||
let mut out = vec![];
|
||||
for x in xs.chunks(chunks) {
|
||||
let mut p = Packets::default();
|
||||
p.packets.resize(x.len(), Packet::default());
|
||||
for (i, o) in x.iter().zip(p.packets.iter_mut()) {
|
||||
let mut wr = io::Cursor::new(&mut o.data[..]);
|
||||
bincode::serialize_into(&mut wr, &i).expect("serialize request");
|
||||
let len = wr.position() as usize;
|
||||
o.meta.size = len;
|
||||
}
|
||||
out.push(p);
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
pub fn to_packets<T: Serialize>(xs: &[T]) -> Vec<Packets> {
|
||||
to_packets_chunked(xs, NUM_PACKETS)
|
||||
}
|
||||
|
||||
pub fn limited_deserialize<T>(data: &[u8]) -> bincode::Result<T>
|
||||
where
|
||||
T: serde::de::DeserializeOwned,
|
||||
{
|
||||
bincode::config()
|
||||
.limit(PACKET_DATA_SIZE as u64)
|
||||
.deserialize(data)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use solana_sdk::hash::Hash;
|
||||
use solana_sdk::signature::{Keypair, KeypairUtil};
|
||||
use solana_sdk::system_transaction;
|
||||
|
||||
#[test]
|
||||
fn test_packets_reset() {
|
||||
let mut packets = Packets::default();
|
||||
packets.packets.resize(10, Packet::default());
|
||||
assert_eq!(packets.packets.len(), 10);
|
||||
packets.reset();
|
||||
assert_eq!(packets.packets.len(), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_to_packets() {
|
||||
let keypair = Keypair::new();
|
||||
let hash = Hash::new(&[1; 32]);
|
||||
let tx = system_transaction::transfer(&keypair, &keypair.pubkey(), 1, hash);
|
||||
let rv = to_packets(&vec![tx.clone(); 1]);
|
||||
assert_eq!(rv.len(), 1);
|
||||
assert_eq!(rv[0].packets.len(), 1);
|
||||
|
||||
let rv = to_packets(&vec![tx.clone(); NUM_PACKETS]);
|
||||
assert_eq!(rv.len(), 1);
|
||||
assert_eq!(rv[0].packets.len(), NUM_PACKETS);
|
||||
|
||||
let rv = to_packets(&vec![tx.clone(); NUM_PACKETS + 1]);
|
||||
assert_eq!(rv.len(), 2);
|
||||
assert_eq!(rv[0].packets.len(), NUM_PACKETS);
|
||||
assert_eq!(rv[1].packets.len(), 1);
|
||||
}
|
||||
}
|
734
perf/src/sigverify.rs
Normal file
734
perf/src/sigverify.rs
Normal file
@ -0,0 +1,734 @@
|
||||
//! The `sigverify` module provides digital signature verification functions.
|
||||
//! By default, signatures are verified in parallel using all available CPU
|
||||
//! cores. When perf-libs are available signature verification is offloaded
|
||||
//! to the GPU.
|
||||
//!
|
||||
|
||||
use crate::cuda_runtime::PinnedVec;
|
||||
use crate::packet::{Packet, Packets};
|
||||
use crate::perf_libs;
|
||||
use crate::recycler::Recycler;
|
||||
use bincode::serialized_size;
|
||||
use rayon::ThreadPool;
|
||||
use solana_metrics::inc_new_counter_debug;
|
||||
use solana_rayon_threadlimit::get_thread_count;
|
||||
use solana_sdk::message::MessageHeader;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use solana_sdk::short_vec::decode_len;
|
||||
use solana_sdk::signature::Signature;
|
||||
#[cfg(test)]
|
||||
use solana_sdk::transaction::Transaction;
|
||||
use std::cell::RefCell;
|
||||
use std::mem::size_of;
|
||||
|
||||
thread_local!(static PAR_THREAD_POOL: RefCell<ThreadPool> = RefCell::new(rayon::ThreadPoolBuilder::new()
|
||||
.num_threads(get_thread_count())
|
||||
.thread_name(|ix| format!("sigverify_{}", ix))
|
||||
.build()
|
||||
.unwrap()));
|
||||
|
||||
pub type TxOffset = PinnedVec<u32>;
|
||||
|
||||
type TxOffsets = (TxOffset, TxOffset, TxOffset, TxOffset, Vec<Vec<u32>>);
|
||||
|
||||
#[derive(Debug, PartialEq, Eq)]
|
||||
struct PacketOffsets {
|
||||
pub sig_len: u32,
|
||||
pub sig_start: u32,
|
||||
pub msg_start: u32,
|
||||
pub pubkey_start: u32,
|
||||
}
|
||||
|
||||
impl PacketOffsets {
|
||||
pub fn new(sig_len: u32, sig_start: u32, msg_start: u32, pubkey_start: u32) -> Self {
|
||||
Self {
|
||||
sig_len,
|
||||
sig_start,
|
||||
msg_start,
|
||||
pubkey_start,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum PacketError {
|
||||
InvalidLen,
|
||||
InvalidPubkeyLen,
|
||||
InvalidShortVec,
|
||||
InvalidSignatureLen,
|
||||
MismatchSignatureLen,
|
||||
PayerNotWritable,
|
||||
}
|
||||
|
||||
impl std::convert::From<std::boxed::Box<bincode::ErrorKind>> for PacketError {
|
||||
fn from(_e: std::boxed::Box<bincode::ErrorKind>) -> PacketError {
|
||||
PacketError::InvalidShortVec
|
||||
}
|
||||
}
|
||||
|
||||
pub fn init() {
|
||||
if let Some(api) = perf_libs::api() {
|
||||
unsafe {
|
||||
(api.ed25519_set_verbose)(true);
|
||||
if !(api.ed25519_init)() {
|
||||
panic!("ed25519_init() failed");
|
||||
}
|
||||
(api.ed25519_set_verbose)(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn verify_packet(packet: &Packet) -> u8 {
|
||||
let packet_offsets = get_packet_offsets(packet, 0);
|
||||
let mut sig_start = packet_offsets.sig_start as usize;
|
||||
let mut pubkey_start = packet_offsets.pubkey_start as usize;
|
||||
let msg_start = packet_offsets.msg_start as usize;
|
||||
|
||||
if packet_offsets.sig_len == 0 {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if packet.meta.size <= msg_start {
|
||||
return 0;
|
||||
}
|
||||
|
||||
let msg_end = packet.meta.size;
|
||||
for _ in 0..packet_offsets.sig_len {
|
||||
let pubkey_end = pubkey_start as usize + size_of::<Pubkey>();
|
||||
let sig_end = sig_start as usize + size_of::<Signature>();
|
||||
|
||||
if pubkey_end >= packet.meta.size || sig_end >= packet.meta.size {
|
||||
return 0;
|
||||
}
|
||||
|
||||
let signature = Signature::new(&packet.data[sig_start..sig_end]);
|
||||
if !signature.verify(
|
||||
&packet.data[pubkey_start..pubkey_end],
|
||||
&packet.data[msg_start..msg_end],
|
||||
) {
|
||||
return 0;
|
||||
}
|
||||
pubkey_start += size_of::<Pubkey>();
|
||||
sig_start += size_of::<Signature>();
|
||||
}
|
||||
1
|
||||
}
|
||||
|
||||
pub fn batch_size(batches: &[Packets]) -> usize {
|
||||
batches.iter().map(|p| p.packets.len()).sum()
|
||||
}
|
||||
|
||||
// internal function to be unit-tested; should be used only by get_packet_offsets
|
||||
fn do_get_packet_offsets(
|
||||
packet: &Packet,
|
||||
current_offset: u32,
|
||||
) -> Result<PacketOffsets, PacketError> {
|
||||
let message_header_size = serialized_size(&MessageHeader::default()).unwrap() as usize;
|
||||
// should have at least 1 signature, sig lengths and the message header
|
||||
if (1 + size_of::<Signature>() + message_header_size) > packet.meta.size {
|
||||
return Err(PacketError::InvalidLen);
|
||||
}
|
||||
|
||||
// read the length of Transaction.signatures (serialized with short_vec)
|
||||
let (sig_len_untrusted, sig_size) = decode_len(&packet.data)?;
|
||||
|
||||
// Using msg_start_offset which is based on sig_len_untrusted introduces uncertainty.
|
||||
// Ultimately, the actual sigverify will determine the uncertainty.
|
||||
let msg_start_offset = sig_size + sig_len_untrusted * size_of::<Signature>();
|
||||
|
||||
// Packet should have data at least for signatures, MessageHeader, 1 byte for Message.account_keys.len
|
||||
if (msg_start_offset + message_header_size + 1) > packet.meta.size {
|
||||
return Err(PacketError::InvalidSignatureLen);
|
||||
}
|
||||
|
||||
// read MessageHeader.num_required_signatures (serialized with u8)
|
||||
let sig_len_maybe_trusted = packet.data[msg_start_offset] as usize;
|
||||
|
||||
let message_account_keys_len_offset = msg_start_offset + message_header_size;
|
||||
|
||||
// This reads and compares the MessageHeader num_required_signatures and
|
||||
// num_readonly_signed_accounts bytes. If num_required_signatures is not larger than
|
||||
// num_readonly_signed_accounts, the first account is not debitable, and cannot be charged
|
||||
// required transaction fees.
|
||||
if packet.data[msg_start_offset] <= packet.data[msg_start_offset + 1] {
|
||||
return Err(PacketError::PayerNotWritable);
|
||||
}
|
||||
|
||||
// read the length of Message.account_keys (serialized with short_vec)
|
||||
let (pubkey_len, pubkey_len_size) =
|
||||
decode_len(&packet.data[message_account_keys_len_offset..])?;
|
||||
|
||||
if (message_account_keys_len_offset + pubkey_len * size_of::<Pubkey>() + pubkey_len_size)
|
||||
> packet.meta.size
|
||||
{
|
||||
return Err(PacketError::InvalidPubkeyLen);
|
||||
}
|
||||
|
||||
let sig_start = current_offset as usize + sig_size;
|
||||
let msg_start = current_offset as usize + msg_start_offset;
|
||||
let pubkey_start = msg_start + message_header_size + pubkey_len_size;
|
||||
|
||||
if sig_len_maybe_trusted != sig_len_untrusted {
|
||||
return Err(PacketError::MismatchSignatureLen);
|
||||
}
|
||||
|
||||
Ok(PacketOffsets::new(
|
||||
sig_len_untrusted as u32,
|
||||
sig_start as u32,
|
||||
msg_start as u32,
|
||||
pubkey_start as u32,
|
||||
))
|
||||
}
|
||||
|
||||
fn get_packet_offsets(packet: &Packet, current_offset: u32) -> PacketOffsets {
|
||||
let unsanitized_packet_offsets = do_get_packet_offsets(packet, current_offset);
|
||||
if let Ok(offsets) = unsanitized_packet_offsets {
|
||||
offsets
|
||||
} else {
|
||||
// force sigverify to fail by returning zeros
|
||||
PacketOffsets::new(0, 0, 0, 0)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn generate_offsets(
|
||||
batches: &[Packets],
|
||||
recycler: &Recycler<TxOffset>,
|
||||
) -> Result<TxOffsets, ()> {
|
||||
debug!("allocating..");
|
||||
let mut signature_offsets: PinnedVec<_> = recycler.allocate("sig_offsets");
|
||||
signature_offsets.set_pinnable();
|
||||
let mut pubkey_offsets: PinnedVec<_> = recycler.allocate("pubkey_offsets");
|
||||
pubkey_offsets.set_pinnable();
|
||||
let mut msg_start_offsets: PinnedVec<_> = recycler.allocate("msg_start_offsets");
|
||||
msg_start_offsets.set_pinnable();
|
||||
let mut msg_sizes: PinnedVec<_> = recycler.allocate("msg_size_offsets");
|
||||
msg_sizes.set_pinnable();
|
||||
let mut current_packet = 0;
|
||||
let mut v_sig_lens = Vec::new();
|
||||
batches.iter().for_each(|p| {
|
||||
let mut sig_lens = Vec::new();
|
||||
p.packets.iter().for_each(|packet| {
|
||||
let current_offset = current_packet as u32 * size_of::<Packet>() as u32;
|
||||
|
||||
let packet_offsets = get_packet_offsets(packet, current_offset);
|
||||
|
||||
sig_lens.push(packet_offsets.sig_len);
|
||||
|
||||
trace!("pubkey_offset: {}", packet_offsets.pubkey_start);
|
||||
|
||||
let mut pubkey_offset = packet_offsets.pubkey_start;
|
||||
let mut sig_offset = packet_offsets.sig_start;
|
||||
for _ in 0..packet_offsets.sig_len {
|
||||
signature_offsets.push(sig_offset);
|
||||
sig_offset += size_of::<Signature>() as u32;
|
||||
|
||||
pubkey_offsets.push(pubkey_offset);
|
||||
pubkey_offset += size_of::<Pubkey>() as u32;
|
||||
|
||||
msg_start_offsets.push(packet_offsets.msg_start);
|
||||
|
||||
msg_sizes
|
||||
.push(current_offset + (packet.meta.size as u32) - packet_offsets.msg_start);
|
||||
}
|
||||
current_packet += 1;
|
||||
});
|
||||
v_sig_lens.push(sig_lens);
|
||||
});
|
||||
Ok((
|
||||
signature_offsets,
|
||||
pubkey_offsets,
|
||||
msg_start_offsets,
|
||||
msg_sizes,
|
||||
v_sig_lens,
|
||||
))
|
||||
}
|
||||
|
||||
pub fn ed25519_verify_cpu(batches: &[Packets]) -> Vec<Vec<u8>> {
|
||||
use rayon::prelude::*;
|
||||
let count = batch_size(batches);
|
||||
debug!("CPU ECDSA for {}", batch_size(batches));
|
||||
let rv = PAR_THREAD_POOL.with(|thread_pool| {
|
||||
thread_pool.borrow().install(|| {
|
||||
batches
|
||||
.into_par_iter()
|
||||
.map(|p| p.packets.par_iter().map(verify_packet).collect())
|
||||
.collect()
|
||||
})
|
||||
});
|
||||
inc_new_counter_debug!("ed25519_verify_cpu", count);
|
||||
rv
|
||||
}
|
||||
|
||||
pub fn ed25519_verify_disabled(batches: &[Packets]) -> Vec<Vec<u8>> {
|
||||
use rayon::prelude::*;
|
||||
let count = batch_size(batches);
|
||||
debug!("disabled ECDSA for {}", batch_size(batches));
|
||||
let rv = batches
|
||||
.into_par_iter()
|
||||
.map(|p| vec![1u8; p.packets.len()])
|
||||
.collect();
|
||||
inc_new_counter_debug!("ed25519_verify_disabled", count);
|
||||
rv
|
||||
}
|
||||
|
||||
pub fn copy_return_values(sig_lens: &[Vec<u32>], out: &PinnedVec<u8>, rvs: &mut Vec<Vec<u8>>) {
|
||||
let mut num = 0;
|
||||
for (vs, sig_vs) in rvs.iter_mut().zip(sig_lens.iter()) {
|
||||
for (v, sig_v) in vs.iter_mut().zip(sig_vs.iter()) {
|
||||
if *sig_v == 0 {
|
||||
*v = 0;
|
||||
} else {
|
||||
let mut vout = 1;
|
||||
for _ in 0..*sig_v {
|
||||
if 0 == out[num] {
|
||||
vout = 0;
|
||||
}
|
||||
num += 1;
|
||||
}
|
||||
*v = vout;
|
||||
}
|
||||
if *v != 0 {
|
||||
trace!("VERIFIED PACKET!!!!!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ed25519_verify(
|
||||
batches: &[Packets],
|
||||
recycler: &Recycler<TxOffset>,
|
||||
recycler_out: &Recycler<PinnedVec<u8>>,
|
||||
) -> Vec<Vec<u8>> {
|
||||
let api = perf_libs::api();
|
||||
if api.is_none() {
|
||||
return ed25519_verify_cpu(batches);
|
||||
}
|
||||
let api = api.unwrap();
|
||||
|
||||
use crate::packet::PACKET_DATA_SIZE;
|
||||
let count = batch_size(batches);
|
||||
|
||||
// micro-benchmarks show GPU time for smallest batch around 15-20ms
|
||||
// and CPU speed for 64-128 sigverifies around 10-20ms. 64 is a nice
|
||||
// power-of-two number around that accounting for the fact that the CPU
|
||||
// may be busy doing other things while being a real validator
|
||||
// TODO: dynamically adjust this crossover
|
||||
if count < 64 {
|
||||
return ed25519_verify_cpu(batches);
|
||||
}
|
||||
|
||||
let (signature_offsets, pubkey_offsets, msg_start_offsets, msg_sizes, sig_lens) =
|
||||
generate_offsets(batches, recycler).unwrap();
|
||||
|
||||
debug!("CUDA ECDSA for {}", batch_size(batches));
|
||||
debug!("allocating out..");
|
||||
let mut out = recycler_out.allocate("out_buffer");
|
||||
out.set_pinnable();
|
||||
let mut elems = Vec::new();
|
||||
let mut rvs = Vec::new();
|
||||
|
||||
let mut num_packets = 0;
|
||||
for p in batches {
|
||||
elems.push(perf_libs::Elems {
|
||||
elems: p.packets.as_ptr(),
|
||||
num: p.packets.len() as u32,
|
||||
});
|
||||
let mut v = Vec::new();
|
||||
v.resize(p.packets.len(), 0);
|
||||
rvs.push(v);
|
||||
num_packets += p.packets.len();
|
||||
}
|
||||
out.resize(signature_offsets.len(), 0);
|
||||
trace!("Starting verify num packets: {}", num_packets);
|
||||
trace!("elem len: {}", elems.len() as u32);
|
||||
trace!("packet sizeof: {}", size_of::<Packet>() as u32);
|
||||
trace!("len offset: {}", PACKET_DATA_SIZE as u32);
|
||||
const USE_NON_DEFAULT_STREAM: u8 = 1;
|
||||
unsafe {
|
||||
let res = (api.ed25519_verify_many)(
|
||||
elems.as_ptr(),
|
||||
elems.len() as u32,
|
||||
size_of::<Packet>() as u32,
|
||||
num_packets as u32,
|
||||
signature_offsets.len() as u32,
|
||||
msg_sizes.as_ptr(),
|
||||
pubkey_offsets.as_ptr(),
|
||||
signature_offsets.as_ptr(),
|
||||
msg_start_offsets.as_ptr(),
|
||||
out.as_mut_ptr(),
|
||||
USE_NON_DEFAULT_STREAM,
|
||||
);
|
||||
if res != 0 {
|
||||
trace!("RETURN!!!: {}", res);
|
||||
}
|
||||
}
|
||||
trace!("done verify");
|
||||
copy_return_values(&sig_lens, &out, &mut rvs);
|
||||
inc_new_counter_debug!("ed25519_verify_gpu", count);
|
||||
recycler_out.recycle(out);
|
||||
recycler.recycle(signature_offsets);
|
||||
recycler.recycle(pubkey_offsets);
|
||||
recycler.recycle(msg_sizes);
|
||||
recycler.recycle(msg_start_offsets);
|
||||
rvs
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub fn make_packet_from_transaction(tx: Transaction) -> Packet {
|
||||
use bincode::serialize;
|
||||
|
||||
let tx_bytes = serialize(&tx).unwrap();
|
||||
let mut packet = Packet::default();
|
||||
packet.meta.size = tx_bytes.len();
|
||||
packet.data[..packet.meta.size].copy_from_slice(&tx_bytes);
|
||||
return packet;
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::packet::{Packet, Packets};
|
||||
use crate::sigverify;
|
||||
use crate::sigverify::PacketOffsets;
|
||||
use crate::test_tx::{test_multisig_tx, test_tx};
|
||||
use bincode::{deserialize, serialize};
|
||||
use solana_sdk::hash::Hash;
|
||||
use solana_sdk::message::{Message, MessageHeader};
|
||||
use solana_sdk::signature::Signature;
|
||||
use solana_sdk::transaction::Transaction;
|
||||
|
||||
const SIG_OFFSET: usize = 1;
|
||||
|
||||
pub fn memfind<A: Eq>(a: &[A], b: &[A]) -> Option<usize> {
|
||||
assert!(a.len() >= b.len());
|
||||
let end = a.len() - b.len() + 1;
|
||||
for i in 0..end {
|
||||
if a[i..i + b.len()] == b[..] {
|
||||
return Some(i);
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_layout() {
|
||||
let tx = test_tx();
|
||||
let tx_bytes = serialize(&tx).unwrap();
|
||||
let packet = serialize(&tx).unwrap();
|
||||
assert_matches!(memfind(&packet, &tx_bytes), Some(0));
|
||||
assert_matches!(memfind(&packet, &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_system_transaction_layout() {
|
||||
let tx = test_tx();
|
||||
let tx_bytes = serialize(&tx).unwrap();
|
||||
let message_data = tx.message_data();
|
||||
let packet = sigverify::make_packet_from_transaction(tx.clone());
|
||||
|
||||
let packet_offsets = sigverify::get_packet_offsets(&packet, 0);
|
||||
|
||||
assert_eq!(
|
||||
memfind(&tx_bytes, &tx.signatures[0].as_ref()),
|
||||
Some(SIG_OFFSET)
|
||||
);
|
||||
assert_eq!(
|
||||
memfind(&tx_bytes, &tx.message().account_keys[0].as_ref()),
|
||||
Some(packet_offsets.pubkey_start as usize)
|
||||
);
|
||||
assert_eq!(
|
||||
memfind(&tx_bytes, &message_data),
|
||||
Some(packet_offsets.msg_start as usize)
|
||||
);
|
||||
assert_eq!(
|
||||
memfind(&tx_bytes, &tx.signatures[0].as_ref()),
|
||||
Some(packet_offsets.sig_start as usize)
|
||||
);
|
||||
assert_eq!(packet_offsets.sig_len, 1);
|
||||
}
|
||||
|
||||
fn packet_from_num_sigs(required_num_sigs: u8, actual_num_sigs: usize) -> Packet {
|
||||
let message = Message {
|
||||
header: MessageHeader {
|
||||
num_required_signatures: required_num_sigs,
|
||||
num_readonly_signed_accounts: 12,
|
||||
num_readonly_unsigned_accounts: 11,
|
||||
},
|
||||
account_keys: vec![],
|
||||
recent_blockhash: Hash::default(),
|
||||
instructions: vec![],
|
||||
};
|
||||
let mut tx = Transaction::new_unsigned(message);
|
||||
tx.signatures = vec![Signature::default(); actual_num_sigs as usize];
|
||||
sigverify::make_packet_from_transaction(tx)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_untrustworthy_sigs() {
|
||||
let required_num_sigs = 14;
|
||||
let actual_num_sigs = 5;
|
||||
|
||||
let packet = packet_from_num_sigs(required_num_sigs, actual_num_sigs);
|
||||
|
||||
let unsanitized_packet_offsets = sigverify::do_get_packet_offsets(&packet, 0);
|
||||
|
||||
assert_eq!(
|
||||
unsanitized_packet_offsets,
|
||||
Err(PacketError::MismatchSignatureLen)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_large_sigs() {
|
||||
// use any large number to be misinterpreted as 2 bytes when decoded as short_vec
|
||||
let required_num_sigs = 214;
|
||||
let actual_num_sigs = 5;
|
||||
|
||||
let packet = packet_from_num_sigs(required_num_sigs, actual_num_sigs);
|
||||
|
||||
let unsanitized_packet_offsets = sigverify::do_get_packet_offsets(&packet, 0);
|
||||
|
||||
assert_eq!(
|
||||
unsanitized_packet_offsets,
|
||||
Err(PacketError::MismatchSignatureLen)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_small_packet() {
|
||||
let tx = test_tx();
|
||||
let mut packet = sigverify::make_packet_from_transaction(tx.clone());
|
||||
|
||||
packet.data[0] = 0xff;
|
||||
packet.data[1] = 0xff;
|
||||
packet.meta.size = 2;
|
||||
|
||||
let res = sigverify::do_get_packet_offsets(&packet, 0);
|
||||
assert_eq!(res, Err(PacketError::InvalidLen));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_large_sig_len() {
|
||||
let tx = test_tx();
|
||||
let mut packet = sigverify::make_packet_from_transaction(tx.clone());
|
||||
|
||||
// Make the signatures len huge
|
||||
packet.data[0] = 0x7f;
|
||||
|
||||
let res = sigverify::do_get_packet_offsets(&packet, 0);
|
||||
assert_eq!(res, Err(PacketError::InvalidSignatureLen));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_really_large_sig_len() {
|
||||
let tx = test_tx();
|
||||
let mut packet = sigverify::make_packet_from_transaction(tx.clone());
|
||||
|
||||
// Make the signatures len huge
|
||||
packet.data[0] = 0xff;
|
||||
packet.data[1] = 0xff;
|
||||
packet.data[2] = 0xff;
|
||||
packet.data[3] = 0xff;
|
||||
|
||||
let res = sigverify::do_get_packet_offsets(&packet, 0);
|
||||
assert_eq!(res, Err(PacketError::InvalidShortVec));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_invalid_pubkey_len() {
|
||||
let tx = test_tx();
|
||||
let mut packet = sigverify::make_packet_from_transaction(tx.clone());
|
||||
|
||||
let res = sigverify::do_get_packet_offsets(&packet, 0);
|
||||
|
||||
// make pubkey len huge
|
||||
packet.data[res.unwrap().pubkey_start as usize - 1] = 0x7f;
|
||||
|
||||
let res = sigverify::do_get_packet_offsets(&packet, 0);
|
||||
assert_eq!(res, Err(PacketError::InvalidPubkeyLen));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_fee_payer_is_debitable() {
|
||||
let message = Message {
|
||||
header: MessageHeader {
|
||||
num_required_signatures: 1,
|
||||
num_readonly_signed_accounts: 1,
|
||||
num_readonly_unsigned_accounts: 1,
|
||||
},
|
||||
account_keys: vec![],
|
||||
recent_blockhash: Hash::default(),
|
||||
instructions: vec![],
|
||||
};
|
||||
let mut tx = Transaction::new_unsigned(message);
|
||||
tx.signatures = vec![Signature::default()];
|
||||
let packet = sigverify::make_packet_from_transaction(tx.clone());
|
||||
let res = sigverify::do_get_packet_offsets(&packet, 0);
|
||||
|
||||
assert_eq!(res, Err(PacketError::PayerNotWritable));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_system_transaction_data_layout() {
|
||||
use crate::packet::PACKET_DATA_SIZE;
|
||||
let mut tx0 = test_tx();
|
||||
tx0.message.instructions[0].data = vec![1, 2, 3];
|
||||
let message0a = tx0.message_data();
|
||||
let tx_bytes = serialize(&tx0).unwrap();
|
||||
assert!(tx_bytes.len() < PACKET_DATA_SIZE);
|
||||
assert_eq!(
|
||||
memfind(&tx_bytes, &tx0.signatures[0].as_ref()),
|
||||
Some(SIG_OFFSET)
|
||||
);
|
||||
let tx1 = deserialize(&tx_bytes).unwrap();
|
||||
assert_eq!(tx0, tx1);
|
||||
assert_eq!(tx1.message().instructions[0].data, vec![1, 2, 3]);
|
||||
|
||||
tx0.message.instructions[0].data = vec![1, 2, 4];
|
||||
let message0b = tx0.message_data();
|
||||
assert_ne!(message0a, message0b);
|
||||
}
|
||||
|
||||
// Just like get_packet_offsets, but not returning redundant information.
|
||||
fn get_packet_offsets_from_tx(tx: Transaction, current_offset: u32) -> PacketOffsets {
|
||||
let packet = sigverify::make_packet_from_transaction(tx);
|
||||
let packet_offsets = sigverify::get_packet_offsets(&packet, current_offset);
|
||||
PacketOffsets::new(
|
||||
packet_offsets.sig_len,
|
||||
packet_offsets.sig_start - current_offset,
|
||||
packet_offsets.msg_start - packet_offsets.sig_start,
|
||||
packet_offsets.pubkey_start - packet_offsets.msg_start,
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_packet_offsets() {
|
||||
assert_eq!(
|
||||
get_packet_offsets_from_tx(test_tx(), 0),
|
||||
PacketOffsets::new(1, 1, 64, 4)
|
||||
);
|
||||
assert_eq!(
|
||||
get_packet_offsets_from_tx(test_tx(), 100),
|
||||
PacketOffsets::new(1, 1, 64, 4)
|
||||
);
|
||||
|
||||
// Ensure we're not indexing packet by the `current_offset` parameter.
|
||||
assert_eq!(
|
||||
get_packet_offsets_from_tx(test_tx(), 1_000_000),
|
||||
PacketOffsets::new(1, 1, 64, 4)
|
||||
);
|
||||
|
||||
// Ensure we're returning sig_len, not sig_size.
|
||||
assert_eq!(
|
||||
get_packet_offsets_from_tx(test_multisig_tx(), 0),
|
||||
PacketOffsets::new(2, 1, 128, 4)
|
||||
);
|
||||
}
|
||||
|
||||
fn generate_packet_vec(
|
||||
packet: &Packet,
|
||||
num_packets_per_batch: usize,
|
||||
num_batches: usize,
|
||||
) -> Vec<Packets> {
|
||||
// generate packet vector
|
||||
let batches: Vec<_> = (0..num_batches)
|
||||
.map(|_| {
|
||||
let mut packets = Packets::default();
|
||||
packets.packets.resize(0, Packet::default());
|
||||
for _ in 0..num_packets_per_batch {
|
||||
packets.packets.push(packet.clone());
|
||||
}
|
||||
assert_eq!(packets.packets.len(), num_packets_per_batch);
|
||||
packets
|
||||
})
|
||||
.collect();
|
||||
assert_eq!(batches.len(), num_batches);
|
||||
|
||||
batches
|
||||
}
|
||||
|
||||
fn test_verify_n(n: usize, modify_data: bool) {
|
||||
let tx = test_tx();
|
||||
let mut packet = sigverify::make_packet_from_transaction(tx);
|
||||
|
||||
// jumble some data to test failure
|
||||
if modify_data {
|
||||
packet.data[20] = packet.data[20].wrapping_add(10);
|
||||
}
|
||||
|
||||
let batches = generate_packet_vec(&packet, n, 2);
|
||||
|
||||
let recycler = Recycler::default();
|
||||
let recycler_out = Recycler::default();
|
||||
// verify packets
|
||||
let ans = sigverify::ed25519_verify(&batches, &recycler, &recycler_out);
|
||||
|
||||
// check result
|
||||
let ref_ans = if modify_data { 0u8 } else { 1u8 };
|
||||
assert_eq!(ans, vec![vec![ref_ans; n], vec![ref_ans; n]]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_verify_tampered_sig_len() {
|
||||
let mut tx = test_tx().clone();
|
||||
// pretend malicious leader dropped a signature...
|
||||
tx.signatures.pop();
|
||||
let packet = sigverify::make_packet_from_transaction(tx);
|
||||
|
||||
let batches = generate_packet_vec(&packet, 1, 1);
|
||||
|
||||
let recycler = Recycler::default();
|
||||
let recycler_out = Recycler::default();
|
||||
// verify packets
|
||||
let ans = sigverify::ed25519_verify(&batches, &recycler, &recycler_out);
|
||||
|
||||
assert_eq!(ans, vec![vec![0u8; 1]]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_verify_zero() {
|
||||
test_verify_n(0, false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_verify_one() {
|
||||
test_verify_n(1, false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_verify_seventy_one() {
|
||||
test_verify_n(71, false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_verify_multisig() {
|
||||
solana_logger::setup();
|
||||
|
||||
let tx = test_multisig_tx();
|
||||
let mut packet = sigverify::make_packet_from_transaction(tx);
|
||||
|
||||
let n = 4;
|
||||
let num_batches = 3;
|
||||
let mut batches = generate_packet_vec(&packet, n, num_batches);
|
||||
|
||||
packet.data[40] = packet.data[40].wrapping_add(8);
|
||||
|
||||
batches[0].packets.push(packet);
|
||||
|
||||
let recycler = Recycler::default();
|
||||
let recycler_out = Recycler::default();
|
||||
// verify packets
|
||||
let ans = sigverify::ed25519_verify(&batches, &recycler, &recycler_out);
|
||||
|
||||
// check result
|
||||
let ref_ans = 1u8;
|
||||
let mut ref_vec = vec![vec![ref_ans; n]; num_batches];
|
||||
ref_vec[0].push(0u8);
|
||||
assert_eq!(ans, ref_vec);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_verify_fail() {
|
||||
test_verify_n(5, true);
|
||||
}
|
||||
}
|
40
perf/src/test_tx.rs
Normal file
40
perf/src/test_tx.rs
Normal file
@ -0,0 +1,40 @@
|
||||
use solana_sdk::hash::Hash;
|
||||
use solana_sdk::instruction::CompiledInstruction;
|
||||
use solana_sdk::signature::{Keypair, KeypairUtil};
|
||||
use solana_sdk::system_instruction::SystemInstruction;
|
||||
use solana_sdk::system_program;
|
||||
use solana_sdk::system_transaction;
|
||||
use solana_sdk::transaction::Transaction;
|
||||
|
||||
pub fn test_tx() -> Transaction {
|
||||
let keypair1 = Keypair::new();
|
||||
let pubkey1 = keypair1.pubkey();
|
||||
let zero = Hash::default();
|
||||
system_transaction::transfer(&keypair1, &pubkey1, 42, zero)
|
||||
}
|
||||
|
||||
pub fn test_multisig_tx() -> Transaction {
|
||||
let keypair0 = Keypair::new();
|
||||
let keypair1 = Keypair::new();
|
||||
let keypairs = vec![&keypair0, &keypair1];
|
||||
let lamports = 5;
|
||||
let blockhash = Hash::default();
|
||||
|
||||
let transfer_instruction = SystemInstruction::Transfer { lamports };
|
||||
|
||||
let program_ids = vec![system_program::id(), solana_budget_api::id()];
|
||||
|
||||
let instructions = vec![CompiledInstruction::new(
|
||||
0,
|
||||
&transfer_instruction,
|
||||
vec![0, 1],
|
||||
)];
|
||||
|
||||
Transaction::new_with_compiled_instructions(
|
||||
&keypairs,
|
||||
&[],
|
||||
blockhash,
|
||||
program_ids,
|
||||
instructions,
|
||||
)
|
||||
}
|
Reference in New Issue
Block a user