diff options
author | Damjan Marion <damarion@cisco.com> | 2016-10-25 18:53:41 +0200 |
---|---|---|
committer | Florin Coras <florin.coras@gmail.com> | 2016-10-26 14:52:00 +0000 |
commit | f530a5526a1f501462ff4247a5bb38e80c13678d (patch) | |
tree | d8c6661467f561411197d6d7dbd5f3b551a78bb1 /vnet/vnet/devices/dpdk/init.c | |
parent | 6398397125e1d37a9f9463351e537eb4012baba7 (diff) |
dpdk: remove support for dpdk 16.04
This also removes old DPDK vhost-user code which doesn't help
much with DPDK 16.07 or newer.
Change-Id: Ic996df1eaccc33acd3fa6cabeaf7381a672c2a90
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet/vnet/devices/dpdk/init.c')
-rw-r--r-- | vnet/vnet/devices/dpdk/init.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c index 8077ef8071e..7045e454048 100644 --- a/vnet/vnet/devices/dpdk/init.c +++ b/vnet/vnet/devices/dpdk/init.c @@ -221,7 +221,6 @@ dpdk_device_lock_init (dpdk_device_t * xd) CLIB_CACHE_LINE_BYTES); memset ((void *) xd->lockp[q], 0, CLIB_CACHE_LINE_BYTES); } - xd->need_txlock = 1; } void @@ -233,7 +232,6 @@ dpdk_device_lock_free (dpdk_device_t * xd) clib_mem_free ((void *) xd->lockp[q]); vec_free (xd->lockp); xd->lockp = 0; - xd->need_txlock = 0; } static clib_error_t * @@ -795,9 +793,6 @@ dpdk_lib_init (dpdk_main_t * dm) clib_warning ("%d mbufs allocated but total rx/tx ring size is %d\n", dm->conf->num_mbufs, nb_desc); - /* init next vhost-user if index */ - dm->next_vu_if_id = 0; - return 0; } @@ -993,9 +988,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) conf->device_config_index_by_pci_addr = hash_create (0, sizeof (uword)); - // MATT-FIXME: inverted virtio-vhost logic to use virtio by default - conf->use_virtio_vhost = 1; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { /* Prime the pump */ @@ -1053,18 +1045,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) ; else if (unformat (input, "socket-mem %s", &socket_mem)) ; - else - if (unformat - (input, "vhost-user-coalesce-frames %d", - &conf->vhost_coalesce_frames)) - ; - else - if (unformat - (input, "vhost-user-coalesce-time %f", - &conf->vhost_coalesce_time)) - ; - else if (unformat (input, "enable-vhost-user")) - conf->use_virtio_vhost = 0; else if (unformat (input, "no-pci")) { no_pci = 1; @@ -1527,9 +1507,6 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) ethernet_main_t *em = ðernet_main; dpdk_device_t *xd; vlib_thread_main_t *tm = vlib_get_thread_main (); -#if DPDK_VHOST_USER - void *vu_state; -#endif int i; error = dpdk_lib_init (dm); @@ -1554,10 +1531,6 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) if (error) clib_error_report (error); -#if DPDK_VHOST_USER - dpdk_vhost_user_process_init (&vu_state); -#endif - tm->worker_thread_release = 1; f64 now = vlib_time_now (vm); @@ -1680,18 +1653,9 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) if ((now - xd->time_last_link_update) >= dm->link_state_poll_interval) dpdk_update_link_state (xd, now); -#if DPDK_VHOST_USER - if (xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) - if (dpdk_vhost_user_process_if (vm, xd, vu_state) != 0) - continue; -#endif } } -#if DPDK_VHOST_USER - dpdk_vhost_user_process_cleanup (vu_state); -#endif - return 0; } @@ -1768,10 +1732,6 @@ dpdk_init (vlib_main_t * vm) dm->efd.consec_full_frames_hi_thresh = DPDK_EFD_DEFAULT_CONSEC_FULL_FRAMES_HI_THRESH; - /* vhost-user coalescence frames defaults */ - dm->conf->vhost_coalesce_frames = 32; - dm->conf->vhost_coalesce_time = 1e-3; - /* Default vlib_buffer_t flags, DISABLES tcp/udp checksumming... */ dm->buffer_flags_template = (VLIB_BUFFER_TOTAL_LENGTH_VALID |