diff options
| author |   Damjan Marion <damarion@cisco.com> | 2017-06-15 19:01:31 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2017-06-16 18:14:56 +0000 |
| commit | 6f9ac6559ba155cc15dbc1153900f7bd3c4c9e13 (patch) | |
| tree | 1448a05624913ac73db0a466a06f18ae2198490e /src | |
| parent | f53a8adf13175a376913e63b13671b2d8ad6377d (diff) | |
Add missing barrier sync to rx placement infra code
Change-Id: I25ccf8260dbe7e1550aee3904a688fc135ce1f03
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/vnet/devices/devices.c | 20 | ||||
| -rw-r--r-- | src/vnet/interface_cli.c | 4 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/vnet/devices/devices.c b/src/vnet/devices/devices.c index 58c72077f24..e3311c43632 100644 --- a/src/vnet/devices/devices.c +++ b/src/vnet/devices/devices.c @@ -123,7 +123,7 @@ vnet_hw_interface_assign_rx_thread (vnet_main_t * vnm, u32 hw_if_index, u16 queue_id, uword thread_index) { vnet_device_main_t *vdm = &vnet_device_main; - vlib_main_t *vm; + vlib_main_t *vm, *vm0; vnet_device_input_runtime_t *rt; vnet_device_and_queue_t *dq; vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index); @@ -143,6 +143,10 @@ vnet_hw_interface_assign_rx_thread (vnet_main_t * vnm, u32 hw_if_index, } vm = vlib_mains[thread_index]; + vm0 = vlib_get_main (); + + vlib_worker_thread_barrier_sync (vm0); + rt = vlib_node_get_runtime_data (vm, hw->input_node_index); vec_add2 (rt->devices_and_queues, dq, 1); @@ -157,6 +161,9 @@ vnet_hw_interface_assign_rx_thread (vnet_main_t * vnm, u32 hw_if_index, vec_validate (hw->rx_mode_by_queue, queue_id); hw->input_node_thread_index_by_queue[queue_id] = thread_index; hw->rx_mode_by_queue[queue_id] = VNET_HW_INTERFACE_RX_MODE_POLLING; + + vlib_worker_thread_barrier_release (vm0); + vlib_node_set_state (vm, hw->input_node_index, rt->enabled_node_state); } @@ -164,7 +171,7 @@ int vnet_hw_interface_unassign_rx_thread (vnet_main_t * vnm, u32 hw_if_index, u16 queue_id) { - vlib_main_t *vm; + vlib_main_t *vm, *vm0; vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index); vnet_device_input_runtime_t *rt; vnet_device_and_queue_t *dq; @@ -187,16 +194,19 @@ vnet_hw_interface_unassign_rx_thread (vnet_main_t * vnm, u32 hw_if_index, if (dq->hw_if_index == hw_if_index && dq->queue_id == queue_id) { mode = dq->mode; - vec_del1 (rt->devices_and_queues, dq - rt->devices_and_queues); - goto deleted; + goto delete; } return VNET_API_ERROR_INVALID_INTERFACE; -deleted: +delete: + vm0 = vlib_get_main (); + vlib_worker_thread_barrier_sync (vm0); + vec_del1 (rt->devices_and_queues, dq - rt->devices_and_queues); vnet_device_queue_update (vnm, rt); hw->rx_mode_by_queue[queue_id] = VNET_HW_INTERFACE_RX_MODE_UNKNOWN; + vlib_worker_thread_barrier_release (vm0); if (vec_len (rt->devices_and_queues) == 0) vlib_node_set_state (vm, hw->input_node_index, VLIB_NODE_STATE_DISABLED); diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c index e18a80fc744..d37c78942c9 100644 --- a/src/vnet/interface_cli.c +++ b/src/vnet/interface_cli.c @@ -1445,8 +1445,10 @@ set_interface_rx_placement (vlib_main_t * vm, unformat_input_t * input, /* *INDENT-OFF* */ VLIB_CLI_COMMAND (cmd_set_if_rx_placement,static) = { .path = "set interface rx-placement", - .short_help = "set interface rx-placement <hw-interface> [queue <n>] [thread <n> | main]", + .short_help = "set interface rx-placement <hw-interface> [queue <n>] " + "[worker <n> | main]", .function = set_interface_rx_placement, + .is_mp_safe = 1, }; /* *INDENT-ON* */ |