Fix performance issues in l2fwd

Author: tropuq

bindings/dpdk/src/eal.rs

@@ -16,11 +16,12 @@ use thiserror::Error;
 
 const MAGIC: &str = "be0dd4ab";
 
-pub const DEFAULT_TX_DESC: u16 = 1024;
-pub const DEFAULT_RX_DESC: u16 = 1024;
-pub const DEFAULT_RX_POOL_SIZE: usize = 8192;
-pub const DEFAULT_RX_PER_CORE_CACHE: usize = 0;
-pub const DEFAULT_PACKET_DATA_LENGTH: usize = 2048;
+pub const DEFAULT_TX_DESC: u16 = 4096;
+pub const DEFAULT_RX_DESC: u16 = 4096;
+pub const DEFAULT_RX_PER_CORE_CACHE: usize = 256;
+pub const DEFAULT_RX_POOL_SIZE: usize = DEFAULT_TX_DESC as usize + DEFAULT_RX_DESC as usize +
+    DEFAULT_RX_BURST + DEFAULT_RX_PER_CORE_CACHE;
+pub const DEFAULT_PACKET_DATA_LENGTH: usize = 2048 + 128;
 pub const DEFAULT_PROMISC: bool = true;
 pub const DEFAULT_RX_BURST: usize = 32;
 pub const DEFAULT_TX_BURST: usize = 32;

l2fwd/src/main.rs

@@ -1,13 +1,12 @@
 use anyhow::Context;
-use dpdk::arrayvec::{self, ArrayVec};
+use dpdk::arrayvec::ArrayVec;
 use dpdk::eal::{self, Eal, LCoreId, Port, TxQ};
 use dpdk::tx_buffer::TxBuffer;
 use log::{info, warn};
 use smoltcp::wire::{EthernetAddress, EthernetFrame};
 use structopt::StructOpt;
 
 use dpdk::eal::EalGlobalApi;
-use std::cell::Cell;
 use std::env;
 
 mod utils;
@@ -187,21 +186,18 @@ fn forward_loop(eal: &Eal, lcore: LCoreId, fwds: Vec<ForwardDesc>) {
     let mut prev_tsc = 0;
     let drain_tsc = (eal.get_tsc_hz() + US_PER_S - 1) / US_PER_S * BURST_TX_DRAIN_US;
 
-    let sent = Cell::new(0);
-    let dropped = Cell::new(0);
+    let mut _sent = 0;
+    let mut _dropped = 0;
     let mut _recv = 0;
-    let handle_tx_res =
-        |(sent_cnt, dropped_pkts): (usize, Option<arrayvec::Drain<'_, _, MAX_PKT_BURST>>)| {
-            sent.set(sent.get() + sent_cnt);
-            dropped.set(dropped.get() + dropped_pkts.map_or(0, |d| d.len()));
-        };
 
     loop {
         let cur_tsc = eal.get_tsc_cycles();
         let diff_tsc = cur_tsc - prev_tsc;
         if diff_tsc > drain_tsc {
             for (dst, tx_buf) in itertools::izip!(&mut dsts, &mut tx_bufs) {
-                handle_tx_res(tx_buf.flush(dst));
+                let (cur_sent, cur_dropped_iter) = tx_buf.flush(dst);
+                _sent += cur_sent;
+                _dropped += cur_dropped_iter.map_or(0, |d| d.len());
             }
             prev_tsc = cur_tsc;
         }
@@ -223,7 +219,9 @@ fn forward_loop(eal: &Eal, lcore: LCoreId, fwds: Vec<ForwardDesc>) {
                 // flush, but in the current implementation we can't do it
                 // because we have common prev_tsc for all fwds handled by
                 // this lcore.
-                handle_tx_res(tx_buf.tx(dst, pkt));
+                let (cur_sent, cur_dropped_iter) = tx_buf.tx(dst, pkt);
+                _sent += cur_sent;
+                _dropped += cur_dropped_iter.map_or(0, |d| d.len());
             }
         }
     }