From 982e44fcc482cc9bc08e46c2a36ab66b0861bacb Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Fri, 19 Mar 2021 13:12:41 -0700 Subject: vlib: add node adaptive mode flag Don't switch nodes from interrupt to polling state unless adaptive mode flag set. For starters, flag set only on interface input nodes with no polling rx queue and at least one in adaptive mode. Type: improvement Signed-off-by: Florin Coras Change-Id: Ica1c75f605ead82b7cf74c45c6a774461008f054 --- src/vnet/interface/runtime.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/vnet/interface') diff --git a/src/vnet/interface/runtime.c b/src/vnet/interface/runtime.c index 019d3ee28d0..c7631272d00 100644 --- a/src/vnet/interface/runtime.c +++ b/src/vnet/interface/runtime.c @@ -64,6 +64,7 @@ vnet_hw_if_update_runtime_data (vnet_main_t *vnm, u32 hw_if_index) vnet_hw_if_rxq_poll_vector_t *pv, **d = 0; vlib_node_state_t *per_thread_node_state = 0; u32 n_threads = vec_len (vlib_mains); + u16 *per_thread_node_adaptive = 0; int something_changed = 0; clib_bitmap_t *pending_int = 0; int last_int = -1; @@ -74,6 +75,7 @@ vnet_hw_if_update_runtime_data (vnet_main_t *vnm, u32 hw_if_index) vec_validate (d, n_threads - 1); vec_validate_init_empty (per_thread_node_state, n_threads - 1, VLIB_NODE_STATE_DISABLED); + vec_validate_init_empty (per_thread_node_adaptive, n_threads - 1, 0); /* find out desired node state on each thread */ pool_foreach (rxq, im->hw_if_rx_queues) @@ -89,7 +91,10 @@ vnet_hw_if_update_runtime_data (vnet_main_t *vnm, u32 hw_if_index) continue; if (rxq->mode == VNET_HW_IF_RX_MODE_POLLING) - per_thread_node_state[ti] = VLIB_NODE_STATE_POLLING; + { + per_thread_node_state[ti] = VLIB_NODE_STATE_POLLING; + per_thread_node_adaptive[ti] = 0; + } if (per_thread_node_state[ti] == VLIB_NODE_STATE_POLLING) continue; @@ -97,6 +102,9 @@ vnet_hw_if_update_runtime_data (vnet_main_t *vnm, u32 hw_if_index) if (rxq->mode == VNET_HW_IF_RX_MODE_INTERRUPT || rxq->mode == VNET_HW_IF_RX_MODE_ADAPTIVE) per_thread_node_state[ti] = VLIB_NODE_STATE_INTERRUPT; + + if (rxq->mode == VNET_HW_IF_RX_MODE_ADAPTIVE) + per_thread_node_adaptive[ti] = 1; } /* construct per-thread polling vectors */ @@ -190,6 +198,8 @@ vnet_hw_if_update_runtime_data (vnet_main_t *vnm, u32 hw_if_index) } vlib_node_set_state (vm, node_index, per_thread_node_state[i]); + vlib_node_set_flag (vm, node_index, VLIB_NODE_FLAG_ADAPTIVE_MODE, + per_thread_node_adaptive[i]); if (last_int >= 0) clib_interrupt_resize (&rt->rxq_interrupts, last_int + 1); @@ -219,4 +229,5 @@ vnet_hw_if_update_runtime_data (vnet_main_t *vnm, u32 hw_if_index) vec_free (d); vec_free (per_thread_node_state); + vec_free (per_thread_node_adaptive); } -- cgit 1.2.3-korg