diff options
Diffstat (limited to 'src/vnet/ip')
| -rw-r--r-- | src/vnet/ip/ip_punt_drop.h | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/src/vnet/ip/ip_punt_drop.h b/src/vnet/ip/ip_punt_drop.h index 046a86a0056..16d46ba190e 100644 --- a/src/vnet/ip/ip_punt_drop.h +++ b/src/vnet/ip/ip_punt_drop.h @@ -72,10 +72,6 @@ ip_punt_policer (vlib_main_t * vm, u64 time_in_policer_periods; vnet_feature_main_t *fm = &feature_main; vnet_feature_config_main_t *cm = &fm->feature_config_mains[arc_index]; - vnet_policer_main_t *pm = &vnet_policer_main; - policer_t *pol = &pm->policers[policer_index]; - u32 pol_thread_index = pol->thread_index; - u32 this_thread_index = vm->thread_index; time_in_policer_periods = clib_cpu_time_now () >> POLICER_TICKS_PER_PERIOD_SHIFT; @@ -84,20 +80,6 @@ ip_punt_policer (vlib_main_t * vm, n_left_from = frame->n_vectors; next_index = node->cached_next_index; - if (PREDICT_FALSE (pol_thread_index == ~0)) - { - /* - * This is the first packet to use this policer. Set the - * thread index in the policer to this thread and any - * packets seen by this node on other threads will - * be handed off to this one. - * - * This could happen simultaneously on another thread. - */ - clib_atomic_cmp_and_swap (&pol->thread_index, ~0, this_thread_index); - pol_thread_index = this_thread_index; - } - while (n_left_from > 0) { vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); @@ -121,7 +103,14 @@ ip_punt_policer (vlib_main_t * vm, b0 = vlib_get_buffer (vm, bi0); b1 = vlib_get_buffer (vm, bi1); - if (PREDICT_FALSE (this_thread_index != pol_thread_index)) + act0 = vnet_policer_police (vm, b0, policer_index, + time_in_policer_periods, POLICE_CONFORM, + true); + act1 = vnet_policer_police (vm, b1, policer_index, + time_in_policer_periods, POLICE_CONFORM, + true); + + if (PREDICT_FALSE (act0 == QOS_ACTION_HANDOFF)) { next0 = next1 = IP_PUNT_POLICER_NEXT_HANDOFF; } @@ -133,13 +122,6 @@ ip_punt_policer (vlib_main_t * vm, vnet_get_config_data (&cm->config_main, &b1->current_config_index, &next1, 0); - act0 = - vnet_policer_police (vm, b0, policer_index, - time_in_policer_periods, POLICE_CONFORM); - act1 = - vnet_policer_police (vm, b1, policer_index, - time_in_policer_periods, POLICE_CONFORM); - if (PREDICT_FALSE (act0 == QOS_ACTION_DROP)) { next0 = IP_PUNT_POLICER_NEXT_DROP; @@ -188,7 +170,10 @@ ip_punt_policer (vlib_main_t * vm, b0 = vlib_get_buffer (vm, bi0); - if (PREDICT_FALSE (this_thread_index != pol_thread_index)) + act0 = vnet_policer_police (vm, b0, policer_index, + time_in_policer_periods, POLICE_CONFORM, + true); + if (PREDICT_FALSE (act0 == QOS_ACTION_HANDOFF)) { next0 = IP_PUNT_POLICER_NEXT_HANDOFF; } @@ -197,9 +182,6 @@ ip_punt_policer (vlib_main_t * vm, vnet_get_config_data (&cm->config_main, &b0->current_config_index, &next0, 0); - act0 = - vnet_policer_police (vm, b0, policer_index, - time_in_policer_periods, POLICE_CONFORM); if (PREDICT_FALSE (act0 == QOS_ACTION_DROP)) { next0 = IP_PUNT_POLICER_NEXT_DROP; |