#include <vnet/feature/feature.h>
-
vnet_feature_main_t feature_main;
typedef struct vnet_feature_upd_registration_t_
}
static void
-vent_feature_reg_invoke (u32 sw_if_index, u8 arc_index, u8 is_enable)
+vnet_feature_reg_invoke (u32 sw_if_index, u8 arc_index, u8 is_enable)
{
vnet_feature_upd_registration_t *reg;
fm->sw_if_index_has_features[arc_index] =
clib_bitmap_set (fm->sw_if_index_has_features[arc_index], sw_if_index,
(feature_count > 0));
- vent_feature_reg_invoke (sw_if_index, arc_index, (feature_count > 0));
-
fm->feature_count_by_sw_if_index[arc_index][sw_if_index] = feature_count;
+
+ vnet_feature_reg_invoke (sw_if_index, arc_index, (feature_count > 0));
+
return 0;
}
n_feature_config_bytes);
}
+int
+vnet_feature_is_enabled (const char *arc_name, const char *feature_node_name,
+ u32 sw_if_index)
+{
+ vnet_feature_main_t *fm = &feature_main;
+ vnet_feature_config_main_t *cm;
+ vnet_config_main_t *ccm;
+ vnet_config_t *current_config;
+ vnet_config_feature_t *f;
+ u32 feature_index;
+ u32 ci;
+ u8 arc_index;
+ u32 *p;
+
+ arc_index = vnet_get_feature_arc_index (arc_name);
+
+ /* No such arc? */
+ if (arc_index == (u8) ~ 0)
+ return VNET_API_ERROR_INVALID_VALUE;
+
+ feature_index = vnet_get_feature_index (arc_index, feature_node_name);
+
+ /* No such feature? */
+ if (feature_index == (u32) ~ 0)
+ return VNET_API_ERROR_INVALID_VALUE_2;
+
+ cm = &fm->feature_config_mains[arc_index];
+
+ if (sw_if_index < vec_len (cm->config_index_by_sw_if_index))
+ ci = vec_elt (cm->config_index_by_sw_if_index, sw_if_index);
+ else
+ /* sw_if_index out of range, certainly not enabled */
+ return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+ /* No features were ever configured? */
+ if (ci == ~0)
+ return 0;
+
+ ccm = &cm->config_main;
+
+ p = heap_elt_at_index (ccm->config_string_heap, ci);
+
+ current_config = pool_elt_at_index (ccm->config_pool, p[-1]);
+
+ /* Find feature with the required index */
+ vec_foreach (f, current_config->features)
+ {
+ if (f->feature_index == feature_index)
+ /* Feature was enabled */
+ return 1;
+ }
+ /* feature wasn't enabled */
+ return 0;
+}
+
+u32
+vnet_feature_get_end_node (u8 arc_index, u32 sw_if_index)
+{
+ vnet_feature_main_t *fm = &feature_main;
+ vnet_feature_config_main_t *cm;
+ u32 ci;
+
+ if (arc_index == (u8) ~0)
+ return VNET_API_ERROR_INVALID_VALUE;
+
+ cm = &fm->feature_config_mains[arc_index];
+ vec_validate_init_empty (cm->config_index_by_sw_if_index, sw_if_index, ~0);
+ ci = cm->config_index_by_sw_if_index[sw_if_index];
+
+ return (vnet_config_get_end_node (vlib_get_main (), &cm->config_main, ci));
+}
+
+u32
+vnet_feature_reset_end_node (u8 arc_index, u32 sw_if_index)
+{
+ vnet_feature_main_t *fm = &feature_main;
+ vnet_feature_config_main_t *cm;
+ u32 ci;
+
+ cm = &fm->feature_config_mains[arc_index];
+ vec_validate_init_empty (cm->config_index_by_sw_if_index, sw_if_index, ~0);
+ ci = cm->config_index_by_sw_if_index[sw_if_index];
+
+ ci = vnet_config_reset_end_node (vlib_get_main (), &cm->config_main, ci);
+
+ if (ci != ~0)
+ cm->config_index_by_sw_if_index[sw_if_index] = ci;
+
+ i16 feature_count;
+
+ if (NULL == fm->feature_count_by_sw_if_index ||
+ vec_len (fm->feature_count_by_sw_if_index) <= arc_index ||
+ vec_len (fm->feature_count_by_sw_if_index[arc_index]) <= sw_if_index)
+ feature_count = 0;
+ else
+ feature_count = fm->feature_count_by_sw_if_index[arc_index][sw_if_index];
+
+ vnet_feature_reg_invoke (sw_if_index, arc_index, (feature_count > 0));
+
+ return ci;
+}
+
u32
vnet_feature_modify_end_node (u8 arc_index,
u32 sw_if_index, u32 end_node_index)
if (ci != ~0)
cm->config_index_by_sw_if_index[sw_if_index] = ci;
+ i16 feature_count;
+
+ if (NULL == fm->feature_count_by_sw_if_index ||
+ vec_len (fm->feature_count_by_sw_if_index) <= arc_index ||
+ vec_len (fm->feature_count_by_sw_if_index[arc_index]) <= sw_if_index)
+ feature_count = 0;
+ else
+ feature_count = fm->feature_count_by_sw_if_index[arc_index][sw_if_index];
+
+ vnet_feature_reg_invoke (sw_if_index, arc_index, (feature_count > 0));
+
return ci;
}
* @cliexend
* @endparblock
?*/
-/* *INDENT-OFF* */
VLIB_CLI_COMMAND (show_features_command, static) = {
.path = "show features",
.short_help = "show features [verbose]",
.function = show_features_command_fn,
};
-/* *INDENT-ON* */
/** Display the set of driver features configured on a specific interface
* Called by "show interface" handler
vlib_cli_output (vm, "\n%s:", areg->arc_name);
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)
+ if (!vnet_have_features (feature_arc, sw_if_index))
{
vlib_cli_output (vm, " none configured");
continue;
current_config_index =
vec_elt (cm[feature_arc].config_index_by_sw_if_index, sw_if_index);
-
- if (current_config_index == ~0)
- {
- vlib_cli_output (vm, " none configured");
- continue;
- }
-
- ASSERT (current_config_index
- < vec_len (vcm->config_pool_index_by_user_index));
-
- cfg_index = vcm->config_pool_index_by_user_index[current_config_index];
+ cfg_index =
+ vec_elt (vcm->config_pool_index_by_user_index, current_config_index);
cfg = pool_elt_at_index (vcm->config_pool, cfg_index);
for (i = 0; i < vec_len (cfg->features); i++)
* @cliexend
* @endparblock
?*/
-/* *INDENT-OFF* */
VLIB_CLI_COMMAND (set_interface_feature_command, static) = {
.path = "set interface feature",
.short_help = "set interface feature <intfc> <feature_name> arc <arc_name> "
"[disable]",
.function = set_interface_features_command_fn,
};
-/* *INDENT-ON* */
+
+static clib_error_t *
+vnet_feature_add_del_sw_interface (vnet_main_t * vnm, u32 sw_if_index,
+ u32 is_add)
+{
+ vnet_feature_main_t *fm = &feature_main;
+ const vnet_feature_arc_registration_t *far;
+
+ if (is_add)
+ return 0;
+
+ /*
+ * remove all enabled features from an interface on deletion
+ */
+ for (far = fm->next_arc; far != 0; far = far->next)
+ {
+ const u8 arc_index = far->feature_arc_index;
+ vnet_feature_config_main_t *cm =
+ vec_elt_at_index (fm->feature_config_mains, arc_index);
+ const u32 ci =
+ vec_len (cm->config_index_by_sw_if_index) <=
+ sw_if_index ? ~0 : vec_elt (cm->config_index_by_sw_if_index,
+ sw_if_index);
+
+ if (~0 == ci)
+ continue;
+
+ fm->sw_if_index_has_features[arc_index] =
+ clib_bitmap_set (fm->sw_if_index_has_features[arc_index], sw_if_index,
+ 0);
+
+ vnet_feature_reg_invoke (sw_if_index, arc_index, 0);
+
+ if (vec_len (fm->feature_count_by_sw_if_index[arc_index]) > sw_if_index)
+ vec_elt (fm->feature_count_by_sw_if_index[arc_index], sw_if_index) =
+ 0;
+
+ vec_elt (cm->config_index_by_sw_if_index, sw_if_index) = ~0;
+ vnet_config_del (&cm->config_main, ci);
+ }
+
+ return 0;
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION_PRIO (vnet_feature_add_del_sw_interface,
+ VNET_ITF_FUNC_PRIORITY_HIGH);
/*
* fd.io coding-style-patch-verification: ON