v1.18: quic: use smallvec to aggregate chunks, save 1 alloc per packe…

…t (backport of anza-xyz#735) (anza-xyz#742) quic: use smallvec to aggregate chunks, save 1 alloc per packet (anza-xyz#735) quic: use smallvec, save one allocation per packet Use smallvec to hold chunks. Streams are packet-sized so we don't expect them to have many chunks. This saves us an allocation for each packet. (cherry picked from commit 55ab7fa) # Conflicts: # programs/sbf/Cargo.lock # streamer/Cargo.toml # streamer/src/nonblocking/quic.rs Co-authored-by: Alessandro Decina <alessandro.d@gmail.com>
firedancer-io · Apr 11, 2024 · 2ed208c · 2ed208c
1 parent f2ea237
commit 2ed208c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -303,7 +303,7 @@ sha2 = "0.10.8"
 sha3 = "0.10.4"
 signal-hook = "0.3.17"
 siphasher = "0.3.11"
-smallvec = "1.13.1"
+smallvec = "1.13.2"
 smpl_jwt = "0.7.1"
 socket2 = "0.5.5"
 soketto = "0.7"

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/streamer/Cargo.toml b/streamer/Cargo.toml
@@ -28,6 +28,7 @@ quinn-proto = { workspace = true }
 rand = { workspace = true }
 rcgen = { workspace = true }
 rustls = { workspace = true, features = ["dangerous_configuration"] }
+smallvec = { workspace = true }
 solana-metrics = { workspace = true }
 solana-perf = { workspace = true }
 solana-sdk = { workspace = true }

diff --git a/streamer/src/nonblocking/quic.rs b/streamer/src/nonblocking/quic.rs
@@ -17,6 +17,7 @@ use {
     quinn::{Connecting, Connection, Endpoint, EndpointConfig, TokioRuntime, VarInt},
     quinn_proto::VarIntBoundsExceeded,
     rand::{thread_rng, Rng},
+    smallvec::SmallVec,
     solana_perf::packet::{PacketBatch, PACKETS_PER_BATCH},
     solana_sdk::{
         packet::{Meta, PACKET_DATA_SIZE},
@@ -93,7 +94,7 @@ struct PacketChunk {
 // the Packet and then when copying the Packet into a PacketBatch)
 struct PacketAccumulator {
     pub meta: Meta,
-    pub chunks: Vec<PacketChunk>,
+    pub chunks: SmallVec<[PacketChunk; 2]>,
 }
 
 #[derive(Copy, Clone, Debug)]
@@ -872,7 +873,7 @@ async fn handle_chunk(
                     meta.set_socket_addr(remote_addr);
                     *packet_accum = Some(PacketAccumulator {
                         meta,
-                        chunks: Vec::new(),
+                        chunks: SmallVec::new(),
                     });
                 }
 
@@ -1471,7 +1472,7 @@ pub mod test {
             meta.size = size;
             let packet_accum = PacketAccumulator {
                 meta,
-                chunks: vec![PacketChunk {
+                chunks: smallvec::smallvec![PacketChunk {
                     bytes,
                     offset,
                     end_of_chunk: size,