X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fpg%2Fcli.c;h=9336ca406d72e0ac751d342c424aff3ac332aa1a;hb=db86329ab;hp=a09107c50c53c548686d63d348cd95362983d294;hpb=671e60e65635b8d030bf303c88411192c747b59e;p=vpp.git diff --git a/src/vnet/pg/cli.c b/src/vnet/pg/cli.c index a09107c50c5..9336ca406d7 100644 --- a/src/vnet/pg/cli.c +++ b/src/vnet/pg/cli.c @@ -42,9 +42,9 @@ #include #include -#ifdef CLIB_UNIX +#include #include -#endif + /* Root of all packet generator cli commands. */ /* *INDENT-OFF* */ @@ -86,13 +86,17 @@ pg_capture (pg_capture_args_t * a) if (a->is_enabled == 1) { struct stat sb; - if (stat ((char *) a->pcap_file_name, &sb) != -1) - return clib_error_return (0, "Cannot create pcap file"); + if (stat (a->pcap_file_name, &sb) != -1) + return clib_error_return (0, "pcap file '%s' already exists.", + a->pcap_file_name); } pi = pool_elt_at_index (pg->interfaces, a->dev_instance); vec_free (pi->pcap_file_name); + if ((pi->pcap_main.flags & PCAP_MAIN_INIT_DONE)) + pcap_close (&pi->pcap_main); clib_memset (&pi->pcap_main, 0, sizeof (pi->pcap_main)); + pi->pcap_main.file_descriptor = -1; if (a->is_enabled == 0) return 0; @@ -109,19 +113,26 @@ static clib_error_t * enable_disable_stream (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { + unformat_input_t _line_input, *line_input = &_line_input; pg_main_t *pg = &pg_main; int is_enable = cmd->function_arg != 0; u32 stream_index = ~0; - if (unformat (input, "%U", unformat_eof)) - ; - else if (unformat (input, "%U", unformat_hash_vec_string, - pg->stream_index_by_name, &stream_index)) - ; - else - return clib_error_create ("unknown input `%U'", - format_unformat_error, input); + if (!unformat_user (input, unformat_line_input, line_input)) + goto doit; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "%U", unformat_hash_vec_string, + pg->stream_index_by_name, &stream_index)) + ; + else + return clib_error_create ("unknown input `%U'", + format_unformat_error, line_input); + } + unformat_free (line_input); +doit: pg_enable_disable (stream_index, is_enable); return 0; @@ -145,40 +156,66 @@ VLIB_CLI_COMMAND (disable_streams_cli, static) = { }; /* *INDENT-ON* */ +static u8 * +format_pg_edit_group (u8 * s, va_list * va) +{ + pg_edit_group_t *g = va_arg (*va, pg_edit_group_t *); + + s = + format (s, "hdr-size %d, offset %d, ", g->n_packet_bytes, + g->start_byte_offset); + if (g->edit_function) + { + u8 *function_name; + u8 *junk_after_name; + function_name = format (0, "%U%c", format_clib_elf_symbol_with_address, + g->edit_function, 0); + junk_after_name = function_name; + while (*junk_after_name && *junk_after_name != ' ') + junk_after_name++; + *junk_after_name = 0; + s = format (s, "edit-function %s, ", function_name); + vec_free (function_name); + } + + return s; +} + static u8 * format_pg_stream (u8 * s, va_list * va) { pg_stream_t *t = va_arg (*va, pg_stream_t *); - u8 *v; + int verbose = va_arg (*va, int); if (!t) - return format (s, "%=16s%=12s%=16s%s", + return format (s, "%-16s%=12s%=16s%s", "Name", "Enabled", "Count", "Parameters"); - s = format (s, "%-16v%=12s%16Ld", + s = format (s, "%-16v%=12s%=16Ld", t->name, pg_stream_is_enabled (t) ? "Yes" : "No", t->n_packets_generated); - v = 0; - - v = format (v, "limit %Ld, ", t->n_packets_limit); + int indent = format_get_indent (s); - v = format (v, "rate %.2e pps, ", t->rate_packets_per_second); - - v = format (v, "size %d%c%d, ", + s = format (s, "limit %Ld, ", t->n_packets_limit); + s = format (s, "rate %.2e pps, ", t->rate_packets_per_second); + s = format (s, "size %d%c%d, ", t->min_packet_bytes, t->packet_size_edit_type == PG_EDIT_RANDOM ? '+' : '-', t->max_packet_bytes); + s = format (s, "buffer-size %d, ", t->buffer_bytes); + s = format (s, "worker %d, ", t->worker_index); - v = format (v, "buffer-size %d, ", t->buffer_bytes); - - v = format (v, "worker %d, ", t->worker_index); - - if (v) + if (verbose) { - s = format (s, " %v", v); - vec_free (v); + pg_edit_group_t *g; + /* *INDENT-OFF* */ + vec_foreach (g, t->edit_groups) + { + s = format (s, "\n%U%U", format_white_space, indent, format_pg_edit_group, g); + } + /* *INDENT-ON* */ } return s; @@ -190,6 +227,15 @@ show_streams (vlib_main_t * vm, { pg_main_t *pg = &pg_main; pg_stream_t *s; + int verbose = 0; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "verbose")) + verbose = 1; + else + break; + } if (pool_elts (pg->streams) == 0) { @@ -197,10 +243,10 @@ show_streams (vlib_main_t * vm, goto done; } - vlib_cli_output (vm, "%U", format_pg_stream, 0); + vlib_cli_output (vm, "%U", format_pg_stream, 0, 0); /* *INDENT-OFF* */ pool_foreach (s, pg->streams, ({ - vlib_cli_output (vm, "%U", format_pg_stream, s); + vlib_cli_output (vm, "%U", format_pg_stream, s, verbose); })); /* *INDENT-ON* */ @@ -210,8 +256,8 @@ done: /* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_streams_cli, static) = { - .path = "show packet-generator", - .short_help = "Show packet generator streams", + .path = "show packet-generator ", + .short_help = "show packet-generator [verbose]", .function = show_streams, }; /* *INDENT-ON* */ @@ -232,8 +278,6 @@ pg_pcap_read (pg_stream_t * s, char *file_name) s->min_packet_bytes = pm.min_packet_bytes; s->max_packet_bytes = pm.max_packet_bytes; s->buffer_bytes = pm.max_packet_bytes; - /* For PCAP buffers we never re-use buffers. */ - s->flags |= PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE; if (s->n_packets_limit == 0) s->n_packets_limit = vec_len (pm.packets_read); @@ -277,10 +321,11 @@ validate_stream (pg_stream_t * s) if (s->max_packet_bytes < s->min_packet_bytes) return clib_error_create ("max-size < min-size"); - if (s->buffer_bytes >= 4096 || s->buffer_bytes == 0) - return - clib_error_create ("buffer-size must be positive and < 4096, given %d", - s->buffer_bytes); + u32 hdr_size = pg_edit_group_n_bytes (s, 0); + if (s->min_packet_bytes < hdr_size) + return clib_error_create ("min-size < total header size %d", hdr_size); + if (s->buffer_bytes == 0) + return clib_error_create ("buffer-size must be positive"); if (s->rate_packets_per_second < 0) return clib_error_create ("negative rate"); @@ -294,7 +339,7 @@ new_stream (vlib_main_t * vm, { clib_error_t *error = 0; u8 *tmp = 0; - u32 hw_if_index; + u32 maxframe, hw_if_index; unformat_input_t sub_input = { 0 }; int sub_input_given = 0; vnet_main_t *vnm = vnet_get_main (); @@ -305,9 +350,11 @@ new_stream (vlib_main_t * vm, s.sw_if_index[VLIB_RX] = s.sw_if_index[VLIB_TX] = ~0; s.node_index = ~0; s.max_packet_bytes = s.min_packet_bytes = 64; - s.buffer_bytes = VLIB_BUFFER_DATA_SIZE; + s.buffer_bytes = vlib_buffer_get_default_data_size (vm); s.if_id = 0; + s.n_max_frame = VLIB_FRAME_SIZE; pcap_file_name = 0; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "name %v", &tmp)) @@ -332,7 +379,8 @@ new_stream (vlib_main_t * vm, else if (unformat (input, "node %U", unformat_vlib_node, vm, &s.node_index)) ; - + else if (unformat (input, "maxframe %u", &maxframe)) + s.n_max_frame = s.n_max_frame < maxframe ? s.n_max_frame : maxframe; else if (unformat (input, "worker %u", &s.worker_index)) ; @@ -340,6 +388,10 @@ new_stream (vlib_main_t * vm, unformat_vnet_sw_interface, vnm, &s.sw_if_index[VLIB_RX])) ; + else if (unformat (input, "tx-interface %U", + unformat_vnet_sw_interface, vnm, + &s.sw_if_index[VLIB_TX])) + ; else if (unformat (input, "pcap %s", &pcap_file_name)) ; @@ -351,9 +403,6 @@ new_stream (vlib_main_t * vm, else if (unformat_user (input, unformat_pg_stream_parameter, &s)) ; - else if (unformat (input, "no-recycle")) - s.flags |= PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE; - else { error = clib_error_create ("unknown input `%U'", @@ -362,10 +411,6 @@ new_stream (vlib_main_t * vm, } } - error = validate_stream (&s); - if (error) - return error; - if (!sub_input_given && !pcap_file_name) { error = clib_error_create ("no packet data given"); @@ -419,6 +464,10 @@ new_stream (vlib_main_t * vm, } } + error = validate_stream (&s); + if (error) + return error; + pg_stream_add (pg, &s); return 0; @@ -442,7 +491,9 @@ VLIB_CLI_COMMAND (new_stream_cli, static) = { "interface STRING interface for stream output \n" "node NODE-NAME node for stream output\n" "data STRING specifies packet data\n" - "pcap FILENAME read packet data from pcap file\n", + "pcap FILENAME read packet data from pcap file\n" + "rate PPS rate to transfer packet data\n" + "maxframe NPKTS maximum number of packets per frame\n", }; /* *INDENT-ON* */ @@ -501,7 +552,10 @@ change_stream_parameters (vlib_main_t * vm, error = validate_stream (&s_new); if (!error) - s[0] = s_new; + { + s[0] = s_new; + pg_stream_change (pg, s); + } return error; } @@ -578,7 +632,7 @@ pg_capture_cmd_fn (vlib_main_t * vm, a->hw_if_index = hw_if_index; a->dev_instance = hi->dev_instance; a->is_enabled = !is_disable; - a->pcap_file_name = pcap_file_name; + a->pcap_file_name = (char *) pcap_file_name; a->count = count; error = pg_capture (a); @@ -603,7 +657,7 @@ create_pg_if_cmd_fn (vlib_main_t * vm, { pg_main_t *pg = &pg_main; unformat_input_t _line_input, *line_input = &_line_input; - u32 if_id; + u32 if_id, gso_enabled = 0, gso_size = 0; clib_error_t *error = NULL; if (!unformat_user (input, unformat_line_input, line_input)) @@ -613,7 +667,17 @@ create_pg_if_cmd_fn (vlib_main_t * vm, { if (unformat (line_input, "interface pg%u", &if_id)) ; - + else if (unformat (line_input, "gso-enabled")) + { + gso_enabled = 1; + if (unformat (line_input, "gso-size %u", &gso_size)) + ; + else + { + error = clib_error_create ("gso enabled but gso size missing"); + goto done; + } + } else { error = clib_error_create ("unknown input `%U'", @@ -622,7 +686,7 @@ create_pg_if_cmd_fn (vlib_main_t * vm, } } - pg_interface_add_or_get (pg, if_id); + pg_interface_add_or_get (pg, if_id, gso_enabled, gso_size); done: unformat_free (line_input); @@ -633,7 +697,7 @@ done: /* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_pg_if_cmd, static) = { .path = "create packet-generator", - .short_help = "create packet-generator interface ", + .short_help = "create packet-generator interface [gso-enabled gso-size ]", .function = create_pg_if_cmd_fn, }; /* *INDENT-ON* */