Changeset b585975 for lib

Timestamp:

02/10/15 14:56:24 (7 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

4d0fdbd

Parents:

47321fd

Message:

Adds support for DPDK v1.8.0

File:

• lib/format_dpdk.c (modified) (8 diffs)

lib/format_dpdk.c

@@ +1 @@
+
 /*
  * This file is part of libtrace
@@ -69 +70 @@
  * code (that we still attempt to support).
  *
- * Currently 1.5 to 1.7 is supported.
+ * DPDK v1.7.1 is recommended.
+ * However 1.5 to 1.8 are likely supported.
  */
 #include <rte_eal.h>
@@ -111 +113 @@
 #else
 #       define DPDK_USE_PMD_INIT 0
+#endif
+
+/* 1.7.0-rc3 :
+ *
+ * Since 1.7.0-rc3 rte_eal_pci_probe is called as part of rte_eal_init.
+ * Somewhere between 1.7 and 1.8 calling it twice broke so we should not call
+ * it twice.
+ */
+#if RTE_VERSION < RTE_VERSION_NUM(1, 7, 0, 3)
+#       define DPDK_USE_PCI_PROBE 1
+#else
+#       define DPDK_USE_PCI_PROBE 0
+#endif
+
+/* 1.8.0-rc1 :
+ * LOG LEVEL is a command line option which overrides what
+ * we previously set it to.
+ */
+#if RTE_VERSION >= RTE_VERSION_NUM(1, 8, 0, 1)
+#       define DPDK_USE_LOG_LEVEL 1
+#else
+#       define DPDK_USE_LOG_LEVEL 0
 #endif
 
@@ -460 +484 @@
 #if DEBUG
     rte_set_log_level(RTE_LOG_DEBUG);
-#else 
+#else
     rte_set_log_level(RTE_LOG_WARNING);
 #endif
@@ -468 +492 @@
      * port that already in use.
      */
-    char* argv[] = {"libtrace", "-c", cpu_number, "-n", "1", "--proc-type", "auto",
-                "--file-prefix", mem_map, "-m", "256", NULL};
+    char* argv[] = {"libtrace",
+                    "-c", cpu_number,
+                    "-n", "1",
+                    "--proc-type", "auto",
+                    "--file-prefix", mem_map,
+                    "-m", "256",
+#if DPDK_USE_LOG_LEVEL
+#       if DEBUG
+                    "--log-level", "8", /* RTE_LOG_DEBUG */
+#       else
+                    "--log-level", "5", /* RTE_LOG_WARNING */
+#       endif
+#endif
+                    NULL};
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
 
@@ -563 +599 @@
 #endif
 
+#if DPDK_USE_PCI_PROBE
     /* This loads DPDK drivers against all ports that are not blacklisted */
         if ((ret = rte_eal_pci_probe()) < 0) {
@@ -569 +606 @@
         return -1;
     }
+#endif
 
     format_data->nb_ports = rte_eth_dev_count();
@@ -1135 +1173 @@
 #if GET_MAC_CRC_CHECKSUM
     /* Add back in the CRC sum */
-    pkt->pkt.pkt_len += ETHER_CRC_LEN;
-    pkt->pkt.data_len += ETHER_CRC_LEN;
+    rte_pktmbuf_pkt_len(pkt) += ETHER_CRC_LEN;
+    rte_pktmbuf_data_len(pkt) += ETHER_CRC_LEN;
     hdr->flags |= INCLUDES_CHECKSUM;
 #endif