diff options
author | Damjan Marion <damarion@cisco.com> | 2017-05-11 14:55:43 +0200 |
---|---|---|
committer | Dave Barach <openvpp@barachs.net> | 2017-05-11 14:28:05 +0000 |
commit | 6a5be214b95f3ec9f30eab46aa1a21a62a7bbc85 (patch) | |
tree | 2f9d4fc1ee0c7ea3337e57be77cc537b0d6d30d5 | |
parent | 11c0549fee379a170f18d9e427ce87bb6965ddaf (diff) |
dpdk: bump to dpdk 17.05
Change-Id: I19744387859129c6b8dc104041af158bf5f1d988
Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r-- | dpdk/Makefile | 9 | ||||
-rw-r--r-- | src/plugins/dpdk/device/device.c | 4 | ||||
-rw-r--r-- | src/plugins/dpdk/device/dpdk.h | 22 | ||||
-rwxr-xr-x | src/plugins/dpdk/device/init.c | 4 | ||||
-rw-r--r-- | src/plugins/dpdk/hqos/hqos.c | 8 |
5 files changed, 21 insertions, 26 deletions
diff --git a/dpdk/Makefile b/dpdk/Makefile index 23e84ef4..cd79e394 100644 --- a/dpdk/Makefile +++ b/dpdk/Makefile @@ -20,17 +20,18 @@ DPDK_PKTMBUF_HEADROOM ?= 128 DPDK_DOWNLOAD_DIR ?= $(HOME)/Downloads DPDK_DEBUG ?= n DPDK_CRYPTO_SW_PMD ?= n +DPDK_MLX4_PMD ?= n DPDK_MLX5_PMD ?= n B := $(DPDK_BUILD_DIR) I := $(DPDK_INSTALL_DIR) -DPDK_VERSION ?= 17.02 -PKG_SUFFIX ?= vpp3 +DPDK_VERSION ?= 17.05 +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_16.11_TARBALL_MD5_CKSUM := 06c1c577795360719d0b4fafaeee21e9 DPDK_17.02_TARBALL_MD5_CKSUM := 6b9f7387c35641f4e8dbba3e528f2376 +DPDK_17.05_TARBALL_MD5_CKSUM := 0a68c31cd6a6cabeed0a4331073e4c05 DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION) ifeq ($(DPDK_CRYPTO_SW_PMD),y) @@ -139,6 +140,7 @@ $(B)/custom-config: $(B)/.patch.ok Makefile $(call set,RTE_LIBRTE_PMD_QAT,y) $(call set,RTE_LIBRTE_PMD_AESNI_MB,$(DPDK_CRYPTO_SW_PMD)) $(call set,RTE_LIBRTE_PMD_AESNI_GCM,$(DPDK_CRYPTO_SW_PMD)) + $(call set,RTE_LIBRTE_MLX4_PMD,$(DPDK_MLX4_PMD)) $(call set,RTE_LIBRTE_MLX5_PMD,$(DPDK_MLX5_PMD)) @# not needed $(call set,RTE_LIBRTE_TIMER,n) @@ -147,7 +149,6 @@ $(B)/custom-config: $(B)/.patch.ok Makefile $(call set,RTE_LIBRTE_ACL,n) $(call set,RTE_LIBRTE_POWER,n) $(call set,RTE_LIBRTE_DISTRIBUTOR,n) - $(call set,RTE_LIBRTE_REORDER,n) $(call set,RTE_LIBRTE_PORT,n) $(call set,RTE_LIBRTE_TABLE,n) $(call set,RTE_LIBRTE_PIPELINE,n) diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c index 465a5874..51d6eacb 100644 --- a/src/plugins/dpdk/device/device.c +++ b/src/plugins/dpdk/device/device.c @@ -254,7 +254,11 @@ 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/dpdk.h b/src/plugins/dpdk/device/dpdk.h index 7e2901bb..7e974491 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -55,7 +55,6 @@ extern vnet_device_class_t dpdk_device_class; extern vlib_node_registration_t dpdk_input_node; -#if RTE_VERSION >= RTE_VERSION_NUM(17, 2, 0, 0) #define foreach_dpdk_pmd \ _ ("net_thunderx", THUNDERX) \ _ ("net_e1000_em", E1000EM) \ @@ -75,27 +74,6 @@ extern vlib_node_registration_t dpdk_input_node; _ ("net_mlx4", MLX4) \ _ ("net_mlx5", MLX5) \ _ ("net_dpaa2", DPAA2) -#else -#define foreach_dpdk_pmd \ - _ ("net_thunderx", THUNDERX) \ - _ ("net_e1000_em", E1000EM) \ - _ ("net_e1000_igb", IGB) \ - _ ("net_e1000_igb_vf", IGBVF) \ - _ ("net_ixgbe", IXGBE) \ - _ ("net_ixgbe_vf", IXGBEVF) \ - _ ("net_i40e", I40E) \ - _ ("net_i40e_vf", I40EVF) \ - _ ("net_virtio", VIRTIO) \ - _ ("net_enic", ENIC) \ - _ ("net_vmxnet3", VMXNET3) \ - _ ("AF_PACKET PMD", AF_PACKET) \ - _ ("rte_bond_pmd", BOND) \ - _ ("net_fm10k", FM10K) \ - _ ("net_cxgbe", CXGBE) \ - _ ("net_mlx4", MLX4) \ - _ ("net_mlx5", MLX5) \ - _ ("net_dpaa2", DPAA2) -#endif typedef enum { diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 69959c05..0ee28db5 100755 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -1174,7 +1174,11 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) log_level = (CLIB_DEBUG > 0) ? RTE_LOG_DEBUG : RTE_LOG_NOTICE; +#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 ca1bdafa..2f2504d6 100644 --- a/src/plugins/dpdk/hqos/hqos.c +++ b/src/plugins/dpdk/hqos/hqos.c @@ -430,7 +430,11 @@ 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++; @@ -521,7 +525,11 @@ 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++; |