aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2022-01-03 14:32:26 -0800
committerDave Barach <openvpp@barachs.net>2022-01-04 22:22:48 +0000
commita121ac599aae8dd9c1344e6f835866b4b03c7d5c (patch)
tree6d51280e2bb09efc71bf72eb6dc041171d54fea7
parent67cc0a6922d41b34d251e08ce0ba0c9c58525e4f (diff)
nsim: cli improvements
- improve format and unformat of bandwidth and delay - integer packet size - track worker wheel size as config Type: improvement Signed-off-by: Florin Coras <fcoras@cisco.com> Change-Id: I616fa96237c5e06d9c809bb5c2e0bed0447f2c4d
-rw-r--r--src/plugins/nsim/nsim.c67
-rw-r--r--src/plugins/nsim/nsim.h3
2 files changed, 56 insertions, 14 deletions
diff --git a/src/plugins/nsim/nsim.c b/src/plugins/nsim/nsim.c
index fc8ffebd4a2..45b5e11a902 100644
--- a/src/plugins/nsim/nsim.c
+++ b/src/plugins/nsim/nsim.c
@@ -127,20 +127,20 @@ nsim_output_feature_enable_disable (nsim_main_t * nsm, u32 sw_if_index,
}
static nsim_wheel_t *
-nsim_wheel_alloc (nsim_main_t * nsm, u32 wheel_slots)
+nsim_wheel_alloc (nsim_main_t *nsm)
{
u32 pagesize = getpagesize ();
nsim_wheel_t *wp;
- nsm->mmap_size = sizeof (nsim_wheel_t)
- + wheel_slots * sizeof (nsim_wheel_entry_t);
+ 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 = wheel_slots;
+ wp->wheel_size = nsm->wheel_slots_per_wrk;
wp->cursize = 0;
wp->head = 0;
wp->tail = 0;
@@ -150,7 +150,7 @@ nsim_wheel_alloc (nsim_main_t * nsm, u32 wheel_slots)
}
static int
-nsim_configure (nsim_main_t * nsm, f64 bandwidth, f64 delay, f64 packet_size,
+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;
@@ -163,7 +163,7 @@ 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 > 9000.0)
+ if (packet_size < 64 || packet_size > 9000)
return VNET_API_ERROR_INVALID_VALUE_3;
if (reorder_fraction > 0.0 && delay == 0.0)
@@ -201,13 +201,14 @@ nsim_configure (nsim_main_t * nsm, f64 bandwidth, f64 delay, f64 packet_size,
/* 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 */
i = (!nsm->poll_main_thread && num_workers) ? 1 : 0;
for (; i < num_workers + 1; i++)
- nsm->wheel_by_thread[i] = nsim_wheel_alloc (nsm, wheel_slots_per_wrk);
+ nsm->wheel_by_thread[i] = nsim_wheel_alloc (nsm);
vlib_worker_thread_barrier_sync (vm);
@@ -602,19 +603,59 @@ 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 (ms): %.2f\n", nsm->delay * 1e3);
+ 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
@@ -624,7 +665,8 @@ format_nsim_config (u8 * s, va_list * args)
else
s = format (s, " reorder fraction: 0\n");
s = format (s, " packet size: %u\n", nsm->packet_size);
- s = format (s, " throughput (Gbps): %.2f\n", nsm->bandwidth / 1e9);
+ 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)
{
@@ -666,9 +708,8 @@ 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;
- f64 delay, bandwidth, packet_size = 1500.0;
- u32 packets_per_drop, packets_per_reorder;
+ 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;
int rv;
@@ -679,7 +720,7 @@ 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))
{
diff --git a/src/plugins/nsim/nsim.h b/src/plugins/nsim/nsim.h
index d7d32b9d234..b35a1c685de 100644
--- a/src/plugins/nsim/nsim.h
+++ b/src/plugins/nsim/nsim.h
@@ -101,9 +101,10 @@ typedef struct
/* Config parameters */
f64 delay;
f64 bandwidth;
- f64 packet_size;
f64 drop_fraction;
f64 reorder_fraction;
+ u32 packet_size;
+ u32 wheel_slots_per_wrk;
u32 poll_main_thread;
u64 mmap_size;