From 85aa49019f4b4b2b7a4fce4313fdc0f2de65c277 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Thu, 14 Jun 2018 18:52:46 -0400 Subject: configurable per-dispatch-cycle sleep Workaround for lack of driver interrupt support. Also quite handy for home gateway, laptop/vagrant, other use-cases not requiring maximum vectors/second for proper operation. Change-Id: Ifc4b98112450664beef67b89ab8a6940a3bf24b5 Signed-off-by: Dave Barach --- src/plugins/dpdk/device/dpdk.h | 3 --- src/plugins/dpdk/device/init.c | 3 --- src/plugins/dpdk/device/node.c | 21 --------------------- 3 files changed, 27 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index d88e294e835..8fa803567ee 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -433,9 +433,6 @@ typedef struct f64 link_state_poll_interval; f64 stat_poll_interval; - /* Sleep for this many usec after each device poll */ - u32 poll_sleep_usec; - /* convenience */ vlib_main_t *vlib_main; vnet_main_t *vnet_main; diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 61057776ebf..0ab339b8455 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -1005,7 +1005,6 @@ static clib_error_t * dpdk_config (vlib_main_t * vm, unformat_input_t * input) { clib_error_t *error = 0; - dpdk_main_t *dm = &dpdk_main; dpdk_config_main_t *conf = &dpdk_config_main; vlib_thread_main_t *tm = vlib_get_thread_main (); dpdk_device_config_t *devconf; @@ -1097,8 +1096,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) tmp = format (0, "--no-pci%c", 0); vec_add1 (conf->eal_init_args, tmp); } - else if (unformat (input, "poll-sleep %d", &dm->poll_sleep_usec)) - ; #define _(a) \ else if (unformat(input, #a)) \ diff --git a/src/plugins/dpdk/device/node.c b/src/plugins/dpdk/device/node.c index bdd0bd0a5c4..8fc8f410ee3 100644 --- a/src/plugins/dpdk/device/node.c +++ b/src/plugins/dpdk/device/node.c @@ -156,24 +156,6 @@ dpdk_prefetch_buffer_data_x4 (struct rte_mbuf *mb[]) CLIB_PREFETCH (b->data, CLIB_CACHE_LINE_BYTES, LOAD); } -static inline void -poll_rate_limit (dpdk_main_t * dm) -{ - /* Limit the poll rate by sleeping for N msec between polls */ - if (PREDICT_FALSE (dm->poll_sleep_usec != 0)) - { - struct timespec ts, tsrem; - - ts.tv_sec = 0; - ts.tv_nsec = 1000 * dm->poll_sleep_usec; - - while (nanosleep (&ts, &tsrem) < 0) - { - ts = tsrem; - } - } -} - /** \brief Main DPDK input node @node dpdk-input @@ -659,9 +641,6 @@ VLIB_NODE_FN (dpdk_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, dq->queue_id); } /* *INDENT-ON* */ - - poll_rate_limit (dm); - return n_rx_packets; } -- cgit 1.2.3-korg