Changeset 3f58e38 for lib

Timestamp:

09/04/14 20:06:40 (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:

6c3b3d7

Parents:

95364aa

Message:

Fixes compling with DPDK 1.6.0r2 and 1.7

File:

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

lib/format_dpdk.c

@@ -57 +57 @@
 #include <unistd.h>
 #include <endian.h>
+#include <string.h>
+
+/* We can deal with any minor differences by checking the RTE VERSION
+ * Typically DPDK backports some fixes (typically for building against
+ * newer kernels) to the older version of DPDK.
+ *
+ * These get released with the rX suffix. The following macros where added
+ * in these new releases.
+ *
+ * Below this is a log of version that required changes to the libtrace
+ * code (that we still attempt to support).
+ *
+ * Currently 1.5 to 1.7 is supported.
+ */
+#include <rte_version.h>
+#ifndef RTE_VERSION_NUM
+#       define RTE_VERSION_NUM(a,b,c,d) ((a) << 24 | (b) << 16 | (c) << 8 | (d))
+#endif
+#ifndef RTE_VER_PATCH_RELEASE
+#       define RTE_VER_PATCH_RELEASE 0
+#endif
+#ifndef RTE_VERSION
+#       define RTE_VERSION RTE_VERSION_NUM(RTE_VER_MAJOR,RTE_VER_MINOR, \
+        RTE_VER_PATCH_LEVEL, RTE_VER_PATCH_RELEASE)
+#endif
+
+/* 1.6.0r2 :
+ *      rte_eal_pci_set_blacklist() is removed
+ *      device_list is renamed ot pci_device_list
+ *
+ * Replaced by:
+ *      rte_devargs (we can simply whitelist)
+ */
+#if RTE_VERSION <= RTE_VERSION_NUM(1, 6, 0, 1)
+#       define DPDK_USE_BLACKLIST 1
+#else
+#       define DPDK_USE_BLACKLIST 0
+#endif
+
+/*
+ * 1.7.0 :
+ *      rte_pmd_init_all is removed
+ *
+ * Replaced by:
+ *      Nothing, no longer needed
+ */
+#if RTE_VERSION < RTE_VERSION_NUM(1, 7, 0, 0)
+#       define DPDK_USE_PMD_INIT 1
+#else
+#       define DPDK_USE_PMD_INIT 0
+#endif
+
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
@@ -191 +243 @@
     int nb_tx_buf; /* The number of packet buffers in the tx ring */
     struct rte_mempool * pktmbuf_pool; /* Our packet memory pool */
+#if DPDK_USE_BLACKLIST
     struct rte_pci_addr blacklist[BLACK_LIST_SIZE]; /* Holds our device blacklist */
+        unsigned int nb_blacklist; /* Number of blacklist items in are valid */
+#endif
     char mempool_name[MEMPOOL_NAME_LEN]; /* The name of the mempool that we are using */
-    unsigned int nb_blacklist; /* Number of blacklist items in are valid */
 #if HAS_HW_TIMESTAMPS_82580
     /* Timestamping only relevent to RX */
@@ -243 +297 @@
  * So blacklist all devices except the one that we wish to use so that 
  * the others can still be used as standard ethernet ports.
- */
-static void blacklist_devices(struct dpdk_format_data_t *format_data, struct rte_pci_addr *whitelist)
+ *
+ * @return 0 if successful, otherwise -1 on error.
+ */
+#if DPDK_USE_BLACKLIST
+static int blacklist_devices(struct dpdk_format_data_t *format_data, struct rte_pci_addr *whitelist)
 {
         struct rte_pci_device *dev = NULL;
@@ -268 +325 @@
 
         rte_eal_pci_set_blacklist(format_data->blacklist, format_data->nb_blacklist);
-}
+        return 0;
+}
+#else /* DPDK_USE_BLACKLIST */
+#include <rte_devargs.h>
+static int blacklist_devices(struct dpdk_format_data_t *format_data UNUSED, struct rte_pci_addr *whitelist)
+{
+        char pci_str[20] = {0};
+        snprintf(pci_str, sizeof(pci_str), PCI_PRI_FMT,
+                 whitelist->domain,
+                 whitelist->bus,
+                 whitelist->devid,
+                 whitelist->function);
+        if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, pci_str) < 0) {
+                return -1;
+        }
+        return 0;
+}
+#endif
 
 /**
@@ -375 +449 @@
                                         char * err, int errlen) {
     int ret; /* Returned error codes */
-    struct rte_pci_addr use_addr; /* The only address that we don't blacklist */   
+    struct rte_pci_addr use_addr; /* The only address that we don't blacklist */
     char cpu_number[10] = {0}; /* The CPU mask we want to bind to */
     char mem_map[20] = {0}; /* The memory name */
@@ -394 +468 @@
                 "--file-prefix", mem_map, "-m", "256", NULL};
     int argc = sizeof(argv) / sizeof(argv[0]) - 1;
-    
-    /* This initialises the Environment Abstraction Layer (EAL)
+
     /* This initialises the Environment Abstraction Layer (EAL)
      * If we had slave workers these are put into WAITING state
@@ -455 +528 @@
     dump_configuration();
 #endif
+
+#if DPDK_USE_PMD_INIT
     /* This registers all available NICs with Intel DPDK
      * These are not loaded until rte_eal_pci_probe() is called.
@@ -463 +538 @@
         return -1;
     }
-
-    /* Black list all ports besides the one that we want to use */
-    blacklist_devices(format_data, &use_addr);
+#endif
+
+    /* Blacklist all ports besides the one that we want to use */
+        if ((ret = blacklist_devices(format_data, &use_addr)) < 0) {
+                snprintf(err, errlen, "Intel DPDK - Whitelisting PCI device failed,"
+                         " are you sure the address is correct?: %s", strerror(-ret));
+                return -1;
+        }
 
     /* This loads DPDK drivers against all ports that are not blacklisted */
@@ -500 +580 @@
     FORMAT(libtrace)->promisc = -1;
     FORMAT(libtrace)->pktmbuf_pool = NULL;
+#if DPDK_USE_BLACKLIST
     FORMAT(libtrace)->nb_blacklist = 0;
+#endif
     FORMAT(libtrace)->paused = DPDK_NEVER_STARTED;
     FORMAT(libtrace)->mempool_name[0] = 0;
@@ -533 +615 @@
     FORMAT(libtrace)->promisc = -1;
     FORMAT(libtrace)->pktmbuf_pool = NULL;
+#if DPDK_USE_BLACKLIST
     FORMAT(libtrace)->nb_blacklist = 0;
+#endif
     FORMAT(libtrace)->paused = DPDK_NEVER_STARTED;
     FORMAT(libtrace)->mempool_name[0] = 0;