adapted to rustc 1.62.0-nightly and bindgen 0.59.2, replaced asm.rs with native rust library code

Author: rstade

.idea/misc.xml

@@ -128,9 +128,13 @@ case $TASK in
             popd
         done
         ;;
-
+    huge_pages)
+        sudo dpdk-hugepages.py -p 2M --setup 8G
+        sudo dpdk-hugepages.py -s
+        ;;
     test)
         native
+        huge_pages
         pushd $BASE_DIR/framework
         export LD_LIBRARY_PATH="${NATIVE_LIB_PATH}:${DPDK_LD_PATH}:${TOOLS_BASE}:${LD_LIBRARY_PATH}"
 #        sudo -E env "PATH=$PATH" ${CARGO} test --release
@@ -210,6 +214,7 @@ case $TASK in
           clean: Remove all built files
           dist_clean: Remove all support files
           env: Environment variables, run as eval \`./build.sh env\`.
+          huge_pages: setup huge pages for dpdk
 endhelp
         ;;
 esac

build.sh

@@ -1,7 +1,7 @@
 [package]
 name = "e2d2"
-version = "1.0.6"
-authors = ["Aurojit Panda <apanda@cs.berkeley.edu>", "rainer <rainer@spacebandit.de>"]
+version = "1.0.7"
+authors = ["Aurojit Panda <apanda@cs.berkeley.edu>", "Rainer Stademann"]
 build = "build.rs"
 
 [lib]

framework/Cargo.toml

@@ -1,3 +1,4 @@
+#![allow(dead_code)]
 use super::super::{PacketRx, PacketTx};
 use super::PortStats;
 use allocators::*;
@@ -20,6 +21,7 @@ use native::zcsi::{
     rte_kni_rx_burst, rte_kni_tx_burst, KniPortParams, MBuf, RteFdirConf, RteFlowError, RteKni,
 };
 use regex::Regex;
+use std::arch::x86_64::_rdtsc;
 use std::cell::RefCell;
 use std::cmp::min;
 use std::collections::VecDeque;
@@ -33,7 +35,7 @@ use std::rc::Rc;
 use std::string::ToString;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
-use utils::{rdtsc_unsafe, FiveTupleV4};
+use utils::FiveTupleV4;
 
 /// A DPDK based PMD port. Send and receive should not be called directly on this structure but on the port queue
 /// structure instead.
@@ -284,7 +286,7 @@ impl PortQueue {
 
     #[inline]
     fn recv_queue(&self, pkts: &mut [*mut MBuf], to_recv: u16) -> errors::Result<u32> {
-        let start = rdtsc_unsafe();
+        let start = unsafe { _rdtsc() };
         unsafe {
             let recv = if self.port.is_native_kni() {
                 rte_kni_rx_burst(self.port.kni.unwrap().as_ptr(), pkts.as_mut_ptr(), to_recv as u32)
@@ -296,7 +298,7 @@ impl PortQueue {
             self.stats_rx.stats.store(update, Ordering::Relaxed);
 
             if recv > 0 {
-                let update = self.stats_rx.cycles.load(Ordering::Relaxed) + (rdtsc_unsafe() - start);
+                let update = self.stats_rx.cycles.load(Ordering::Relaxed) + (_rdtsc() - start);
                 self.stats_rx.cycles.store(update, Ordering::Relaxed);
             }
             Ok(recv)
@@ -420,7 +422,7 @@ impl PortQueueTxBuffered {
 
     #[inline]
     fn send_queue(&mut self, pkts: &mut [*mut MBuf], to_send: u32) -> errors::Result<u32> {
-        let stamp = rdtsc_unsafe();
+        let stamp = unsafe { _rdtsc() };
         if self.tx_queue_is_empty() {
             let sent = self.port_queue.try_send(pkts, to_send);
             if sent < to_send {

framework/src/interface/port/phy_port.rs

@@ -1,5 +1,4 @@
 #![recursion_limit = "1024"]
-#![feature(asm)]
 #![feature(log_syntax)]
 #![feature(box_syntax)]
 #![feature(min_specialization)]
@@ -9,7 +8,6 @@
 #![feature(allocator_api)]
 #![allow(unused_features)]
 #![feature(integer_atomics)]
-#![feature(llvm_asm)]
 #![allow(unused_doc_comments)]
 #![cfg_attr(feature = "dev", allow(unstable_features))]
 // Need this since PMD port construction triggers too many arguments.

framework/src/lib.rs

@@ -61,6 +61,7 @@ impl rte_eth_dev_info {
             max_vfs: 0,
             max_vmdq_pools: 0,
             rx_seg_capa: rte_eth_rxseg_capa {
+                _bitfield_align_1: [],
                 _bitfield_1: Default::default(),
                 max_nseg: 0,
                 reserved: 0,