FIB_ENTRY_DBG(fib_entry, "last-lock");
fib_node_deinit(&fib_entry->fe_node);
+ // FIXME -RR Backwalk
ASSERT(0 == vec_len(fib_entry->fe_delegates));
vec_free(fib_entry->fe_delegates);
- if (fib_entry_has_multiple_srcs(fib_entry))
- {
- vec_free(fib_entry->fe_u_src.fe_srcs);
- }
+ vec_free(fib_entry->fe_srcs);
pool_put(fib_entry_pool, fib_entry);
}
-static const fib_entry_src_t*
+static fib_entry_src_t*
fib_entry_get_best_src_i (const fib_entry_t *fib_entry)
{
- const fib_entry_src_t *bsrc;
+ fib_entry_src_t *bsrc;
/*
* the enum of sources is deliberately arranged in priority order
*/
- if (fib_entry_has_multiple_srcs(fib_entry))
+ if (0 == vec_len(fib_entry->fe_srcs))
{
- ASSERT(vec_len(fib_entry->fe_u_src.fe_srcs));
-
- bsrc = vec_elt_at_index(fib_entry->fe_u_src.fe_srcs, 0);
+ bsrc = NULL;
}
else
{
- bsrc = &fib_entry->fe_u_src.fe_src;
+ bsrc = vec_elt_at_index(fib_entry->fe_srcs, 0);
}
return (bsrc);
{
return (esrc->fes_src);
}
- return (FIB_SOURCE_INVALID);
+ return (FIB_SOURCE_MAX);
}
static fib_entry_flag_t
return (FIB_ENTRY_FLAG_NONE);
}
-fib_entry_flag_t
-fib_entry_get_flags_i (const fib_entry_t *fib_entry)
-{
- const fib_entry_src_t *esrc;
-
- esrc = fib_entry_get_best_src_i(fib_entry);
-
- ASSERT(esrc);
-
- return (esrc->fes_entry_flags);
-}
-
fib_entry_flag_t
fib_entry_get_flags (fib_node_index_t fib_entry_index)
{
pool_foreach(entry, fib_entry_pool,
({
- if (fib_entry_has_multiple_srcs(entry))
- {
- n_srcs += vec_len(entry->fe_u_src.fe_srcs);
- vec_foreach(esrc, entry->fe_u_src.fe_srcs)
- {
- n_exts += fib_path_ext_list_length(&esrc->fes_path_exts);
- }
- }
- else
- {
- n_exts += fib_path_ext_list_length(&entry->fe_u_src.fe_src.fes_path_exts);
- }
+ n_srcs += vec_len(entry->fe_srcs);
+ vec_foreach(esrc, entry->fe_srcs)
+ {
+ n_exts += fib_path_ext_list_length(&esrc->fes_path_exts);
+ }
}));
fib_show_memory_usage("Entry Source",
fib_entry_flag_t flags,
const dpo_id_t *dpo)
{
- const fib_entry_src_t *bsrc;
fib_source_t best_source;
fib_entry_flag_t bflags;
fib_entry_t *fib_entry;
+ fib_entry_src_t *bsrc;
fib_entry = fib_entry_get(fib_entry_index);
fib_entry_flag_t flags,
const dpo_id_t *dpo)
{
- const fib_entry_src_t *bsrc;
fib_source_t best_source;
fib_entry_flag_t bflags;
fib_entry_t *fib_entry;
+ fib_entry_src_t *bsrc;
fib_entry = fib_entry_get(fib_entry_index);
fib_entry_flag_t flags,
const fib_route_path_t *rpath)
{
- const fib_entry_src_t *bsrc;
fib_source_t best_source;
fib_entry_flag_t bflags;
fib_entry_t *fib_entry;
+ fib_entry_src_t *bsrc;
ASSERT(1 == vec_len(rpath));
fib_source_t source,
const fib_route_path_t *rpath)
{
- const fib_entry_src_t *bsrc;
fib_entry_src_flag_t sflag;
fib_source_t best_source;
fib_entry_flag_t bflags;
fib_entry_t *fib_entry;
+ fib_entry_src_t *bsrc;
ASSERT(1 == vec_len(rpath));
bsrc = fib_entry_get_best_src_i(fib_entry);
best_source = fib_entry_src_get_source(bsrc);
- if (FIB_SOURCE_INVALID == best_source) {
+ if (FIB_SOURCE_MAX == best_source) {
/*
* no more sources left. this entry is toast.
*/
fib_entry_special_remove (fib_node_index_t fib_entry_index,
fib_source_t source)
{
- const fib_entry_src_t *bsrc;
fib_entry_src_flag_t sflag;
fib_source_t best_source;
fib_entry_flag_t bflags;
fib_entry_t *fib_entry;
+ fib_entry_src_t *bsrc;
fib_entry = fib_entry_get(fib_entry_index);
ASSERT(NULL != fib_entry);
bsrc = fib_entry_get_best_src_i(fib_entry);
best_source = fib_entry_src_get_source(bsrc);
- if (FIB_SOURCE_INVALID == best_source) {
+ if (FIB_SOURCE_MAX == best_source) {
/*
* no more sources left. this entry is toast.
*/
fib_entry_flag_t flags,
const fib_route_path_t *paths)
{
- const fib_entry_src_t *bsrc;
fib_source_t best_source;
fib_entry_flag_t bflags;
fib_entry_t *fib_entry;
+ fib_entry_src_t *bsrc;
fib_entry = fib_entry_get(fib_entry_index);
ASSERT(NULL != fib_entry);
fib_source_t
fib_entry_get_best_source (fib_node_index_t entry_index)
{
- const fib_entry_src_t *bsrc;
fib_entry_t *fib_entry;
+ fib_entry_src_t *bsrc;
fib_entry = fib_entry_get(entry_index);
* The lower the value the higher the priority
*/
typedef enum fib_source_t_ {
- /**
- * An invalid source of value 0
- */
- FIB_SOURCE_INVALID,
/**
* Marker. Add new values after this one.
*/
#define FIB_SOURCE_MAX (FIB_SOURCE_LAST+1)
#define FIB_SOURCES { \
- [FIB_SOURCE_INVALID] = "invalid", \
[FIB_SOURCE_SPECIAL] = "special", \
[FIB_SOURCE_INTERFACE] = "interface", \
[FIB_SOURCE_PROXY] = "proxy", \
};
} fib_entry_src_t;
-/**
- * FIB entry flags.
- * these are stored in the pad space within the fib_node_t
- */
-typedef enum fib_entry_node_attribute_t_
-{
- /**
- * FIB entry has multiple sources, so the fe_srcs union
- * uses the vector
- */
- FIB_ENTRY_NODE_ATTR_MULTIPLE_SRCS,
-} fib_entry_node_attribute_t;
-
-#define FIB_ENTRY_NODE_FLAG_NAMES { \
- [FIB_ENTRY_NODE_ATTR_MULTIPLE_SRCS] = "multiple-srcs", \
-}
-
-typedef enum fib_entry_node_flags_t_
-{
- FIB_ENTRY_NODE_FLAG_MULTIPLE_SRCS = (1 << FIB_ENTRY_NODE_ATTR_MULTIPLE_SRCS),
-} fib_entry_node_flags_t;
-
-
/**
* An entry in a FIB table.
*
* type to derive the EOS bit value.
*/
dpo_id_t fe_lb;
-
/**
- * Source info.
- * in the majority of cases a FIB entry will have only one source.
- * so to save the extra memory allocation of the source's vector, we
- * store space for one source inline. When two sources are present,
- * we burn extra memory.
- * The union is switched based on the FIB_ENTRY_NODE_FLAG_MULTIPLE_SRCS
+ * Vector of source infos.
+ * Most entries will only have 1 source. So we optimise for memory usage,
+ * which is preferable since we have many entries.
*/
- union {
- fib_entry_src_t *fe_srcs;
- fib_entry_src_t fe_src;
- } fe_u_src;
-
+ fib_entry_src_t *fe_srcs;
/**
* the path-list for which this entry is a child. This is also the path-list
* that is contributing forwarding for this entry.
fib_entry_src_vft[source].fesv_init(&esrc);
}
- if (fib_entry_has_multiple_srcs(fib_entry))
- {
- vec_add1(fib_entry->fe_u_src.fe_srcs, esrc);
-
- vec_sort_with_function(fib_entry->fe_u_src.fe_srcs,
- fib_entry_src_cmp_for_sort);
- }
- else
- {
- /*
- * is this the very first source
- */
- if (FIB_SOURCE_INVALID == fib_entry->fe_u_src.fe_src.fes_src)
- {
- clib_memcpy(&fib_entry->fe_u_src.fe_src, &esrc, sizeof(esrc));
- }
- else
- {
- /*
- * transitioning to multiple sources.
- * allocate the vecotr of sources.
- */
- fib_entry_src_t *srcs = NULL;
-
- vec_validate(srcs, 1);
-
- /*
- * sorted insert
- */
- if (fib_entry->fe_u_src.fe_src.fes_src < esrc.fes_src)
- {
- srcs[0] = fib_entry->fe_u_src.fe_src;
- srcs[1] = esrc;
- }
- else
- {
- srcs[0] = esrc;
- srcs[1] = fib_entry->fe_u_src.fe_src;
- }
- memset(&fib_entry->fe_u_src.fe_src, 0,
- sizeof(fib_entry->fe_u_src.fe_src));
- fib_entry->fe_u_src.fe_srcs = srcs;
-
- fib_entry->fe_node.fn_pad |= FIB_ENTRY_NODE_FLAG_MULTIPLE_SRCS;
- }
- }
-}
-
-u32
-fib_entry_has_multiple_srcs(const fib_entry_t * fib_entry)
-{
- return (fib_entry->fe_node.fn_pad & FIB_ENTRY_NODE_FLAG_MULTIPLE_SRCS);
+ vec_add1(fib_entry->fe_srcs, esrc);
+ vec_sort_with_function(fib_entry->fe_srcs,
+ fib_entry_src_cmp_for_sort);
}
static fib_entry_src_t *
-fib_entry_src_find (fib_entry_t *fib_entry,
+fib_entry_src_find (const fib_entry_t *fib_entry,
fib_source_t source,
u32 *index)
int ii;
ii = 0;
- if (fib_entry_has_multiple_srcs(fib_entry))
- {
- vec_foreach(esrc, fib_entry->fe_u_src.fe_srcs)
- {
- if (esrc->fes_src == source)
- {
- if (NULL != index)
- {
- *index = ii;
- }
- return (esrc);
- }
- else
- {
- ii++;
- }
- }
- }
- else
- {
- esrc = &fib_entry->fe_u_src.fe_src;
- if (esrc->fes_src == source)
- {
- if (NULL != index)
- {
- *index = -1;
- }
- return (esrc);
- }
- }
-
- return (NULL);
-}
-
-static fib_entry_src_t *
-fib_entry_src_delete (fib_entry_t *fib_entry,
- u32 index)
-
-{
- if (-1 == index)
- {
- ASSERT(!fib_entry_has_multiple_srcs(fib_entry));
- memset(&fib_entry->fe_u_src.fe_src, 0,
- sizeof(fib_entry->fe_u_src.fe_src));
- }
- else
+ vec_foreach(esrc, fib_entry->fe_srcs)
{
- vec_del1(fib_entry->fe_u_src.fe_srcs, index);
-
- ASSERT(vec_len(fib_entry->fe_u_src.fe_srcs));
- if (1 == vec_len(fib_entry->fe_u_src.fe_srcs))
- {
- /*
- * Is there much point in transitioning back?
- * We've paid the cost of the malloc for the vector,
- * why not keep it.
- * Favour memory use. If the expectation that multiple sources
- * is rare is correct, then we should expect this entry is
- * unlikely to need the vector again
- */
- fib_entry_src_t *srcs;
-
- srcs = fib_entry->fe_u_src.fe_srcs;
- fib_entry->fe_node.fn_pad &= ~FIB_ENTRY_NODE_FLAG_MULTIPLE_SRCS;
- clib_memcpy(&fib_entry->fe_u_src.fe_src,
- &srcs[0],
- sizeof(fib_entry->fe_u_src.fe_src));
- vec_free(srcs);
- }
- else
- {
- vec_sort_with_function(fib_entry->fe_u_src.fe_srcs,
- fib_entry_src_cmp_for_sort);
- }
+ if (esrc->fes_src == source)
+ {
+ if (NULL != index)
+ {
+ *index = ii;
+ }
+ return (esrc);
+ }
+ else
+ {
+ ii++;
+ }
}
return (NULL);
static fib_entry_src_t *
fib_entry_src_find_or_create (fib_entry_t *fib_entry,
- fib_source_t source)
+ fib_source_t source,
+ u32 *index)
{
fib_entry_src_t *esrc;
}
fib_path_ext_list_flush(&esrc->fes_path_exts);
- fib_entry_src_delete(fib_entry, index);
+ vec_del1(fib_entry->fe_srcs, index);
}
fib_entry_src_cover_res_t
fib_entry->fe_sibling = FIB_NODE_INDEX_INVALID;
}
+static void
+fib_entry_src_action_fwd_update (const fib_entry_t *fib_entry,
+ fib_source_t source)
+{
+ fib_entry_src_t *esrc;
+
+ vec_foreach(esrc, fib_entry->fe_srcs)
+ {
+ if (NULL != fib_entry_src_vft[esrc->fes_src].fesv_fwd_update)
+ {
+ fib_entry_src_vft[esrc->fes_src].fesv_fwd_update(esrc,
+ fib_entry,
+ source);
+ }
+ }
+}
+
void
fib_entry_src_action_reactivate (fib_entry_t *fib_entry,
fib_source_t source)
fib_path_list_unlock(path_list_index);
}
fib_entry_src_action_install(fib_entry, source);
+ fib_entry_src_action_fwd_update(fib_entry, source);
}
void
-fib_entry_src_action_installed (fib_entry_t *fib_entry,
+fib_entry_src_action_installed (const fib_entry_t *fib_entry,
fib_source_t source)
{
fib_entry_src_t *esrc;
fib_entry_src_vft[source].fesv_installed(esrc,
fib_entry);
}
+
+ fib_entry_src_action_fwd_update(fib_entry, source);
}
/*
fib_node_index_t fib_entry_index;
fib_entry_src_t *esrc;
- esrc = fib_entry_src_find_or_create(fib_entry, source);
+ esrc = fib_entry_src_find_or_create(fib_entry, source, NULL);
esrc->fes_ref_count++;
fib_node_index_t fib_entry_index, old_path_list_index;
fib_entry_src_t *esrc;
- esrc = fib_entry_src_find_or_create(fib_entry, source);
+ esrc = fib_entry_src_find_or_create(fib_entry, source, NULL);
if (NULL == esrc)
return (fib_entry_src_action_add(fib_entry, source, flags, dpo));
return (FIB_ENTRY_FLAG_NONE);
}
+fib_entry_flag_t
+fib_entry_get_flags_i (const fib_entry_t *fib_entry)
+{
+ fib_entry_flag_t flags;
+
+ /*
+ * the vector of sources is deliberately arranged in priority order
+ */
+ if (0 == vec_len(fib_entry->fe_srcs))
+ {
+ flags = FIB_ENTRY_FLAG_NONE;
+ }
+ else
+ {
+ fib_entry_src_t *esrc;
+
+ esrc = vec_elt_at_index(fib_entry->fe_srcs, 0);
+ flags = esrc->fes_entry_flags;
+ }
+
+ return (flags);
+}
+
void
fib_entry_set_source_data (fib_node_index_t fib_entry_index,
fib_source_t source,
fib_entry_src_t *src,
const fib_entry_t *fib_entry);
+/**
+ * Forwarding updated. Notification that the forwarding information for the
+ * entry has been updated. This notification is sent to all sources, not just
+ * the active best.
+ */
+typedef void (*fib_entry_src_fwd_update_t)(fib_entry_src_t *src,
+ const fib_entry_t *fib_entry,
+ fib_source_t best_source);
+
/**
* Installed. Notification that the source is now installed as
* the entry's forwarding source.
fib_entry_src_cover_update_t fesv_cover_update;
fib_entry_src_format_t fesv_format;
fib_entry_src_installed_t fesv_installed;
+ fib_entry_src_fwd_update_t fesv_fwd_update;
fib_entry_src_get_data_t fesv_get_data;
fib_entry_src_set_data_t fesv_set_data;
} fib_entry_src_vft_t;
-#define FOR_EACH_SRC_ADDED(_entry, _src, _source, action) \
-{ \
- if (fib_entry_has_multiple_srcs(_entry)) \
- { \
- vec_foreach(_src, _entry->fe_u_src.fe_srcs) \
- { \
- if (_src->fes_flags & FIB_ENTRY_SRC_FLAG_ADDED) { \
- _source = _src->fes_src; \
- do { \
- action; \
- } while(0); \
- } \
- } \
- } \
- else \
- { \
- _src = &_entry->fe_u_src.fe_src; \
- if (_src->fes_flags & FIB_ENTRY_SRC_FLAG_ADDED) { \
- _source = _src->fes_src; \
- do { \
- action; \
- } while(0); \
- } \
- } \
-}
-
-#define FOR_EACH_SRC(_entry, _src, _source, action) \
-{ \
- if (fib_entry_has_multiple_srcs(_entry)) \
- { \
- vec_foreach(_src, _entry->fe_u_src.fe_srcs) \
- { \
- _source = _src->fes_src; \
- do { \
- action; \
- } while(0); \
- } \
- } \
- else \
- { \
- _src = &_entry->fe_u_src.fe_src; \
- _source = _src->fes_src; \
- do { \
- action; \
- } while(0); \
- } \
+#define FOR_EACH_SRC_ADDED(_entry, _src, _source, action) \
+{ \
+ vec_foreach(_src, _entry->fe_srcs) \
+ { \
+ if (_src->fes_flags & FIB_ENTRY_SRC_FLAG_ADDED) { \
+ _source = _src->fes_src; \
+ do { \
+ action; \
+ } while(0); \
+ } \
+ } \
}
extern u8* fib_entry_src_format(fib_entry_t *entry,
fib_source_t source,
const fib_route_path_t *path);
-extern void fib_entry_src_action_installed(fib_entry_t *fib_entry,
+extern void fib_entry_src_action_installed(const fib_entry_t *fib_entry,
fib_source_t source);
extern fib_forward_chain_type_t fib_entry_get_default_chain_type(
extern fib_protocol_t fib_entry_get_proto(const fib_entry_t * fib_entry);
extern dpo_proto_t fib_entry_get_dpo_proto(const fib_entry_t * fib_entry);
-extern u32 fib_entry_has_multiple_srcs(const fib_entry_t * fib_entry);
/*
* Per-source registration. declared here so we save a separate .h file for each
.fesv_format = fib_entry_src_mpls_format,
.fesv_set_data = fib_entry_src_mpls_set_data,
.fesv_get_data = fib_entry_src_mpls_get_data,
+ /*
+ * .fesv_fwd_update = fib_entry_src_mpls_fwd_update,
+ * When the forwarding for the IP entry is updated, any MPLS chains
+ * it has created are also updated. Since the MPLS entry will have already
+ * installed that chain/load-balance there is no need to update the netry
+ * FIXME: later: propagate any walk to the children of the MPLS entry. for SR
+ */
};
void
Code Review / vpp.git / commitdiff