/* process start nodes */
while ((s = areg->start_nodes[i]))
{
- vlib_node_t *n;
- vlib_node_runtime_t *rt;
- n = vlib_get_node_by_name (vm, (u8 *) s);
-
- if (n == 0)
- return clib_error_return (0,
- "Unknown start node '%s' on feature arc '%s'",
- s, areg->arc_name);
-
- rt = vlib_node_get_runtime (vm, n->index);
- rt->feature_arc_index = arc_index;
i++;
}
areg->n_start_nodes = i;
freg = fm->next_feature;
while (freg)
{
- vlib_node_t *n;
- vlib_node_runtime_t *rt;
uword *p = hash_get_mem (fm->arc_index_by_name, freg->arc_name);
if (p == 0)
return clib_error_return (0, "Unknown feature arc '%s'",
areg = uword_to_pointer (p[0], vnet_feature_arc_registration_t *);
arc_index = areg->feature_arc_index;
- /* set feature arc index in node runtime */
- n = vlib_get_node_by_name (vm, (u8 *) freg->node_name);
- if (n == 0)
- return clib_error_return (0, "Unknown node '%s', freg->node_name");
- rt = vlib_node_get_runtime (vm, n->index);
- rt->feature_arc_index = arc_index;
-
vec_add1 (fm->next_feature_by_arc[arc_index], *freg);
/* next */
arc_index++;
}
+ fm->device_input_feature_arc_index =
+ vnet_get_feature_arc_index ("device-input");
return 0;
}
VLIB_INIT_FUNCTION (vnet_feature_init);
void
-vnet_config_update_feature_count (vnet_feature_main_t * fm, u16 arc,
+vnet_config_update_feature_count (vnet_feature_main_t * fm, u8 arc,
u32 sw_if_index, int is_add)
{
uword bit_value;
bit_value);
}
-u16
-vnet_feature_arc_index_from_node_name (const char *s)
+u8
+vnet_get_feature_arc_index (const char *s)
{
vnet_feature_main_t *fm = &feature_main;
vnet_feature_arc_registration_t *reg;
}
u32
-vnet_feature_index_from_node_name (u16 arc, const char *s)
+vnet_get_feature_index (u8 arc, const char *s)
{
vnet_feature_main_t *fm = &feature_main;
vnet_feature_registration_t *reg;
vnet_feature_main_t *fm = &feature_main;
vnet_feature_config_main_t *cm;
u32 feature_index, ci;
- u16 arc_index;
+ u8 arc_index;
- arc_index = vnet_feature_arc_index_from_node_name (arc_name);
+ arc_index = vnet_get_feature_arc_index (arc_name);
if (arc_index == ~0)
return;
cm = &fm->feature_config_mains[arc_index];
vec_validate_init_empty (cm->config_index_by_sw_if_index, sw_if_index, ~0);
- feature_index = vnet_feature_index_from_node_name (arc_index, node_name);
+ feature_index = vnet_get_feature_index (arc_index, node_name);
if (feature_index == ~0)
return;
ci = cm->config_index_by_sw_if_index[sw_if_index];
areg = areg->next;
if (NULL == cm[feature_arc].config_index_by_sw_if_index ||
- vec_len (cm[feature_arc].config_index_by_sw_if_index) < sw_if_index)
+ vec_len (cm[feature_arc].config_index_by_sw_if_index) <=
+ sw_if_index)
{
vlib_cli_output (vm, " none configured");
continue;
char **start_nodes;
int n_start_nodes;
/* Feature arc index, assigned by init function */
- u16 feature_arc_index;
+ u8 feature_arc_index;
} vnet_feature_arc_registration_t;
/** feature registration object */
/** feature reference counts by interface */
i16 **feature_count_by_sw_if_index;
+ /** Feature arc index for device-input */
+ u8 device_input_feature_arc_index;
+
/** convenience */
vlib_main_t *vlib_main;
vnet_main_t *vnet_main;
__VA_ARGS__ vnet_feature_registration_t vnet_feat_##x
void
-vnet_config_update_feature_count (vnet_feature_main_t * fm, u16 arc,
+vnet_config_update_feature_count (vnet_feature_main_t * fm, u8 arc,
u32 sw_if_index, int is_add);
-u32 vnet_feature_index_from_node_name (u16 type, const char *s);
+u32 vnet_get_feature_index (u8 arc, const char *s);
+u8 vnet_get_feature_arc_index (const char *s);
void
vnet_feature_enable_disable (const char *arc_name, const char *node_name,
static_always_inline int
-vnet_have_features (u32 arc, u32 sw_if_index)
+vnet_have_features (u8 arc, u32 sw_if_index)
{
vnet_feature_main_t *fm = &feature_main;
return clib_bitmap_get (fm->sw_if_index_has_features[arc], sw_if_index);
}
static_always_inline u32
-vnet_feature_get_config_index (u16 arc, u32 sw_if_index)
+vnet_get_feature_config_index (u8 arc, u32 sw_if_index)
{
vnet_feature_main_t *fm = &feature_main;
vnet_feature_config_main_t *cm = &fm->feature_config_mains[arc];
return vec_elt (cm->config_index_by_sw_if_index, sw_if_index);
}
+static_always_inline void *
+vnet_feature_arc_start_with_data (u8 arc, u32 sw_if_index, u32 * next,
+ vlib_buffer_t * b, u32 n_data_bytes)
+{
+ vnet_feature_main_t *fm = &feature_main;
+ vnet_feature_config_main_t *cm;
+ cm = &fm->feature_config_mains[arc];
+
+ if (PREDICT_FALSE (vnet_have_features (arc, sw_if_index)))
+ {
+ 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,
+ next, n_data_bytes);
+ }
+}
+
static_always_inline void
-vnet_feature_redirect (u16 arc, u32 sw_if_index, u32 * next0,
- vlib_buffer_t * b0)
+vnet_feature_arc_start (u8 arc, u32 sw_if_index, u32 * next0,
+ vlib_buffer_t * b0)
+{
+ vnet_feature_arc_start_with_data (arc, sw_if_index, next0, b0, 0);
+}
+
+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_main_t *fm = &feature_main;
+ u8 arc = b0->feature_arc_index;
vnet_feature_config_main_t *cm = &fm->feature_config_mains[arc];
- if (PREDICT_FALSE (vnet_have_features (arc, sw_if_index)))
+ return vnet_get_config_data (&cm->config_main,
+ &b0->current_config_index, next0,
+ n_data_bytes);
+}
+
+static_always_inline void
+vnet_feature_next (u32 sw_if_index, u32 * next0, vlib_buffer_t * b0)
+{
+ vnet_feature_next_with_data (sw_if_index, next0, b0, 0);
+}
+
+static_always_inline void
+vnet_feature_start_device_input_x1 (u32 sw_if_index, u32 * next0,
+ vlib_buffer_t * b0, u16 buffer_advanced0)
+{
+ vnet_feature_main_t *fm = &feature_main;
+ vnet_feature_config_main_t *cm;
+ u8 feature_arc_index = fm->device_input_feature_arc_index;
+ cm = &fm->feature_config_mains[feature_arc_index];
+
+ if (PREDICT_FALSE
+ (clib_bitmap_get
+ (fm->sw_if_index_has_features[feature_arc_index], sw_if_index)))
{
+ /*
+ * Save next0 so that the last feature in the chain
+ * can skip ethernet-input if indicated...
+ */
+ vnet_buffer (b0)->device_input_feat.saved_next_index = *next0;
+ vnet_buffer (b0)->device_input_feat.buffer_advance = buffer_advanced0;
+ vlib_buffer_advance (b0, -buffer_advanced0);
+
+ 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,
}
static_always_inline void
-vnet_feature_device_input_redirect_x1 (vlib_node_runtime_t * node,
- u32 sw_if_index, u32 * next0,
- vlib_buffer_t * b0,
- u16 buffer_advanced0)
+vnet_feature_start_device_input_x2 (u32 sw_if_index,
+ u32 * next0,
+ u32 * next1,
+ vlib_buffer_t * b0,
+ vlib_buffer_t * b1,
+ u16 buffer_advanced0,
+ u16 buffer_advanced1)
{
vnet_feature_main_t *fm = &feature_main;
vnet_feature_config_main_t *cm;
-
- ASSERT (node->feature_arc_index != ~(u16) 0);
- cm = &fm->feature_config_mains[node->feature_arc_index];
+ u8 feature_arc_index = fm->device_input_feature_arc_index;
+ cm = &fm->feature_config_mains[feature_arc_index];
if (PREDICT_FALSE
(clib_bitmap_get
- (fm->sw_if_index_has_features[node->feature_arc_index], sw_if_index)))
+ (fm->sw_if_index_has_features[feature_arc_index], sw_if_index)))
{
/*
* Save next0 so that the last feature in the chain
* can skip ethernet-input if indicated...
*/
vnet_buffer (b0)->device_input_feat.saved_next_index = *next0;
+ vnet_buffer (b1)->device_input_feat.saved_next_index = *next1;
vnet_buffer (b0)->device_input_feat.buffer_advance = buffer_advanced0;
+ vnet_buffer (b1)->device_input_feat.buffer_advance = buffer_advanced1;
vlib_buffer_advance (b0, -buffer_advanced0);
+ vlib_buffer_advance (b1, -buffer_advanced1);
+ b0->feature_arc_index = feature_arc_index;
+ 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;
vnet_get_config_data (&cm->config_main, &b0->current_config_index,
next0, /* # bytes of config data */ 0);
+ vnet_get_config_data (&cm->config_main, &b1->current_config_index,
+ next1, /* # bytes of config data */ 0);
}
}
+
#define ORDER_CONSTRAINTS (char*[])
#define VNET_FEATURES(...) (char*[]) { __VA_ARGS__, 0}