X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fapi_format.c;h=ec21c045f5c09c18e843a0c461c123be5336b695;hb=4208a4ce8;hp=d9a9d2238040e9b454dd668efdb7942b8eaa4b74;hpb=bc764c8bc26282445901dc9aa32223a13f18e8dc;p=vpp.git diff --git a/src/vat/api_format.c b/src/vat/api_format.c index d9a9d223804..ec21c045f5c 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -58,7 +58,6 @@ #include "vat/json_format.h" #include #include -#include #include #include @@ -86,6 +85,9 @@ #define __plugin_msg_base 0 #include +void vl_api_set_elog_main (elog_main_t * m); +int vl_api_set_elog_trace_api_messages (int enable); + #if VPP_API_TEST_BUILTIN == 0 #include @@ -165,7 +167,8 @@ errmsg (char *fmt, ...) if (vam->ifp != stdin) fformat (vam->ofp, "%s(%d): \n", vam->current_file, vam->input_line_number); - fformat (vam->ofp, (char *) s); + else + fformat (vam->ofp, "%s\n", (char *) s); fflush (vam->ofp); } #endif @@ -738,9 +741,9 @@ increment_v6_address (vl_api_ip6_address_t * i) static void increment_address (vl_api_address_t * a) { - if (a->af == ADDRESS_IP4) + if (clib_net_to_host_u32 (a->af) == ADDRESS_IP4) increment_v4_address (&a->un.ip4); - else if (a->af == ADDRESS_IP6) + else if (clib_net_to_host_u32 (a->af) == ADDRESS_IP6) increment_v6_address (&a->un.ip6); } @@ -789,8 +792,8 @@ static void vat_json_object_add_prefix (vat_json_node_t * node, const vl_api_prefix_t * prefix) { - vat_json_object_add_uint (node, "address_length", prefix->address_length); - vat_json_object_add_address (node, "prefix", &prefix->address); + vat_json_object_add_uint (node, "len", prefix->len); + vat_json_object_add_address (node, "address", &prefix->address); } static void vl_api_create_loopback_reply_t_handler @@ -1352,9 +1355,8 @@ static void vl_api_show_version_reply_t_handler p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t); s = vl_api_from_api_to_vec ((vl_api_string_t *) p); - vec_free (s); - errmsg ("build directory: %v\n", s); + vec_free (s); } vam->retval = retval; vam->result_ready = 1; @@ -2665,7 +2667,7 @@ static void vl_api_ip_address_details_t_handler address = vec_elt_at_index (addresses, vec_len (addresses) - 1); clib_memcpy (&address->ip, &mp->prefix.address.un, sizeof (address->ip)); - address->prefix_length = mp->prefix.address_length; + address->prefix_length = mp->prefix.len; #undef addresses } @@ -7429,6 +7431,7 @@ api_tap_create_v2 (vat_main_t * vam) { unformat_input_t *i = vam->input; vl_api_tap_create_v2_t *mp; +#define TAP_FLAG_GSO (1 << 0) u8 mac_address[6]; u8 random_mac = 1; u32 id = ~0; @@ -7445,6 +7448,9 @@ api_tap_create_v2 (vat_main_t * vam) ip6_address_t host_ip6_gw; u8 host_ip6_gw_set = 0; u32 host_ip6_prefix_len = 0; + u8 host_mtu_set = 0; + u32 host_mtu_size = 0; + u32 tap_flags = 0; int ret; u32 rx_ring_sz = 0, tx_ring_sz = 0; @@ -7484,6 +7490,12 @@ api_tap_create_v2 (vat_main_t * vam) ; else if (unformat (i, "tx-ring-size %d", &tx_ring_sz)) ; + else if (unformat (i, "host-mtu-size %d", &host_mtu_size)) + host_mtu_set = 1; + else if (unformat (i, "no-gso")) + tap_flags &= ~TAP_FLAG_GSO; + else if (unformat (i, "gso")) + tap_flags |= TAP_FLAG_GSO; else break; } @@ -7533,6 +7545,11 @@ api_tap_create_v2 (vat_main_t * vam) errmsg ("tx ring size must be 32768 or lower. "); return -99; } + if (host_mtu_set && (host_mtu_size < 64 || host_mtu_size > 65355)) + { + errmsg ("host MTU size must be in between 64 and 65355. "); + return -99; + } /* Construct the API message */ M (TAP_CREATE_V2, mp); @@ -7546,6 +7563,9 @@ api_tap_create_v2 (vat_main_t * vam) mp->host_ip6_addr_set = host_ip6_prefix_len != 0; mp->rx_ring_sz = ntohs (rx_ring_sz); mp->tx_ring_sz = ntohs (tx_ring_sz); + mp->host_mtu_set = host_mtu_set; + mp->host_mtu_size = ntohl (host_mtu_size); + mp->tap_flags = ntohl (tap_flags); if (random_mac == 0) clib_memcpy (mp->mac_address, mac_address, 6); @@ -7749,6 +7769,7 @@ api_bond_create (vat_main_t * vam) u8 lb; u8 mode_is_set = 0; u32 id = ~0; + u8 numa_only = 0; clib_memset (mac_address, 0, sizeof (mac_address)); lb = BOND_LB_L2; @@ -7764,6 +7785,8 @@ api_bond_create (vat_main_t * vam) else if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address)) custom_mac = 1; + else if (unformat (i, "numa-only")) + numa_only = 1; else if (unformat (i, "id %u", &id)) ; else @@ -7784,6 +7807,7 @@ api_bond_create (vat_main_t * vam) mp->mode = mode; mp->lb = lb; mp->id = htonl (id); + mp->numa_only = numa_only; if (custom_mac) clib_memcpy (mp->mac_address, mac_address, 6); @@ -13276,6 +13300,7 @@ api_create_vhost_user_if (vat_main_t * vam) u8 disable_mrg_rxbuf = 0; u8 disable_indirect_desc = 0; u8 *tag = 0; + u8 enable_gso = 0; int ret; /* Shut up coverity */ @@ -13297,6 +13322,8 @@ api_create_vhost_user_if (vat_main_t * vam) disable_mrg_rxbuf = 1; else if (unformat (i, "disable_indirect_desc")) disable_indirect_desc = 1; + else if (unformat (i, "gso")) + enable_gso = 1; else if (unformat (i, "tag %s", &tag)) ; else @@ -13321,6 +13348,7 @@ api_create_vhost_user_if (vat_main_t * vam) mp->is_server = is_server; mp->disable_mrg_rxbuf = disable_mrg_rxbuf; mp->disable_indirect_desc = disable_indirect_desc; + mp->enable_gso = enable_gso; clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); vec_free (file_name); if (custom_dev_instance != ~0) @@ -13351,6 +13379,7 @@ api_modify_vhost_user_if (vat_main_t * vam) u32 custom_dev_instance = ~0; u8 sw_if_index_set = 0; u32 sw_if_index = (u32) ~ 0; + u8 enable_gso = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) @@ -13367,6 +13396,8 @@ api_modify_vhost_user_if (vat_main_t * vam) ; else if (unformat (i, "server")) is_server = 1; + else if (unformat (i, "gso")) + enable_gso = 1; else break; } @@ -13394,6 +13425,7 @@ api_modify_vhost_user_if (vat_main_t * vam) mp->sw_if_index = ntohl (sw_if_index); mp->is_server = is_server; + mp->enable_gso = enable_gso; clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); vec_free (file_name); if (custom_dev_instance != ~0) @@ -18905,7 +18937,7 @@ static void vl_api_mpls_route_details_t_handler (vl_api_mpls_route_details_t * mp) { vat_main_t *vam = &vat_main; - int count = ntohl (mp->mr_route.mr_n_paths); + int count = (int) clib_net_to_host_u32 (mp->mr_route.mr_n_paths); vl_api_fib_path_t *fp; int i; @@ -18925,7 +18957,7 @@ static void vl_api_mpls_route_details_t_handler_json (vl_api_mpls_route_details_t * mp) { vat_main_t *vam = &vat_main; - int count = ntohl (mp->mr_route.mr_n_paths); + int count = (int) clib_host_to_net_u32 (mp->mr_route.mr_n_paths); vat_json_node_t *node = NULL; vl_api_fib_path_t *fp; int i; @@ -19185,8 +19217,7 @@ vl_api_ip_route_details_t_handler (vl_api_ip_route_details_t * mp) print (vam->ofp, "table-id %d, prefix %U/%d", ntohl (mp->route.table_id), - format_ip46_address, - mp->route.prefix.address, mp->route.prefix.address_length); + format_ip46_address, mp->route.prefix.address, mp->route.prefix.len); for (i = 0; i < count; i++) { fp = &mp->route.paths[i]; @@ -19226,8 +19257,7 @@ static void vl_api_ip_route_details_t_handler_json clib_memcpy (&ip4, &mp->route.prefix.address.un.ip4, sizeof (ip4)); vat_json_object_add_ip4 (node, "prefix", ip4); } - vat_json_object_add_uint (node, "mask_length", - mp->route.prefix.address_length); + vat_json_object_add_uint (node, "mask_length", mp->route.prefix.len); vat_json_object_add_uint (node, "path_count", count); for (i = 0; i < count; i++) { @@ -19727,12 +19757,24 @@ api_pg_create_interface (vat_main_t * vam) unformat_input_t *input = vam->input; vl_api_pg_create_interface_t *mp; - u32 if_id = ~0; + u32 if_id = ~0, gso_size = 0; + u8 gso_enabled = 0; int ret; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "if_id %d", &if_id)) ; + else if (unformat (input, "gso-enabled")) + { + gso_enabled = 1; + if (unformat (input, "gso-size %u", &gso_size)) + ; + else + { + errmsg ("missing gso-size"); + return -99; + } + } else break; } @@ -19746,6 +19788,7 @@ api_pg_create_interface (vat_main_t * vam) M (PG_CREATE_INTERFACE, mp); mp->context = 0; mp->interface_id = ntohl (if_id); + mp->gso_enabled = gso_enabled; S (mp); W (ret); @@ -21294,7 +21337,7 @@ api_ip_container_proxy_add_del (vat_main_t * vam) else break; } - if (sw_if_index == ~0 || pfx.address_length == 0) + if (sw_if_index == ~0 || pfx.len == 0) { errmsg ("address and sw_if_index must be set"); return -99; @@ -21351,8 +21394,8 @@ api_qos_record_enable_disable (vat_main_t * vam) M (QOS_RECORD_ENABLE_DISABLE, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->input_source = qs; + mp->record.sw_if_index = ntohl (sw_if_index); + mp->record.input_source = qs; mp->enable = enable; S (mp); @@ -21388,6 +21431,98 @@ comment (vat_main_t * vam) return 0; } +static int +elog_save (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + elog_main_t *em = &vam->elog_main; + unformat_input_t *i = vam->input; + char *file, *chroot_file; + clib_error_t *error; + + if (!unformat (i, "%s", &file)) + { + errmsg ("expected file name, got `%U'", format_unformat_error, i); + return 0; + } + + /* It's fairly hard to get "../oopsie" through unformat; just in case */ + if (strstr (file, "..") || index (file, '/')) + { + errmsg ("illegal characters in filename '%s'", file); + return 0; + } + + chroot_file = (char *) format (0, "/tmp/%s%c", file, 0); + + vec_free (file); + + errmsg ("Saving %wd of %wd events to %s", + elog_n_events_in_buffer (em), + elog_buffer_capacity (em), chroot_file); + + error = elog_write_file (em, chroot_file, 1 /* flush ring */ ); + vec_free (chroot_file); + + if (error) + clib_error_report (error); +#else + errmsg ("Use the vpp event loger..."); +#endif + + return 0; +} + +static int +elog_setup (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + elog_main_t *em = &vam->elog_main; + unformat_input_t *i = vam->input; + u32 nevents = 128 << 10; + + (void) unformat (i, "nevents %d", &nevents); + + elog_init (em, nevents); + vl_api_set_elog_main (em); + vl_api_set_elog_trace_api_messages (1); + errmsg ("Event logger initialized with %u events", nevents); +#else + errmsg ("Use the vpp event loger..."); +#endif + return 0; +} + +static int +elog_enable (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + elog_main_t *em = &vam->elog_main; + + elog_enable_disable (em, 1 /* enable */ ); + vl_api_set_elog_trace_api_messages (1); + errmsg ("Event logger enabled..."); +#else + errmsg ("Use the vpp event loger..."); +#endif + return 0; +} + +static int +elog_disable (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + elog_main_t *em = &vam->elog_main; + + elog_enable_disable (em, 0 /* enable */ ); + vl_api_set_elog_trace_api_messages (1); + errmsg ("Event logger disabled..."); +#else + errmsg ("Use the vpp event loger..."); +#endif + return 0; +} + static int statseg (vat_main_t * vam) { @@ -21843,7 +21978,7 @@ _(l2_flags, \ _(bridge_flags, \ "bd_id [learn] [forward] [uu-flood] [flood] [arp-term] [disable]\n") \ _(tap_create_v2, \ - "id [hw-addr ] [host-ns ] [rx-ring-size [tx-ring-size ]") \ + "id [hw-addr ] [host-ns ] [rx-ring-size [tx-ring-size ] [host-mtu-size ] [gso | no-gso]") \ _(tap_delete_v2, \ " | sw_if_index ") \ _(sw_interface_tap_v2_dump, "") \ @@ -21999,11 +22134,11 @@ _(l2_interface_vlan_tag_rewrite, \ "[translate-2-[1|2]] [push_dot1q 0] tag1 tag2 ") \ _(create_vhost_user_if, \ "socket [server] [renumber ] " \ - "[disable_mrg_rxbuf] [disable_indirect_desc] " \ + "[disable_mrg_rxbuf] [disable_indirect_desc] [gso] " \ "[mac ]") \ _(modify_vhost_user_if, \ " | sw_if_index socket \n" \ - "[server] [renumber ]") \ + "[server] [renumber ] [gso]") \ _(delete_vhost_user_if, " | sw_if_index ") \ _(sw_interface_vhost_user_dump, "") \ _(show_version, "") \ @@ -22210,7 +22345,7 @@ _(ipfix_classify_table_dump, "") \ _(sw_interface_span_enable_disable, "[l2] [src | src_sw_if_index ] [disable | [[dst | dst_sw_if_index ] [both|rx|tx]]]") \ _(sw_interface_span_dump, "[l2]") \ _(get_next_index, "node-name next-node-name ") \ -_(pg_create_interface, "if_id ") \ +_(pg_create_interface, "if_id [gso-enabled gso-size ]") \ _(pg_capture, "if_id pcap count [disable]") \ _(pg_enable_disable, "[stream ] disable") \ _(ip_source_and_port_range_check_add_del, \ @@ -22272,6 +22407,10 @@ _(dump_ipv6_table, "usage: dump_ipv6_table") \ _(dump_macro_table, "usage: dump_macro_table ") \ _(dump_node_table, "usage: dump_node_table") \ _(dump_msg_api_table, "usage: dump_msg_api_table") \ +_(elog_setup, "usage: elog_setup [nevents, default 128K]") \ +_(elog_disable, "usage: elog_disable") \ +_(elog_enable, "usage: elog_enable") \ +_(elog_save, "usage: elog_save ") \ _(get_msg_id, "usage: get_msg_id name_and_crc") \ _(echo, "usage: echo ") \ _(exec, "usage: exec ") \