mirrors/krata
1
0
Fork 0
mirror of https://github.com/edera-dev/krata.git synced 2025-08-02 12:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: performance tuning and IPv6 checksum fixups

Browse Source
This commit is contained in:
Alex Zenla 2024-03-04 07:59:37 +00:00
parent c9c071dd8e
commit 9350a7520d
No known key found for this signature in database
GPG Key ID: 067B238899B51269
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
network/src/lib.rs
View File

@ -22,7 +22,7 @@ pub mod proxynat;
pub mod raw_socket; pub mod raw_socket;
pub mod vbridge; pub mod vbridge;
pub const FORCE_MTU: usize = 20000; pub const FORCE_MTU: usize = 65521;
pub struct NetworkService { pub struct NetworkService {
pub backends: HashMap<Uuid, JoinHandle<()>>, pub backends: HashMap<Uuid, JoinHandle<()>>,

4
network/src/proxynat/tcp.rs
View File

@ -194,7 +194,7 @@ impl ProxyTcpHandler {
} }
ProxyTcpAcceptSelect::DoNothing => { ProxyTcpAcceptSelect::DoNothing => {
sleeper = Some(tokio::time::sleep(Duration::from_millis(50))); sleeper = Some(tokio::time::sleep(Duration::from_micros(100)));
} }
ProxyTcpAcceptSelect::Internal(data) => { ProxyTcpAcceptSelect::Internal(data) => {
@ -398,7 +398,7 @@ impl ProxyTcpHandler {
} }
ProxyTcpDataSelect::DoNothing => { ProxyTcpDataSelect::DoNothing => {
sleeper = Some(tokio::time::sleep(Duration::from_millis(50))); sleeper = Some(tokio::time::sleep(Duration::from_micros(100)));
} }
ProxyTcpDataSelect::Close => { ProxyTcpDataSelect::Close => {

22
network/src/vbridge.rs
View File

@ -1,6 +1,6 @@
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use bytes::BytesMut; use bytes::BytesMut;
use etherparse::{EtherType, Ethernet2Header, IpNumber, Ipv4Header, TcpHeader}; use etherparse::{EtherType, Ethernet2Header, IpNumber, Ipv4Header, Ipv6Header, TcpHeader};
use log::{debug, trace, warn}; use log::{debug, trace, warn};
use smoltcp::wire::EthernetAddress; use smoltcp::wire::EthernetAddress;
use std::{ use std::{
@ -148,13 +148,12 @@ impl VirtualBridge {
} }
}; };
// recalculate TCP checksums when routing packets.
// the xen network backend / frontend drivers for linux
// use checksum offloading but since we bypass some layers
// of the kernel we have to do it ourselves.
if header.ether_type == EtherType::IPV4 { if header.ether_type == EtherType::IPV4 {
let (ipv4, payload) = Ipv4Header::from_slice(payload)?; let (ipv4, payload) = Ipv4Header::from_slice(payload)?;
// recalculate TCP checksums when routing packets.
// the xen network backend / frontend drivers for linux
// are very stupid and do not calculate these properly
// despite all best attempts at making it do so.
if ipv4.protocol == IpNumber::TCP { if ipv4.protocol == IpNumber::TCP {
let (mut tcp, payload) = TcpHeader::from_slice(payload)?; let (mut tcp, payload) = TcpHeader::from_slice(payload)?;
tcp.checksum = tcp.calc_checksum_ipv4(&ipv4, payload)?; tcp.checksum = tcp.calc_checksum_ipv4(&ipv4, payload)?;
@ -164,6 +163,17 @@ impl VirtualBridge {
packet[tcp_header_offset + i] = *b; packet[tcp_header_offset + i] = *b;
} }
} }
} else if header.ether_type == EtherType::IPV6 {
let (ipv6, payload) = Ipv6Header::from_slice(payload)?;
if ipv6.next_header == IpNumber::TCP {
let (mut tcp, payload) = TcpHeader::from_slice(payload)?;
tcp.checksum = tcp.calc_checksum_ipv6(&ipv6, payload)?;
let tcp_header_offset = Ethernet2Header::LEN + ipv6.header_len();
let tcp_header_bytes = tcp.to_bytes();
for (i, b) in tcp_header_bytes.iter().enumerate() {
packet[tcp_header_offset + i] = *b;
}
}
} }
let destination = EthernetAddress(header.destination); let destination = EthernetAddress(header.destination);