X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_cli.c;h=a66e1576bde6d1076fcb254effd24d9da93a6939;hb=e0792fdff;hp=9271f5b78c5076eb4fd762cefb7be2cd12507f88;hpb=54f7c51fd5a1ea927a4df3a989f62afdf9d6c0c5;p=vpp.git diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c index 9271f5b78c5..a66e1576bde 100644 --- a/src/vnet/interface_cli.c +++ b/src/vnet/interface_cli.c @@ -304,6 +304,7 @@ show_sw_interfaces (vlib_main_t * vm, verbose = 1; else { + vec_free (sorted_sis); error = clib_error_return (0, "unknown input `%U'", format_unformat_error, linput); goto done; @@ -314,7 +315,10 @@ show_sw_interfaces (vlib_main_t * vm, if (show_features || show_tag) { if (sw_if_index == ~(u32) 0) - return clib_error_return (0, "Interface not specified..."); + { + vec_free (sorted_sis); + return clib_error_return (0, "Interface not specified..."); + } } if (show_features) @@ -326,14 +330,16 @@ show_sw_interfaces (vlib_main_t * vm, /* 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); + vlib_cli_output (vm, "\nl2-input:\n%U", format_l2_input_features, fb, + 1); 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); + l2_output->feature_bitmap, 1); + vec_free (sorted_sis); return 0; } if (show_tag) @@ -343,6 +349,7 @@ show_sw_interfaces (vlib_main_t * vm, vlib_cli_output (vm, "%U: %s", format_vnet_sw_if_index_name, vnm, sw_if_index, tag ? (char *) tag : "(none)"); + vec_free (sorted_sis); return 0; } @@ -469,6 +476,7 @@ VLIB_CLI_COMMAND (show_sw_interfaces_command, static) = { .path = "show interface", .short_help = "show interface [address|addr|features|feat] [ [ [..]]] [verbose]", .function = show_sw_interfaces, + .is_mp_safe = 1, }; /* *INDENT-ON* */ @@ -495,42 +503,24 @@ clear_interface_counters (vlib_main_t * vm, vnet_interface_main_t *im = &vnm->interface_main; vlib_simple_counter_main_t *sm; vlib_combined_counter_main_t *cm; - static vnet_main_t **my_vnet_mains; - int i, j, n_counters; - - vec_reset_length (my_vnet_mains); - - for (i = 0; i < vec_len (vnet_mains); i++) - { - if (vnet_mains[i]) - vec_add1 (my_vnet_mains, vnet_mains[i]); - } - - if (vec_len (vnet_mains) == 0) - vec_add1 (my_vnet_mains, vnm); + int j, n_counters; n_counters = vec_len (im->combined_sw_if_counters); for (j = 0; j < n_counters; j++) { - for (i = 0; i < vec_len (my_vnet_mains); i++) - { - im = &my_vnet_mains[i]->interface_main; - cm = im->combined_sw_if_counters + j; - vlib_clear_combined_counters (cm); - } + im = &vnm->interface_main; + cm = im->combined_sw_if_counters + j; + vlib_clear_combined_counters (cm); } n_counters = vec_len (im->sw_if_counters); for (j = 0; j < n_counters; j++) { - for (i = 0; i < vec_len (my_vnet_mains); i++) - { - im = &my_vnet_mains[i]->interface_main; - sm = im->sw_if_counters + j; - vlib_clear_simple_counters (sm); - } + im = &vnm->interface_main; + sm = im->sw_if_counters + j; + vlib_clear_simple_counters (sm); } return 0; @@ -687,7 +677,7 @@ create_sub_interfaces (vlib_main_t * vm, goto done; } - memset (&template, 0, sizeof (template)); + clib_memset (&template, 0, sizeof (template)); template.sub.eth.raw_flags = 0; if (unformat (input, "%d default", &id_min)) @@ -814,14 +804,14 @@ done: * subinterfaces to handle a range of VLAN IDs. * * - create sub-interfaces dot1q|dot1ad |any [exact-match] - - * Use this command to specify the outer VLAN ID, to either be explicited or to make the + * Use this command to specify the outer VLAN ID, to either be explicit or to make the * VLAN ID different from the 'subId'. * * - create sub-interfaces dot1q|dot1ad |any inner-dot1q * |any [exact-match] - Use this command to specify the outer VLAN ID and - * the innner VLAN ID. + * the inner VLAN ID. * - * When 'dot1q' or 'dot1ad' is explictly entered, subinterfaces + * When 'dot1q' or 'dot1ad' is explicitly entered, subinterfaces * can be configured as either exact-match or non-exact match. Non-exact match is the CLI * default. If 'exact-match' is specified, packets must have the same number of * VLAN tags as the configuration. For non-exact-match, packets must at least that number @@ -964,7 +954,7 @@ set_unnumbered (vlib_main_t * vm, if (~0 == unnumbered_sw_if_index) return clib_error_return (0, "Specify the unnumbered interface"); if (enable && ~0 == inherit_from_sw_if_index) - return clib_error_return (0, "When enabling unnumberered specify the" + return clib_error_return (0, "When enabling unnumbered specify the" " IP enabled interface that it uses"); vnet_sw_interface_update_unnumbered (unnumbered_sw_if_index, @@ -1174,6 +1164,158 @@ VLIB_CLI_COMMAND (set_interface_mtu_cmd, static) = { }; /* *INDENT-ON* */ +static clib_error_t * +show_interface_sec_mac_addr_fn (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + vnet_main_t *vnm = vnet_get_main (); + vnet_interface_main_t *im = &vnm->interface_main; + ethernet_main_t *em = ðernet_main; + u32 sw_if_index = ~0; + vnet_sw_interface_t *si, *sorted_sis = 0; + + if (unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index)) + { + si = pool_elt_at_index (im->sw_interfaces, sw_if_index); + vec_add1 (sorted_sis, si[0]); + } + + /* if an interface name was not passed, get all interfaces */ + if (vec_len (sorted_sis) == 0) + { + sorted_sis = + vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces)); + _vec_len (sorted_sis) = 0; + /* *INDENT-OFF* */ + pool_foreach (si, im->sw_interfaces, + ({ + int visible = vnet_swif_is_api_visible (si); + if (visible) + vec_add1 (sorted_sis, si[0]);} + )); + /* *INDENT-ON* */ + /* Sort by name. */ + vec_sort_with_function (sorted_sis, sw_interface_name_compare); + } + + vec_foreach (si, sorted_sis) + { + vnet_sw_interface_t *sup_si; + ethernet_interface_t *ei; + + sup_si = vnet_get_sup_sw_interface (vnm, si->sw_if_index); + ei = ethernet_get_interface (em, sup_si->hw_if_index); + + vlib_cli_output (vm, "%U (%s):", + format_vnet_sw_if_index_name, vnm, si->sw_if_index, + (si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? + "up" : "dn"); + + if (ei && ei->secondary_addrs) + { + mac_address_t *sec_addr; + + vec_foreach (sec_addr, ei->secondary_addrs) + { + vlib_cli_output (vm, " %U", format_mac_address_t, sec_addr); + } + } + } + + vec_free (sorted_sis); + return 0; +} + +/*? + * This command is used to display interface secondary mac addresses. + * + * @cliexpar + * Example of how to display interface secondary mac addresses: + * @cliexstart{show interface secondary-mac-address} + * @cliexend +?*/ +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (show_interface_sec_mac_addr, static) = { + .path = "show interface secondary-mac-address", + .short_help = "show interface secondary-mac-address []", + .function = show_interface_sec_mac_addr_fn, +}; +/* *INDENT-ON* */ + +static clib_error_t * +interface_add_del_mac_address (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + vnet_main_t *vnm = vnet_get_main (); + vnet_sw_interface_t *si = NULL; + clib_error_t *error = 0; + u32 sw_if_index = ~0; + u8 mac[6] = { 0 }; + u8 is_add, is_del; + + is_add = is_del = 0; + + if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index)) + { + error = clib_error_return (0, "unknown interface `%U'", + format_unformat_error, input); + goto done; + } + if (!unformat_user (input, unformat_ethernet_address, mac)) + { + error = clib_error_return (0, "expected mac address `%U'", + format_unformat_error, input); + goto done; + } + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "add")) + is_add = 1; + else if (unformat (input, "del")) + is_del = 1; + else + break; + } + + if (is_add == is_del) + { + error = clib_error_return (0, "must choose one of add or del"); + goto done; + } + + si = vnet_get_sw_interface (vnm, sw_if_index); + error = + vnet_hw_interface_add_del_mac_address (vnm, si->hw_if_index, mac, is_add); + +done: + return error; +} + +/*? + * The 'set interface secondary-mac-address ' command allows adding + * or deleting extra MAC addresses on a given interface without changing the + * default MAC address. This could allow packets sent to these MAC addresses + * to be received without setting the interface to promiscuous mode. + * Not all interfaces support this operation. The ones that do are mostly + * hardware NICs, though virtio does also. + * + * @cliexpar + * @parblock + * Example of how to add a secondary MAC Address on an interface: + * @cliexcmd{set interface secondary-mac-address GigabitEthernet0/8/0 aa:bb:cc:dd:ee:01 add} + * Example of how to delete a secondary MAC address from an interface: + * @cliexcmd{set interface secondary-mac-address GigabitEthernet0/8/0 aa:bb:cc:dd:ee:01 del} + * @endparblock +?*/ +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (interface_add_del_mac_address_cmd, static) = { + .path = "set interface secondary-mac-address", + .short_help = "set interface secondary-mac-address [(add|del)]", + .function = interface_add_del_mac_address, +}; +/* *INDENT-ON* */ + static clib_error_t * set_interface_mac_address (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) @@ -1520,7 +1662,7 @@ show_interface_rx_placement_fn (vlib_main_t * vm, unformat_input_t * input, })); if (vec_len (s) > 0) { - vlib_cli_output(vm, "Thread %u (%v):\n%v", index, + vlib_cli_output(vm, "Thread %u (%s):\n%v", index, vlib_worker_threads[index].name, s); vec_reset_length (s); } @@ -1704,6 +1846,352 @@ VLIB_CLI_COMMAND (cmd_set_if_rx_placement,static) = { .is_mp_safe = 1, }; /* *INDENT-ON* */ + +static u8 * +format_vnet_pcap (u8 * s, va_list * args) +{ + vnet_pcap_t *pp = va_arg (*args, vnet_pcap_t *); + int type = va_arg (*args, int); + int printed = 0; + + if (type == 0) + { + if (pp->pcap_rx_enable) + { + s = format (s, "rx"); + printed = 1; + } + if (pp->pcap_tx_enable) + { + if (printed) + s = format (s, " and "); + s = format (s, "tx"); + printed = 1; + } + if (pp->pcap_drop_enable) + { + if (printed) + s = format (s, " and "); + s = format (s, "drop"); + printed = 1; + } + return s; + } + s = format (s, "unknown type %d!", type); + return s; +} + + +int +vnet_pcap_dispatch_trace_configure (vnet_pcap_dispatch_trace_args_t * a) +{ + vlib_main_t *vm = vlib_get_main (); + vnet_pcap_t *pp = &vm->pcap; + pcap_main_t *pm = &pp->pcap_main; + vnet_classify_main_t *cm = &vnet_classify_main; + vnet_classify_filter_set_t *set = 0; + + if (a->status) + { + if (pp->pcap_rx_enable || pp->pcap_tx_enable || pp->pcap_drop_enable) + { + vlib_cli_output + (vm, "pcap %U dispatch capture enabled: %d of %d pkts...", + format_vnet_pcap, pp, 0 /* print type */ , + pm->n_packets_captured, pm->n_packets_to_capture); + vlib_cli_output (vm, "capture to file %s", pm->file_name); + } + else + vlib_cli_output (vm, "pcap dispatch capture disabled"); + + return 0; + } + + /* Consistency checks */ + + /* Enable w/ capture already enabled not allowed */ + if ((pp->pcap_rx_enable + pp->pcap_tx_enable + pp->pcap_drop_enable) + && (a->rx_enable + a->tx_enable + a->drop_enable)) + return VNET_API_ERROR_INVALID_VALUE; + + /* Disable capture with capture already disabled, not interesting */ + if (((pp->pcap_rx_enable + pp->pcap_tx_enable + pp->pcap_drop_enable) == 0) + && ((a->rx_enable + a->tx_enable + a->drop_enable == 0))) + return VNET_API_ERROR_VALUE_EXIST; + + /* Change number of packets to capture while capturing */ + if ((pp->pcap_rx_enable + pp->pcap_tx_enable + pp->pcap_drop_enable) + && (a->rx_enable + a->tx_enable + a->drop_enable) + && (pm->n_packets_to_capture != a->packets_to_capture)) + return VNET_API_ERROR_INVALID_VALUE_2; + + set = pool_elt_at_index (cm->filter_sets, cm->filter_set_by_sw_if_index[0]); + + /* Classify filter specified, but no classify filter configured */ + if ((a->rx_enable + a->tx_enable + a->drop_enable) && a->filter && + (set->table_indices[0] == ~0)) + return VNET_API_ERROR_NO_SUCH_LABEL; + + if (a->rx_enable + a->tx_enable + a->drop_enable) + { + /* Sanity check max bytes per pkt */ + if (a->max_bytes_per_pkt < 32 || a->max_bytes_per_pkt > 9000) + return VNET_API_ERROR_INVALID_MEMORY_SIZE; + + /* Clean up from previous run, if any */ + vec_free (pm->file_name); + vec_free (pm->pcap_data); + memset (pm, 0, sizeof (*pm)); + + vec_validate_aligned (vnet_trace_dummy, 2048, CLIB_CACHE_LINE_BYTES); + if (pm->lock == 0) + clib_spinlock_init (&(pm->lock)); + + if (a->filename == 0) + { + u8 *stem = 0; + + if (a->rx_enable) + stem = format (stem, "rx"); + if (a->tx_enable) + stem = format (stem, "tx"); + if (a->drop_enable) + stem = format (stem, "drop"); + a->filename = format (0, "/tmp/%s.pcap%c", stem, 0); + vec_free (stem); + } + + pm->file_name = (char *) a->filename; + pm->n_packets_captured = 0; + pm->packet_type = PCAP_PACKET_TYPE_ethernet; + pm->n_packets_to_capture = a->packets_to_capture; + pp->pcap_sw_if_index = a->sw_if_index; + if (a->filter) + pp->filter_classify_table_index = set->table_indices[0]; + else + pp->filter_classify_table_index = ~0; + pp->pcap_rx_enable = a->rx_enable; + pp->pcap_tx_enable = a->tx_enable; + pp->pcap_drop_enable = a->drop_enable; + pp->max_bytes_per_pkt = a->max_bytes_per_pkt; + } + else + { + pp->pcap_rx_enable = 0; + pp->pcap_tx_enable = 0; + pp->pcap_drop_enable = 0; + pp->filter_classify_table_index = ~0; + if (pm->n_packets_captured) + { + clib_error_t *error; + pm->n_packets_to_capture = pm->n_packets_captured; + vlib_cli_output (vm, "Write %d packets to %s, and stop capture...", + pm->n_packets_captured, pm->file_name); + error = pcap_write (pm); + if (pm->flags & PCAP_MAIN_INIT_DONE) + pcap_close (pm); + /* Report I/O errors... */ + if (error) + { + clib_error_report (error); + return VNET_API_ERROR_SYSCALL_ERROR_1; + } + return 0; + } + else + return VNET_API_ERROR_NO_SUCH_ENTRY; + } + + return 0; +} + +static clib_error_t * +pcap_trace_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + unformat_input_t _line_input, *line_input = &_line_input; + vnet_pcap_dispatch_trace_args_t _a, *a = &_a; + vnet_main_t *vnm = vnet_get_main (); + u8 *filename = 0; + u32 max = 1000; + u32 max_bytes_per_pkt = 512; + int rv; + int rx_enable = 0; + int tx_enable = 0; + int drop_enable = 0; + int status = 0; + int filter = 0; + u32 sw_if_index = ~0; + + /* 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, "rx")) + rx_enable = 1; + else if (unformat (line_input, "tx")) + tx_enable = 1; + else if (unformat (line_input, "drop")) + drop_enable = 1; + else if (unformat (line_input, "off")) + rx_enable = tx_enable = drop_enable = 0; + else if (unformat (line_input, "max-bytes-per-pkt %u", + &max_bytes_per_pkt)) + ; + else if (unformat (line_input, "max %d", &max)) + ; + else if (unformat (line_input, "packets-to-capture %d", &max)) + ; + else if (unformat (line_input, "file %U", unformat_vlib_tmpfile, + &filename)) + ; + else if (unformat (line_input, "status %=", &status, 1)) + ; + else if (unformat (line_input, "intfc %U", + unformat_vnet_sw_interface, vnm, &sw_if_index)) + ; + else if (unformat (line_input, "intfc any")) + sw_if_index = 0; + else if (unformat (line_input, "filter")) + filter = 1; + else + { + return clib_error_return (0, "unknown input `%U'", + format_unformat_error, line_input); + } + } + + unformat_free (line_input); + + /* no need for memset (a, 0, sizeof (*a)), set all fields here. */ + a->filename = filename; + a->rx_enable = rx_enable; + a->tx_enable = tx_enable; + a->drop_enable = drop_enable; + a->status = status; + a->packets_to_capture = max; + a->sw_if_index = sw_if_index; + a->filter = filter; + a->max_bytes_per_pkt = max_bytes_per_pkt; + + rv = vnet_pcap_dispatch_trace_configure (a); + + switch (rv) + { + case 0: + break; + + case VNET_API_ERROR_INVALID_VALUE: + return clib_error_return (0, "dispatch trace already enabled..."); + + case VNET_API_ERROR_VALUE_EXIST: + return clib_error_return (0, "dispatch trace already disabled..."); + + case VNET_API_ERROR_INVALID_VALUE_2: + return clib_error_return + (0, "can't change number of records to capture while tracing..."); + + case VNET_API_ERROR_SYSCALL_ERROR_1: + return clib_error_return (0, "I/O writing trace capture..."); + + case VNET_API_ERROR_NO_SUCH_ENTRY: + return clib_error_return (0, "No packets captured..."); + + case VNET_API_ERROR_INVALID_MEMORY_SIZE: + return clib_error_return (0, + "Max bytes per pkt must be > 32, < 9000..."); + + case VNET_API_ERROR_NO_SUCH_LABEL: + return clib_error_return + (0, "No classify filter configured, see 'classify filter...'"); + + default: + vlib_cli_output (vm, "WARNING: trace configure returned %d", rv); + break; + } + return 0; +} + +/*? + * This command is used to start or stop a packet capture, or show + * the status of packet capture. + * + * This command has the following optional parameters: + * + * + * - rx - Capture received packets + * + * - tx - Capture transmitted packets + * + * - drop - Capture dropped packets + * + * - off - Stop capturing packets, write results to the specified file + * + * - max - Depth of local buffer. Once 'nn' number + * of packets have been received, buffer is flushed to file. Once another + * 'nn' number of packets have been received, buffer is flushed + * to file, overwriting previous write. If not entered, value defaults + * to 100. Can only be updated if packet capture is off. + * + * - max-bytes-per-pkt - Maximum number of bytes to capture + * for each packet. Must be >= 32, <= 9000. + * + * - intfc |any - Used to specify a given interface, + * or use 'any' to run packet capture on all interfaces. + * 'any' is the default if not provided. Settings from a previous + * packet capture are preserved, so 'any' can be used to reset + * the interface setting. + * + * - filter - Use the pcap rx / tx / drop trace filter, which + * must be configured. Use classify filter pcap... to configure the + * filter. The filter will only be executed if the per-interface or + * any-interface tests fail. + * + * - file - Used to specify the output filename. The file will + * be placed in the '/tmp' directory, so only the filename is + * supported. Directory should not be entered. If file already exists, file + * will be overwritten. If no filename is provided, the file will be + * named "/tmp/rx.pcap", "/tmp/tx.pcap", "/tmp/rxandtx.pcap", etc. + * Can only be updated if packet capture is off. + * + * - status - Displays the current status and configured attributes + * associated with a packet capture. If packet capture is in progress, + * 'status' also will return the number of packets currently in + * the local buffer. All additional attributes entered on command line + * with 'status' will be ignored and not applied. + * + * @cliexpar + * Example of how to display the status of a tx packet capture when off: + * @cliexstart{pcap trace status} + * max is 100, for any interface to file /tmp/vpe.pcap + * pcap tx capture is off... + * @cliexend + * Example of how to start a tx packet capture: + * @cliexstart{pcap trace tx max 35 intfc GigabitEthernet0/8/0 file vppTest.pcap} + * @cliexend + * Example of how to display the status of a tx packet capture in progress: + * @cliexstart{pcap trace status} + * max is 35, for interface GigabitEthernet0/8/0 to file /tmp/vppTest.pcap + * pcap tx capture is on: 20 of 35 pkts... + * @cliexend + * Example of how to stop a tx packet capture: + * @cliexstart{pcap trace off} + * captured 21 pkts... + * saved to /tmp/vppTest.pcap... + * @cliexend +?*/ +/* *INDENT-OFF* */ + +VLIB_CLI_COMMAND (pcap_tx_trace_command, static) = { + .path = "pcap trace", + .short_help = + "pcap trace rx tx drop off [max ] [intfc |any] [file ] [status] [max-bytes-per-pkt ][filter]", + .function = pcap_trace_command_fn, +}; +/* *INDENT-ON* */ + /* * fd.io coding-style-patch-verification: ON *