Update DPDK version to 17.05 (#507)

* Update DPDK to 17.05

* Update outdated comments

* Apply DPDK 17.05 internal change

* Apply rte_mbuf layout changes

* Add new and delete operators for 64B alignment

* Fix layout issue in DPDK on 32bit systems

* Set default decimal points for percentage

* Add static assertions for rte_mbuf layout check

Author: sangjinhan

.codecov.yml

@@ -1,10 +1,6 @@
 codecov:
   branch: master  # base branch for delta computation
 
-coverage:
-  precision: 0
-  round: nearest
-
 ignore:           # files and folders to be ignored
   - "*_test.cc$"
   - "*_bench.cc$"

build.py

@@ -13,7 +13,7 @@
 DEPS_DIR = '%s/deps' % BESS_DIR
 
 DPDK_REPO = 'http://dpdk.org/browse/dpdk/snapshot'
-DPDK_VER = 'dpdk-17.02'
+DPDK_VER = 'dpdk-17.05'
 
 arch = subprocess.check_output('uname -m', shell=True).strip()
 if arch == 'x86_64':
@@ -37,10 +37,8 @@
 
 
 def cmd(cmd):
-    proc = subprocess.Popen(cmd,
-                            stdout=subprocess.PIPE,
-                            stderr=subprocess.STDOUT,
-                            shell=True)
+    proc = subprocess.Popen(
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     # err should be None
     out, err = proc.communicate()
@@ -53,10 +51,8 @@ def cmd(cmd):
 
 def cmd_success(cmd):
     try:
-        subprocess.check_call(cmd,
-                              stdout=subprocess.PIPE,
-                              stderr=subprocess.STDOUT,
-                              shell=True)
+        subprocess.check_call(
+            cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
         return True
     except subprocess.CalledProcessError:
         return False
@@ -111,8 +107,7 @@ def check_c_lib(lib):
 
 def required(header_file, lib_name, compiler):
     if not check_header(header_file, compiler):
-        print('Error - #include <%s> failed. '
-              'Did you install "%s" package?'
+        print('Error - #include <%s> failed. Did you install "%s" package?'
               % (header_file, lib_name), file=sys.stderr)
         sys.exit(1)
 
@@ -155,8 +150,7 @@ def check_bnx():
         global extra_libs
         extra_libs.add('z')
     else:
-        print(' - "zlib1g-dev" is not available. '
-              'Disabling BNX2X PMD...')
+        print(' - "zlib1g-dev" is not available. Disabling BNX2X PMD...')
         set_config(DPDK_FINAL_CONFIG, 'CONFIG_RTE_LIBRTE_BNX2X_PMD', 'n')
 
 
@@ -180,8 +174,8 @@ def generate_dpdk_extra_mk():
     global extra_libs
 
     with open('core/extra.dpdk.mk', 'w') as fp:
-        fp.write('LIBS += %s\n' %
-                 ' '.join(map(lambda lib: '-l' + lib, extra_libs)))
+        fp.write(
+            'LIBS += %s\n' % ' '.join(map(lambda lib: '-l' + lib, extra_libs)))
 
 
 def generate_extra_mk():
@@ -227,8 +221,8 @@ def build_dpdk():
         try:
             print('Decompressing DPDK...')
             cmd('mkdir -p %s' % DPDK_DIR)
-            cmd('tar zxf %s -C %s --strip-components 1' %
-                (DPDK_FILE, DPDK_DIR))
+            cmd('tar zxf %s -C %s --strip-components 1' % (DPDK_FILE,
+                                                           DPDK_DIR))
         except:
             cmd('rm -rf %s' % (DPDK_DIR))
             raise
@@ -261,7 +255,7 @@ def build_bess():
 
     print('Building BESS daemon...')
     cmd('bin/bessctl daemon stop 2> /dev/null || true')
-    cmd('rm -f core/bessd')     # force relink as DPDK might have been rebuilt
+    cmd('rm -f core/bessd')  # force relink as DPDK might have been rebuilt
     cmd('make -C core -j`nproc`')
     cmd('ln -f -s ../core/bessd bin/bessd')
 
@@ -319,11 +313,18 @@ def update_benchmark_path(path):
 def main():
     os.chdir(BESS_DIR)
     parser = argparse.ArgumentParser(description='Build BESS')
-    parser.add_argument('action', metavar='action', nargs='?', default='all',
-                        help='Action is one of all, dpdk, bess, kmod, clean'
-                             ' dist_clean, help')
-    parser.add_argument('--with-benchmark', dest='benchmark_path', nargs=1,
-                        help='Location of benchmark library')
+    parser.add_argument(
+        'action',
+        metavar='action',
+        nargs='?',
+        default='all',
+        help='Action is one of all, dpdk, bess, kmod, clean'
+        ' dist_clean, help')
+    parser.add_argument(
+        '--with-benchmark',
+        dest='benchmark_path',
+        nargs=1,
+        help='Location of benchmark library')
     args = parser.parse_args()
 
     if args.benchmark_path:

core/Makefile

@@ -25,7 +25,7 @@ ifeq "$(shell expr $(CXXCOMPILER) = g++ \& $(CXXVERSION) \< 40800)" "1"
     $(error g++ 4.8 or higher is required)
 endif
 
-RTE_SDK ?= $(abspath ../deps/dpdk-17.02)
+RTE_SDK ?= $(abspath ../deps/dpdk-17.05)
 RTE_TARGET ?= $(shell uname -m)-native-linuxapp-gcc
 DPDK_LIB ?= dpdk
 

core/drivers/pmd.cc

@@ -81,7 +81,7 @@ static CommandResponse find_dpdk_port_by_id(dpdk_port_t port_id,
   if (port_id >= RTE_MAX_ETHPORTS) {
     return CommandFailure(EINVAL, "Invalid port id %d", port_id);
   }
-  if (!rte_eth_devices[port_id].attached) {
+  if (rte_eth_devices[port_id].state != RTE_ETH_DEV_ATTACHED) {
     return CommandFailure(ENODEV, "Port id %d is not available", port_id);
   }
 

core/packet.cc

@@ -15,8 +15,6 @@
 
 namespace bess {
 
-Packet pframe_template;
-
 static struct rte_mempool *pframe_pool[RTE_MAX_NUMA_NODES];
 
 static void packet_init(struct rte_mempool *mp, void *opaque_arg, void *_m,
@@ -72,22 +70,6 @@ static void init_mempool_socket(int sid) {
             << ": OK";
 }
 
-static void init_templates(void) {
-  int i;
-
-  for (i = 0; i < RTE_MAX_NUMA_NODES; i++) {
-    Packet *pkt;
-
-    if (!pframe_pool[i]) {
-      continue;
-    }
-
-    pkt = reinterpret_cast<Packet *>(rte_pktmbuf_alloc(pframe_pool[i]));
-    pframe_template = *pkt;
-    Packet::Free(pkt);
-  }
-}
-
 void init_mempool(void) {
   int initialized[RTE_MAX_NUMA_NODES];
 
@@ -109,8 +91,6 @@ void init_mempool(void) {
       initialized[sid] = 1;
     }
   }
-
-  init_templates();
 }
 
 void close_mempool(void) {
@@ -142,6 +122,32 @@ static Packet *paddr_to_snb_memchunk(struct rte_mempool_memhdr *chunk,
   return nullptr;
 }
 
+#define check_offset(field)                                                                                                                                                                                                                                                                                                  \
+  do {                                                                                                                                                                                                                                                                                                                \
+    static_assert(offsetof(Packet, field##_) == offsetof(rte_mbuf, field), \
+      "Incompatibility detected between class Packet and struct rte_mbuf"); \
+  } while (0)
+
+Packet::Packet() {
+  // static assertions for rte_mbuf layout compatibility
+  static_assert(offsetof(Packet, mbuf_) == 0, "mbuf_ must be at offset 0");
+  check_offset(buf_addr);
+  check_offset(rearm_data);
+  check_offset(data_off);
+  check_offset(refcnt);
+  check_offset(nb_segs);
+  check_offset(rx_descriptor_fields1);
+  check_offset(pkt_len);
+  check_offset(data_len);
+  check_offset(buf_len);
+  check_offset(pool);
+  check_offset(next);
+
+  rte_pktmbuf_reset(&mbuf_);
+}
+
+#undef check_offset
+
 Packet *Packet::from_paddr(phys_addr_t paddr) {
   for (int i = 0; i < RTE_MAX_NUMA_NODES; i++) {
     struct rte_mempool *pool;
@@ -251,7 +257,7 @@ std::string Packet::Dump() {
 
   dump << "refcnt chain: ";
   for (pkt = this; pkt; pkt = pkt->next_) {
-    dump << pkt->refcnt_;
+    dump << pkt->refcnt_ << ' ';
   }
   dump << std::endl;
 
@@ -273,8 +279,8 @@ std::string Packet::Dump() {
   dump << "dump packet at " << this << ", phys=" << buf_physaddr_
        << ", buf_len=" << buf_len_ << std::endl;
   dump << "  pkt_len=" << pkt_len_ << ", ol_flags=" << std::hex
-       << offload_flags_ << ", nb_segs=" << std::dec << unsigned{nb_segs_}
-       << ", in_port=" << unsigned{port_} << std::endl;
+       << mbuf_.ol_flags << ", nb_segs=" << std::dec << nb_segs_
+       << ", in_port=" << mbuf_.port << std::endl;
 
   nb_segs = nb_segs_;
   pkt = this;