sendmmsg cleanup #18589
Rationalize usage of sendmmsg(2). Skip packets which failed to send and track failures.
This commit is contained in:
parent
2ec81f627d
commit
ae5ad5cf9b
|
@ -23,7 +23,7 @@ use solana_poh::poh_recorder::WorkingBankEntry;
|
||||||
use solana_runtime::{bank::Bank, bank_forks::BankForks};
|
use solana_runtime::{bank::Bank, bank_forks::BankForks};
|
||||||
use solana_sdk::timing::timestamp;
|
use solana_sdk::timing::timestamp;
|
||||||
use solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Keypair};
|
use solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Keypair};
|
||||||
use solana_streamer::sendmmsg::send_mmsg;
|
use solana_streamer::sendmmsg::{batch_send, SendPktsError};
|
||||||
use std::sync::atomic::AtomicU64;
|
use std::sync::atomic::AtomicU64;
|
||||||
use std::{
|
use std::{
|
||||||
collections::HashMap,
|
collections::HashMap,
|
||||||
|
@ -402,10 +402,11 @@ pub fn broadcast_shreds(
|
||||||
self_pubkey: Pubkey,
|
self_pubkey: Pubkey,
|
||||||
bank_forks: &Arc<RwLock<BankForks>>,
|
bank_forks: &Arc<RwLock<BankForks>>,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
|
let mut result = Ok(());
|
||||||
let broadcast_len = cluster_nodes.num_peers();
|
let broadcast_len = cluster_nodes.num_peers();
|
||||||
if broadcast_len == 0 {
|
if broadcast_len == 0 {
|
||||||
update_peer_stats(1, 1, last_datapoint_submit);
|
update_peer_stats(1, 1, last_datapoint_submit);
|
||||||
return Ok(());
|
return result;
|
||||||
}
|
}
|
||||||
let mut shred_select = Measure::start("shred_select");
|
let mut shred_select = Measure::start("shred_select");
|
||||||
let root_bank = bank_forks.read().unwrap().root_bank();
|
let root_bank = bank_forks.read().unwrap().root_bank();
|
||||||
|
@ -414,24 +415,20 @@ pub fn broadcast_shreds(
|
||||||
.filter_map(|shred| {
|
.filter_map(|shred| {
|
||||||
let seed = shred.seed(Some(self_pubkey), &root_bank);
|
let seed = shred.seed(Some(self_pubkey), &root_bank);
|
||||||
let node = cluster_nodes.get_broadcast_peer(seed)?;
|
let node = cluster_nodes.get_broadcast_peer(seed)?;
|
||||||
Some((&shred.payload, &node.tvu))
|
Some((&shred.payload[..], &node.tvu))
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
shred_select.stop();
|
shred_select.stop();
|
||||||
transmit_stats.shred_select += shred_select.as_us();
|
transmit_stats.shred_select += shred_select.as_us();
|
||||||
|
|
||||||
let mut sent = 0;
|
|
||||||
let mut send_mmsg_time = Measure::start("send_mmsg");
|
let mut send_mmsg_time = Measure::start("send_mmsg");
|
||||||
while sent < packets.len() {
|
if let Err(SendPktsError::IoError(ioerr, num_failed)) = batch_send(s, &packets[..]) {
|
||||||
match send_mmsg(s, &packets[sent..]) {
|
transmit_stats.dropped_packets += num_failed;
|
||||||
Ok(n) => sent += n,
|
result = Err(Error::Io(ioerr));
|
||||||
Err(e) => {
|
|
||||||
return Err(Error::Io(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
send_mmsg_time.stop();
|
send_mmsg_time.stop();
|
||||||
transmit_stats.send_mmsg_elapsed += send_mmsg_time.as_us();
|
transmit_stats.send_mmsg_elapsed += send_mmsg_time.as_us();
|
||||||
|
transmit_stats.total_packets += packets.len();
|
||||||
|
|
||||||
let num_live_peers = cluster_nodes.num_peers_live(timestamp()) as i64;
|
let num_live_peers = cluster_nodes.num_peers_live(timestamp()) as i64;
|
||||||
update_peer_stats(
|
update_peer_stats(
|
||||||
|
@ -439,7 +436,7 @@ pub fn broadcast_shreds(
|
||||||
broadcast_len as i64 + 1,
|
broadcast_len as i64 + 1,
|
||||||
last_datapoint_submit,
|
last_datapoint_submit,
|
||||||
);
|
);
|
||||||
Ok(())
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|
|
@ -19,6 +19,8 @@ pub struct TransmitShredsStats {
|
||||||
pub get_peers_elapsed: u64,
|
pub get_peers_elapsed: u64,
|
||||||
pub shred_select: u64,
|
pub shred_select: u64,
|
||||||
pub num_shreds: usize,
|
pub num_shreds: usize,
|
||||||
|
pub total_packets: usize,
|
||||||
|
pub dropped_packets: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl BroadcastStats for TransmitShredsStats {
|
impl BroadcastStats for TransmitShredsStats {
|
||||||
|
@ -28,6 +30,8 @@ impl BroadcastStats for TransmitShredsStats {
|
||||||
self.get_peers_elapsed += new_stats.get_peers_elapsed;
|
self.get_peers_elapsed += new_stats.get_peers_elapsed;
|
||||||
self.num_shreds += new_stats.num_shreds;
|
self.num_shreds += new_stats.num_shreds;
|
||||||
self.shred_select += new_stats.shred_select;
|
self.shred_select += new_stats.shred_select;
|
||||||
|
self.total_packets += new_stats.total_packets;
|
||||||
|
self.dropped_packets += new_stats.dropped_packets;
|
||||||
}
|
}
|
||||||
fn report_stats(&mut self, slot: Slot, slot_start: Instant) {
|
fn report_stats(&mut self, slot: Slot, slot_start: Instant) {
|
||||||
datapoint_info!(
|
datapoint_info!(
|
||||||
|
@ -45,6 +49,8 @@ impl BroadcastStats for TransmitShredsStats {
|
||||||
("get_peers_elapsed", self.get_peers_elapsed as i64, i64),
|
("get_peers_elapsed", self.get_peers_elapsed as i64, i64),
|
||||||
("num_shreds", self.num_shreds as i64, i64),
|
("num_shreds", self.num_shreds as i64, i64),
|
||||||
("shred_select", self.shred_select as i64, i64),
|
("shred_select", self.shred_select as i64, i64),
|
||||||
|
("total_packets", self.total_packets as i64, i64),
|
||||||
|
("dropped_packets", self.dropped_packets as i64, i64),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -173,6 +179,8 @@ mod test {
|
||||||
send_mmsg_elapsed: 3,
|
send_mmsg_elapsed: 3,
|
||||||
shred_select: 4,
|
shred_select: 4,
|
||||||
num_shreds: 5,
|
num_shreds: 5,
|
||||||
|
total_packets: 6,
|
||||||
|
dropped_packets: 7,
|
||||||
},
|
},
|
||||||
&Some(BroadcastShredBatchInfo {
|
&Some(BroadcastShredBatchInfo {
|
||||||
slot: 0,
|
slot: 0,
|
||||||
|
@ -190,14 +198,18 @@ mod test {
|
||||||
assert_eq!(slot_0_stats.broadcast_shred_stats.send_mmsg_elapsed, 3);
|
assert_eq!(slot_0_stats.broadcast_shred_stats.send_mmsg_elapsed, 3);
|
||||||
assert_eq!(slot_0_stats.broadcast_shred_stats.shred_select, 4);
|
assert_eq!(slot_0_stats.broadcast_shred_stats.shred_select, 4);
|
||||||
assert_eq!(slot_0_stats.broadcast_shred_stats.num_shreds, 5);
|
assert_eq!(slot_0_stats.broadcast_shred_stats.num_shreds, 5);
|
||||||
|
assert_eq!(slot_0_stats.broadcast_shred_stats.total_packets, 6);
|
||||||
|
assert_eq!(slot_0_stats.broadcast_shred_stats.dropped_packets, 7);
|
||||||
|
|
||||||
slot_broadcast_stats.update(
|
slot_broadcast_stats.update(
|
||||||
&TransmitShredsStats {
|
&TransmitShredsStats {
|
||||||
transmit_elapsed: 7,
|
transmit_elapsed: 11,
|
||||||
get_peers_elapsed: 8,
|
get_peers_elapsed: 12,
|
||||||
send_mmsg_elapsed: 9,
|
send_mmsg_elapsed: 13,
|
||||||
shred_select: 10,
|
shred_select: 14,
|
||||||
num_shreds: 11,
|
num_shreds: 15,
|
||||||
|
total_packets: 16,
|
||||||
|
dropped_packets: 17,
|
||||||
},
|
},
|
||||||
&None,
|
&None,
|
||||||
);
|
);
|
||||||
|
@ -211,6 +223,8 @@ mod test {
|
||||||
assert_eq!(slot_0_stats.broadcast_shred_stats.send_mmsg_elapsed, 3);
|
assert_eq!(slot_0_stats.broadcast_shred_stats.send_mmsg_elapsed, 3);
|
||||||
assert_eq!(slot_0_stats.broadcast_shred_stats.shred_select, 4);
|
assert_eq!(slot_0_stats.broadcast_shred_stats.shred_select, 4);
|
||||||
assert_eq!(slot_0_stats.broadcast_shred_stats.num_shreds, 5);
|
assert_eq!(slot_0_stats.broadcast_shred_stats.num_shreds, 5);
|
||||||
|
assert_eq!(slot_0_stats.broadcast_shred_stats.total_packets, 6);
|
||||||
|
assert_eq!(slot_0_stats.broadcast_shred_stats.dropped_packets, 7);
|
||||||
|
|
||||||
// If another batch is given, then total number of batches == num_expected_batches == 2,
|
// If another batch is given, then total number of batches == num_expected_batches == 2,
|
||||||
// so the batch should be purged from the HashMap
|
// so the batch should be purged from the HashMap
|
||||||
|
@ -221,6 +235,8 @@ mod test {
|
||||||
send_mmsg_elapsed: 1,
|
send_mmsg_elapsed: 1,
|
||||||
shred_select: 1,
|
shred_select: 1,
|
||||||
num_shreds: 1,
|
num_shreds: 1,
|
||||||
|
total_packets: 1,
|
||||||
|
dropped_packets: 1,
|
||||||
},
|
},
|
||||||
&Some(BroadcastShredBatchInfo {
|
&Some(BroadcastShredBatchInfo {
|
||||||
slot: 0,
|
slot: 0,
|
||||||
|
|
|
@ -63,7 +63,7 @@ use {
|
||||||
},
|
},
|
||||||
solana_streamer::{
|
solana_streamer::{
|
||||||
packet,
|
packet,
|
||||||
sendmmsg::multicast,
|
sendmmsg::{multi_target_send, SendPktsError},
|
||||||
streamer::{PacketReceiver, PacketSender},
|
streamer::{PacketReceiver, PacketSender},
|
||||||
},
|
},
|
||||||
solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY,
|
solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY,
|
||||||
|
@ -1239,27 +1239,17 @@ impl ClusterInfo {
|
||||||
} else {
|
} else {
|
||||||
peers.iter().map(|peer| &peer.tvu).collect()
|
peers.iter().map(|peer| &peer.tvu).collect()
|
||||||
};
|
};
|
||||||
let mut dests = &dests[..];
|
|
||||||
let data = &packet.data[..packet.meta.size];
|
let data = &packet.data[..packet.meta.size];
|
||||||
while !dests.is_empty() {
|
|
||||||
match multicast(s, data, dests) {
|
if let Err(SendPktsError::IoError(ioerr, num_failed)) = multi_target_send(s, data, &dests) {
|
||||||
Ok(n) => dests = &dests[n..],
|
inc_new_counter_info!("cluster_info-retransmit-packets", dests.len(), 1);
|
||||||
Err(err) => {
|
inc_new_counter_error!("cluster_info-retransmit-error", num_failed, 1);
|
||||||
inc_new_counter_error!("cluster_info-retransmit-send_to_error", dests.len(), 1);
|
error!(
|
||||||
error!("retransmit multicast: {:?}", err);
|
"retransmit_to multi_target_send error: {:?}, {}/{} packets failed",
|
||||||
break;
|
ioerr,
|
||||||
}
|
num_failed,
|
||||||
}
|
dests.len(),
|
||||||
}
|
);
|
||||||
let mut errs = 0;
|
|
||||||
for dest in dests {
|
|
||||||
if let Err(err) = s.send_to(data, dest) {
|
|
||||||
error!("retransmit send: {}, {:?}", dest, err);
|
|
||||||
errs += 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if errs != 0 {
|
|
||||||
inc_new_counter_error!("cluster_info-retransmit-error", errs, 1);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,159 +2,165 @@
|
||||||
|
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::net::{SocketAddr, UdpSocket};
|
use std::net::{SocketAddr, UdpSocket};
|
||||||
|
use thiserror::Error;
|
||||||
|
|
||||||
|
#[derive(Debug, Error)]
|
||||||
|
pub enum SendPktsError {
|
||||||
|
/// IO Error during send: first error, num failed packets
|
||||||
|
#[error("IO Error, some packets could not be sent")]
|
||||||
|
IoError(io::Error, usize),
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(not(target_os = "linux"))]
|
#[cfg(not(target_os = "linux"))]
|
||||||
pub fn send_mmsg(sock: &UdpSocket, packets: &[(&Vec<u8>, &SocketAddr)]) -> io::Result<usize> {
|
pub fn batch_send(sock: &UdpSocket, packets: &[(&[u8], &SocketAddr)]) -> Result<(), SendPktsError> {
|
||||||
let count = packets.len();
|
let mut num_failed = 0;
|
||||||
|
let mut erropt = None;
|
||||||
for (p, a) in packets {
|
for (p, a) in packets {
|
||||||
sock.send_to(p, *a)?;
|
if let Err(e) = sock.send_to(p, *a) {
|
||||||
|
num_failed += 1;
|
||||||
|
if erropt.is_none() {
|
||||||
|
erropt = Some(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(count)
|
if let Some(err) = erropt {
|
||||||
|
Err(SendPktsError::IoError(err, num_failed))
|
||||||
|
} else {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
use libc::{iovec, mmsghdr, sockaddr_in, sockaddr_in6};
|
use libc::{iovec, mmsghdr, sockaddr_in, sockaddr_in6, sockaddr_storage};
|
||||||
|
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
fn mmsghdr_for_packet(
|
fn mmsghdr_for_packet(
|
||||||
packet: &[u8],
|
packet: &[u8],
|
||||||
dest: &SocketAddr,
|
dest: &SocketAddr,
|
||||||
index: usize,
|
|
||||||
addr_in_len: u32,
|
|
||||||
addr_in6_len: u32,
|
|
||||||
iovs: &mut Vec<iovec>,
|
iovs: &mut Vec<iovec>,
|
||||||
addr_in: &mut Vec<sockaddr_in>,
|
addrs: &mut Vec<sockaddr_storage>,
|
||||||
addr_in6: &mut Vec<sockaddr_in6>,
|
hdrs: &mut Vec<mmsghdr>,
|
||||||
) -> mmsghdr {
|
) {
|
||||||
use libc::c_void;
|
use libc::c_void;
|
||||||
use nix::sys::socket::InetAddr;
|
use nix::sys::socket::InetAddr;
|
||||||
use std::mem;
|
use std::mem;
|
||||||
|
|
||||||
|
const SIZE_OF_SOCKADDR_IN: usize = mem::size_of::<sockaddr_in>();
|
||||||
|
const SIZE_OF_SOCKADDR_IN6: usize = mem::size_of::<sockaddr_in6>();
|
||||||
|
|
||||||
|
let index = hdrs.len();
|
||||||
|
|
||||||
|
debug_assert!(index < hdrs.capacity());
|
||||||
|
debug_assert!(index < addrs.capacity());
|
||||||
|
debug_assert!(index < iovs.capacity());
|
||||||
|
debug_assert_eq!(hdrs.len(), addrs.len());
|
||||||
|
debug_assert_eq!(hdrs.len(), iovs.len());
|
||||||
|
|
||||||
iovs.push(iovec {
|
iovs.push(iovec {
|
||||||
iov_base: packet.as_ptr() as *mut c_void,
|
iov_base: packet.as_ptr() as *mut c_void,
|
||||||
iov_len: packet.len(),
|
iov_len: packet.len(),
|
||||||
});
|
});
|
||||||
|
|
||||||
let mut hdr: mmsghdr = unsafe { mem::zeroed() };
|
let hdr: mmsghdr = unsafe { mem::zeroed() };
|
||||||
hdr.msg_hdr.msg_iov = &mut iovs[index];
|
hdrs.push(hdr);
|
||||||
hdr.msg_hdr.msg_iovlen = 1;
|
|
||||||
hdr.msg_len = packet.len() as u32;
|
let addr_storage: sockaddr_storage = unsafe { mem::zeroed() };
|
||||||
|
addrs.push(addr_storage);
|
||||||
|
|
||||||
|
debug_assert!(index < hdrs.len());
|
||||||
|
|
||||||
|
hdrs[index].msg_hdr.msg_iov = &mut iovs[index];
|
||||||
|
hdrs[index].msg_hdr.msg_iovlen = 1;
|
||||||
|
|
||||||
match InetAddr::from_std(dest) {
|
match InetAddr::from_std(dest) {
|
||||||
InetAddr::V4(addr) => {
|
InetAddr::V4(addr) => {
|
||||||
let index = addr_in.len();
|
unsafe {
|
||||||
addr_in.push(addr);
|
core::ptr::write(&mut addrs[index] as *mut _ as *mut _, addr);
|
||||||
hdr.msg_hdr.msg_name = &mut addr_in[index] as *mut _ as *mut _;
|
}
|
||||||
hdr.msg_hdr.msg_namelen = addr_in_len;
|
hdrs[index].msg_hdr.msg_name = &mut addrs[index] as *mut _ as *mut _;
|
||||||
|
hdrs[index].msg_hdr.msg_namelen = SIZE_OF_SOCKADDR_IN as u32;
|
||||||
}
|
}
|
||||||
InetAddr::V6(addr) => {
|
InetAddr::V6(addr) => {
|
||||||
let index = addr_in6.len();
|
unsafe {
|
||||||
addr_in6.push(addr);
|
core::ptr::write(&mut addrs[index] as *mut _ as *mut _, addr);
|
||||||
hdr.msg_hdr.msg_name = &mut addr_in6[index] as *mut _ as *mut _;
|
}
|
||||||
hdr.msg_hdr.msg_namelen = addr_in6_len;
|
hdrs[index].msg_hdr.msg_name = &mut addrs[index] as *mut _ as *mut _;
|
||||||
|
hdrs[index].msg_hdr.msg_namelen = SIZE_OF_SOCKADDR_IN6 as u32;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
hdr
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
pub fn send_mmsg(sock: &UdpSocket, packets: &[(&Vec<u8>, &SocketAddr)]) -> io::Result<usize> {
|
fn sendmmsg_retry(sock: &UdpSocket, hdrs: &mut Vec<mmsghdr>) -> Result<(), SendPktsError> {
|
||||||
use libc::{sendmmsg, socklen_t};
|
use libc::sendmmsg;
|
||||||
use std::mem;
|
|
||||||
use std::os::unix::io::AsRawFd;
|
use std::os::unix::io::AsRawFd;
|
||||||
|
|
||||||
|
let sock_fd = sock.as_raw_fd();
|
||||||
|
let mut total_sent = 0;
|
||||||
|
let mut erropt = None;
|
||||||
|
|
||||||
|
let mut pkts = &mut hdrs[..];
|
||||||
|
while !pkts.is_empty() {
|
||||||
|
let npkts = match unsafe { sendmmsg(sock_fd, &mut pkts[0], pkts.len() as u32, 0) } {
|
||||||
|
-1 => {
|
||||||
|
if erropt.is_none() {
|
||||||
|
erropt = Some(io::Error::last_os_error());
|
||||||
|
}
|
||||||
|
// skip over the failing packet
|
||||||
|
1_usize
|
||||||
|
}
|
||||||
|
n => {
|
||||||
|
// if we fail to send all packets we advance to the failing
|
||||||
|
// packet and retry in order to capture the error code
|
||||||
|
total_sent += n as usize;
|
||||||
|
n as usize
|
||||||
|
}
|
||||||
|
};
|
||||||
|
pkts = &mut pkts[npkts..];
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(err) = erropt {
|
||||||
|
Err(SendPktsError::IoError(err, hdrs.len() - total_sent))
|
||||||
|
} else {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
pub fn batch_send(sock: &UdpSocket, packets: &[(&[u8], &SocketAddr)]) -> Result<(), SendPktsError> {
|
||||||
// The vectors are allocated with capacity, as later code inserts elements
|
// The vectors are allocated with capacity, as later code inserts elements
|
||||||
// at specific indices, and uses the address of the vector index in hdrs
|
// at specific indices, and uses the address of the vector index in hdrs
|
||||||
let mut iovs: Vec<iovec> = Vec::with_capacity(packets.len());
|
let mut iovs: Vec<iovec> = Vec::with_capacity(packets.len());
|
||||||
let mut addr_in: Vec<sockaddr_in> = Vec::with_capacity(packets.len());
|
let mut addrs: Vec<sockaddr_storage> = Vec::with_capacity(packets.len());
|
||||||
let mut addr_in6: Vec<sockaddr_in6> = Vec::with_capacity(packets.len());
|
let mut hdrs: Vec<mmsghdr> = Vec::with_capacity(packets.len());
|
||||||
|
|
||||||
let addr_in_len = mem::size_of_val(&addr_in) as socklen_t;
|
for (pkt, dest) in packets.iter() {
|
||||||
let addr_in6_len = mem::size_of_val(&addr_in6) as socklen_t;
|
mmsghdr_for_packet(pkt, dest, &mut iovs, &mut addrs, &mut hdrs);
|
||||||
let sock_fd = sock.as_raw_fd();
|
|
||||||
|
|
||||||
let mut hdrs: Vec<mmsghdr> = packets
|
|
||||||
.iter()
|
|
||||||
.enumerate()
|
|
||||||
.map(|(i, (packet, dest))| {
|
|
||||||
mmsghdr_for_packet(
|
|
||||||
packet,
|
|
||||||
dest,
|
|
||||||
i,
|
|
||||||
addr_in_len as u32,
|
|
||||||
addr_in6_len as u32,
|
|
||||||
&mut iovs,
|
|
||||||
&mut addr_in,
|
|
||||||
&mut addr_in6,
|
|
||||||
)
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let npkts = match unsafe { sendmmsg(sock_fd, &mut hdrs[0], packets.len() as u32, 0) } {
|
|
||||||
-1 => return Err(io::Error::last_os_error()),
|
|
||||||
n => n as usize,
|
|
||||||
};
|
|
||||||
Ok(npkts)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(not(target_os = "linux"))]
|
|
||||||
pub fn multicast(sock: &UdpSocket, packet: &[u8], dests: &[&SocketAddr]) -> io::Result<usize> {
|
|
||||||
let count = dests.len();
|
|
||||||
for a in dests {
|
|
||||||
sock.send_to(packet, a)?;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(count)
|
sendmmsg_retry(sock, &mut hdrs)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "linux")]
|
pub fn multi_target_send(
|
||||||
pub fn multicast(sock: &UdpSocket, packet: &[u8], dests: &[&SocketAddr]) -> io::Result<usize> {
|
sock: &UdpSocket,
|
||||||
use libc::{sendmmsg, socklen_t};
|
packet: &[u8],
|
||||||
use std::mem;
|
dests: &[&SocketAddr],
|
||||||
use std::os::unix::io::AsRawFd;
|
) -> Result<(), SendPktsError> {
|
||||||
|
let pkts: Vec<_> = dests.iter().map(|addr| (packet, *addr)).collect();
|
||||||
// The vectors are allocated with capacity, as later code inserts elements
|
batch_send(sock, &pkts[..])
|
||||||
// at specific indices, and uses the address of the vector index in hdrs
|
|
||||||
let mut iovs: Vec<iovec> = Vec::with_capacity(dests.len());
|
|
||||||
let mut addr_in: Vec<sockaddr_in> = Vec::with_capacity(dests.len());
|
|
||||||
let mut addr_in6: Vec<sockaddr_in6> = Vec::with_capacity(dests.len());
|
|
||||||
|
|
||||||
let addr_in_len = mem::size_of_val(&addr_in) as socklen_t;
|
|
||||||
let addr_in6_len = mem::size_of_val(&addr_in6) as socklen_t;
|
|
||||||
let sock_fd = sock.as_raw_fd();
|
|
||||||
|
|
||||||
let mut hdrs: Vec<mmsghdr> = dests
|
|
||||||
.iter()
|
|
||||||
.enumerate()
|
|
||||||
.map(|(i, dest)| {
|
|
||||||
mmsghdr_for_packet(
|
|
||||||
packet,
|
|
||||||
dest,
|
|
||||||
i,
|
|
||||||
addr_in_len as u32,
|
|
||||||
addr_in6_len as u32,
|
|
||||||
&mut iovs,
|
|
||||||
&mut addr_in,
|
|
||||||
&mut addr_in6,
|
|
||||||
)
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let npkts = match unsafe { sendmmsg(sock_fd, &mut hdrs[0], dests.len() as u32, 0) } {
|
|
||||||
-1 => return Err(io::Error::last_os_error()),
|
|
||||||
n => n as usize,
|
|
||||||
};
|
|
||||||
Ok(npkts)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use crate::packet::Packet;
|
use crate::packet::Packet;
|
||||||
use crate::recvmmsg::recv_mmsg;
|
use crate::recvmmsg::recv_mmsg;
|
||||||
use crate::sendmmsg::{multicast, send_mmsg};
|
use crate::sendmmsg::{batch_send, multi_target_send, SendPktsError};
|
||||||
use solana_sdk::packet::PACKET_DATA_SIZE;
|
use solana_sdk::packet::PACKET_DATA_SIZE;
|
||||||
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, UdpSocket};
|
use std::{
|
||||||
|
io::ErrorKind,
|
||||||
|
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, UdpSocket},
|
||||||
|
};
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
pub fn test_send_mmsg_one_dest() {
|
pub fn test_send_mmsg_one_dest() {
|
||||||
|
@ -163,10 +169,10 @@ mod tests {
|
||||||
let sender = UdpSocket::bind("127.0.0.1:0").expect("bind");
|
let sender = UdpSocket::bind("127.0.0.1:0").expect("bind");
|
||||||
|
|
||||||
let packets: Vec<_> = (0..32).map(|_| vec![0u8; PACKET_DATA_SIZE]).collect();
|
let packets: Vec<_> = (0..32).map(|_| vec![0u8; PACKET_DATA_SIZE]).collect();
|
||||||
let packet_refs: Vec<_> = packets.iter().map(|p| (p, &addr)).collect();
|
let packet_refs: Vec<_> = packets.iter().map(|p| (&p[..], &addr)).collect();
|
||||||
|
|
||||||
let sent = send_mmsg(&sender, &packet_refs).ok();
|
let sent = batch_send(&sender, &packet_refs[..]).ok();
|
||||||
assert_eq!(sent, Some(32));
|
assert_eq!(sent, Some(()));
|
||||||
|
|
||||||
let mut packets = vec![Packet::default(); 32];
|
let mut packets = vec![Packet::default(); 32];
|
||||||
let recv = recv_mmsg(&reader, &mut packets[..]).unwrap().1;
|
let recv = recv_mmsg(&reader, &mut packets[..]).unwrap().1;
|
||||||
|
@ -187,11 +193,17 @@ mod tests {
|
||||||
let packet_refs: Vec<_> = packets
|
let packet_refs: Vec<_> = packets
|
||||||
.iter()
|
.iter()
|
||||||
.enumerate()
|
.enumerate()
|
||||||
.map(|(i, p)| if i < 16 { (p, &addr) } else { (p, &addr2) })
|
.map(|(i, p)| {
|
||||||
|
if i < 16 {
|
||||||
|
(&p[..], &addr)
|
||||||
|
} else {
|
||||||
|
(&p[..], &addr2)
|
||||||
|
}
|
||||||
|
})
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
let sent = send_mmsg(&sender, &packet_refs).ok();
|
let sent = batch_send(&sender, &packet_refs[..]).ok();
|
||||||
assert_eq!(sent, Some(32));
|
assert_eq!(sent, Some(()));
|
||||||
|
|
||||||
let mut packets = vec![Packet::default(); 32];
|
let mut packets = vec![Packet::default(); 32];
|
||||||
let recv = recv_mmsg(&reader, &mut packets[..]).unwrap().1;
|
let recv = recv_mmsg(&reader, &mut packets[..]).unwrap().1;
|
||||||
|
@ -220,13 +232,13 @@ mod tests {
|
||||||
|
|
||||||
let packet = Packet::default();
|
let packet = Packet::default();
|
||||||
|
|
||||||
let sent = multicast(
|
let sent = multi_target_send(
|
||||||
&sender,
|
&sender,
|
||||||
&packet.data[..packet.meta.size],
|
&packet.data[..packet.meta.size],
|
||||||
&[&addr, &addr2, &addr3, &addr4],
|
&[&addr, &addr2, &addr3, &addr4],
|
||||||
)
|
)
|
||||||
.ok();
|
.ok();
|
||||||
assert_eq!(sent, Some(4));
|
assert_eq!(sent, Some(()));
|
||||||
|
|
||||||
let mut packets = vec![Packet::default(); 32];
|
let mut packets = vec![Packet::default(); 32];
|
||||||
let recv = recv_mmsg(&reader, &mut packets[..]).unwrap().1;
|
let recv = recv_mmsg(&reader, &mut packets[..]).unwrap().1;
|
||||||
|
@ -246,12 +258,108 @@ mod tests {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_message_header_from_packet() {
|
fn test_intermediate_failures_mismatched_bind() {
|
||||||
let packets: Vec<_> = (0..2).map(|_| vec![0u8; PACKET_DATA_SIZE]).collect();
|
let packets: Vec<_> = (0..3).map(|_| vec![0u8; PACKET_DATA_SIZE]).collect();
|
||||||
let ip4 = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080);
|
let ip4 = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8080);
|
||||||
let ip6 = SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0)), 8080);
|
let ip6 = SocketAddr::new(IpAddr::V6(Ipv6Addr::LOCALHOST), 8080);
|
||||||
let packet_refs: Vec<_> = vec![(&packets[0], &ip4), (&packets[1], &ip6)];
|
let packet_refs: Vec<_> = vec![
|
||||||
let sender = UdpSocket::bind("127.0.0.1:0").expect("bind");
|
(&packets[0][..], &ip4),
|
||||||
send_mmsg(&sender, &packet_refs).unwrap();
|
(&packets[1][..], &ip6),
|
||||||
|
(&packets[2][..], &ip4),
|
||||||
|
];
|
||||||
|
let dest_refs: Vec<_> = vec![&ip4, &ip6, &ip4];
|
||||||
|
|
||||||
|
let sender = UdpSocket::bind("0.0.0.0:0").expect("bind");
|
||||||
|
if let Err(SendPktsError::IoError(_, num_failed)) = batch_send(&sender, &packet_refs[..]) {
|
||||||
|
assert_eq!(num_failed, 1);
|
||||||
|
}
|
||||||
|
if let Err(SendPktsError::IoError(_, num_failed)) =
|
||||||
|
multi_target_send(&sender, &packets[0], &dest_refs)
|
||||||
|
{
|
||||||
|
assert_eq!(num_failed, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_intermediate_failures_unreachable_address() {
|
||||||
|
let packets: Vec<_> = (0..5).map(|_| vec![0u8; PACKET_DATA_SIZE]).collect();
|
||||||
|
let ipv4local = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8080);
|
||||||
|
let ipv4broadcast = SocketAddr::new(IpAddr::V4(Ipv4Addr::BROADCAST), 8080);
|
||||||
|
let sender = UdpSocket::bind("0.0.0.0:0").expect("bind");
|
||||||
|
|
||||||
|
// test intermediate failures for batch_send
|
||||||
|
let packet_refs: Vec<_> = vec![
|
||||||
|
(&packets[0][..], &ipv4local),
|
||||||
|
(&packets[1][..], &ipv4broadcast),
|
||||||
|
(&packets[2][..], &ipv4local),
|
||||||
|
(&packets[3][..], &ipv4broadcast),
|
||||||
|
(&packets[4][..], &ipv4local),
|
||||||
|
];
|
||||||
|
if let Err(SendPktsError::IoError(ioerror, num_failed)) =
|
||||||
|
batch_send(&sender, &packet_refs[..])
|
||||||
|
{
|
||||||
|
assert!(matches!(ioerror.kind(), ErrorKind::PermissionDenied));
|
||||||
|
assert_eq!(num_failed, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
// test leading and trailing failures for batch_send
|
||||||
|
let packet_refs: Vec<_> = vec![
|
||||||
|
(&packets[0][..], &ipv4broadcast),
|
||||||
|
(&packets[1][..], &ipv4local),
|
||||||
|
(&packets[2][..], &ipv4broadcast),
|
||||||
|
(&packets[3][..], &ipv4local),
|
||||||
|
(&packets[4][..], &ipv4broadcast),
|
||||||
|
];
|
||||||
|
if let Err(SendPktsError::IoError(ioerror, num_failed)) =
|
||||||
|
batch_send(&sender, &packet_refs[..])
|
||||||
|
{
|
||||||
|
assert!(matches!(ioerror.kind(), ErrorKind::PermissionDenied));
|
||||||
|
assert_eq!(num_failed, 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
// test consecutive intermediate failures for batch_send
|
||||||
|
let packet_refs: Vec<_> = vec![
|
||||||
|
(&packets[0][..], &ipv4local),
|
||||||
|
(&packets[1][..], &ipv4local),
|
||||||
|
(&packets[2][..], &ipv4broadcast),
|
||||||
|
(&packets[3][..], &ipv4broadcast),
|
||||||
|
(&packets[4][..], &ipv4local),
|
||||||
|
];
|
||||||
|
if let Err(SendPktsError::IoError(ioerror, num_failed)) =
|
||||||
|
batch_send(&sender, &packet_refs[..])
|
||||||
|
{
|
||||||
|
assert!(matches!(ioerror.kind(), ErrorKind::PermissionDenied));
|
||||||
|
assert_eq!(num_failed, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
// test intermediate failures for multi_target_send
|
||||||
|
let dest_refs: Vec<_> = vec![
|
||||||
|
&ipv4local,
|
||||||
|
&ipv4broadcast,
|
||||||
|
&ipv4local,
|
||||||
|
&ipv4broadcast,
|
||||||
|
&ipv4local,
|
||||||
|
];
|
||||||
|
if let Err(SendPktsError::IoError(ioerror, num_failed)) =
|
||||||
|
multi_target_send(&sender, &packets[0], &dest_refs)
|
||||||
|
{
|
||||||
|
assert!(matches!(ioerror.kind(), ErrorKind::PermissionDenied));
|
||||||
|
assert_eq!(num_failed, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
// test leading and trailing failures for multi_target_send
|
||||||
|
let dest_refs: Vec<_> = vec![
|
||||||
|
&ipv4broadcast,
|
||||||
|
&ipv4local,
|
||||||
|
&ipv4broadcast,
|
||||||
|
&ipv4local,
|
||||||
|
&ipv4broadcast,
|
||||||
|
];
|
||||||
|
if let Err(SendPktsError::IoError(ioerror, num_failed)) =
|
||||||
|
multi_target_send(&sender, &packets[0], &dest_refs)
|
||||||
|
{
|
||||||
|
assert!(matches!(ioerror.kind(), ErrorKind::PermissionDenied));
|
||||||
|
assert_eq!(num_failed, 3);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue