#include <vppinfra/bitmap.h>
#include <vnet/fib/ip4_fib.h>
#include <vnet/fib/ip6_fib.h>
+#include <vnet/l2/l2_output.h>
+#include <vnet/l2/l2_input.h>
static int
compare_interface_names (void *a1, void *a2)
if (show_features)
{
vnet_interface_features_show (vm, sw_if_index);
+
+ l2_input_config_t *l2_input = l2input_intf_config (sw_if_index);
+ u32 fb = l2_input->feature_bitmap;
+ /* intf input features are masked by bridge domain */
+ if (l2_input->bridge)
+ fb &= l2input_bd_config (l2_input->bd_index)->feature_bitmap;
+ vlib_cli_output (vm, "\nl2-input:\n%U", format_l2_input_features, fb);
+
+ l2_output_config_t *l2_output = l2output_intf_config (sw_if_index);
+ vlib_cli_output (vm, "\nl2-output:");
+ if (l2_output->out_vtr_flag)
+ vlib_cli_output (vm, "%10s (%s)", "VTR", "--internal--");
+ vlib_cli_output (vm, "%U", format_l2_output_features,
+ l2_output->feature_bitmap);
return 0;
}
if (show_tag)
_vec_len (sorted_sis) = 0;
pool_foreach (si, im->sw_interfaces, (
{
- if (vnet_swif_is_api_visible
- (si)) vec_add1 (sorted_sis,
- si[0]);}
+ int visible =
+ vnet_swif_is_api_visible (si);
+ if (visible)
+ vec_add1 (sorted_sis, si[0]);}
));
/* Sort by name. */
{
vec_foreach (si, sorted_sis)
{
- l2input_main_t *l2m = &l2input_main;
ip4_main_t *im4 = &ip4_main;
ip6_main_t *im6 = &ip6_main;
ip_lookup_main_t *lm4 = &im4->lookup_main;
u32 fib_index4 = 0, fib_index6 = 0;
ip4_fib_t *fib4;
ip6_fib_t *fib6;
- l2_input_config_t *config;
if (vec_len (im4->fib_index_by_sw_if_index) > si->sw_if_index)
fib_index4 = vec_elt (im4->fib_index_by_sw_if_index,
? "up" : "dn");
}
- /* Display any L2 addressing info */
- vec_validate (l2m->configs, si->sw_if_index);
- config = vec_elt_at_index (l2m->configs, si->sw_if_index);
- if (config->bridge)
+ /* Display any L2 info */
+ l2_input_config_t *l2_input = l2input_intf_config (si->sw_if_index);
+ if (l2_input->bridge)
{
- u32 bd_id = l2input_main.bd_configs[config->bd_index].bd_id;
+ u32 bd_id = l2input_main.bd_configs[l2_input->bd_index].bd_id;
vlib_cli_output (vm, " l2 bridge bd_id %d%s%d", bd_id,
- config->bvi ? " bvi shg " : " shg ",
- config->shg);
+ l2_input->bvi ? " bvi shg " : " shg ",
+ l2_input->shg);
}
- else if (config->xconnect)
+ else if (l2_input->xconnect)
{
vlib_cli_output (vm, " l2 xconnect %U",
format_vnet_sw_if_index_name,
- vnm, config->output_sw_if_index);
+ vnm, l2_input->output_sw_if_index);
}
/* Display any IP4 addressing info */
};
/* *INDENT-ON* */
+static clib_error_t *
+set_hw_interface_rx_mode (vnet_main_t * vnm, u32 hw_if_index,
+ u32 queue_id, vnet_hw_interface_rx_mode mode)
+{
+ vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+ vnet_device_class_t *dev_class =
+ vnet_get_device_class (vnm, hw->dev_class_index);
+ clib_error_t *error;
+ vnet_hw_interface_rx_mode old_mode;
+ int rv;
+
+ if (mode == VNET_HW_INTERFACE_RX_MODE_DEFAULT)
+ mode = hw->default_rx_mode;
+
+ rv = vnet_hw_interface_get_rx_mode (vnm, hw_if_index, queue_id, &old_mode);
+ switch (rv)
+ {
+ case 0:
+ if (old_mode == mode)
+ return 0; /* same rx-mode, no change */
+ break;
+ case VNET_API_ERROR_INVALID_INTERFACE:
+ return clib_error_return (0, "invalid interface");
+ default:
+ return clib_error_return (0, "unknown error");
+ }
+
+ if (dev_class->rx_mode_change_function)
+ {
+ error = dev_class->rx_mode_change_function (vnm, hw_if_index, queue_id,
+ mode);
+ if (error)
+ return (error);
+ }
+
+ rv = vnet_hw_interface_set_rx_mode (vnm, hw_if_index, queue_id, mode);
+ switch (rv)
+ {
+ case 0:
+ break;
+ case VNET_API_ERROR_UNSUPPORTED:
+ return clib_error_return (0, "unsupported");
+ case VNET_API_ERROR_INVALID_INTERFACE:
+ return clib_error_return (0, "invalid interface");
+ default:
+ return clib_error_return (0, "unknown error");
+ }
+
+ return 0;
+}
+
static clib_error_t *
set_interface_rx_mode (vlib_main_t * vm, unformat_input_t * input,
vlib_cli_command_t * cmd)
u32 hw_if_index = (u32) ~ 0;
u32 queue_id = (u32) ~ 0;
vnet_hw_interface_rx_mode mode = VNET_HW_INTERFACE_RX_MODE_UNKNOWN;
- int i, rv = 0;
+ int i;
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
hw = vnet_get_hw_interface (vnm, hw_if_index);
if (queue_id == ~0)
- for (i = 0; i < vec_len (hw->dq_runtime_index_by_queue); i++)
- {
- rv = vnet_hw_interface_set_rx_mode (vnm, hw_if_index, i, mode);
- if (rv)
- goto error;
- }
+ {
+ for (i = 0; i < vec_len (hw->dq_runtime_index_by_queue); i++)
+ {
+ error = set_hw_interface_rx_mode (vnm, hw_if_index, i, mode);
+ if (error)
+ break;
+ }
+ hw->default_rx_mode = mode;
+ }
else
- rv = vnet_hw_interface_set_rx_mode (vnm, hw_if_index, queue_id, mode);
-
- if (rv)
- goto error;
-
- return 0;
-
-error:
- if (rv == VNET_API_ERROR_UNSUPPORTED)
- return clib_error_return (0, "unsupported");
-
- if (rv == VNET_API_ERROR_INVALID_INTERFACE)
- return clib_error_return (0, "invalid interfaace");
+ error = set_hw_interface_rx_mode (vnm, hw_if_index, queue_id, mode);
- return clib_error_return (0, "unknown error");
+ return (error);
}
/*?
vec_foreach (dq, rt->devices_and_queues)
{
+ vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm,
+ dq->hw_if_index);
s = format (s, " %U queue %u (%U)\n",
- format_vnet_sw_if_index_name, vnm, dq->hw_if_index,
+ format_vnet_sw_if_index_name, vnm, hi->sw_if_index,
dq->queue_id,
format_vnet_hw_interface_rx_mode, dq->mode);
}
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (cmd_set_if_rx_placement,static) = {
.path = "set interface rx-placement",
- .short_help = "set interface rx-placement <hw-interface> [queue <n>] [thread <n> | main]",
+ .short_help = "set interface rx-placement <hw-interface> [queue <n>] "
+ "[worker <n> | main]",
.function = set_interface_rx_placement,
+ .is_mp_safe = 1,
};
/* *INDENT-ON* */
Code Review / vpp.git / blobdiff