X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffeature%2Ffeature.h;h=cd016735aca6b163e6490ec8425cb523d06c2d07;hb=5cd31ec9405d2bb2fbc8152a08c4cfb64f2a8e73;hp=eb6c95ca2c2bae80fec69c6144e43b8d3302875f;hpb=dc09133c33aa5f40a06533b06b136c8574e56ea9;p=vpp.git diff --git a/src/vnet/feature/feature.h b/src/vnet/feature/feature.h index eb6c95ca2c2..cd016735aca 100644 --- a/src/vnet/feature/feature.h +++ b/src/vnet/feature/feature.h @@ -30,6 +30,8 @@ typedef struct _vnet_feature_arc_registration /** Start nodes */ char **start_nodes; int n_start_nodes; + /** End of the arc (optional, for consistency-checking) */ + char *last_in_arc; /* Feature arc index, assigned by init function */ u8 feature_arc_index; u8 *arc_index_ptr; @@ -43,7 +45,7 @@ typedef clib_error_t *(vnet_feature_enable_disable_function_t) typedef struct _vnet_feature_registration { /** next registration in list of all registrations*/ - struct _vnet_feature_registration *next; + struct _vnet_feature_registration *next, *next_in_arc; /** Feature arc name */ char *arc_name; /** Graph node name */ @@ -60,6 +62,21 @@ typedef struct _vnet_feature_registration vnet_feature_enable_disable_function_t *enable_disable_cb; } vnet_feature_registration_t; +/** constraint registration object */ +typedef struct _vnet_feature_constraint_registration +{ + /** next constraint set in list of all registrations*/ + struct _vnet_feature_constraint_registration *next, *next_in_arc; + /** Feature arc name */ + char *arc_name; + + /** Feature arc index, assigned by init function */ + u8 feature_arc_index; + + /** Node names, to run in the specified order */ + char **node_names; +} vnet_feature_constraint_registration_t; + typedef struct vnet_feature_config_main_t_ { vnet_config_main_t config_main; @@ -75,6 +92,8 @@ typedef struct /** feature path configuration lists */ vnet_feature_registration_t *next_feature; vnet_feature_registration_t **next_feature_by_arc; + vnet_feature_constraint_registration_t *next_constraint; + vnet_feature_constraint_registration_t **next_constraint_by_arc; uword **next_feature_by_name; /** feature config main objects */ @@ -99,6 +118,7 @@ typedef struct extern vnet_feature_main_t feature_main; +#ifndef CLIB_MARCH_VARIANT #define VNET_FEATURE_ARC_INIT(x,...) \ __VA_ARGS__ vnet_feature_arc_registration_t vnet_feat_arc_##x;\ static void __vnet_add_feature_arc_registration_##x (void) \ @@ -109,6 +129,14 @@ static void __vnet_add_feature_arc_registration_##x (void) \ vnet_feat_arc_##x.next = fm->next_arc; \ fm->next_arc = & vnet_feat_arc_##x; \ } \ +static void __vnet_rm_feature_arc_registration_##x (void) \ + __attribute__((__destructor__)) ; \ +static void __vnet_rm_feature_arc_registration_##x (void) \ +{ \ + vnet_feature_main_t * fm = &feature_main; \ + vnet_feature_arc_registration_t *r = &vnet_feat_arc_##x; \ + VLIB_REMOVE_FROM_LINKED_LIST (fm->next_arc, r, next); \ +} \ __VA_ARGS__ vnet_feature_arc_registration_t vnet_feat_arc_##x #define VNET_FEATURE_INIT(x,...) \ @@ -121,8 +149,54 @@ static void __vnet_add_feature_registration_##x (void) \ vnet_feat_##x.next = fm->next_feature; \ fm->next_feature = & vnet_feat_##x; \ } \ +static void __vnet_rm_feature_registration_##x (void) \ + __attribute__((__destructor__)) ; \ +static void __vnet_rm_feature_registration_##x (void) \ +{ \ + vnet_feature_main_t * fm = &feature_main; \ + vnet_feature_registration_t *r = &vnet_feat_##x; \ + VLIB_REMOVE_FROM_LINKED_LIST (fm->next_feature, r, next); \ +} \ __VA_ARGS__ vnet_feature_registration_t vnet_feat_##x +#define VNET_FEATURE_ARC_ORDER(x,...) \ + __VA_ARGS__ vnet_feature_constraint_registration_t \ +vnet_feature_constraint_##x; \ +static void __vnet_add_constraint_registration_##x (void) \ + __attribute__((__constructor__)) ; \ +static void __vnet_add_constraint_registration_##x (void) \ +{ \ + vnet_feature_main_t * fm = &feature_main; \ + vnet_feature_constraint_##x.next = fm->next_constraint; \ + fm->next_constraint = & vnet_feature_constraint_##x; \ +} \ +static void __vnet_rm_constraint_registration_##x (void) \ + __attribute__((__destructor__)) ; \ +static void __vnet_rm_constraint_registration_##x (void) \ +{ \ + vnet_feature_main_t * fm = &feature_main; \ + vnet_feature_constraint_registration_t *r = &vnet_feature_constraint_##x; \ + VLIB_REMOVE_FROM_LINKED_LIST (fm->next_constraint, r, next); \ +} \ +__VA_ARGS__ vnet_feature_constraint_registration_t vnet_feature_constraint_##x + +#else +#define VNET_FEATURE_ARC_INIT(x,...) \ +extern vnet_feature_arc_registration_t __clib_unused vnet_feat_arc_##x; \ +static vnet_feature_arc_registration_t __clib_unused __clib_unused_vnet_feat_arc_##x +#define VNET_FEATURE_INIT(x,...) \ +extern vnet_feature_registration_t __clib_unused vnet_feat_##x; \ +static vnet_feature_registration_t __clib_unused __clib_unused_vnet_feat_##x + +#define VNET_FEATURE_ARC_ORDER(x,...) \ +extern vnet_feature_constraint_registration_t \ +__clib_unused vnet_feature_constraint_##x; \ +static vnet_feature_constraint_registration_t __clib_unused \ +__clib_unused_vnet_feature_constraint_##x + + +#endif + void vnet_config_update_feature_count (vnet_feature_main_t * fm, u8 arc, u32 sw_if_index, int is_add); @@ -145,6 +219,13 @@ vnet_feature_enable_disable (const char *arc_name, const char *node_name, void *feature_config, u32 n_feature_config_bytes); +static_always_inline u32 +vnet_get_feature_count (u8 arc, u32 sw_if_index) +{ + vnet_feature_main_t *fm = &feature_main; + return (fm->feature_count_by_sw_if_index[arc][sw_if_index]); +} + static inline vnet_feature_config_main_t * vnet_get_feature_arc_config_main (u8 arc_index) { @@ -188,7 +269,7 @@ vnet_feature_arc_start_with_data (u8 arc, u32 sw_if_index, u32 * next, if (PREDICT_FALSE (vnet_have_features (arc, sw_if_index))) { - b->feature_arc_index = arc; + vnet_buffer (b)->feature_arc_index = arc; b->current_config_index = vec_elt (cm->config_index_by_sw_if_index, sw_if_index); return vnet_get_config_data (&cm->config_main, &b->current_config_index, @@ -205,11 +286,11 @@ vnet_feature_arc_start (u8 arc, u32 sw_if_index, u32 * next0, } static_always_inline void * -vnet_feature_next_with_data (u32 sw_if_index, u32 * next0, - vlib_buffer_t * b0, u32 n_data_bytes) +vnet_feature_next_with_data (u32 * next0, vlib_buffer_t * b0, + u32 n_data_bytes) { vnet_feature_main_t *fm = &feature_main; - u8 arc = b0->feature_arc_index; + u8 arc = vnet_buffer (b0)->feature_arc_index; vnet_feature_config_main_t *cm = &fm->feature_config_mains[arc]; return vnet_get_config_data (&cm->config_main, @@ -218,9 +299,17 @@ vnet_feature_next_with_data (u32 sw_if_index, u32 * next0, } static_always_inline void -vnet_feature_next (u32 sw_if_index, u32 * next0, vlib_buffer_t * b0) +vnet_feature_next (u32 * next0, vlib_buffer_t * b0) { - vnet_feature_next_with_data (sw_if_index, next0, b0, 0); + vnet_feature_next_with_data (next0, b0, 0); +} + +static_always_inline void +vnet_feature_next_u16 (u16 * next0, vlib_buffer_t * b0) +{ + u32 next32; + vnet_feature_next_with_data (&next32, b0, 0); + *next0 = next32; } static_always_inline int @@ -249,12 +338,10 @@ vnet_feature_start_device_input_x1 (u32 sw_if_index, u32 * next0, */ u16 adv; - vnet_buffer (b0)->device_input_feat.saved_next_index = *next0; adv = device_input_next_node_advance[*next0]; - vnet_buffer (b0)->device_input_feat.buffer_advance = adv; vlib_buffer_advance (b0, -adv); - b0->feature_arc_index = feature_arc_index; + vnet_buffer (b0)->feature_arc_index = feature_arc_index; b0->current_config_index = vec_elt (cm->config_index_by_sw_if_index, sw_if_index); vnet_get_config_data (&cm->config_main, &b0->current_config_index, @@ -283,18 +370,14 @@ vnet_feature_start_device_input_x2 (u32 sw_if_index, */ u16 adv; - vnet_buffer (b0)->device_input_feat.saved_next_index = *next0; adv = device_input_next_node_advance[*next0]; - vnet_buffer (b0)->device_input_feat.buffer_advance = adv; vlib_buffer_advance (b0, -adv); - vnet_buffer (b1)->device_input_feat.saved_next_index = *next1; adv = device_input_next_node_advance[*next1]; - vnet_buffer (b1)->device_input_feat.buffer_advance = adv; vlib_buffer_advance (b1, -adv); - b0->feature_arc_index = feature_arc_index; - b1->feature_arc_index = feature_arc_index; + vnet_buffer (b0)->feature_arc_index = feature_arc_index; + vnet_buffer (b1)->feature_arc_index = feature_arc_index; b0->current_config_index = vec_elt (cm->config_index_by_sw_if_index, sw_if_index); b1->current_config_index = b0->current_config_index; @@ -330,30 +413,22 @@ vnet_feature_start_device_input_x4 (u32 sw_if_index, */ u16 adv; - vnet_buffer (b0)->device_input_feat.saved_next_index = *next0; adv = device_input_next_node_advance[*next0]; - vnet_buffer (b0)->device_input_feat.buffer_advance = adv; vlib_buffer_advance (b0, -adv); - vnet_buffer (b1)->device_input_feat.saved_next_index = *next1; adv = device_input_next_node_advance[*next1]; - vnet_buffer (b1)->device_input_feat.buffer_advance = adv; vlib_buffer_advance (b1, -adv); - vnet_buffer (b2)->device_input_feat.saved_next_index = *next2; adv = device_input_next_node_advance[*next2]; - vnet_buffer (b2)->device_input_feat.buffer_advance = adv; vlib_buffer_advance (b2, -adv); - vnet_buffer (b3)->device_input_feat.saved_next_index = *next3; adv = device_input_next_node_advance[*next3]; - vnet_buffer (b3)->device_input_feat.buffer_advance = adv; vlib_buffer_advance (b3, -adv); - b0->feature_arc_index = feature_arc_index; - b1->feature_arc_index = feature_arc_index; - b2->feature_arc_index = feature_arc_index; - b3->feature_arc_index = feature_arc_index; + vnet_buffer (b0)->feature_arc_index = feature_arc_index; + vnet_buffer (b1)->feature_arc_index = feature_arc_index; + vnet_buffer (b2)->feature_arc_index = feature_arc_index; + vnet_buffer (b3)->feature_arc_index = feature_arc_index; b0->current_config_index = vec_elt (cm->config_index_by_sw_if_index, sw_if_index); @@ -374,14 +449,24 @@ vnet_feature_start_device_input_x4 (u32 sw_if_index, #define VNET_FEATURES(...) (char*[]) { __VA_ARGS__, 0} -clib_error_t *vnet_feature_arc_init (vlib_main_t * vm, - vnet_config_main_t * vcm, - char **feature_start_nodes, - int num_feature_start_nodes, - vnet_feature_registration_t * - first_reg, char ***feature_nodes); +clib_error_t *vnet_feature_arc_init + (vlib_main_t * vm, + vnet_config_main_t * vcm, + char **feature_start_nodes, + int num_feature_start_nodes, + char *last_in_arc, + vnet_feature_registration_t * first_reg, + vnet_feature_constraint_registration_t * first_const_set, + char ***in_feature_nodes); + +void vnet_interface_features_show (vlib_main_t * vm, u32 sw_if_index, + int verbose); + +typedef void (*vnet_feature_update_cb_t) (u32 sw_if_index, + u8 arc_index, + u8 is_enable, void *cb); -void vnet_interface_features_show (vlib_main_t * vm, u32 sw_if_index); +extern void vnet_feature_register (vnet_feature_update_cb_t cb, void *data); #endif /* included_feature_h */