diff options
| -rw-r--r-- | build/external/packages/dpdk.mk | 4 | ||||
| -rw-r--r-- | src/plugins/dpdk/device/init.c | 53 |
2 files changed, 7 insertions, 50 deletions
diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk index 82ae2d218a3..6c46ac29834 100644 --- a/build/external/packages/dpdk.mk +++ b/build/external/packages/dpdk.mk @@ -21,12 +21,12 @@ DPDK_MLX5_PMD_DLOPEN_DEPS ?= n DPDK_TAP_PMD ?= n DPDK_FAILSAFE_PMD ?= n -DPDK_VERSION ?= 18.08 +DPDK_VERSION ?= 18.11 DPDK_BASE_URL ?= http://fast.dpdk.org/rel DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL) -DPDK_18.05_TARBALL_MD5_CKSUM := 9fc86367cd9407ff6a8dfea56c4eddc4 DPDK_18.08_TARBALL_MD5_CKSUM := da5e7fb25ab063c47e53929fb8c58be5 +DPDK_18.11_TARBALL_MD5_CKSUM := 04b86f4a77f4f81a7fbd26467dd2ea9f MACHINE=$(shell uname -m) # replace dot with space, and if 3rd word exists we deal with stable dpdk rel diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 6cde04123cc..9a78ac6761b 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -206,9 +206,7 @@ dpdk_ring_alloc (struct rte_mempool *mp) static int dpdk_port_crc_strip_enabled (dpdk_device_t * xd) { -#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) - return ! !(xd->port_conf.rxmode.hw_strip_crc); -#elif RTE_VERSION < RTE_VERSION_NUM(18, 11, 0, 0) +#if RTE_VERSION < RTE_VERSION_NUM(18, 11, 0, 0) return ! !(xd->port_conf.rxmode.offloads & DEV_RX_OFFLOAD_CRC_STRIP); #else return !(xd->port_conf.rxmode.offloads & DEV_RX_OFFLOAD_KEEP_CRC); @@ -375,27 +373,15 @@ dpdk_lib_init (dpdk_main_t * dm) if (dm->conf->no_multi_seg) { -#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) - xd->tx_conf.txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS; - xd->port_conf.rxmode.jumbo_frame = 0; - xd->port_conf.rxmode.enable_scatter = 0; -#else xd->port_conf.txmode.offloads &= ~DEV_TX_OFFLOAD_MULTI_SEGS; xd->port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME; xd->port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_SCATTER; -#endif } else { -#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) - xd->tx_conf.txq_flags &= ~ETH_TXQ_FLAGS_NOMULTSEGS; - xd->port_conf.rxmode.jumbo_frame = 1; - xd->port_conf.rxmode.enable_scatter = 1; -#else xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_MULTI_SEGS; xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_SCATTER; -#endif xd->flags |= DPDK_DEVICE_FLAG_MAYBE_MULTISEG; } @@ -470,13 +456,8 @@ dpdk_lib_init (dpdk_main_t * dm) if (dm->conf->no_tx_checksum_offload == 0) { -#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) - xd->tx_conf.txq_flags &= ~(ETH_TXQ_FLAGS_NOXSUMUDP | - ETH_TXQ_FLAGS_NOXSUMTCP); -#else xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_CKSUM; xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_UDP_CKSUM; -#endif xd->flags |= DPDK_DEVICE_FLAG_TX_OFFLOAD | DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM; @@ -496,42 +477,28 @@ dpdk_lib_init (dpdk_main_t * dm) case VNET_DPDK_PMD_IXGBEVF: case VNET_DPDK_PMD_I40EVF: xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF; -#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) - xd->port_conf.rxmode.hw_strip_crc = 1; -#elif RTE_VERSION < RTE_VERSION_NUM(18, 11, 0, 0) +#if RTE_VERSION < RTE_VERSION_NUM(18, 11, 0, 0) xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_CRC_STRIP; #endif break; case VNET_DPDK_PMD_THUNDERX: xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF; -#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) - xd->port_conf.rxmode.hw_strip_crc = 1; -#elif RTE_VERSION < RTE_VERSION_NUM(18, 11, 0, 0) +#if RTE_VERSION < RTE_VERSION_NUM(18, 11, 0, 0) xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_CRC_STRIP; #endif if (dm->conf->no_tx_checksum_offload == 0) { -#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) - xd->tx_conf.txq_flags &= ~(ETH_TXQ_FLAGS_NOXSUMUDP | - ETH_TXQ_FLAGS_NOXSUMTCP); -#else xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_CKSUM; xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_UDP_CKSUM; -#endif - xd->flags |= - DPDK_DEVICE_FLAG_TX_OFFLOAD; + xd->flags |= DPDK_DEVICE_FLAG_TX_OFFLOAD; } break; case VNET_DPDK_PMD_ENA: xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF; -#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) - xd->port_conf.rxmode.enable_scatter = 0; -#else xd->port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_SCATTER; -#endif break; case VNET_DPDK_PMD_DPAA2: @@ -549,9 +516,7 @@ dpdk_lib_init (dpdk_main_t * dm) /* Intel Red Rock Canyon */ case VNET_DPDK_PMD_FM10K: xd->port_type = VNET_DPDK_PORT_TYPE_ETH_SWITCH; -#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) - xd->port_conf.rxmode.hw_strip_crc = 1; -#elif RTE_VERSION < RTE_VERSION_NUM(18, 11, 0, 0) +#if RTE_VERSION < RTE_VERSION_NUM(18, 11, 0, 0) xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_CRC_STRIP; #endif break; @@ -566,11 +531,7 @@ dpdk_lib_init (dpdk_main_t * dm) /* vmxnet3 */ case VNET_DPDK_PMD_VMXNET3: xd->port_type = VNET_DPDK_PORT_TYPE_ETH_1G; -#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) - xd->tx_conf.txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS; -#else xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_MULTI_SEGS; -#endif break; case VNET_DPDK_PMD_AF_PACKET: @@ -828,14 +789,10 @@ dpdk_lib_init (dpdk_main_t * dm) int vlan_off; vlan_off = rte_eth_dev_get_vlan_offload (xd->port_id); vlan_off |= ETH_VLAN_STRIP_OFFLOAD; -#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0) - xd->port_conf.rxmode.hw_vlan_strip = vlan_off; -#else if (vlan_off) xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_VLAN_STRIP; else xd->port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP; -#endif if (rte_eth_dev_set_vlan_offload (xd->port_id, vlan_off) == 0) dpdk_log_info ("VLAN strip enabled for interface\n"); else |