1 files changed, 47 insertions, 115 deletions

diff --git a/hicn-plugin/src/interest_hitpit_node.c b/hicn-plugin/src/interest_hitpit_node.c
index 837eddca7..7f1b0f449 100644
--- a/hicn-plugin/src/interest_hitpit_node.c
+++ b/hicn-plugin/src/interest_hitpit_node.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021 Cisco and/or its affiliates.
+ * Copyright (c) 2021 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -25,7 +25,6 @@
 #include "strategy_dpo_manager.h"
 #include "state.h"
 #include "error.h"
-#include "face_db.h"
 
 /* packet trace format function */
 static u8 *hicn_interest_hitpit_format_trace (u8 *s, va_list *args);
@@ -39,8 +38,6 @@ static char *hicn_interest_hitpit_error_strings[] = {
 
 vlib_node_registration_t hicn_interest_hitpit_node;
 
-always_inline void drop_packet (u32 *next0);
-
 /*
  * hICN forwarder node for interests hitting the PIT
  */
@@ -52,7 +49,17 @@ hicn_interest_hitpit_node_fn (vlib_main_t *vm, vlib_node_runtime_t *node,
   hicn_interest_hitpit_next_t next_index;
   hicn_interest_hitpit_runtime_t *rt;
   vl_api_hicn_api_node_stats_get_reply_t stats = { 0 };
-  f64 tnow;
+  u32 n_left_to_next;
+  vlib_buffer_t *b0;
+  u32 bi0;
+  u32 next0 = HICN_INTEREST_HITPIT_NEXT_ERROR_DROP;
+  const hicn_strategy_vft_t *strategy_vft0;
+  const hicn_dpo_vft_t *dpo_vft0;
+  u8 dpo_ctx_id0;
+  u8 forward = 0;
+  u32 pit_entry_index;
+  hicn_pcs_entry_t *pcs_entry = NULL;
+  hicn_buffer_t *hicnb0;
 
   rt = vlib_node_get_runtime_data (vm, hicn_interest_hitpit_node.index);
 
@@ -64,42 +71,17 @@ hicn_interest_hitpit_node_fn (vlib_main_t *vm, vlib_node_runtime_t *node,
   n_left_from = frame->n_vectors;
   next_index = node->cached_next_index;
 
-  /* Capture time in vpp terms */
-  tnow = vlib_time_now (vm);
-
   while (n_left_from > 0)
     {
-      u32 n_left_to_next;
       vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
       while (n_left_from > 0 && n_left_to_next > 0)
 	{
-	  vlib_buffer_t *b0;
-	  u8 isv6;
-	  u8 *nameptr;
-	  u16 namelen;
-	  u32 bi0;
-	  u32 next0 = HICN_INTEREST_HITPIT_NEXT_ERROR_DROP;
-	  hicn_name_t name;
-	  hicn_header_t *hicn0;
-	  hicn_hash_node_t *node0;
-	  const hicn_strategy_vft_t *strategy_vft0;
-	  const hicn_dpo_vft_t *dpo_vft0;
-	  hicn_pcs_entry_t *pitp;
-	  u8 dpo_ctx_id0;
-	  u8 found = 0;
-	  int nh_idx;
-	  hicn_face_id_t outface;
-	  hicn_hash_entry_t *hash_entry0;
-	  hicn_buffer_t *hicnb0;
-	  int ret;
-
 	  /* Prefetch for next iteration. */
 	  if (n_left_from > 1)
 	    {
 	      vlib_buffer_t *b1;
 	      b1 = vlib_get_buffer (vm, from[1]);
 	      CLIB_PREFETCH (b1, CLIB_CACHE_LINE_BYTES, LOAD);
-	      CLIB_PREFETCH (b1->data, CLIB_CACHE_LINE_BYTES, STORE);
 	    }
 
 	  /* Dequeue a packet buffer */
@@ -114,96 +96,54 @@ hicn_interest_hitpit_node_fn (vlib_main_t *vm, vlib_node_runtime_t *node,
 
 	  /* Get hicn buffer and state */
 	  hicnb0 = hicn_get_buffer (b0);
-	  hicn_get_internal_state (hicnb0, rt->pitcs, &node0, &strategy_vft0,
-				   &dpo_vft0, &dpo_ctx_id0, &hash_entry0);
+	  hicn_get_internal_state (hicnb0, &pit_entry_index, &strategy_vft0,
+				   &dpo_vft0, &dpo_ctx_id0);
 
-	  ret = hicn_interest_parse_pkt (b0, &name, &namelen, &hicn0, &isv6);
-	  nameptr = (u8 *) (&name);
-	  pitp = hicn_pit_get_data (node0);
-	  dpo_id_t hicn_dpo_id0 = { .dpoi_type =
-				      dpo_vft0->hicn_dpo_get_type (),
-				    .dpoi_proto = 0,
-				    .dpoi_next_node = 0,
-				    .dpoi_index = dpo_ctx_id0 };
+	  // Retrieve PIT entry
+	  pcs_entry =
+	    hicn_pcs_entry_get_entry_from_index (rt->pitcs, pit_entry_index);
 
-	  /*
-	   * Check if the hit is instead a collision in the
-	   * hash table. Unlikely to happen.
-	   */
-	  if (PREDICT_FALSE (ret != HICN_ERROR_NONE ||
-			     !hicn_node_compare (nameptr, namelen, node0)))
-	    {
-	      stats.interests_hash_collision++;
-	      /* Remove lock from the entry */
-	      hicn_pcs_remove_lock (rt->pitcs, &pitp, &node0, vm, hash_entry0,
-				    dpo_vft0, &hicn_dpo_id0);
-	      drop_packet (&next0);
+	  // Increment packet counter
+	  stats.pkts_processed += 1;
 
-	      goto end_processing;
-	    }
-	  /*
-	   * If the entry is expired, remove it no matter of
-	   * the possible cases.
-	   */
-	  if (tnow > pitp->shared.expire_time)
+	  // A data packet may have arrived in the time between the pcs
+	  // lookup and now. Check again to make sure the entry is CS or
+	  // PIT
+	  if (hicn_pcs_entry_is_cs (pcs_entry))
 	    {
-	      strategy_vft0->hicn_on_interest_timeout (dpo_ctx_id0);
-	      hicn_pcs_delete (rt->pitcs, &pitp, &node0, vm, hash_entry0,
-			       dpo_vft0, &hicn_dpo_id0);
-	      stats.pit_expired_count++;
-	      next0 = HICN_INTEREST_HITPIT_NEXT_STRATEGY;
+	      next0 = HICN_INTEREST_HITPIT_NEXT_INTEREST_HITCS;
 	    }
 	  else
 	    {
-	      if ((hash_entry0->he_flags & HICN_HASH_ENTRY_FLAG_CS_ENTRY))
+	      // Distinguish between aggregation, retransmission and
+	      // additionally check if the strategy mandates to always send
+	      // the interest
+
+	      // Retransmission
+	      forward = hicn_pcs_entry_pit_search (pcs_entry, hicnb0->face_id);
+
+	      // Strategy mandates to force send after aggregation
+	      if (!forward && strategy_vft0->hicn_send_after_aggregation (
+				dpo_ctx_id0, hicnb0->face_id))
 		{
-		  next0 = HICN_INTEREST_HITPIT_NEXT_INTEREST_HITCS;
+		  forward = true;
+		  hicn_pcs_entry_pit_add_face (pcs_entry, hicnb0->face_id);
+		}
+
+	      if (forward && hicnb0->payload_type != HPT_MANIFEST)
+		{
+		  next0 = HICN_INTEREST_HITPIT_NEXT_STRATEGY;
 		}
 	      else
 		{
-		  /*
-		   * Distinguish between aggregation or
-		   * retransmission
-		   */
-
-		  found =
-		    hicn_face_search (hicnb0->face_id, &(pitp->u.pit.faces));
+		  // Aggregation
+		  hicn_pcs_entry_pit_add_face (pcs_entry, hicnb0->face_id);
 
-		  if (found)
-		    {
-		      strategy_vft0->hicn_select_next_hop (dpo_ctx_id0,
-							   &nh_idx, &outface);
-		      /* Retransmission */
-		      /*
-		       * Prepare the packet for the
-		       * forwarding
-		       */
-		      next0 = isv6 ? HICN_INTEREST_HITPIT_NEXT_FACE6_OUTPUT :
-				     HICN_INTEREST_HITPIT_NEXT_FACE4_OUTPUT;
-		      vnet_buffer (b0)->ip.adj_index[VLIB_TX] = outface;
+		  next0 = HICN_INTEREST_HITPIT_NEXT_ERROR_DROP;
 
-		      /*
-		       * Update the egress face in
-		       * the PIT
-		       */
-		      pitp->u.pit.pe_txnh = nh_idx;
-		      stats.interests_retx++;
-		    }
-		  else
-		    {
-		      hicn_face_db_add_face (hicnb0->face_id,
-					     &pitp->u.pit.faces);
-
-		      /* Aggregation */
-		      drop_packet (&next0);
-		      stats.interests_aggregated++;
-		    }
-		  /* Remove lock from the entry */
-		  hicn_pcs_remove_lock (rt->pitcs, &pitp, &node0, vm,
-					hash_entry0, dpo_vft0, &hicn_dpo_id0);
+		  stats.interests_aggregated++;
 		}
 	    }
-	end_processing:
 
 	  /* Maybe trace */
 	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
@@ -211,12 +151,10 @@ hicn_interest_hitpit_node_fn (vlib_main_t *vm, vlib_node_runtime_t *node,
 	    {
 	      hicn_interest_hitpit_trace_t *t =
 		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->pkt_type = HICN_PKT_TYPE_INTEREST;
+	      t->pkt_type = HICN_PACKET_TYPE_INTEREST;
 	      t->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
 	      t->next_index = next0;
 	    }
-	  /* Incr packet counter */
-	  stats.pkts_processed += 1;
 
 	  /*
 	   * Verify speculative enqueue, maybe switch current
@@ -227,7 +165,7 @@ hicn_interest_hitpit_node_fn (vlib_main_t *vm, vlib_node_runtime_t *node,
 	}
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
-  u32 pit_int_count = hicn_pit_get_int_count (rt->pitcs);
+  u32 pit_int_count = hicn_pcs_get_pit_count (rt->pitcs);
 
   vlib_node_increment_counter (vm, hicn_interest_hitpit_node.index,
 			       HICNFWD_ERROR_PROCESSED, stats.pkts_processed);
@@ -264,12 +202,6 @@ hicn_interest_hitpit_format_trace (u8 *s, va_list *args)
   return (s);
 }
 
-void
-drop_packet (u32 *next0)
-{
-  *next0 = HICN_INTEREST_HITPIT_NEXT_ERROR_DROP;
-}
-
 /*
  * Node registration for the interest forwarder node
  */