X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnsim%2Fnsim.c;h=1c5b26bbaaa6cf7e118258062c0db0a49982356f;hb=HEAD;hp=ce3396c58454723d14c8e194659efde47cb9c6e5;hpb=10c5ff143a86d15e78cb1f8625eb0ab8bf72b6ce;p=vpp.git diff --git a/src/plugins/nsim/nsim.c b/src/plugins/nsim/nsim.c index ce3396c5845..1c5b26bbaaa 100644 --- a/src/plugins/nsim/nsim.c +++ b/src/plugins/nsim/nsim.c @@ -30,45 +30,19 @@ #include /* define message IDs */ -#include - -/* define message structures */ -#define vl_typedefs -#include -#undef vl_typedefs - -/* define generated endian-swappers */ -#define vl_endianfun -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun - -/* Get the API version number */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include -#undef vl_api_version +#include +#include #define REPLY_MSG_ID_BASE nsm->msg_id_base #include nsim_main_t nsim_main; -/* List of message types that this plugin understands */ - -#define foreach_nsim_plugin_api_msg \ -_(NSIM_ENABLE_DISABLE, nsim_enable_disable) \ -_(NSIM_CONFIGURE, nsim_configure) - -/* Action function shared between message handler and debug CLI */ +/* Action functions shared between message handlers and debug CLI */ int -nsim_enable_disable (nsim_main_t * nsm, u32 sw_if_index0, - u32 sw_if_index1, int enable_disable) +nsim_cross_connect_enable_disable (nsim_main_t * nsm, u32 sw_if_index0, + u32 sw_if_index1, int enable_disable) { vnet_sw_interface_t *sw; vnet_hw_interface_t *hw; @@ -117,15 +91,70 @@ nsim_enable_disable (nsim_main_t * nsm, u32 sw_if_index0, return rv; } -static int -nsim_configure (nsim_main_t * nsm, f64 bandwidth, f64 delay, f64 packet_size, - f64 drop_fraction) +int +nsim_output_feature_enable_disable (nsim_main_t * nsm, u32 sw_if_index, + int enable_disable) +{ + vnet_sw_interface_t *sw; + vnet_hw_interface_t *hw; + int rv = 0; + + if (nsm->is_configured == 0) + return VNET_API_ERROR_CANNOT_ENABLE_DISABLE_FEATURE; + + /* Utterly wrong? */ + if (pool_is_free_index (nsm->vnet_main->interface_main.sw_interfaces, + sw_if_index)) + return VNET_API_ERROR_INVALID_SW_IF_INDEX; + + /* Not a physical port? */ + sw = vnet_get_sw_interface (nsm->vnet_main, sw_if_index); + if (sw->type != VNET_SW_INTERFACE_TYPE_HARDWARE) + return VNET_API_ERROR_INVALID_SW_IF_INDEX; + + /* Add a graph arc for the input / wheel scraper node */ + hw = vnet_get_hw_interface (nsm->vnet_main, sw_if_index); + vec_validate_init_empty (nsm->output_next_index_by_sw_if_index, sw_if_index, + ~0); + /* Note: use the tx node, this pkt has already visited the output node... */ + nsm->output_next_index_by_sw_if_index[sw_if_index] = + vlib_node_add_next (nsm->vlib_main, nsim_input_node.index, + hw->tx_node_index); + + vnet_feature_enable_disable ("interface-output", "nsim-output-feature", + sw_if_index, enable_disable, 0, 0); + return rv; +} + +static nsim_wheel_t * +nsim_wheel_alloc (nsim_main_t *nsm) { - u64 total_buffer_size_in_bytes, per_worker_buffer_size; - u64 wheel_slots_per_worker; - int i; - int num_workers = vlib_num_workers (); u32 pagesize = getpagesize (); + nsim_wheel_t *wp; + + nsm->mmap_size = sizeof (nsim_wheel_t) + + nsm->wheel_slots_per_wrk * sizeof (nsim_wheel_entry_t); + + nsm->mmap_size += pagesize - 1; + nsm->mmap_size &= ~(pagesize - 1); + + wp = clib_mem_vm_alloc (nsm->mmap_size); + ASSERT (wp != 0); + wp->wheel_size = nsm->wheel_slots_per_wrk; + wp->cursize = 0; + wp->head = 0; + wp->tail = 0; + wp->entries = (void *) (wp + 1); + + return wp; +} + +static int +nsim_configure (nsim_main_t *nsm, f64 bandwidth, f64 delay, u32 packet_size, + f64 drop_fraction, f64 reorder_fraction) +{ + u64 total_buffer_size_in_bytes, per_worker_buffer_size, wheel_slots_per_wrk; + int i, num_workers = vlib_num_workers (); vlib_main_t *vm = nsm->vlib_main; if (bandwidth == 0.0) @@ -134,25 +163,28 @@ nsim_configure (nsim_main_t * nsm, f64 bandwidth, f64 delay, f64 packet_size, if (delay == 0.0) return VNET_API_ERROR_INVALID_VALUE_2; - if (packet_size < 64.0 || packet_size > (f64) WHEEL_ENTRY_DATA_SIZE) + if (packet_size < 64 || packet_size > 9000) return VNET_API_ERROR_INVALID_VALUE_3; + if (reorder_fraction > 0.0 && delay == 0.0) + return VNET_API_ERROR_INVALID_VALUE_4; + /* Toss the old wheel(s)... */ if (nsm->is_configured) { for (i = 0; i < vec_len (nsm->wheel_by_thread); i++) { - nsim_wheel_t *wp = nsm->wheel_by_thread[i]; - munmap (wp, nsm->mmap_size); + clib_mem_vm_free (nsm->wheel_by_thread[i], nsm->mmap_size); nsm->wheel_by_thread[i] = 0; } } nsm->delay = delay; nsm->drop_fraction = drop_fraction; + nsm->reorder_fraction = reorder_fraction; /* delay in seconds, bandwidth in bits/sec */ - total_buffer_size_in_bytes = (u32) ((delay * bandwidth) / 8.0) + 0.5; + total_buffer_size_in_bytes = ((delay * bandwidth) / 8.0) + 0.5; /* * Work out how much buffering each worker needs, assuming decent @@ -163,45 +195,28 @@ nsim_configure (nsim_main_t * nsm, f64 bandwidth, f64 delay, f64 packet_size, else per_worker_buffer_size = total_buffer_size_in_bytes; - wheel_slots_per_worker = per_worker_buffer_size / packet_size; - wheel_slots_per_worker++; + wheel_slots_per_wrk = per_worker_buffer_size / packet_size; + wheel_slots_per_wrk++; /* Save these for the show command */ nsm->bandwidth = bandwidth; nsm->packet_size = packet_size; + nsm->wheel_slots_per_wrk = wheel_slots_per_wrk; vec_validate (nsm->wheel_by_thread, num_workers); - vec_validate (nsm->buffer_indices_by_thread, num_workers); /* Initialize the output scheduler wheels */ - for (i = num_workers ? 1 : 0; i < num_workers + 1; i++) - { - nsim_wheel_t *wp; - - nsm->mmap_size = sizeof (nsim_wheel_t) - + wheel_slots_per_worker * sizeof (nsim_wheel_entry_t); - - nsm->mmap_size += pagesize - 1; - nsm->mmap_size &= ~(pagesize - 1); - - wp = clib_mem_vm_alloc (nsm->mmap_size); - ASSERT (wp != 0); - wp->wheel_size = wheel_slots_per_worker; - wp->cursize = 0; - wp->head = 0; - wp->tail = 0; - wp->entries = (void *) (wp + 1); - nsm->wheel_by_thread[i] = wp; - vec_validate (nsm->buffer_indices_by_thread[i], VLIB_FRAME_SIZE - 1); - _vec_len (nsm->buffer_indices_by_thread[i]) = 0; - } + i = (!nsm->poll_main_thread && num_workers) ? 1 : 0; + for (; i < num_workers + 1; i++) + nsm->wheel_by_thread[i] = nsim_wheel_alloc (nsm); vlib_worker_thread_barrier_sync (vm); /* turn on the ring scrapers */ - for (i = num_workers ? 1 : 0; i < num_workers + 1; i++) + i = (!nsm->poll_main_thread && num_workers) ? 1 : 0; + for (; i < num_workers + 1; i++) { - vlib_main_t *this_vm = vlib_mains[i]; + vlib_main_t *this_vm = vlib_get_main_by_index (i); vlib_node_set_state (this_vm, nsim_input_node.index, VLIB_NODE_STATE_POLLING); @@ -217,22 +232,27 @@ nsim_configure (nsim_main_t * nsm, f64 bandwidth, f64 delay, f64 packet_size, * enable or disable the cross-connect */ static clib_error_t * -nsim_enable_disable_command_fn (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) +nsim_cross_connect_enable_disable_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) { nsim_main_t *nsm = &nsim_main; + unformat_input_t _line_input, *line_input = &_line_input; u32 sw_if_index0 = ~0; u32 sw_if_index1 = ~0; int enable_disable = 1; u32 tmp; int rv; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Get a line of input. */ + if (!unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "disable")) + if (unformat (line_input, "disable")) enable_disable = 0; - else if (unformat (input, "%U", unformat_vnet_sw_interface, + else if (unformat (line_input, "%U", unformat_vnet_sw_interface, nsm->vnet_main, &tmp)) { if (sw_if_index0 == ~0) @@ -244,10 +264,13 @@ nsim_enable_disable_command_fn (vlib_main_t * vm, break; } + unformat_free (line_input); + if (sw_if_index0 == ~0 || sw_if_index1 == ~0) return clib_error_return (0, "Please specify two interfaces..."); - rv = nsim_enable_disable (nsm, sw_if_index0, sw_if_index1, enable_disable); + rv = nsim_cross_connect_enable_disable (nsm, sw_if_index0, + sw_if_index1, enable_disable); switch (rv) { @@ -273,6 +296,28 @@ nsim_enable_disable_command_fn (vlib_main_t * vm, return 0; } +static clib_error_t * +nsim_config (vlib_main_t * vm, unformat_input_t * input) +{ + nsim_main_t *nsm = &nsim_main; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "poll-main-thread")) + { + nsm->poll_main_thread = 1; + } + else + { + return clib_error_return (0, "unknown input '%U'", + format_unformat_error, input); + } + } + return 0; +} + +VLIB_CONFIG_FUNCTION (nsim_config, "nsim"); + /*? * Enable or disable network simulation cross-connect on two interfaces * The network simulator must have already been configured, see @@ -284,34 +329,64 @@ nsim_enable_disable_command_fn (vlib_main_t * vm, * @cliexpar * To enable or disable network simulation cross-connect * @clistart - * nsim enable-disable TenGigabitEthernet2/0/0 TenGigabitEthernet2/0 - * nsim enable-disable TenGigabitEthernet2/0/0 TenGigabitEthernet2/0 disable + * nsim cross-connect enable-disable TenGigabitEthernet2/0/0 TenGigabitEthernet2/0 + * nsim cross-connect enable-disable TenGigabitEthernet2/0/0 TenGigabitEthernet2/0 disable * @cliend * @cliexcmd{nsim enable-disable [disable]} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (nsim_enable_disable_command, static) = { - .path = "nsim enable-disable", + .path = "nsim cross-connect enable-disable", .short_help = - "nsim enable-disable [disable]", - .function = nsim_enable_disable_command_fn, + "nsim cross-connect enable-disable " + " [disable]", + .function = nsim_cross_connect_enable_disable_command_fn, }; -/* *INDENT-ON* */ /* API message handler */ -static void vl_api_nsim_enable_disable_t_handler - (vl_api_nsim_enable_disable_t * mp) +static void vl_api_nsim_cross_connect_enable_disable_t_handler + (vl_api_nsim_cross_connect_enable_disable_t * mp) +{ + vl_api_nsim_cross_connect_enable_disable_reply_t *rmp; + nsim_main_t *nsm = &nsim_main; + int rv; + u32 sw_if_index0, sw_if_index1; + + sw_if_index0 = clib_net_to_host_u32 (mp->sw_if_index0); + sw_if_index1 = clib_net_to_host_u32 (mp->sw_if_index1); + + if (!vnet_sw_if_index_is_api_valid (sw_if_index0)) + { + rv = VNET_API_ERROR_INVALID_SW_IF_INDEX; + goto bad_sw_if_index; + } + if (!vnet_sw_if_index_is_api_valid (sw_if_index1)) + { + rv = VNET_API_ERROR_INVALID_SW_IF_INDEX_2; + goto bad_sw_if_index; + } + + rv = nsim_cross_connect_enable_disable (nsm, sw_if_index0, sw_if_index1, + (int) (mp->enable_disable)); + + BAD_SW_IF_INDEX_LABEL; + REPLY_MACRO (VL_API_NSIM_CROSS_CONNECT_ENABLE_DISABLE_REPLY); +} + +/* API message handler */ +static void vl_api_nsim_output_feature_enable_disable_t_handler + (vl_api_nsim_output_feature_enable_disable_t * mp) { - vl_api_nsim_enable_disable_reply_t *rmp; + vl_api_nsim_output_feature_enable_disable_reply_t *rmp; nsim_main_t *nsm = &nsim_main; int rv; + VALIDATE_SW_IF_INDEX (mp); - rv = nsim_enable_disable (nsm, ntohl (mp->sw_if_index0), - ntohl (mp->sw_if_index1), - (int) (mp->enable_disable)); + rv = nsim_output_feature_enable_disable (nsm, ntohl (mp->sw_if_index), + (int) (mp->enable_disable)); - REPLY_MACRO (VL_API_NSIM_ENABLE_DISABLE_REPLY); + BAD_SW_IF_INDEX_LABEL; + REPLY_MACRO (VL_API_NSIM_OUTPUT_FEATURE_ENABLE_DISABLE_REPLY); } /* API message handler */ @@ -320,7 +395,7 @@ vl_api_nsim_configure_t_handler (vl_api_nsim_configure_t * mp) { vl_api_nsim_configure_reply_t *rmp; nsim_main_t *nsm = &nsim_main; - f64 delay, bandwidth, packet_size, drop_fraction; + f64 delay, bandwidth, packet_size, drop_fraction = 0.0, reorder_rate = 0.0; u32 packets_per_drop; int rv; @@ -331,90 +406,164 @@ vl_api_nsim_configure_t_handler (vl_api_nsim_configure_t * mp) packets_per_drop = ntohl (mp->packets_per_drop); if (packets_per_drop > 0) drop_fraction = 1.0 / (f64) (packets_per_drop); - else - drop_fraction = 0.0; - rv = nsim_configure (nsm, bandwidth, delay, packet_size, drop_fraction); + rv = nsim_configure (nsm, bandwidth, delay, packet_size, drop_fraction, + reorder_rate); REPLY_MACRO (VL_API_NSIM_CONFIGURE_REPLY); } +static void +vl_api_nsim_configure2_t_handler (vl_api_nsim_configure2_t * mp) +{ + vl_api_nsim_configure_reply_t *rmp; + nsim_main_t *nsm = &nsim_main; + f64 delay, bandwidth, packet_size, drop_fraction = 0.0, reorder_rate = 0.0; + u32 packets_per_drop, packets_per_reorder; + int rv; -/* Set up the API message handling tables */ + delay = ((f64) (ntohl (mp->delay_in_usec))) * 1e-6; + bandwidth = (f64) (clib_net_to_host_u64 (mp->bandwidth_in_bits_per_second)); + packet_size = (f64) (ntohl (mp->average_packet_size)); + + packets_per_drop = ntohl (mp->packets_per_drop); + if (packets_per_drop > 0) + drop_fraction = 1.0 / (f64) (packets_per_drop); + + packets_per_reorder = ntohl (mp->packets_per_reorder); + if (packets_per_reorder > 0) + reorder_rate = 1.0 / (f64) packets_per_reorder; + + rv = nsim_configure (nsm, bandwidth, delay, packet_size, drop_fraction, + reorder_rate); + + REPLY_MACRO (VL_API_NSIM_CONFIGURE2_REPLY); +} + + +/* + * enable or disable the output_feature + */ static clib_error_t * -nsim_plugin_api_hookup (vlib_main_t * vm) +nsim_output_feature_enable_disable_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) { nsim_main_t *nsm = &nsim_main; -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + nsm->msg_id_base), \ - #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_nsim_plugin_api_msg; -#undef _ + unformat_input_t _line_input, *line_input = &_line_input; + u32 sw_if_index = ~0; + int enable_disable = 1; + int rv; + + /* Get a line of input. */ + if (!unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "disable")) + enable_disable = 0; + else if (unformat (line_input, "%U", unformat_vnet_sw_interface, + nsm->vnet_main, &sw_if_index)) + ; + else + { + clib_error_t *error = clib_error_return (0, "unknown input `%U'", + format_unformat_error, + line_input); + unformat_free (line_input); + return error; + } + } + + unformat_free (line_input); + + if (sw_if_index == ~0) + return clib_error_return (0, "Please specify one interface..."); + + rv = nsim_output_feature_enable_disable (nsm, sw_if_index, enable_disable); + + switch (rv) + { + case 0: + break; + + case VNET_API_ERROR_CANNOT_ENABLE_DISABLE_FEATURE: + return clib_error_return (0, "Not configured, please 'set nsim' first"); + case VNET_API_ERROR_INVALID_SW_IF_INDEX: + return clib_error_return + (0, "Invalid interface, only works on physical ports"); + break; + + case VNET_API_ERROR_UNIMPLEMENTED: + return clib_error_return (0, + "Device driver doesn't support redirection"); + break; + + default: + return clib_error_return + (0, "nsim_output_feature_enable_disable returned %d", rv); + } return 0; } -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (nsim_main_t * nsm, api_main_t * am) +/*? + * Enable or disable network simulation output feature on an interface + * The network simulator must have already been configured, see + * the "nsim_configure" command. + * + * @cliexpar + * To enable or disable network simulation output feature + * @clistart + * nsim output-feature enable-disable TenGigabitEthernet2/0/0 + * nsim output-feature enable-disable TenGigabitEthernet2/0/0 disable + * @cliend + * @cliexcmd{nsim output-feature enable-disable [disable]} +?*/ +VLIB_CLI_COMMAND (nsim_output_feature_enable_disable_command, static) = { -#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + nsm->msg_id_base); - foreach_vl_msg_name_crc_nsim; -#undef _ -} + .path = "nsim output-feature enable-disable", + .short_help = + "nsim output-feature enable-disable [disable]", + .function = nsim_output_feature_enable_disable_command_fn, +}; +#include static clib_error_t * nsim_init (vlib_main_t * vm) { nsim_main_t *nsm = &nsim_main; - clib_error_t *error = 0; - u8 *name; nsm->vlib_main = vm; nsm->vnet_main = vnet_get_main (); - name = format (0, "nsim_%08x%c", api_version, 0); - /* Ask for a correctly-sized block of API message decode slots */ - nsm->msg_id_base = vl_msg_api_get_msg_ids - ((char *) name, VL_MSG_FIRST_AVAILABLE); - - error = nsim_plugin_api_hookup (vm); - - /* Add our API messages to the global name_crc hash table */ - setup_message_id_table (nsm, &api_main); - - vec_free (name); - - return error; + nsm->msg_id_base = setup_message_id_table (); + nsm->arc_index = nsm->vnet_main->interface_main.output_feature_arc_index; + return 0; } VLIB_INIT_FUNCTION (nsim_init); -/* *INDENT-OFF* */ VNET_FEATURE_INIT (nsim, static) = { .arc_name = "device-input", .node_name = "nsim", .runs_before = VNET_FEATURES ("ethernet-input"), }; -/* *INDENT-ON */ -/* *INDENT-OFF* */ +VNET_FEATURE_INIT (nsim_feature, static) = { + .arc_name = "interface-output", + .node_name = "nsim-output-feature", + .runs_before = VNET_FEATURES ("interface-output-arc-end"), +}; + VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, - .description = "network delay simulator plugin", + .description = "Network Delay Simulator", }; -/* *INDENT-ON* */ static uword unformat_delay (unformat_input_t * input, va_list * args) @@ -444,21 +593,114 @@ unformat_bandwidth (unformat_input_t * input, va_list * args) *result = tmp * 1e9; else if (unformat (input, "%f gbyte", &tmp)) *result = tmp * 8e9; + else if (unformat (input, "%f gbps", &tmp)) + *result = tmp * 1e9; + else if (unformat (input, "%f mbps", &tmp)) + *result = tmp * 1e6; + else if (unformat (input, "%f kbps", &tmp)) + *result = tmp * 1e3; + else if (unformat (input, "%f bps", &tmp)) + *result = tmp; else return 0; return 1; } +static u8 * +format_delay (u8 *s, va_list *args) +{ + f64 delay = va_arg (*args, f64); + + if (delay < 1e-3) + s = format (s, "%.1f us", delay * 1e6); + else if (delay < 1) + s = format (s, "%.1f ms", delay * 1e3); + else + s = format (s, "%f sec", delay); + + return s; +} + +static u8 * +format_bandwidth (u8 *s, va_list *args) +{ + f64 bandwidth = va_arg (*args, f64); + + if (bandwidth >= 1e9) + s = format (s, "%.1f gbps", bandwidth / 1e9); + else if (bandwidth >= 1e6) + s = format (s, "%.1f mbps", bandwidth / 1e6); + else if (bandwidth >= 1e3) + s = format (s, "%.1f kbps", bandwidth / 1e3); + else + s = format (s, "%f bps", bandwidth); + + return s; +} + +static u8 * +format_nsim_config (u8 * s, va_list * args) +{ + int verbose = va_arg (*args, int); + nsim_main_t *nsm = &nsim_main; + + s = format (s, "configuration\n"); + s = format (s, " delay: %U\n", format_delay, nsm->delay); + if (nsm->drop_fraction) + s = format (s, " drop fraction: %.5f\n", nsm->drop_fraction); + else + s = format (s, " drop fraction: 0\n"); + if (nsm->reorder_fraction) + s = format (s, " reorder fraction: %.5f\n", nsm->reorder_fraction); + else + s = format (s, " reorder fraction: 0\n"); + s = format (s, " packet size: %u\n", nsm->packet_size); + s = format (s, " worker wheel size: %u\n", nsm->wheel_slots_per_wrk); + s = format (s, " throughput: %U\n", format_bandwidth, nsm->bandwidth); + + if (verbose) + { + s = format (s, " poll main thread: %u\n", nsm->poll_main_thread); + s = format (s, " memory: %U bytes per thread %U bytes total\n", + format_memory_size, nsm->mmap_size, format_memory_size, + nsm->mmap_size * vlib_num_workers ()); + } + + s = format (s, "\n"); + + if (nsm->sw_if_index0 != 0) + { + s = format (s, "cross-connect\n %U and %U\n", + format_vnet_sw_if_index_name, nsm->vnet_main, + nsm->sw_if_index0, format_vnet_sw_if_index_name, + nsm->vnet_main, nsm->sw_if_index1); + } + else if (vec_len (nsm->output_next_index_by_sw_if_index)) + { + int i; + s = format (s, "output feature arcs to:\n"); + for (i = 0; i < vec_len (nsm->output_next_index_by_sw_if_index); i++) + { + if (nsm->output_next_index_by_sw_if_index[i] != ~0) + s = format (s, " %U %u\n", format_vnet_sw_if_index_name, + nsm->vnet_main, i, i); + } + } + else + { + s = format (s, " nsim not enabled\n"); + } + + return s; +} + static clib_error_t * set_nsim_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { + f64 drop_fraction = 0.0, reorder_fraction = 0.0, delay, bandwidth; + u32 packets_per_drop, packets_per_reorder, packet_size = 1500; nsim_main_t *nsm = &nsim_main; - f64 delay, bandwidth; - f64 packet_size = 1500.0; - f64 drop_fraction = 0.0; - u32 packets_per_drop; - u32 num_workers = vlib_num_workers (); int rv; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) @@ -468,24 +710,39 @@ set_nsim_command_fn (vlib_main_t * vm, else if (unformat (input, "bandwidth %U", unformat_bandwidth, &bandwidth)) ; - else if (unformat (input, "packet-size %f", &packet_size)) + else if (unformat (input, "packet-size %u", &packet_size)) ; else if (unformat (input, "packets-per-drop %d", &packets_per_drop)) { if (packets_per_drop > 0) drop_fraction = 1.0 / ((f64) packets_per_drop); } + else if (unformat (input, "packets-per-reorder %d", + &packets_per_reorder)) + { + if (packets_per_reorder > 0) + reorder_fraction = 1.0 / ((f64) packets_per_reorder); + } else if (unformat (input, "drop-fraction %f", &drop_fraction)) { if (drop_fraction < 0.0 || drop_fraction > 1.0) return clib_error_return (0, "drop fraction must be between zero and 1"); } + else if (unformat (input, "reorder-fraction %f", &reorder_fraction)) + { + if (reorder_fraction < 0.0 || reorder_fraction > 1.0) + return clib_error_return + (0, "reorder fraction must be between zero and 1"); + } + else if (unformat (input, "poll-main-thread")) + nsm->poll_main_thread = 1; else break; } - rv = nsim_configure (nsm, bandwidth, delay, packet_size, drop_fraction); + rv = nsim_configure (nsm, bandwidth, delay, packet_size, drop_fraction, + reorder_fraction); switch (rv) { @@ -498,6 +755,10 @@ set_nsim_command_fn (vlib_main_t * vm, case VNET_API_ERROR_INVALID_VALUE_3: return clib_error_return (0, "invalid packet size %.2f", packet_size); + case VNET_API_ERROR_INVALID_VALUE_4: + return clib_error_return (0, "invalid reorder fraction %.3f for " + "delay %.2f", reorder_fraction, delay); + default: return clib_error_return (0, "error %d", rv); @@ -505,18 +766,7 @@ set_nsim_command_fn (vlib_main_t * vm, break; } - vlib_cli_output (vm, "Configured link delay %.2f ms, %.2f ms round-trip", - nsm->delay * 1e3, 2.0 * nsm->delay * 1e3); - if (nsm->drop_fraction > 0.0) - vlib_cli_output (vm, "... simulating a network drop fraction of %.5f", - nsm->drop_fraction); - - - if (num_workers) - vlib_cli_output (vm, "Sim uses %llu bytes per thread, %llu bytes total", - nsm->mmap_size, nsm->mmap_size * num_workers); - else - vlib_cli_output (vm, "Sim uses %llu bytes total", nsm->mmap_size); + vlib_cli_output (vm, "%U", format_nsim_config, 1); return 0; } @@ -537,14 +787,13 @@ set_nsim_command_fn (vlib_main_t * vm, * @cliend * @cliexcmd{set nsim delay bandwidth packet-size } ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_nsim_command, static) = { .path = "set nsim", - .short_help = "set nsim delay