Revision and refactor of the VPP plugin with fixes for the

packet generator. Hash table for the packet cache has been
changed with the bihash.

Co-authored-by: Mauro Sardara <msardara@cisco.com>
Signed-off-by: Luca Muscariello <muscariello@ieee.org>
Change-Id: I0e0191a9f109d37081d32cc55d577ea43533f8c0
Signed-off-by: Mauro Sardara <msardara@cisco.com>

1 files changed, 137 insertions, 47 deletions

diff --git a/hicn-plugin/src/cache_policies/cs_policy.h b/hicn-plugin/src/cache_policies/cs_policy.h
index 73f3de107..5280a59c2 100644
--- a/hicn-plugin/src/cache_policies/cs_policy.h
+++ b/hicn-plugin/src/cache_policies/cs_policy.h
@@ -16,7 +16,9 @@
 #ifndef __HICN_CS_POLICY_H__
 #define __HICN_CS_POLICY_H__
 
-#include "../hashtb.h"
+#include <vppinfra/types.h>
+#include <vppinfra/clib.h>
+#include <stddef.h>
 
 /**
  * @file cs_policy.h
@@ -24,25 +26,10 @@
  * This file provides the needed structures to implement a CS policy
  */
 
-/*
- * Structure
- */
-typedef struct hicn_cs_policy_s
-{
-  u32 max;
-  u32 count;
-
-  /* Indexes to hashtable nodes forming CS LRU */
-  u32 head;
-  u32 tail;
-
-} hicn_cs_policy_t;
-
 /* Forward declaration */
-struct hicn_pit_cs_s;
-struct hicn_hash_node_s;
-struct hicn_pcs_entry_s;
-struct hicn_cs_policy_s;
+typedef struct hicn_pit_cs_s hicn_pit_cs_t;
+typedef struct hicn_pcs_entry_s hicn_pcs_entry_t;
+typedef struct hicn_cs_policy_s hicn_cs_policy_t;
 
 /**
  * @brief Definition of the virtual functin table for a cache policy.
@@ -51,40 +38,143 @@ struct hicn_cs_policy_s;
  * - insert: add a new element
  * - update: update the position of an existing element
  * - dequeue: remove an element from the list
- * - delete_get: return the next element that should be removed trim
+ * - delete_get: return the next element that should be removed
+ * - trim: trim last sz elements from the list
  * - flush: clean the cs
  */
 typedef struct hicn_cs_policy_vft_s
 {
-  void (*hicn_cs_insert) (struct hicn_pit_cs_s *p,
-			  struct hicn_hash_node_s *node,
-			  struct hicn_pcs_entry_s *pcs,
-			  hicn_cs_policy_t *policy);
-
-  void (*hicn_cs_update) (struct hicn_pit_cs_s *p,
-			  struct hicn_hash_node_s *node,
-			  struct hicn_pcs_entry_s *pcs,
-			  hicn_cs_policy_t *policy);
-
-  void (*hicn_cs_dequeue) (struct hicn_pit_cs_s *p,
-			   struct hicn_hash_node_s *node,
-			   struct hicn_pcs_entry_s *pcs,
-			   hicn_cs_policy_t *policy);
-
-  void (*hicn_cs_delete_get) (struct hicn_pit_cs_s *p,
-			      hicn_cs_policy_t *policy,
-			      struct hicn_hash_node_s **node,
-			      struct hicn_pcs_entry_s **pcs,
-			      struct hicn_hash_entry_s **hash_entry);
-
-  int (*hicn_cs_trim) (struct hicn_pit_cs_s *p, u32 *node_list, int sz,
-		       hicn_cs_policy_t *policy);
-
-  int (*hicn_cs_flush) (vlib_main_t *vm, struct hicn_pit_cs_s *p,
-			hicn_cs_policy_t *policy_state);
+  void (*hicn_cs_insert) (hicn_cs_policy_t *policy, hicn_pit_cs_t *pcs,
+			  hicn_pcs_entry_t *pcs_entry);
+
+  void (*hicn_cs_update) (hicn_cs_policy_t *policy, hicn_pit_cs_t *pcs,
+			  hicn_pcs_entry_t *pcs_entry);
+
+  void (*hicn_cs_dequeue) (hicn_cs_policy_t *policy, hicn_pit_cs_t *pcs,
+			   hicn_pcs_entry_t *pcs_entry);
+
+  void (*hicn_cs_delete_get) (hicn_cs_policy_t *policy,
+			      const hicn_pit_cs_t *pcs,
+			      hicn_pcs_entry_t **pcs_entry);
+
+  int (*hicn_cs_trim) (hicn_cs_policy_t *policy, hicn_pit_cs_t *pcs,
+		       u32 *node_list, size_t sz);
+
+  int (*hicn_cs_flush) (hicn_cs_policy_t *policy, hicn_pit_cs_t *pcs);
 } hicn_cs_policy_vft_t;
 
-#endif /* // __HICN_POLICY_H__ */
+/*
+ * CS policy
+ */
+typedef struct hicn_cs_policy_s
+{
+#define HICN_CS_POLICY_END_OF_CHAIN (u32) (~0)
+
+  /*
+   * VFT implementing the CS eviction/insertion policy. This must be the first
+   * element of the structure.
+   */
+  hicn_cs_policy_vft_t vft;
+
+  /*
+   * Max number of element in CS
+   */
+  u32 max;
+
+  /*
+   * Number of element in CS
+   */
+  u32 count;
+
+  /*
+   * Head element of the CS (i.e. the most recent element used for LRU)
+   */
+  u32 head;
+
+  /*
+   * Tail element of the LRU (i.e. the next element to evict for LRU)
+   */
+  u32 tail;
+} hicn_cs_policy_t;
+
+/*
+ * Get the max number of element in the CS
+ */
+always_inline u32
+hicn_cs_policy_get_max (const hicn_cs_policy_t *policy)
+{
+  return policy->max;
+}
+
+/*
+ * Get the number of element in the CS
+ */
+always_inline u32
+hicn_cs_policy_get_count (const hicn_cs_policy_t *policy)
+{
+  return policy->count;
+}
+
+/*
+ * Get the head element of the CS
+ */
+always_inline u32
+hicn_cs_policy_get_head (const hicn_cs_policy_t *policy)
+{
+  return policy->head;
+}
+
+/*
+ * Get the tail element of the CS
+ */
+always_inline u32
+hicn_cs_policy_get_tail (const hicn_cs_policy_t *policy)
+{
+  return policy->tail;
+}
+
+always_inline void
+hicn_cs_policy_insert (hicn_cs_policy_t *policy, hicn_pit_cs_t *pcs,
+		       hicn_pcs_entry_t *pcs_entry)
+{
+  return policy->vft.hicn_cs_insert (policy, pcs, pcs_entry);
+}
+
+always_inline void
+hicn_cs_policy_update (hicn_cs_policy_t *policy, hicn_pit_cs_t *pcs,
+		       hicn_pcs_entry_t *pcs_entry)
+{
+  return policy->vft.hicn_cs_update (policy, pcs, pcs_entry);
+}
+
+always_inline void
+hicn_cs_policy_dequeue (hicn_cs_policy_t *policy, hicn_pit_cs_t *pcs,
+			hicn_pcs_entry_t *pcs_entry)
+{
+  return policy->vft.hicn_cs_dequeue (policy, pcs, pcs_entry);
+}
+
+always_inline void
+hicn_cs_policy_delete_get (hicn_cs_policy_t *policy, const hicn_pit_cs_t *pcs,
+			   hicn_pcs_entry_t **pcs_entry)
+{
+  return policy->vft.hicn_cs_delete_get (policy, pcs, pcs_entry);
+}
+
+always_inline int
+hicn_cs_policy_trim (hicn_cs_policy_t *policy, hicn_pit_cs_t *pcs,
+		     u32 *node_list, int sz)
+{
+  return policy->vft.hicn_cs_trim (policy, pcs, node_list, sz);
+}
+
+always_inline int
+hicn_cs_policy_flush (hicn_cs_policy_t *policy, hicn_pit_cs_t *pcs)
+{
+  return policy->vft.hicn_cs_flush (policy, pcs);
+}
+
+#endif /* __HICN_POLICY_H__ */
 
 /*
  * fd.io coding-style-patch-verification: ON