From b3b64c5a0529bbbbdcaf14f72fb47667bb457e9d Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Wed, 10 Feb 2021 16:34:47 +0100 Subject: [HICN-682] Fix hicn-plugin to be compatible with version 21.01 Signed-off-by: Mauro Sardara Change-Id: Ia116ad74ce78e2ca2d7ee624eea75a38936d27f8 Signed-off-by: Mauro Sardara --- hicn-plugin/src/pcs.h | 364 ++++++++++++++++++++++++-------------------------- 1 file changed, 177 insertions(+), 187 deletions(-) (limited to 'hicn-plugin/src/pcs.h') diff --git a/hicn-plugin/src/pcs.h b/hicn-plugin/src/pcs.h index a9e1ae5a0..083efa901 100644 --- a/hicn-plugin/src/pcs.h +++ b/hicn-plugin/src/pcs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Cisco and/or its affiliates. + * Copyright (c) 2017-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: @@ -36,21 +36,22 @@ /* The PIT and CS are stored as a union */ #define HICN_PIT_NULL_TYPE 0 -#define HICN_PIT_TYPE 1 -#define HICN_CS_TYPE 2 +#define HICN_PIT_TYPE 1 +#define HICN_CS_TYPE 2 /* * Definitions and Forward refs for the time counters we're trying out. * Counters are maintained by the background process. TODO. */ -#define SEC_MS 1000 +#define SEC_MS 1000 #define HICN_INFRA_FAST_TIMER_SECS 1 #define HICN_INFRA_FAST_TIMER_MSECS (HICN_INFRA_FAST_TIMER_SECS * SEC_MS) #define HICN_INFRA_SLOW_TIMER_SECS 60 #define HICN_INFRA_SLOW_TIMER_MSECS (HICN_INFRA_SLOW_TIMER_SECS * SEC_MS) /* - * Note that changing this may change alignment within the PIT struct, so be careful. + * Note that changing this may change alignment within the PIT struct, so be + * careful. */ typedef struct __attribute__ ((packed)) hicn_pcs_shared_s { @@ -117,7 +118,6 @@ typedef struct __attribute__ ((packed)) hicn_cs_entry_s /* 36B + (64 - 36)B = 64B */ u8 opaque[HICN_CS_ENTRY_OPAQUE_SIZE]; - } __attribute__ ((packed)) hicn_cs_entry_t; /* @@ -137,7 +137,6 @@ typedef struct hicn_pcs_entry_s } u; } hicn_pcs_entry_t; - /* * Overall PIT/CS table, based on the common hashtable */ @@ -161,90 +160,92 @@ typedef struct hicn_pit_cs_s } hicn_pit_cs_t; /* Functions declarations */ -int hicn_pit_create (hicn_pit_cs_t * p, u32 num_elems); - -always_inline void -hicn_pit_to_cs (vlib_main_t * vm, hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t * pcs_entry, hicn_hash_entry_t * hash_entry, - hicn_hash_node_t * node, const hicn_dpo_vft_t * dpo_vft, - dpo_id_t * hicn_dpo_id, hicn_face_id_t inface_id, u8 is_appface); - -always_inline void -hicn_pcs_cs_update (vlib_main_t * vm, hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t * old_entry, hicn_pcs_entry_t * entry, - hicn_hash_node_t * node); - -always_inline void -hicn_pcs_cs_delete (vlib_main_t * vm, hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t ** pcs_entry, hicn_hash_node_t ** node, - hicn_hash_entry_t * hash_entry, - const hicn_dpo_vft_t * dpo_vft, dpo_id_t * hicn_dpo_id); - -always_inline int -hicn_pcs_cs_insert (vlib_main_t * vm, hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t * entry, hicn_hash_node_t * node, - hicn_hash_entry_t ** hash_entry, u64 hashval, - u32 * node_id, index_t * dpo_ctx_id, u8 * vft_id, - u8 * is_cs, u8 * hash_entry_id, u32 * bucket_id, - u8 * bucket_is_overflow); +int hicn_pit_create (hicn_pit_cs_t *p, u32 num_elems); + +always_inline void hicn_pit_to_cs (vlib_main_t *vm, hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t *pcs_entry, + hicn_hash_entry_t *hash_entry, + hicn_hash_node_t *node, + const hicn_dpo_vft_t *dpo_vft, + dpo_id_t *hicn_dpo_id, + hicn_face_id_t inface_id, u8 is_appface); + +always_inline void hicn_pcs_cs_update (vlib_main_t *vm, hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t *old_entry, + hicn_pcs_entry_t *entry, + hicn_hash_node_t *node); + +always_inline void hicn_pcs_cs_delete (vlib_main_t *vm, hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t **pcs_entry, + hicn_hash_node_t **node, + hicn_hash_entry_t *hash_entry, + const hicn_dpo_vft_t *dpo_vft, + dpo_id_t *hicn_dpo_id); always_inline int -hicn_pcs_cs_insert_update (vlib_main_t * vm, hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t * entry, hicn_hash_node_t * node, - hicn_hash_entry_t ** hash_entry, u64 hashval, - u32 * node_id, index_t * dpo_ctx_id, u8 * vft_id, - u8 * is_cs, u8 * hash_entry_id, u32 * bucket_id, - u8 * bucket_is_overflow, hicn_face_id_t inface); +hicn_pcs_cs_insert (vlib_main_t *vm, hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t *entry, hicn_hash_node_t *node, + hicn_hash_entry_t **hash_entry, u64 hashval, u32 *node_id, + index_t *dpo_ctx_id, u8 *vft_id, u8 *is_cs, + u8 *hash_entry_id, u32 *bucket_id, u8 *bucket_is_overflow); + +always_inline int hicn_pcs_cs_insert_update ( + vlib_main_t *vm, hicn_pit_cs_t *pitcs, hicn_pcs_entry_t *entry, + hicn_hash_node_t *node, hicn_hash_entry_t **hash_entry, u64 hashval, + u32 *node_id, index_t *dpo_ctx_id, u8 *vft_id, u8 *is_cs, u8 *hash_entry_id, + u32 *bucket_id, u8 *bucket_is_overflow, hicn_face_id_t inface); always_inline int -hicn_pcs_pit_insert (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t * entry, - hicn_hash_node_t * node, hicn_hash_entry_t ** hash_entry, - u64 hashval, u32 * node_id, index_t * dpo_ctx_id, - u8 * vft_id, u8 * is_cs, u8 * hash_entry_id, - u32 * bucket_id, u8 * bucket_is_overflow); +hicn_pcs_pit_insert (hicn_pit_cs_t *pitcs, hicn_pcs_entry_t *entry, + hicn_hash_node_t *node, hicn_hash_entry_t **hash_entry, + u64 hashval, u32 *node_id, index_t *dpo_ctx_id, + u8 *vft_id, u8 *is_cs, u8 *hash_entry_id, u32 *bucket_id, + u8 *bucket_is_overflow); always_inline void -hicn_pcs_pit_delete (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, - hicn_hash_node_t ** node, vlib_main_t * vm, - hicn_hash_entry_t * hash_entry, - const hicn_dpo_vft_t * dpo_vft, dpo_id_t * hicn_dpo_id); - -always_inline int -hicn_pcs_insert (vlib_main_t * vm, hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t * entry, hicn_hash_node_t * node, - hicn_hash_entry_t ** hash_entry, u64 hashval, u32 * node_id, - index_t * dpo_ctx_id, u8 * vft_id, u8 * is_cs, - u8 * hash_entry_id, u32 * bucket_id, - u8 * bucket_is_overflow); +hicn_pcs_pit_delete (hicn_pit_cs_t *pitcs, hicn_pcs_entry_t **pcs_entryp, + hicn_hash_node_t **node, vlib_main_t *vm, + hicn_hash_entry_t *hash_entry, + const hicn_dpo_vft_t *dpo_vft, dpo_id_t *hicn_dpo_id); + +always_inline int hicn_pcs_insert (vlib_main_t *vm, hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t *entry, + hicn_hash_node_t *node, + hicn_hash_entry_t **hash_entry, u64 hashval, + u32 *node_id, index_t *dpo_ctx_id, + u8 *vft_id, u8 *is_cs, u8 *hash_entry_id, + u32 *bucket_id, u8 *bucket_is_overflow); + +always_inline void hicn_pcs_delete (hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t **pcs_entryp, + hicn_hash_node_t **node, vlib_main_t *vm, + hicn_hash_entry_t *hash_entry, + const hicn_dpo_vft_t *dpo_vft, + dpo_id_t *hicn_dpo_id); always_inline void -hicn_pcs_delete (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, - hicn_hash_node_t ** node, vlib_main_t * vm, - hicn_hash_entry_t * hash_entry, - const hicn_dpo_vft_t * dpo_vft, dpo_id_t * hicn_dpo_id); +hicn_pcs_remove_lock (hicn_pit_cs_t *pitcs, hicn_pcs_entry_t **pcs_entryp, + hicn_hash_node_t **node, vlib_main_t *vm, + hicn_hash_entry_t *hash_entry, + const hicn_dpo_vft_t *dpo_vft, dpo_id_t *hicn_dpo_id); -always_inline void -hicn_pcs_remove_lock (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, - hicn_hash_node_t ** node, vlib_main_t * vm, - hicn_hash_entry_t * hash_entry, - const hicn_dpo_vft_t * dpo_vft, dpo_id_t * hicn_dpo_id); - -always_inline void -hicn_cs_delete_trimmed (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, - hicn_hash_entry_t * hash_entry, - hicn_hash_node_t ** node, vlib_main_t * vm); +always_inline void hicn_cs_delete_trimmed (hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t **pcs_entryp, + hicn_hash_entry_t *hash_entry, + hicn_hash_node_t **node, + vlib_main_t *vm); /* Function implementation */ /* Accessor for pit/cs data inside hash table node */ static inline hicn_pcs_entry_t * -hicn_pit_get_data (hicn_hash_node_t * node) +hicn_pit_get_data (hicn_hash_node_t *node) { return (hicn_pcs_entry_t *) (hicn_hashtb_node_data (node)); } /* Init pit/cs data block (usually inside hash table node) */ static inline void -hicn_pit_init_data (hicn_pcs_entry_t * p) +hicn_pit_init_data (hicn_pcs_entry_t *p) { p->shared.entry_flags = 0; p->u.pit.faces.n_faces = 0; @@ -257,14 +258,13 @@ hicn_pit_init_data (hicn_pcs_entry_t * p) /* Init pit/cs data block (usually inside hash table node) */ static inline void -hicn_cs_init_data (hicn_pcs_entry_t * p) +hicn_cs_init_data (hicn_pcs_entry_t *p) { p->shared.entry_flags = 0; p->u.pit.faces.n_faces = 0; p->u.pit.faces.is_overflow = 0; } - static inline f64 hicn_pcs_get_exp_time (f64 cur_time_sec, u64 lifetime_msec) { @@ -276,7 +276,7 @@ hicn_pcs_get_exp_time (f64 cur_time_sec, u64 lifetime_msec) * good choice. */ static inline void -hicn_pit_set_lru_max (hicn_pit_cs_t * p, u32 limit) +hicn_pit_set_lru_max (hicn_pit_cs_t *p, u32 limit) { p->policy_state.max = limit; } @@ -285,7 +285,7 @@ hicn_pit_set_lru_max (hicn_pit_cs_t * p, u32 limit) * Accessor for PIT interest counter. */ static inline u32 -hicn_pit_get_int_count (const hicn_pit_cs_t * pitcs) +hicn_pit_get_int_count (const hicn_pit_cs_t *pitcs) { return (pitcs->pcs_pit_count); } @@ -294,25 +294,25 @@ hicn_pit_get_int_count (const hicn_pit_cs_t * pitcs) * Accessor for PIT cs entries counter. */ static inline u32 -hicn_pit_get_cs_count (const hicn_pit_cs_t * pitcs) +hicn_pit_get_cs_count (const hicn_pit_cs_t *pitcs) { return (pitcs->pcs_cs_count); } static inline u32 -hicn_pcs_get_ntw_count (const hicn_pit_cs_t * pitcs) +hicn_pcs_get_ntw_count (const hicn_pit_cs_t *pitcs) { return (pitcs->policy_state.count); } static inline u32 -hicn_pit_get_htb_bucket_count (const hicn_pit_cs_t * pitcs) +hicn_pit_get_htb_bucket_count (const hicn_pit_cs_t *pitcs) { return (pitcs->pcs_table->ht_overflow_buckets_used); } static inline int -hicn_cs_enabled (hicn_pit_cs_t * pit) +hicn_cs_enabled (hicn_pit_cs_t *pit) { switch (HICN_FEATURE_CS) { @@ -331,12 +331,10 @@ hicn_cs_enabled (hicn_pit_cs_t * pit) * maintain the per-PIT stats. */ always_inline void -hicn_pcs_delete_internal (hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t ** pcs_entryp, - hicn_hash_entry_t * hash_entry, - hicn_hash_node_t ** node, vlib_main_t * vm, - const hicn_dpo_vft_t * dpo_vft, - dpo_id_t * hicn_dpo_id) +hicn_pcs_delete_internal (hicn_pit_cs_t *pitcs, hicn_pcs_entry_t **pcs_entryp, + hicn_hash_entry_t *hash_entry, + hicn_hash_node_t **node, vlib_main_t *vm, + const hicn_dpo_vft_t *dpo_vft, dpo_id_t *hicn_dpo_id) { hicn_pcs_entry_t *pcs = *pcs_entryp; @@ -348,8 +346,8 @@ hicn_pcs_delete_internal (hicn_pit_cs_t * pitcs, /* Free any associated packet buffer */ vlib_buffer_free_one (vm, pcs->u.cs.cs_pkt_buf); pcs->u.cs.cs_pkt_buf = ~0; - ASSERT ((pcs->u.cs.cs_lru_prev == 0) - && (pcs->u.cs.cs_lru_prev == pcs->u.cs.cs_lru_next)); + ASSERT ((pcs->u.cs.cs_lru_prev == 0) && + (pcs->u.cs.cs_lru_prev == pcs->u.cs.cs_lru_next)); } else { @@ -369,10 +367,10 @@ hicn_pcs_delete_internal (hicn_pit_cs_t * pitcs, * the hashtable.) This is primarily here to maintain the internal counters. */ always_inline void -hicn_pit_to_cs (vlib_main_t * vm, hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t * pcs_entry, hicn_hash_entry_t * hash_entry, - hicn_hash_node_t * node, const hicn_dpo_vft_t * dpo_vft, - dpo_id_t * hicn_dpo_id, hicn_face_id_t inface_id, u8 is_appface) +hicn_pit_to_cs (vlib_main_t *vm, hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t *pcs_entry, hicn_hash_entry_t *hash_entry, + hicn_hash_node_t *node, const hicn_dpo_vft_t *dpo_vft, + dpo_id_t *hicn_dpo_id, hicn_face_id_t inface_id, u8 is_appface) { /* @@ -405,9 +403,8 @@ hicn_pit_to_cs (vlib_main_t * vm, hicn_pit_cs_t * pitcs, hicn_hash_node_t *node; hicn_pcs_entry_t *pcs_entry; hicn_hash_entry_t *hash_entry; - policy_vft->hicn_cs_delete_get (pitcs, policy_state, - &node, &pcs_entry, &hash_entry); - + policy_vft->hicn_cs_delete_get (pitcs, policy_state, &node, &pcs_entry, + &hash_entry); /* * We don't have to decrease the lock (therefore we cannot @@ -425,9 +422,9 @@ hicn_pit_to_cs (vlib_main_t * vm, hicn_pit_cs_t * pitcs, /* Functions specific for PIT or CS */ always_inline void -hicn_pcs_cs_update (vlib_main_t * vm, hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t * old_entry, hicn_pcs_entry_t * entry, - hicn_hash_node_t * node) +hicn_pcs_cs_update (vlib_main_t *vm, hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t *old_entry, hicn_pcs_entry_t *entry, + hicn_hash_node_t *node) { hicn_cs_policy_t *policy_state; hicn_cs_policy_vft_t *policy_vft; @@ -451,8 +448,8 @@ hicn_pcs_cs_update (vlib_main_t * vm, hicn_pit_cs_t * pitcs, hicn_hash_node_t *node; hicn_pcs_entry_t *pcs_entry; hicn_hash_entry_t *hash_entry; - policy_vft->hicn_cs_delete_get (pitcs, policy_state, - &node, &pcs_entry, &hash_entry); + policy_vft->hicn_cs_delete_get (pitcs, policy_state, &node, + &pcs_entry, &hash_entry); /* * We don't have to decrease the lock (therefore we cannot @@ -472,10 +469,10 @@ hicn_pcs_cs_update (vlib_main_t * vm, hicn_pit_cs_t * pitcs, } always_inline void -hicn_pcs_cs_delete (vlib_main_t * vm, hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t ** pcs_entryp, hicn_hash_node_t ** nodep, - hicn_hash_entry_t * hash_entry, - const hicn_dpo_vft_t * dpo_vft, dpo_id_t * hicn_dpo_id) +hicn_pcs_cs_delete (vlib_main_t *vm, hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t **pcs_entryp, hicn_hash_node_t **nodep, + hicn_hash_entry_t *hash_entry, + const hicn_dpo_vft_t *dpo_vft, dpo_id_t *hicn_dpo_id) { if (!(hash_entry->he_flags & HICN_HASH_ENTRY_FLAG_DELETED)) { @@ -492,12 +489,13 @@ hicn_pcs_cs_delete (vlib_main_t * vm, hicn_pit_cs_t * pitcs, pitcs->pcs_cs_count--; } - /* A data could have been inserted in the CS through a push. In this case locks == 0 */ + /* A data could have been inserted in the CS through a push. In this case + * locks == 0 */ hash_entry->locks--; if (hash_entry->locks == 0) { - hicn_pcs_delete_internal - (pitcs, pcs_entryp, hash_entry, nodep, vm, dpo_vft, hicn_dpo_id); + hicn_pcs_delete_internal (pitcs, pcs_entryp, hash_entry, nodep, vm, + dpo_vft, hicn_dpo_id); } else { @@ -506,19 +504,17 @@ hicn_pcs_cs_delete (vlib_main_t * vm, hicn_pit_cs_t * pitcs, } always_inline int -hicn_pcs_cs_insert (vlib_main_t * vm, hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t * entry, hicn_hash_node_t * node, - hicn_hash_entry_t ** hash_entry, u64 hashval, - u32 * node_id, index_t * dpo_ctx_id, u8 * vft_id, - u8 * is_cs, u8 * hash_entry_id, u32 * bucket_id, - u8 * bucket_is_overflow) +hicn_pcs_cs_insert (vlib_main_t *vm, hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t *entry, hicn_hash_node_t *node, + hicn_hash_entry_t **hash_entry, u64 hashval, u32 *node_id, + index_t *dpo_ctx_id, u8 *vft_id, u8 *is_cs, + u8 *hash_entry_id, u32 *bucket_id, u8 *bucket_is_overflow) { ASSERT (entry == hicn_hashtb_node_data (node)); - int ret = - hicn_hashtb_insert (pitcs->pcs_table, node, hash_entry, hashval, node_id, - dpo_ctx_id, vft_id, is_cs, hash_entry_id, bucket_id, - bucket_is_overflow); + int ret = hicn_hashtb_insert (pitcs->pcs_table, node, hash_entry, hashval, + node_id, dpo_ctx_id, vft_id, is_cs, + hash_entry_id, bucket_id, bucket_is_overflow); if (PREDICT_TRUE (ret == HICN_ERROR_NONE)) { @@ -541,8 +537,8 @@ hicn_pcs_cs_insert (vlib_main_t * vm, hicn_pit_cs_t * pitcs, hicn_hash_node_t *node; hicn_pcs_entry_t *pcs_entry; hicn_hash_entry_t *hash_entry; - policy_vft->hicn_cs_delete_get (pitcs, policy_state, - &node, &pcs_entry, &hash_entry); + policy_vft->hicn_cs_delete_get (pitcs, policy_state, &node, + &pcs_entry, &hash_entry); /* * We don't have to decrease the lock (therefore we cannot @@ -564,22 +560,21 @@ hicn_pcs_cs_insert (vlib_main_t * vm, hicn_pit_cs_t * pitcs, * helping maintain the per-PIT stats. */ always_inline int -hicn_pcs_cs_insert_update (vlib_main_t * vm, hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t * entry, hicn_hash_node_t * node, - hicn_hash_entry_t ** hash_entry, u64 hashval, - u32 * node_id, index_t * dpo_ctx_id, u8 * vft_id, - u8 * is_cs, u8 * hash_entry_id, u32 * bucket_id, - u8 * bucket_is_overflow, hicn_face_id_t inface) +hicn_pcs_cs_insert_update (vlib_main_t *vm, hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t *entry, hicn_hash_node_t *node, + hicn_hash_entry_t **hash_entry, u64 hashval, + u32 *node_id, index_t *dpo_ctx_id, u8 *vft_id, + u8 *is_cs, u8 *hash_entry_id, u32 *bucket_id, + u8 *bucket_is_overflow, hicn_face_id_t inface) { int ret; ASSERT (entry == hicn_hashtb_node_data (node)); entry->u.cs.cs_rxface = inface; - ret = - hicn_pcs_cs_insert (vm, pitcs, entry, node, hash_entry, hashval, node_id, - dpo_ctx_id, vft_id, is_cs, hash_entry_id, bucket_id, - bucket_is_overflow); + ret = hicn_pcs_cs_insert (vm, pitcs, entry, node, hash_entry, hashval, + node_id, dpo_ctx_id, vft_id, is_cs, hash_entry_id, + bucket_id, bucket_is_overflow); /* A content already exists in CS with the same name */ if (ret == HICN_ERROR_HASHTB_EXIST && *is_cs) @@ -608,18 +603,17 @@ hicn_pcs_cs_insert_update (vlib_main_t * vm, hicn_pit_cs_t * pitcs, * helping maintain the per-PIT stats. */ always_inline int -hicn_pcs_pit_insert (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t * entry, - hicn_hash_node_t * node, hicn_hash_entry_t ** hash_entry, - u64 hashval, u32 * node_id, index_t * dpo_ctx_id, - u8 * vft_id, u8 * is_cs, u8 * hash_entry_id, - u32 * bucket_id, u8 * bucket_is_overflow) +hicn_pcs_pit_insert (hicn_pit_cs_t *pitcs, hicn_pcs_entry_t *entry, + hicn_hash_node_t *node, hicn_hash_entry_t **hash_entry, + u64 hashval, u32 *node_id, index_t *dpo_ctx_id, + u8 *vft_id, u8 *is_cs, u8 *hash_entry_id, u32 *bucket_id, + u8 *bucket_is_overflow) { ASSERT (entry == hicn_hashtb_node_data (node)); - int ret = - hicn_hashtb_insert (pitcs->pcs_table, node, hash_entry, hashval, node_id, - dpo_ctx_id, vft_id, is_cs, hash_entry_id, bucket_id, - bucket_is_overflow); + int ret = hicn_hashtb_insert (pitcs->pcs_table, node, hash_entry, hashval, + node_id, dpo_ctx_id, vft_id, is_cs, + hash_entry_id, bucket_id, bucket_is_overflow); if (PREDICT_TRUE (ret == HICN_ERROR_NONE)) pitcs->pcs_pit_count++; @@ -628,17 +622,17 @@ hicn_pcs_pit_insert (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t * entry, } always_inline void -hicn_pcs_pit_delete (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, - hicn_hash_node_t ** node, vlib_main_t * vm, - hicn_hash_entry_t * hash_entry, - const hicn_dpo_vft_t * dpo_vft, dpo_id_t * hicn_dpo_id) +hicn_pcs_pit_delete (hicn_pit_cs_t *pitcs, hicn_pcs_entry_t **pcs_entryp, + hicn_hash_node_t **node, vlib_main_t *vm, + hicn_hash_entry_t *hash_entry, + const hicn_dpo_vft_t *dpo_vft, dpo_id_t *hicn_dpo_id) { hash_entry->locks--; if (hash_entry->locks == 0) { pitcs->pcs_pit_count--; - hicn_pcs_delete_internal - (pitcs, pcs_entryp, hash_entry, node, vm, dpo_vft, hicn_dpo_id); + hicn_pcs_delete_internal (pitcs, pcs_entryp, hash_entry, node, vm, + dpo_vft, hicn_dpo_id); } else { @@ -646,7 +640,6 @@ hicn_pcs_pit_delete (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, } } - /* Generic functions for PIT/CS */ /* @@ -654,42 +647,39 @@ hicn_pcs_pit_delete (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, * helping maintain the per-PIT stats. */ always_inline int -hicn_pcs_insert (vlib_main_t * vm, hicn_pit_cs_t * pitcs, - hicn_pcs_entry_t * entry, hicn_hash_node_t * node, - hicn_hash_entry_t ** hash_entry, u64 hashval, u32 * node_id, - index_t * dpo_ctx_id, u8 * vft_id, u8 * is_cs, - u8 * hash_entry_id, u32 * bucket_id, u8 * bucket_is_overflow) +hicn_pcs_insert (vlib_main_t *vm, hicn_pit_cs_t *pitcs, + hicn_pcs_entry_t *entry, hicn_hash_node_t *node, + hicn_hash_entry_t **hash_entry, u64 hashval, u32 *node_id, + index_t *dpo_ctx_id, u8 *vft_id, u8 *is_cs, u8 *hash_entry_id, + u32 *bucket_id, u8 *bucket_is_overflow) { int ret; if ((*hash_entry)->he_flags & HICN_HASH_ENTRY_FLAG_CS_ENTRY) { - ret = - hicn_pcs_cs_insert (vm, pitcs, entry, node, hash_entry, hashval, - node_id, dpo_ctx_id, vft_id, is_cs, hash_entry_id, - bucket_id, bucket_is_overflow); + ret = hicn_pcs_cs_insert (vm, pitcs, entry, node, hash_entry, hashval, + node_id, dpo_ctx_id, vft_id, is_cs, + hash_entry_id, bucket_id, bucket_is_overflow); } else { - ret = - hicn_pcs_pit_insert (pitcs, entry, node, hash_entry, hashval, node_id, - dpo_ctx_id, vft_id, is_cs, hash_entry_id, - bucket_id, bucket_is_overflow); + ret = hicn_pcs_pit_insert (pitcs, entry, node, hash_entry, hashval, + node_id, dpo_ctx_id, vft_id, is_cs, + hash_entry_id, bucket_id, bucket_is_overflow); } return (ret); } - /* * Delete entry if there are no pending lock on the entry, otherwise mark it * as to delete. */ always_inline void -hicn_pcs_delete (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, - hicn_hash_node_t ** nodep, vlib_main_t * vm, - hicn_hash_entry_t * hash_entry, - const hicn_dpo_vft_t * dpo_vft, dpo_id_t * hicn_dpo_id) +hicn_pcs_delete (hicn_pit_cs_t *pitcs, hicn_pcs_entry_t **pcs_entryp, + hicn_hash_node_t **nodep, vlib_main_t *vm, + hicn_hash_entry_t *hash_entry, const hicn_dpo_vft_t *dpo_vft, + dpo_id_t *hicn_dpo_id) { /* * If the entry has already been marked as deleted, it has already @@ -697,13 +687,13 @@ hicn_pcs_delete (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, */ if (hash_entry->he_flags & HICN_HASH_ENTRY_FLAG_CS_ENTRY) { - hicn_pcs_cs_delete (vm, pitcs, pcs_entryp, nodep, hash_entry, - dpo_vft, hicn_dpo_id); + hicn_pcs_cs_delete (vm, pitcs, pcs_entryp, nodep, hash_entry, dpo_vft, + hicn_dpo_id); } else { - hicn_pcs_pit_delete (pitcs, pcs_entryp, nodep, vm, - hash_entry, dpo_vft, hicn_dpo_id); + hicn_pcs_pit_delete (pitcs, pcs_entryp, nodep, vm, hash_entry, dpo_vft, + hicn_dpo_id); } } @@ -712,17 +702,17 @@ hicn_pcs_delete (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, * the entry is marked as to be deleted */ always_inline void -hicn_pcs_remove_lock (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, - hicn_hash_node_t ** node, vlib_main_t * vm, - hicn_hash_entry_t * hash_entry, - const hicn_dpo_vft_t * dpo_vft, dpo_id_t * hicn_dpo_id) +hicn_pcs_remove_lock (hicn_pit_cs_t *pitcs, hicn_pcs_entry_t **pcs_entryp, + hicn_hash_node_t **node, vlib_main_t *vm, + hicn_hash_entry_t *hash_entry, + const hicn_dpo_vft_t *dpo_vft, dpo_id_t *hicn_dpo_id) { hash_entry->locks--; - if (hash_entry->locks == 0 - && (hash_entry->he_flags & HICN_HASH_ENTRY_FLAG_DELETED)) + if (hash_entry->locks == 0 && + (hash_entry->he_flags & HICN_HASH_ENTRY_FLAG_DELETED)) { - hicn_pcs_delete_internal - (pitcs, pcs_entryp, hash_entry, node, vm, dpo_vft, hicn_dpo_id); + hicn_pcs_delete_internal (pitcs, pcs_entryp, hash_entry, node, vm, + dpo_vft, hicn_dpo_id); } } @@ -730,20 +720,21 @@ hicn_pcs_remove_lock (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, * Delete entry which has already been bulk-removed from lru list */ always_inline void -hicn_cs_delete_trimmed (hicn_pit_cs_t * pitcs, hicn_pcs_entry_t ** pcs_entryp, - hicn_hash_entry_t * hash_entry, - hicn_hash_node_t ** node, vlib_main_t * vm) +hicn_cs_delete_trimmed (hicn_pit_cs_t *pitcs, hicn_pcs_entry_t **pcs_entryp, + hicn_hash_entry_t *hash_entry, hicn_hash_node_t **node, + vlib_main_t *vm) { - if (hash_entry->locks == 0) { const hicn_dpo_vft_t *dpo_vft = hicn_dpo_get_vft (hash_entry->vft_id); - dpo_id_t hicn_dpo_id = - { dpo_vft->hicn_dpo_get_type (), 0, 0, hash_entry->dpo_ctx_id }; + dpo_id_t hicn_dpo_id = { .dpoi_type = dpo_vft->hicn_dpo_get_type (), + .dpoi_proto = 0, + .dpoi_next_node = 0, + .dpoi_index = hash_entry->dpo_ctx_id }; - hicn_pcs_delete_internal - (pitcs, pcs_entryp, hash_entry, node, vm, dpo_vft, &hicn_dpo_id); + hicn_pcs_delete_internal (pitcs, pcs_entryp, hash_entry, node, vm, + dpo_vft, &hicn_dpo_id); } else { @@ -796,16 +787,15 @@ hicn_infra_seq16_ge (u16 a, u16 b) return (hicn_infra_seq16_cmp (a, b) >= 0); } - -extern u16 hicn_infra_fast_timer; /* Counts at 1 second intervals */ -extern u16 hicn_infra_slow_timer; /* Counts at 1 minute intervals */ +extern u16 hicn_infra_fast_timer; /* Counts at 1 second intervals */ +extern u16 hicn_infra_slow_timer; /* Counts at 1 minute intervals */ /* * Utilities to convert lifetime into expiry time based on compressed clock, * suitable for the opportunistic hashtable entry timeout processing. */ -//convert time in msec to time in clicks +// convert time in msec to time in clicks always_inline u16 hicn_infra_ms2clicks (u64 time_ms, u64 ms_per_click) { -- cgit 1.2.3-korg