ip: add classifier-based ACLs support on ip punt

This feature allows one to add classifier-based ACLs on packets punted
from the ip infra, eg. to only whitelist specific sender(s).

Type: feature

Change-Id: Idab37b188583efbca980038875fc3e540cb2e880
Signed-off-by: Benoît Ganne <bganne@cisco.com>

5 files changed, 301 insertions, 291 deletions

diff --git a/src/vnet/classify/classify.api b/src/vnet/classify/classify.api
index c569fe6a599..d1d7340302f 100644
--- a/src/vnet/classify/classify.api
+++ b/src/vnet/classify/classify.api
@@ -420,6 +420,22 @@ autoreply define input_acl_set_interface
   bool is_add;
 };
 
+/** \brief Add/del punt ACL
+    @param client_index - opaque cookie to identify the sender
+    @param context - sender context, to match reply w/ request
+    @param ip4_table_index - ip4 punt classify table index (~0 for skip)
+    @param ip6_table_index - ip6 punt classify table index (~0 for skip)
+    @param is_add - add punt ACL if non-zero, else delete
+*/
+autoreply define punt_acl_add_del
+{
+  u32 client_index;
+  u32 context;
+  u32 ip4_table_index [default=0xffffffff];
+  u32 ip6_table_index [default=0xffffffff];
+  bool is_add [default=true];
+};
+
 /** \brief Set/unset output ACL interface
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
diff --git a/src/vnet/classify/classify_api.c b/src/vnet/classify/classify_api.c
index 269aac1a194..3e8dc511479 100644
--- a/src/vnet/classify/classify_api.c
+++ b/src/vnet/classify/classify_api.c
@@ -896,6 +896,22 @@ static void vl_api_input_acl_set_interface_t_handler
   REPLY_MACRO (VL_API_INPUT_ACL_SET_INTERFACE_REPLY);
 }
 
+static void
+vl_api_punt_acl_add_del_t_handler (vl_api_punt_acl_add_del_t *mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  vl_api_punt_acl_add_del_reply_t *rmp;
+  int rv;
+
+  rv = vnet_set_in_out_acl_intfc (
+    vm, 0 /* sw_if_index */, ~0 /* ip4_table_index */,
+    ~0 /* ip6_table_index */, ~0 /* l2_table_index */,
+    ntohl (mp->ip4_table_index), ntohl (mp->ip6_table_index), mp->is_add,
+    0 /* is_output */);
+
+  REPLY_MACRO (VL_API_PUNT_ACL_ADD_DEL_REPLY);
+}
+
 static void vl_api_output_acl_set_interface_t_handler
   (vl_api_output_acl_set_interface_t * mp)
 {
diff --git a/src/vnet/classify/in_out_acl.c b/src/vnet/classify/in_out_acl.c
index 7f5a926212c..752305e1cc2 100644
--- a/src/vnet/classify/in_out_acl.c
+++ b/src/vnet/classify/in_out_acl.c
@@ -21,63 +21,75 @@
 in_out_acl_main_t in_out_acl_main;
 
 static int
-vnet_in_out_acl_ip_feature_enable (vlib_main_t * vnm,
-				   in_out_acl_main_t * am,
-				   u32 sw_if_index,
-				   in_out_acl_table_id_t tid,
-				   int feature_enable, int is_output)
+vnet_in_out_acl_feature_enable (in_out_acl_main_t *am, u32 sw_if_index,
+				in_out_acl_table_id_t tid, int feature_enable,
+				int is_output)
 {
+  const char *arc_name, *feature_name;
+  vnet_feature_config_main_t *fcm;
+  u8 arc;
+  int rv;
 
-  if (tid == IN_OUT_ACL_TABLE_L2)
+  switch (tid)
     {
+    case IN_OUT_ACL_N_TABLES:
+      return VNET_API_ERROR_NO_SUCH_TABLE;
+    case IN_OUT_ACL_TABLE_L2:
       if (is_output)
 	l2output_intf_bitmap_enable (sw_if_index, L2OUTPUT_FEAT_ACL,
 				     feature_enable);
       else
 	l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_ACL,
 				    feature_enable);
+      return 0;
+    case IN_OUT_ACL_TABLE_IP4:
+      arc_name = is_output ? "ip4-output" : "ip4-unicast";
+      feature_name = is_output ? "ip4-outacl" : "ip4-inacl";
+      break;
+    case IN_OUT_ACL_TABLE_IP6:
+      arc_name = is_output ? "ip6-output" : "ip6-unicast";
+      feature_name = is_output ? "ip6-outacl" : "ip6-inacl";
+      break;
+    case IN_OUT_ACL_TABLE_IP4_PUNT:
+      if (sw_if_index != 0)
+	return VNET_API_ERROR_INVALID_INTERFACE;
+      arc_name = "ip4-punt";
+      feature_name = "ip4-punt-acl";
+      break;
+    case IN_OUT_ACL_TABLE_IP6_PUNT:
+      if (sw_if_index != 0)
+	return VNET_API_ERROR_INVALID_INTERFACE;
+      arc_name = "ip6-punt";
+      feature_name = "ip6-punt-acl";
+      break;
     }
-  else
-    {				/* IP[46] */
-      vnet_feature_config_main_t *fcm;
-      u8 arc;
 
-      if (tid == IN_OUT_ACL_TABLE_IP4)
-	{
-	  char *arc_name = is_output ? "ip4-output" : "ip4-unicast";
-	  vnet_feature_enable_disable (arc_name,
-				       is_output ? "ip4-outacl" : "ip4-inacl",
-				       sw_if_index, feature_enable, 0, 0);
-	  arc = vnet_get_feature_arc_index (arc_name);
-	}
-      else
-	{
-	  char *arc_name = is_output ? "ip6-output" : "ip6-unicast";
-	  vnet_feature_enable_disable (arc_name,
-				       is_output ? "ip6-outacl" : "ip6-inacl",
-				       sw_if_index, feature_enable, 0, 0);
-	  arc = vnet_get_feature_arc_index (arc_name);
-	}
+  rv = vnet_feature_enable_disable (arc_name, feature_name, sw_if_index,
+				    feature_enable, 0, 0);
+  if (rv)
+    return rv;
 
-      fcm = vnet_get_feature_arc_config_main (arc);
-      am->vnet_config_main[is_output][tid] = &fcm->config_main;
-    }
+  arc = vnet_get_feature_arc_index (arc_name);
+  fcm = vnet_get_feature_arc_config_main (arc);
+  am->vnet_config_main[is_output][tid] = &fcm->config_main;
 
   return 0;
 }
 
 int
-vnet_set_in_out_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
-			   u32 ip4_table_index,
-			   u32 ip6_table_index, u32 l2_table_index,
-			   u32 is_add, u32 is_output)
+vnet_set_in_out_acl_intfc (vlib_main_t *vm, u32 sw_if_index,
+			   u32 ip4_table_index, u32 ip6_table_index,
+			   u32 l2_table_index, u32 ip4_punt_table_index,
+			   u32 ip6_punt_table_index, u32 is_add, u32 is_output)
 {
   in_out_acl_main_t *am = &in_out_acl_main;
   vnet_classify_main_t *vcm = am->vnet_classify_main;
-  u32 acl[IN_OUT_ACL_N_TABLES] = { ip4_table_index, ip6_table_index,
-    l2_table_index
+  u32 acl[IN_OUT_ACL_N_TABLES] = {
+    ip4_table_index,	  ip6_table_index,	l2_table_index,
+    ip4_punt_table_index, ip6_punt_table_index,
   };
   u32 ti;
+  int rv;
 
   /* Assume that we've validated sw_if_index in the API layer */
 
@@ -111,8 +123,10 @@ vnet_set_in_out_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
 	  != ~0)
 	return 0;
 
-      vnet_in_out_acl_ip_feature_enable (vm, am, sw_if_index, ti, is_add,
-					 is_output);
+      rv = vnet_in_out_acl_feature_enable (am, sw_if_index, ti, is_add,
+					   is_output);
+      if (rv)
+	return rv;
 
       if (is_add)
 	am->classify_table_index_by_sw_if_index[is_output][ti][sw_if_index] =
@@ -130,9 +144,10 @@ vnet_set_input_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
 			  u32 ip4_table_index,
 			  u32 ip6_table_index, u32 l2_table_index, u32 is_add)
 {
-  return vnet_set_in_out_acl_intfc (vm, sw_if_index, ip4_table_index,
-				    ip6_table_index, l2_table_index, is_add,
-				    IN_OUT_ACL_INPUT_TABLE_GROUP);
+  return vnet_set_in_out_acl_intfc (
+    vm, sw_if_index, ip4_table_index, ip6_table_index, l2_table_index,
+    ~0 /* ip4_punt_table_index */, ~0 /* ip6_punt_table_index */, is_add,
+    IN_OUT_ACL_INPUT_TABLE_GROUP);
 }
 
 int
@@ -141,9 +156,10 @@ vnet_set_output_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
 			   u32 ip6_table_index, u32 l2_table_index,
 			   u32 is_add)
 {
-  return vnet_set_in_out_acl_intfc (vm, sw_if_index, ip4_table_index,
-				    ip6_table_index, l2_table_index, is_add,
-				    IN_OUT_ACL_OUTPUT_TABLE_GROUP);
+  return vnet_set_in_out_acl_intfc (
+    vm, sw_if_index, ip4_table_index, ip6_table_index, l2_table_index,
+    ~0 /* ip4_punt_table_index */, ~0 /* ip6_punt_table_index */, is_add,
+    IN_OUT_ACL_OUTPUT_TABLE_GROUP);
 }
 
 static clib_error_t *
@@ -155,6 +171,8 @@ set_in_out_acl_command_fn (vlib_main_t * vm,
   u32 sw_if_index = ~0;
   u32 ip4_table_index = ~0;
   u32 ip6_table_index = ~0;
+  u32 ip4_punt_table_index = ~0;
+  u32 ip6_punt_table_index = ~0;
   u32 l2_table_index = ~0;
   u32 is_add = 1;
   u32 idx_cnt = 0;
@@ -169,6 +187,10 @@ set_in_out_acl_command_fn (vlib_main_t * vm,
 	idx_cnt++;
       else if (unformat (input, "ip6-table %d", &ip6_table_index))
 	idx_cnt++;
+      else if (unformat (input, "ip4-punt-table %d", &ip4_punt_table_index))
+	idx_cnt++;
+      else if (unformat (input, "ip6-punt-table %d", &ip6_punt_table_index))
+	idx_cnt++;
       else if (unformat (input, "l2-table %d", &l2_table_index))
 	idx_cnt++;
       else if (unformat (input, "del"))
@@ -186,9 +208,9 @@ set_in_out_acl_command_fn (vlib_main_t * vm,
   if (idx_cnt > 1)
     return clib_error_return (0, "Only one table index per API is allowed.");
 
-  rv = vnet_set_in_out_acl_intfc (vm, sw_if_index, ip4_table_index,
-				  ip6_table_index, l2_table_index, is_add,
-				  is_output);
+  rv = vnet_set_in_out_acl_intfc (
+    vm, sw_if_index, ip4_table_index, ip6_table_index, l2_table_index,
+    ip4_punt_table_index, ip6_punt_table_index, is_add, is_output);
 
   switch (rv)
     {
@@ -200,6 +222,9 @@ set_in_out_acl_command_fn (vlib_main_t * vm,
 
     case VNET_API_ERROR_NO_SUCH_ENTRY:
       return clib_error_return (0, "No such classifier table");
+
+    default:
+      return clib_error_return (0, "Error: %d", rv);
     }
   return 0;
 }
@@ -232,11 +257,12 @@ set_output_acl_command_fn (vlib_main_t * vm,
  */
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (set_input_acl_command, static) = {
-    .path = "set interface input acl",
-    .short_help =
+  .path = "set interface input acl",
+  .short_help =
     "set interface input acl intfc <int> [ip4-table <index>]\n"
-    "  [ip6-table <index>] [l2-table <index>] [del]",
-    .function = set_input_acl_command_fn,
+    "  [ip6-table <index>] [l2-table <index>] [ip4-punt-table <index>]\n"
+    "  [ip6-punt-table <index> [del]",
+  .function = set_input_acl_command_fn,
 };
 VLIB_CLI_COMMAND (set_output_acl_command, static) = {
     .path = "set interface output acl",
diff --git a/src/vnet/classify/in_out_acl.h b/src/vnet/classify/in_out_acl.h
index be0323055d8..331c64f531f 100644
--- a/src/vnet/classify/in_out_acl.h
+++ b/src/vnet/classify/in_out_acl.h
@@ -31,6 +31,8 @@ typedef enum
   IN_OUT_ACL_TABLE_IP4,
   IN_OUT_ACL_TABLE_IP6,
   IN_OUT_ACL_TABLE_L2,
+  IN_OUT_ACL_TABLE_IP4_PUNT,
+  IN_OUT_ACL_TABLE_IP6_PUNT,
   IN_OUT_ACL_N_TABLES,
 } in_out_acl_table_id_t;
 
@@ -59,14 +61,14 @@ typedef struct
 
 extern in_out_acl_main_t in_out_acl_main;
 
-int vnet_set_in_out_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
-			       u32 ip4_table_index,
-			       u32 ip6_table_index,
-			       u32 l2_table_index, u32 is_add, u32 is_output);
+int vnet_set_in_out_acl_intfc (vlib_main_t *vm, u32 sw_if_index,
+			       u32 ip4_table_index, u32 ip6_table_index,
+			       u32 l2_table_index, u32 ip4_punt_table_index,
+			       u32 ip6_punt_table_index, u32 is_add,
+			       u32 is_output);
 
-int vnet_set_input_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
-			      u32 ip4_table_index,
-			      u32 ip6_table_index,
+int vnet_set_input_acl_intfc (vlib_main_t *vm, u32 sw_if_index,
+			      u32 ip4_table_index, u32 ip6_table_index,
 			      u32 l2_table_index, u32 is_add);
 
 int vnet_set_output_acl_intfc (vlib_main_t * vm, u32 sw_if_index,
diff --git a/src/vnet/ip/ip_in_out_acl.c b/src/vnet/ip/ip_in_out_acl.c
index a5e652e1ee8..e858c8ed9cc 100644
--- a/src/vnet/ip/ip_in_out_acl.c
+++ b/src/vnet/ip/ip_in_out_acl.c
@@ -97,57 +97,42 @@ static char *ip_outacl_error_strings[] = {
 };
 
 static_always_inline void
-ip_in_out_acl_inline (vlib_main_t * vm,
-		      vlib_node_runtime_t * node, vlib_buffer_t ** b,
-		      u16 * next, u32 n_left, int is_ip4, int is_output,
-		      int do_trace)
+ip_in_out_acl_inline_trace (vlib_main_t *vm, vlib_node_runtime_t *node,
+			    vlib_frame_t *frame, vlib_buffer_t **b, u16 *next,
+			    u32 n_left, u32 *hits__, u32 *misses__,
+			    u32 *chain_hits__, const vlib_error_t error_none,
+			    const vlib_error_t error_deny,
+			    const vlib_error_t error_miss,
+			    vnet_classify_table_t *tables,
+			    const u32 *table_index_by_sw_if_index,
+			    vnet_config_main_t *cm, const vlib_rx_or_tx_t way,
+			    const int is_output, const int do_trace)
 {
-  in_out_acl_main_t *am = &in_out_acl_main;
-  vnet_classify_main_t *vcm = am->vnet_classify_main;
   f64 now = vlib_time_now (vm);
   u32 hits = 0;
   u32 misses = 0;
   u32 chain_hits = 0;
-  in_out_acl_table_id_t tid;
-  vlib_node_runtime_t *error_node;
-  u32 n_next_nodes;
-
+  u32 n_next_nodes = node->n_next_nodes;
   u8 *h[4];
   u32 sw_if_index[4];
   u32 table_index[4];
   vnet_classify_table_t *t[4] = { 0, 0 };
   u64 hash[4];
 
-  n_next_nodes = node->n_next_nodes;
-
-  if (is_ip4)
-    {
-      tid = IN_OUT_ACL_TABLE_IP4;
-      error_node = vlib_node_get_runtime (vm, ip4_input_node.index);
-    }
-  else
-    {
-      tid = IN_OUT_ACL_TABLE_IP6;
-      error_node = vlib_node_get_runtime (vm, ip6_input_node.index);
-    }
-
   /* calculate hashes for b[0] & b[1] */
   if (n_left >= 2)
     {
-      sw_if_index[2] =
-	vnet_buffer (b[0])->sw_if_index[is_output ? VLIB_TX : VLIB_RX];
-      sw_if_index[3] =
-	vnet_buffer (b[1])->sw_if_index[is_output ? VLIB_TX : VLIB_RX];
+      /* ~0 is used as a wildcard to say 'always use sw_if_index 0'
+       * aka local0. It is used when we do not care about the sw_if_index, as
+       * when punting */
+      sw_if_index[2] = ~0 == way ? 0 : vnet_buffer (b[0])->sw_if_index[way];
+      sw_if_index[3] = ~0 == way ? 0 : vnet_buffer (b[1])->sw_if_index[way];
 
-      table_index[2] =
-	am->classify_table_index_by_sw_if_index[is_output][tid]
-	[sw_if_index[2]];
-      table_index[3] =
-	am->classify_table_index_by_sw_if_index[is_output][tid]
-	[sw_if_index[3]];
+      table_index[2] = table_index_by_sw_if_index[sw_if_index[2]];
+      table_index[3] = table_index_by_sw_if_index[sw_if_index[3]];
 
-      t[2] = pool_elt_at_index (vcm->tables, table_index[2]);
-      t[3] = pool_elt_at_index (vcm->tables, table_index[3]);
+      t[2] = pool_elt_at_index (tables, table_index[2]);
+      t[3] = pool_elt_at_index (tables, table_index[3]);
 
       if (t[2]->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
 	h[2] =
@@ -198,7 +183,6 @@ ip_in_out_acl_inline (vlib_main_t * vm,
     {
       vnet_classify_entry_t *e[2] = { 0, 0 };
       u32 _next[2] = { ACL_NEXT_INDEX_DENY, ACL_NEXT_INDEX_DENY };
-      u8 error[2];
 
       h[0] = h[2];
       h[1] = h[3];
@@ -228,19 +212,15 @@ ip_in_out_acl_inline (vlib_main_t * vm,
       if (n_left >= 4)
 	{
 	  sw_if_index[2] =
-	    vnet_buffer (b[2])->sw_if_index[is_output ? VLIB_TX : VLIB_RX];
+	    ~0 == way ? 0 : vnet_buffer (b[2])->sw_if_index[way];
 	  sw_if_index[3] =
-	    vnet_buffer (b[3])->sw_if_index[is_output ? VLIB_TX : VLIB_RX];
+	    ~0 == way ? 0 : vnet_buffer (b[3])->sw_if_index[way];
 
-	  table_index[2] =
-	    am->classify_table_index_by_sw_if_index[is_output][tid]
-	    [sw_if_index[2]];
-	  table_index[3] =
-	    am->classify_table_index_by_sw_if_index[is_output][tid]
-	    [sw_if_index[3]];
+	  table_index[2] = table_index_by_sw_if_index[sw_if_index[2]];
+	  table_index[3] = table_index_by_sw_if_index[sw_if_index[3]];
 
-	  t[2] = pool_elt_at_index (vcm->tables, table_index[2]);
-	  t[3] = pool_elt_at_index (vcm->tables, table_index[3]);
+	  t[2] = pool_elt_at_index (tables, table_index[2]);
+	  t[3] = pool_elt_at_index (tables, table_index[3]);
 
 	  if (t[2]->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
 	    h[2] =
@@ -292,11 +272,9 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 	}
 
       /* find entry for b[0] & b[1] */
-      vnet_get_config_data (am->vnet_config_main[is_output][tid],
-			    &b[0]->current_config_index, &_next[0],
+      vnet_get_config_data (cm, &b[0]->current_config_index, &_next[0],
 			    /* # bytes of config data */ 0);
-      vnet_get_config_data (am->vnet_config_main[is_output][tid],
-			    &b[1]->current_config_index, &_next[1],
+      vnet_get_config_data (cm, &b[1]->current_config_index, &_next[1],
 			    /* # bytes of config data */ 0);
 
       if (PREDICT_TRUE (table_index[0] != ~0))
@@ -314,15 +292,8 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 
 	      hits++;
 
-	      if (is_ip4)
-		error[0] = (_next[0] == ACL_NEXT_INDEX_DENY) ?
-		  (is_output ? IP4_ERROR_OUTACL_SESSION_DENY :
-		   IP4_ERROR_INACL_SESSION_DENY) : IP4_ERROR_NONE;
-	      else
-		error[0] = (_next[0] == ACL_NEXT_INDEX_DENY) ?
-		  (is_output ? IP6_ERROR_OUTACL_SESSION_DENY :
-		   IP6_ERROR_INACL_SESSION_DENY) : IP6_ERROR_NONE;
-	      b[0]->error = error_node->errors[error[0]];
+	      b[0]->error =
+		(_next[0] == ACL_NEXT_INDEX_DENY) ? error_deny : error_none;
 
 	      if (!is_output)
 		{
@@ -339,8 +310,7 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 	      while (1)
 		{
 		  if (PREDICT_TRUE (t[0]->next_table_index != ~0))
-		    t[0] = pool_elt_at_index (vcm->tables,
-					      t[0]->next_table_index);
+		    t[0] = pool_elt_at_index (tables, t[0]->next_table_index);
 		  else
 		    {
 		      _next[0] = (t[0]->miss_next_index < n_next_nodes) ?
@@ -348,15 +318,9 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 
 		      misses++;
 
-		      if (is_ip4)
-			error[0] = (_next[0] == ACL_NEXT_INDEX_DENY) ?
-			  (is_output ? IP4_ERROR_OUTACL_TABLE_MISS :
-			   IP4_ERROR_INACL_TABLE_MISS) : IP4_ERROR_NONE;
-		      else
-			error[0] = (_next[0] == ACL_NEXT_INDEX_DENY) ?
-			  (is_output ? IP6_ERROR_OUTACL_TABLE_MISS :
-			   IP6_ERROR_INACL_TABLE_MISS) : IP6_ERROR_NONE;
-		      b[0]->error = error_node->errors[error[0]];
+		      b[0]->error = (_next[0] == ACL_NEXT_INDEX_DENY) ?
+				      error_miss :
+				      error_none;
 		      break;
 		    }
 
@@ -386,15 +350,9 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 		      hits++;
 		      chain_hits++;
 
-		      if (is_ip4)
-			error[0] = (_next[0] == ACL_NEXT_INDEX_DENY) ?
-			  (is_output ? IP4_ERROR_OUTACL_SESSION_DENY :
-			   IP4_ERROR_INACL_SESSION_DENY) : IP4_ERROR_NONE;
-		      else
-			error[0] = (_next[0] == ACL_NEXT_INDEX_DENY) ?
-			  (is_output ? IP6_ERROR_OUTACL_SESSION_DENY :
-			   IP6_ERROR_INACL_SESSION_DENY) : IP6_ERROR_NONE;
-		      b[0]->error = error_node->errors[error[0]];
+		      b[0]->error = (_next[0] == ACL_NEXT_INDEX_DENY) ?
+				      error_deny :
+				      error_none;
 
 		      if (!is_output)
 			{
@@ -430,15 +388,8 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 
 	      hits++;
 
-	      if (is_ip4)
-		error[1] = (_next[1] == ACL_NEXT_INDEX_DENY) ?
-		  (is_output ? IP4_ERROR_OUTACL_SESSION_DENY :
-		   IP4_ERROR_INACL_SESSION_DENY) : IP4_ERROR_NONE;
-	      else
-		error[1] = (_next[1] == ACL_NEXT_INDEX_DENY) ?
-		  (is_output ? IP6_ERROR_OUTACL_SESSION_DENY :
-		   IP6_ERROR_INACL_SESSION_DENY) : IP6_ERROR_NONE;
-	      b[1]->error = error_node->errors[error[1]];
+	      b[1]->error =
+		(_next[1] == ACL_NEXT_INDEX_DENY) ? error_deny : error_none;
 
 	      if (!is_output)
 		{
@@ -455,8 +406,7 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 	      while (1)
 		{
 		  if (PREDICT_TRUE (t[1]->next_table_index != ~0))
-		    t[1] = pool_elt_at_index (vcm->tables,
-					      t[1]->next_table_index);
+		    t[1] = pool_elt_at_index (tables, t[1]->next_table_index);
 		  else
 		    {
 		      _next[1] = (t[1]->miss_next_index < n_next_nodes) ?
@@ -464,15 +414,9 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 
 		      misses++;
 
-		      if (is_ip4)
-			error[1] = (_next[1] == ACL_NEXT_INDEX_DENY) ?
-			  (is_output ? IP4_ERROR_OUTACL_TABLE_MISS :
-			   IP4_ERROR_INACL_TABLE_MISS) : IP4_ERROR_NONE;
-		      else
-			error[1] = (_next[1] == ACL_NEXT_INDEX_DENY) ?
-			  (is_output ? IP6_ERROR_OUTACL_TABLE_MISS :
-			   IP6_ERROR_INACL_TABLE_MISS) : IP6_ERROR_NONE;
-		      b[1]->error = error_node->errors[error[1]];
+		      b[1]->error = (_next[1] == ACL_NEXT_INDEX_DENY) ?
+				      error_miss :
+				      error_none;
 		      break;
 		    }
 
@@ -502,15 +446,9 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 		      hits++;
 		      chain_hits++;
 
-		      if (is_ip4)
-			error[1] = (_next[1] == ACL_NEXT_INDEX_DENY) ?
-			  (is_output ? IP4_ERROR_OUTACL_SESSION_DENY :
-			   IP4_ERROR_INACL_SESSION_DENY) : IP4_ERROR_NONE;
-		      else
-			error[1] = (_next[1] == ACL_NEXT_INDEX_DENY) ?
-			  (is_output ? IP6_ERROR_OUTACL_SESSION_DENY :
-			   IP6_ERROR_INACL_SESSION_DENY) : IP6_ERROR_NONE;
-		      b[1]->error = error_node->errors[error[1]];
+		      b[1]->error = (_next[1] == ACL_NEXT_INDEX_DENY) ?
+				      error_deny :
+				      error_none;
 
 		      if (!is_output)
 			{
@@ -536,9 +474,9 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 	  ip_in_out_acl_trace_t *_t =
 	    vlib_add_trace (vm, node, b[0], sizeof (*_t));
 	  _t->sw_if_index =
-	    vnet_buffer (b[0])->sw_if_index[is_output ? VLIB_TX : VLIB_RX];
+	    ~0 == way ? 0 : vnet_buffer (b[0])->sw_if_index[way];
 	  _t->next_index = _next[0];
-	  _t->table_index = t[0] ? t[0] - vcm->tables : ~0;
+	  _t->table_index = t[0] ? t[0] - tables : ~0;
 	  _t->offset = (e[0]
 			&& t[0]) ? vnet_classify_get_offset (t[0], e[0]) : ~0;
 	}
@@ -548,9 +486,9 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 	  ip_in_out_acl_trace_t *_t =
 	    vlib_add_trace (vm, node, b[1], sizeof (*_t));
 	  _t->sw_if_index =
-	    vnet_buffer (b[1])->sw_if_index[is_output ? VLIB_TX : VLIB_RX];
+	    ~0 == way ? 0 : vnet_buffer (b[1])->sw_if_index[way];
 	  _t->next_index = _next[1];
-	  _t->table_index = t[1] ? t[1] - vcm->tables : ~0;
+	  _t->table_index = t[1] ? t[1] - tables : ~0;
 	  _t->offset = (e[1]
 			&& t[1]) ? vnet_classify_get_offset (t[1], e[1]) : ~0;
 	}
@@ -585,14 +523,11 @@ ip_in_out_acl_inline (vlib_main_t * vm,
       vnet_classify_entry_t *e0 = 0;
       u32 next0 = ACL_NEXT_INDEX_DENY;
       u64 hash0;
-      u8 error0;
 
-      sw_if_index0 =
-	vnet_buffer (b[0])->sw_if_index[is_output ? VLIB_TX : VLIB_RX];
-      table_index0 =
-	am->classify_table_index_by_sw_if_index[is_output][tid][sw_if_index0];
+      sw_if_index0 = ~0 == way ? 0 : vnet_buffer (b[0])->sw_if_index[way];
+      table_index0 = table_index_by_sw_if_index[sw_if_index0];
 
-      t0 = pool_elt_at_index (vcm->tables, table_index0);
+      t0 = pool_elt_at_index (tables, table_index0);
 
       if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
 	h0 =
@@ -615,14 +550,13 @@ ip_in_out_acl_inline (vlib_main_t * vm,
       vnet_buffer (b[0])->l2_classify.table_index = table_index0;
       vnet_buffer (b[0])->l2_classify.opaque_index = ~0;
 
-      vnet_get_config_data (am->vnet_config_main[is_output][tid],
-			    &b[0]->current_config_index, &next0,
+      vnet_get_config_data (cm, &b[0]->current_config_index, &next0,
 			    /* # bytes of config data */ 0);
 
       if (PREDICT_TRUE (table_index0 != ~0))
 	{
 	  hash0 = vnet_buffer (b[0])->l2_classify.hash;
-	  t0 = pool_elt_at_index (vcm->tables, table_index0);
+	  t0 = pool_elt_at_index (tables, table_index0);
 
 	  if (t0->current_data_flag == CLASSIFY_FLAG_USE_CURR_DATA)
 	    h0 =
@@ -646,15 +580,8 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 
 	      hits++;
 
-	      if (is_ip4)
-		error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-		  (is_output ? IP4_ERROR_OUTACL_SESSION_DENY :
-		   IP4_ERROR_INACL_SESSION_DENY) : IP4_ERROR_NONE;
-	      else
-		error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-		  (is_output ? IP6_ERROR_OUTACL_SESSION_DENY :
-		   IP6_ERROR_INACL_SESSION_DENY) : IP6_ERROR_NONE;
-	      b[0]->error = error_node->errors[error0];
+	      b[0]->error =
+		(next0 == ACL_NEXT_INDEX_DENY) ? error_deny : error_none;
 
 	      if (!is_output)
 		{
@@ -670,8 +597,7 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 	      while (1)
 		{
 		  if (PREDICT_TRUE (t0->next_table_index != ~0))
-		    t0 =
-		      pool_elt_at_index (vcm->tables, t0->next_table_index);
+		    t0 = pool_elt_at_index (tables, t0->next_table_index);
 		  else
 		    {
 		      next0 = (t0->miss_next_index < n_next_nodes) ?
@@ -679,15 +605,9 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 
 		      misses++;
 
-		      if (is_ip4)
-			error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-			  (is_output ? IP4_ERROR_OUTACL_TABLE_MISS :
-			   IP4_ERROR_INACL_TABLE_MISS) : IP4_ERROR_NONE;
-		      else
-			error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-			  (is_output ? IP6_ERROR_OUTACL_TABLE_MISS :
-			   IP6_ERROR_INACL_TABLE_MISS) : IP6_ERROR_NONE;
-		      b[0]->error = error_node->errors[error0];
+		      b[0]->error = (next0 == ACL_NEXT_INDEX_DENY) ?
+				      error_miss :
+				      error_none;
 		      break;
 		    }
 
@@ -714,15 +634,9 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 			e0->next_index : next0;
 		      hits++;
 
-		      if (is_ip4)
-			error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-			  (is_output ? IP4_ERROR_OUTACL_SESSION_DENY :
-			   IP4_ERROR_INACL_SESSION_DENY) : IP4_ERROR_NONE;
-		      else
-			error0 = (next0 == ACL_NEXT_INDEX_DENY) ?
-			  (is_output ? IP6_ERROR_OUTACL_SESSION_DENY :
-			   IP6_ERROR_INACL_SESSION_DENY) : IP6_ERROR_NONE;
-		      b[0]->error = error_node->errors[error0];
+		      b[0]->error = (next0 == ACL_NEXT_INDEX_DENY) ?
+				      error_deny :
+				      error_none;
 
 		      if (!is_output)
 			{
@@ -747,9 +661,9 @@ ip_in_out_acl_inline (vlib_main_t * vm,
 	  ip_in_out_acl_trace_t *t =
 	    vlib_add_trace (vm, node, b[0], sizeof (*t));
 	  t->sw_if_index =
-	    vnet_buffer (b[0])->sw_if_index[is_output ? VLIB_TX : VLIB_RX];
+	    ~0 == way ? 0 : vnet_buffer (b[0])->sw_if_index[way];
 	  t->next_index = next0;
-	  t->table_index = t0 ? t0 - vcm->tables : ~0;
+	  t->table_index = t0 ? t0 - tables : ~0;
 	  t->offset = (e0 && t0) ? vnet_classify_get_offset (t0, e0) : ~0;
 	}
 
@@ -767,66 +681,87 @@ ip_in_out_acl_inline (vlib_main_t * vm,
       n_left--;
     }
 
-  vlib_node_increment_counter (vm, node->node_index,
-			       is_output ? IP_OUTACL_ERROR_MISS :
-			       IP_INACL_ERROR_MISS, misses);
-  vlib_node_increment_counter (vm, node->node_index,
-			       is_output ? IP_OUTACL_ERROR_HIT :
-			       IP_INACL_ERROR_HIT, hits);
-  vlib_node_increment_counter (vm, node->node_index,
-			       is_output ? IP_OUTACL_ERROR_CHAIN_HIT :
-			       IP_INACL_ERROR_CHAIN_HIT, chain_hits);
+  *hits__ = hits;
+  *misses__ = misses;
+  *chain_hits__ = chain_hits;
 }
 
-VLIB_NODE_FN (ip4_inacl_node) (vlib_main_t * vm, vlib_node_runtime_t * node,
-			       vlib_frame_t * frame)
+static_always_inline uword
+ip_in_out_acl_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
+		      vlib_frame_t *frame, const in_out_acl_table_id_t tid,
+		      const vlib_node_registration_t *parent_error_node,
+		      const u32 error_none_index, const u32 error_deny_index,
+		      const u32 error_miss_index, const vlib_rx_or_tx_t way,
+		      const int is_output)
 {
-
-  u32 *from;
+  const in_out_acl_main_t *am = &in_out_acl_main;
+  vnet_classify_table_t *tables = am->vnet_classify_main->tables;
+  u32 *from = vlib_frame_vector_args (frame);
+  const u32 *table_index_by_sw_if_index =
+    am->classify_table_index_by_sw_if_index[is_output][tid];
+  vnet_config_main_t *cm = am->vnet_config_main[is_output][tid];
+  const vlib_node_runtime_t *error_node =
+    vlib_node_get_runtime (vm, parent_error_node->index);
+  const vlib_error_t error_none = error_node->errors[error_none_index];
+  const vlib_error_t error_deny = error_node->errors[error_deny_index];
+  const vlib_error_t error_miss = error_node->errors[error_miss_index];
   vlib_buffer_t *bufs[VLIB_FRAME_SIZE];
   u16 nexts[VLIB_FRAME_SIZE];
-
-  from = vlib_frame_vector_args (frame);
+  u32 hits, misses, chain_hits;
 
   vlib_get_buffers (vm, from, bufs, frame->n_vectors);
 
-  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-    ip_in_out_acl_inline (vm, node, bufs, nexts, frame->n_vectors,
-			  1 /* is_ip4 */ ,
-			  0 /* is_output */ , 1 /* is_trace */ );
+#define ip_in_out_acl_inline_trace__(do_trace)                                \
+  ip_in_out_acl_inline_trace (                                                \
+    vm, node, frame, bufs, nexts, frame->n_vectors, &hits, &misses,           \
+    &chain_hits, error_deny, error_miss, error_none, tables,                  \
+    table_index_by_sw_if_index, cm, way, is_output, do_trace)
+
+  if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE))
+    ip_in_out_acl_inline_trace__ (1 /* do_trace */);
   else
-    ip_in_out_acl_inline (vm, node, bufs, nexts, frame->n_vectors,
-			  1 /* is_ip4 */ ,
-			  0 /* is_output */ , 0 /* is_trace */ );
+    ip_in_out_acl_inline_trace__ (0 /* do_trace */);
+
+  vlib_node_increment_counter (
+    vm, node->node_index,
+    is_output ? IP_OUTACL_ERROR_MISS : IP_INACL_ERROR_MISS, misses);
+  vlib_node_increment_counter (
+    vm, node->node_index, is_output ? IP_OUTACL_ERROR_HIT : IP_INACL_ERROR_HIT,
+    hits);
+  vlib_node_increment_counter (vm, node->node_index,
+			       is_output ? IP_OUTACL_ERROR_CHAIN_HIT :
+					   IP_INACL_ERROR_CHAIN_HIT,
+			       chain_hits);
 
   vlib_buffer_enqueue_to_next (vm, node, from, nexts, frame->n_vectors);
-
   return frame->n_vectors;
 }
 
-VLIB_NODE_FN (ip4_outacl_node) (vlib_main_t * vm, vlib_node_runtime_t * node,
-				vlib_frame_t * frame)
+VLIB_NODE_FN (ip4_inacl_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
 {
-  u32 *from;
-  vlib_buffer_t *bufs[VLIB_FRAME_SIZE];
-  u16 nexts[VLIB_FRAME_SIZE];
-
-  from = vlib_frame_vector_args (frame);
-
-  vlib_get_buffers (vm, from, bufs, frame->n_vectors);
-
-  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-    ip_in_out_acl_inline (vm, node, bufs, nexts, frame->n_vectors,
-			  1 /* is_ip4 */ ,
-			  1 /* is_output */ , 1 /* is_trace */ );
-  else
-    ip_in_out_acl_inline (vm, node, bufs, nexts, frame->n_vectors,
-			  1 /* is_ip4 */ ,
-			  1 /* is_output */ , 0 /* is_trace */ );
+  return ip_in_out_acl_inline (
+    vm, node, frame, IN_OUT_ACL_TABLE_IP4, &ip4_input_node, IP4_ERROR_NONE,
+    IP4_ERROR_INACL_SESSION_DENY, IP4_ERROR_INACL_TABLE_MISS, VLIB_RX,
+    0 /* is_output */);
+}
 
-  vlib_buffer_enqueue_to_next (vm, node, from, nexts, frame->n_vectors);
+VLIB_NODE_FN (ip4_punt_acl_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return ip_in_out_acl_inline (
+    vm, node, frame, IN_OUT_ACL_TABLE_IP4_PUNT, &ip4_input_node,
+    IP4_ERROR_NONE, IP4_ERROR_INACL_SESSION_DENY, IP4_ERROR_INACL_TABLE_MISS,
+    ~0 /* way */, 0 /* is_output */);
+}
 
-  return frame->n_vectors;
+VLIB_NODE_FN (ip4_outacl_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return ip_in_out_acl_inline (
+    vm, node, frame, IN_OUT_ACL_TABLE_IP4, &ip4_input_node, IP4_ERROR_NONE,
+    IP4_ERROR_INACL_SESSION_DENY, IP4_ERROR_INACL_TABLE_MISS, VLIB_TX,
+    1 /* is_output */);
 }
 
 /* *INDENT-OFF* */
@@ -843,6 +778,19 @@ VLIB_REGISTER_NODE (ip4_inacl_node) = {
   },
 };
 
+VLIB_REGISTER_NODE (ip4_punt_acl_node) = {
+  .name = "ip4-punt-acl",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip_inacl_trace,
+  .n_errors = ARRAY_LEN(ip_inacl_error_strings),
+  .error_strings = ip_inacl_error_strings,
+
+  .n_next_nodes = ACL_NEXT_INDEX_N_NEXT,
+  .next_nodes = {
+    [ACL_NEXT_INDEX_DENY] = "ip4-drop",
+  },
+};
+
 VLIB_REGISTER_NODE (ip4_outacl_node) = {
   .name = "ip4-outacl",
   .vector_size = sizeof (u32),
@@ -857,54 +805,37 @@ VLIB_REGISTER_NODE (ip4_outacl_node) = {
 };
 /* *INDENT-ON* */
 
+VNET_FEATURE_INIT (ip4_punt_acl_feature) = {
+  .arc_name = "ip4-punt",
+  .node_name = "ip4-punt-acl",
+  .runs_after = VNET_FEATURES ("ip4-punt-policer"),
+};
+
 VLIB_NODE_FN (ip6_inacl_node) (vlib_main_t * vm, vlib_node_runtime_t * node,
 			       vlib_frame_t * frame)
 {
-  u32 *from;
-  vlib_buffer_t *bufs[VLIB_FRAME_SIZE];
-  u16 nexts[VLIB_FRAME_SIZE];
-
-  from = vlib_frame_vector_args (frame);
-
-  vlib_get_buffers (vm, from, bufs, frame->n_vectors);
-
-  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-    ip_in_out_acl_inline (vm, node, bufs, nexts, frame->n_vectors,
-			  0 /* is_ip4 */ ,
-			  0 /* is_output */ , 1 /* is_trace */ );
-  else
-    ip_in_out_acl_inline (vm, node, bufs, nexts, frame->n_vectors,
-			  0 /* is_ip4 */ ,
-			  0 /* is_output */ , 0 /* is_trace */ );
-
-  vlib_buffer_enqueue_to_next (vm, node, from, nexts, frame->n_vectors);
+  return ip_in_out_acl_inline (
+    vm, node, frame, IN_OUT_ACL_TABLE_IP6, &ip6_input_node, IP6_ERROR_NONE,
+    IP6_ERROR_INACL_SESSION_DENY, IP6_ERROR_INACL_TABLE_MISS, VLIB_RX,
+    0 /* is_output */);
+}
 
-  return frame->n_vectors;
+VLIB_NODE_FN (ip6_punt_acl_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return ip_in_out_acl_inline (
+    vm, node, frame, IN_OUT_ACL_TABLE_IP6_PUNT, &ip6_input_node,
+    IP6_ERROR_NONE, IP6_ERROR_INACL_SESSION_DENY, IP6_ERROR_INACL_TABLE_MISS,
+    ~0 /* way */, 0 /* is_output */);
 }
 
 VLIB_NODE_FN (ip6_outacl_node) (vlib_main_t * vm, vlib_node_runtime_t * node,
 				vlib_frame_t * frame)
 {
-  u32 *from;
-  vlib_buffer_t *bufs[VLIB_FRAME_SIZE];
-  u16 nexts[VLIB_FRAME_SIZE];
-
-  from = vlib_frame_vector_args (frame);
-
-  vlib_get_buffers (vm, from, bufs, frame->n_vectors);
-
-  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
-    ip_in_out_acl_inline (vm, node, bufs, nexts, frame->n_vectors,
-			  0 /* is_ip4 */ ,
-			  1 /* is_output */ , 1 /* is_trace */ );
-  else
-    ip_in_out_acl_inline (vm, node, bufs, nexts, frame->n_vectors,
-			  0 /* is_ip4 */ ,
-			  1 /* is_output */ , 0 /* is_trace */ );
-
-  vlib_buffer_enqueue_to_next (vm, node, from, nexts, frame->n_vectors);
-
-  return frame->n_vectors;
+  return ip_in_out_acl_inline (
+    vm, node, frame, IN_OUT_ACL_TABLE_IP6, &ip6_input_node, IP6_ERROR_NONE,
+    IP6_ERROR_INACL_SESSION_DENY, IP6_ERROR_INACL_TABLE_MISS, VLIB_TX,
+    1 /* is_output */);
 }
 
 /* *INDENT-OFF* */
@@ -921,6 +852,19 @@ VLIB_REGISTER_NODE (ip6_inacl_node) = {
   },
 };
 
+VLIB_REGISTER_NODE (ip6_punt_acl_node) = {
+  .name = "ip6-punt-acl",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip_inacl_trace,
+  .n_errors = ARRAY_LEN(ip_inacl_error_strings),
+  .error_strings = ip_inacl_error_strings,
+
+  .n_next_nodes = ACL_NEXT_INDEX_N_NEXT,
+  .next_nodes = {
+    [ACL_NEXT_INDEX_DENY] = "ip6-drop",
+  },
+};
+
 VLIB_REGISTER_NODE (ip6_outacl_node) = {
   .name = "ip6-outacl",
   .vector_size = sizeof (u32),
@@ -935,6 +879,12 @@ VLIB_REGISTER_NODE (ip6_outacl_node) = {
 };
 /* *INDENT-ON* */
 
+VNET_FEATURE_INIT (ip6_punt_acl_feature) = {
+  .arc_name = "ip6-punt",
+  .node_name = "ip6-punt-acl",
+  .runs_after = VNET_FEATURES ("ip6-punt-policer"),
+};
+
 #ifndef CLIB_MARCH_VARIANT
 static clib_error_t *
 ip_in_out_acl_init (vlib_main_t * vm)