dpdk: bump to dpdk 17.08, remove support for dpdk 17.02

Change-Id: I674fb1212e48693939045523df085326a4dd1809
Signed-off-by: Damjan Marion <damarion@cisco.com>

diff --git a/dpdk/Makefile b/dpdk/Makefile
index 8d5b42e..06e38f7 100644 (file)
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -24,12 +24,11 @@ DPDK_MLX5_PMD         ?= n
 
 B := $(DPDK_BUILD_DIR)
 I := $(DPDK_INSTALL_DIR)
-DPDK_VERSION ?= 17.05
-PKG_SUFFIX ?= vpp6
+DPDK_VERSION ?= 17.08
+PKG_SUFFIX ?= vpp1
 DPDK_BASE_URL ?= http://fast.dpdk.org/rel
 DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz
 DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
-DPDK_17.02_TARBALL_MD5_CKSUM := 6b9f7387c35641f4e8dbba3e528f2376
 DPDK_17.05_TARBALL_MD5_CKSUM := 0a68c31cd6a6cabeed0a4331073e4c05
 DPDK_17.08_TARBALL_MD5_CKSUM := 0641f59ea8ea98afefa7cfa2699f6241
 DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)

diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c
index b0f247e..28af100 100644 (file)
--- a/src/plugins/dpdk/buffer.c
+++ b/src/plugins/dpdk/buffer.c
@@ -213,18 +213,6 @@ fill_free_list (vlib_main_t * vm,
       mb2 = vm->mbuf_alloc_list[i + 2];
       mb3 = vm->mbuf_alloc_list[i + 3];
 
-#if RTE_VERSION < RTE_VERSION_NUM(17, 5, 0, 0)
-      ASSERT (rte_mbuf_refcnt_read (mb0) == 0);
-      ASSERT (rte_mbuf_refcnt_read (mb1) == 0);
-      ASSERT (rte_mbuf_refcnt_read (mb2) == 0);
-      ASSERT (rte_mbuf_refcnt_read (mb3) == 0);
-
-      rte_mbuf_refcnt_set (mb0, 1);
-      rte_mbuf_refcnt_set (mb1, 1);
-      rte_mbuf_refcnt_set (mb2, 1);
-      rte_mbuf_refcnt_set (mb3, 1);
-#endif
-
       b0 = vlib_buffer_from_rte_mbuf (mb0);
       b1 = vlib_buffer_from_rte_mbuf (mb1);
       b2 = vlib_buffer_from_rte_mbuf (mb2);
@@ -259,11 +247,6 @@ fill_free_list (vlib_main_t * vm,
     {
       mb0 = vm->mbuf_alloc_list[i];
 
-#if RTE_VERSION < RTE_VERSION_NUM(17, 5, 0, 0)
-      ASSERT (rte_mbuf_refcnt_read (mb0) == 0);
-      rte_mbuf_refcnt_set (mb0, 1);
-#endif
-
       b0 = vlib_buffer_from_rte_mbuf (mb0);
       bi0 = vlib_get_buffer_index (vm, b0);
 

diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c
index c755060..a247c7c 100644 (file)
--- a/src/plugins/dpdk/device/device.c
+++ b/src/plugins/dpdk/device/device.c
@@ -254,11 +254,7 @@ static_always_inline
                                  &tx_vector[tx_tail], tx_head - tx_tail);
          rv = rte_ring_sp_enqueue_burst (hqos->swq,
                                          (void **) &tx_vector[tx_tail],
-#if RTE_VERSION >= RTE_VERSION_NUM(17, 5, 0, 0)
                                          (uint16_t) (tx_head - tx_tail), 0);
-#else
-                                         (uint16_t) (tx_head - tx_tail));
-#endif
        }
       else if (PREDICT_TRUE (xd->flags & DPDK_DEVICE_FLAG_PMD))
        {

diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index 6f7e168..a795ba0 100755 (executable)
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -1186,11 +1186,7 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
 
   /* Set up DPDK eal and packet mbuf pool early. */
 
-#if RTE_VERSION >= RTE_VERSION_NUM(17, 5, 0, 0)
   rte_log_set_global_level (log_level);
-#else
-  rte_set_log_level (log_level);
-#endif
 
   vm = vlib_get_main ();
 

diff --git a/src/plugins/dpdk/hqos/hqos.c b/src/plugins/dpdk/hqos/hqos.c
index 2f2504d..813eb91 100644 (file)
--- a/src/plugins/dpdk/hqos/hqos.c
+++ b/src/plugins/dpdk/hqos/hqos.c
@@ -430,11 +430,7 @@ dpdk_hqos_thread_internal_hqos_dbg_bypass (vlib_main_t * vm)
          pkts_enq_len += rte_ring_sc_dequeue_burst (swq,
                                                     (void **)
                                                     &pkts_enq[pkts_enq_len],
-#if RTE_VERSION >= RTE_VERSION_NUM(17, 5, 0, 0)
                                                     hqos->hqos_burst_enq, 0);
-#else
-                                                    hqos->hqos_burst_enq);
-#endif
 
          /* Get next SWQ for this device */
          swq_pos++;
@@ -525,11 +521,7 @@ dpdk_hqos_thread_internal (vlib_main_t * vm)
          pkts_enq_len += rte_ring_sc_dequeue_burst (swq,
                                                     (void **)
                                                     &pkts_enq[pkts_enq_len],
-#if RTE_VERSION >= RTE_VERSION_NUM(17, 5, 0, 0)
                                                     hqos->hqos_burst_enq, 0);
-#else
-                                                    hqos->hqos_burst_enq);
-#endif
 
          /* Get next SWQ for this device */
          swq_pos++;

diff --git a/src/plugins/dpdk/ipsec/esp.h b/src/plugins/dpdk/ipsec/esp.h
index 308a66a..5b5c81a 100644 (file)
--- a/src/plugins/dpdk/ipsec/esp.h
+++ b/src/plugins/dpdk/ipsec/esp.h
@@ -242,9 +242,11 @@ create_sym_sess (ipsec_sa_t * sa, crypto_sa_session_t * sa_sess,
       cipher_xform.aead.key.length = sa->crypto_key_len;
 
       if (is_outbound)
-       cipher_xform.cipher.op = RTE_CRYPTO_AEAD_OP_ENCRYPT;
+       cipher_xform.cipher.op =
+         (enum rte_crypto_cipher_operation) RTE_CRYPTO_AEAD_OP_ENCRYPT;
       else
-       cipher_xform.cipher.op = RTE_CRYPTO_AEAD_OP_DECRYPT;
+       cipher_xform.cipher.op =
+         (enum rte_crypto_cipher_operation) RTE_CRYPTO_AEAD_OP_DECRYPT;
       cipher_xform.next = NULL;
       xfs = &cipher_xform;
       p_key->is_aead = 1;