return rv;
}
-static int
-nsim_configure (nsim_main_t * nsm, f64 bandwidth, f64 delay, f64 packet_size,
- f64 drop_fraction)
+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)
if (delay == 0.0)
return VNET_API_ERROR_INVALID_VALUE_2;
- if (packet_size < 64.0 || packet_size > 9000.0)
+ 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 = ((delay * bandwidth) / 8.0) + 0.5;
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);
/* 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;
- }
+ 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);
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
* @cliend
* @cliexcmd{nsim enable-disable <intfc> <intfc> [disable]}
?*/
-/* *INDENT-OFF* */
VLIB_CLI_COMMAND (nsim_enable_disable_command, static) =
{
.path = "nsim cross-connect enable-disable",
"<interface-name-2> [disable]",
.function = nsim_cross_connect_enable_disable_command_fn,
};
-/* *INDENT-ON* */
/* API message handler */
static void vl_api_nsim_cross_connect_enable_disable_t_handler
{
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;
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;
+
+ 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
* @cliend
* @cliexcmd{nsim output-feature enable-disable <intfc> [disable]}
?*/
-/* *INDENT-OFF* */
VLIB_CLI_COMMAND (nsim_output_feature_enable_disable_command, static) =
{
.path = "nsim output-feature enable-disable",
"nsim output-feature enable-disable <interface-name> [disable]",
.function = nsim_output_feature_enable_disable_command_fn,
};
-/* *INDENT-ON* */
#include <nsim/nsim.api.c>
static clib_error_t *
/* Ask for a correctly-sized block of API message decode slots */
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) =
-{
+VNET_FEATURE_INIT (nsim_feature, static) = {
.arc_name = "interface-output",
.node_name = "nsim-output-feature",
- .runs_before = VNET_FEATURES ("interface-tx"),
+ .runs_before = VNET_FEATURES ("interface-output-arc-end"),
};
-/* *INDENT-ON */
-/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () =
{
.version = VPP_BUILD_VER,
.description = "Network Delay Simulator",
};
-/* *INDENT-ON* */
static uword
unformat_delay (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)
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)
{
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);
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;
}
* @cliend
* @cliexcmd{set nsim delay <nn> bandwidth <bb> packet-size <nn>}
?*/
-/* *INDENT-OFF* */
VLIB_CLI_COMMAND (set_nsim_command, static) =
{
.path = "set nsim",
" [packets-per-drop <nn>][drop-fraction <f64: 0.0 - 1.0>]",
.function = set_nsim_command_fn,
};
-/* *INDENT-ON*/
static clib_error_t *
unformat_input_t * input, vlib_cli_command_t * cmd)
{
nsim_main_t *nsm = &nsim_main;
- u32 num_workers = vlib_num_workers ();
int verbose = 0;
if (nsm->is_configured == 0)
return clib_error_return (0, "Network simulator not configured");
- if (nsm->sw_if_index0 == 0)
- return clib_error_return (0, "Network simulator not enabled");
-
if (unformat (input, "verbose"))
verbose = 1;
- vlib_cli_output (vm, "Network simulator cross-connects %U and %U",
- 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);
-
- vlib_cli_output (vm,
- "...inserting link delay of %.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 (verbose)
- {
-
- vlib_cli_output (vm, " Configured bandwidth: %.2f gbit/sec",
- nsm->bandwidth / 1e9);
- vlib_cli_output (vm, " Configured packet size: %f", nsm->packet_size);
- 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, verbose);
return 0;
}
* @cliexcmd{show nsim}
?*/
-/* *INDENT-OFF* */
VLIB_CLI_COMMAND (show_nsim_command, static) =
{
.path = "show nsim",
.short_help = "Display network delay simulator configuration",
.function = show_nsim_command_fn,
};
-/* *INDENT-ON* */
/*
* fd.io coding-style-patch-verification: ON
Code Review / vpp.git / blobdiff