diff options
| author |   Damjan Marion <damarion@cisco.com> | 2019-02-02 16:28:16 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-02-02 16:31:07 +0000 |
| commit | 1a6ece34358a34367ff1807ac3a9a97b8a120b77 (patch) | |
| tree | ff3df0b997689914129c8345e32815bda448298d /src/plugins/dpdk/device | |
| parent | 773291163a4f72f131afc6a84b065bcfed13aeb7 (diff) | |
dpdk: bump to dpdk 19.02
HQoS requires fixes to work with dpdk 19.02 so code is disabled and
pending deprecation unless active maintainer is found.
Change-Id: I3569c4287b6dfdd2c29e02375eb53bf01fa6ae84
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins/dpdk/device')
| -rw-r--r-- | src/plugins/dpdk/device/cli.c | 4 | ||||
| -rw-r--r-- | src/plugins/dpdk/device/device.c | 5 | ||||
| -rw-r--r-- | src/plugins/dpdk/device/init.c | 13 |
3 files changed, 8 insertions, 14 deletions
diff --git a/src/plugins/dpdk/device/cli.c b/src/plugins/dpdk/device/cli.c index 209f4ed51ed..41f3fdef838 100644 --- a/src/plugins/dpdk/device/cli.c +++ b/src/plugins/dpdk/device/cli.c @@ -40,6 +40,7 @@ */ +#if 0 static clib_error_t * get_hqos (u32 hw_if_index, u32 subport_id, dpdk_device_t ** xd, dpdk_device_config_t ** devconf) @@ -92,6 +93,7 @@ get_hqos (u32 hw_if_index, u32 subport_id, dpdk_device_t ** xd, done: return error; } +#endif static inline clib_error_t * pcap_trace_command_internal (vlib_main_t * vm, @@ -691,6 +693,7 @@ VLIB_CLI_COMMAND (cmd_set_dpdk_if_desc,static) = { }; /* *INDENT-ON* */ +#if 0 static int dpdk_device_queue_sort (void *a1, void *a2) { @@ -1986,6 +1989,7 @@ VLIB_CLI_COMMAND (cmd_show_dpdk_hqos_queue_stats, static) = { .function = show_dpdk_hqos_queue_stats, }; /* *INDENT-ON* */ +#endif static clib_error_t * show_dpdk_version_command_fn (vlib_main_t * vm, diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c index e3520fc720e..466abc37e68 100644 --- a/src/plugins/dpdk/device/device.c +++ b/src/plugins/dpdk/device/device.c @@ -166,6 +166,7 @@ static_always_inline queue_id = (queue_id + 1) % xd->tx_q_used; } +#if 0 if (PREDICT_FALSE (xd->flags & DPDK_DEVICE_FLAG_HQOS)) /* HQoS ON */ { /* no wrap, transmit in one burst */ @@ -178,7 +179,9 @@ static_always_inline n_sent = rte_ring_sp_enqueue_burst (hqos->swq, (void **) mb, n_left, 0); } - else if (PREDICT_TRUE (xd->flags & DPDK_DEVICE_FLAG_PMD)) + else +#endif + if (PREDICT_TRUE (xd->flags & DPDK_DEVICE_FLAG_PMD)) { /* no wrap, transmit in one burst */ n_sent = rte_eth_tx_burst (xd->port_id, queue_id, mb, n_left); diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index fa3b691fca4..a5af97c44d4 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -154,11 +154,7 @@ dpdk_device_lock_init (dpdk_device_t * xd) static int dpdk_port_crc_strip_enabled (dpdk_device_t * xd) { -#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); -#endif } static clib_error_t * @@ -421,16 +417,10 @@ 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, 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, 11, 0, 0) - xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_CRC_STRIP; -#endif if (dm->conf->no_tx_checksum_offload == 0) { @@ -460,9 +450,6 @@ 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, 11, 0, 0) - xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_CRC_STRIP; -#endif break; /* virtio */ |