X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip_punt_drop.h;h=11b7ad6c8958d4868efb31981f37fe10b36004f2;hb=2a1783fd6;hp=11affcb6e28aca3d528eabeaa917488c130e9516;hpb=1b2e16ac7703681a66edd589fd1f6be26b9f1661;p=vpp.git

diff --git a/src/vnet/ip/ip_punt_drop.h b/src/vnet/ip/ip_punt_drop.h
index 11affcb6e28..11b7ad6c895 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_read_response_type_st *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,19 +122,12 @@ 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 == SSE2_QOS_ACTION_DROP))
+	      if (PREDICT_FALSE (act0 == QOS_ACTION_DROP))
 		{
 		  next0 = IP_PUNT_POLICER_NEXT_DROP;
 		  b0->error = node->errors[IP_PUNT_POLICER_ERROR_DROP];
 		}
-	      if (PREDICT_FALSE (act1 == SSE2_QOS_ACTION_DROP))
+	      if (PREDICT_FALSE (act1 == QOS_ACTION_DROP))
 		{
 		  next1 = IP_PUNT_POLICER_NEXT_DROP;
 		  b1->error = node->errors[IP_PUNT_POLICER_ERROR_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,10 +182,7 @@ 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 == SSE2_QOS_ACTION_DROP))
+	      if (PREDICT_FALSE (act0 == QOS_ACTION_DROP))
 		{
 		  next0 = IP_PUNT_POLICER_NEXT_DROP;
 		  b0->error = node->errors[IP_PUNT_POLICER_ERROR_DROP];
@@ -285,10 +267,9 @@ typedef struct ip4_punt_redirect_trace_t_
 /**
  * Add a punt redirect entry
  */
-extern void ip_punt_redirect_add (fib_protocol_t fproto,
-				  u32 rx_sw_if_index,
+extern void ip_punt_redirect_add (fib_protocol_t fproto, u32 rx_sw_if_index,
 				  fib_forward_chain_type_t ct,
-				  fib_route_path_t * rpaths);
+				  const fib_route_path_t *rpaths);
 
 extern void ip_punt_redirect_del (fib_protocol_t fproto, u32 rx_sw_if_index);
 extern index_t ip_punt_redirect_find (fib_protocol_t fproto,
@@ -367,6 +348,8 @@ ip_punt_redirect (vlib_main_t * vm,
 
 	  if (PREDICT_TRUE (INDEX_INVALID != rrxi0))
 	    {
+	      /* prevent ttl decrement on forward */
+	      b0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
 	      rrx0 = ip_punt_redirect_get (rrxi0);
 	      vnet_buffer (b0)->ip.adj_index[VLIB_TX] = rrx0->dpo.dpoi_index;
 	      next0 = rrx0->dpo.dpoi_next_node;