X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fflowprobe%2Fflowprobe.c;h=ffc43bcd440a9c44782bb524406a8c998aeba741;hb=c3cb2075d;hp=ee951965e963dd2e2059e1ad40f771f5dcf7cf36;hpb=2be45813c757137000878dc711dd169fc2d414af;p=vpp.git diff --git a/src/plugins/flowprobe/flowprobe.c b/src/plugins/flowprobe/flowprobe.c index ee951965e96..ffc43bcd440 100644 --- a/src/plugins/flowprobe/flowprobe.c +++ b/src/plugins/flowprobe/flowprobe.c @@ -26,41 +26,21 @@ #include #include #include +#include #include #include #include /* define message IDs */ -#include - -/* define message structures */ -#define vl_typedefs -#include -#undef vl_typedefs - -/* define generated endian-swappers */ -#define vl_endianfun -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun +#include +#include flowprobe_main_t flowprobe_main; -vlib_node_registration_t flowprobe_walker_node; static vlib_node_registration_t flowprobe_timer_node; uword flowprobe_walker_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f); -/* Get the API version number */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include -#undef vl_api_version - #define REPLY_MSG_ID_BASE fm->msg_id_base #include @@ -80,15 +60,15 @@ VNET_FEATURE_INIT (flow_perpacket_ip6, static) = .runs_before = VNET_FEATURES ("interface-output"), }; -VNET_FEATURE_INIT (flow_perpacket_l2, static) = -{ +VNET_FEATURE_INIT (flow_perpacket_l2, static) = { .arc_name = "interface-output", .node_name = "flowprobe-l2", - .runs_before = VNET_FEATURES ("interface-tx"), + .runs_before = VNET_FEATURES ("interface-output-arc-end"), }; /* *INDENT-ON* */ /* Macro to finish up custom dump fns */ +#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define FINISH \ vec_add1 (s, 0); \ vl_print (handle, (char *)s); \ @@ -652,13 +632,6 @@ void vl_api_flowprobe_tx_interface_add_del_t_handler VALIDATE_SW_IF_INDEX (mp); - if (mp->which != FLOW_VARIANT_IP4 && mp->which != FLOW_VARIANT_L2 - && mp->which != FLOW_VARIANT_IP6) - { - rv = VNET_API_ERROR_UNIMPLEMENTED; - goto out; - } - if (fm->record == 0) { clib_warning ("Please specify flowprobe params record first..."); @@ -682,24 +655,6 @@ out: REPLY_MACRO (VL_API_FLOWPROBE_TX_INTERFACE_ADD_DEL_REPLY); } -/** - * @brief API message custom-dump function - * @param mp vl_api_flowprobe_tx_interface_add_del_t * mp the api message - * @param handle void * print function handle - * @returns u8 * output string - */ -static void *vl_api_flowprobe_tx_interface_add_del_t_print - (vl_api_flowprobe_tx_interface_add_del_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: flowprobe_tx_interface_add_del "); - s = format (s, "sw_if_index %d is_add %d which %d ", - clib_host_to_net_u32 (mp->sw_if_index), - (int) mp->is_add, (int) mp->which); - FINISH; -} - #define vec_neg_search(v,E) \ ({ \ word _v(i) = 0; \ @@ -750,18 +705,16 @@ vl_api_flowprobe_params_t_handler (vl_api_flowprobe_params_t * mp) int rv = 0; rv = flowprobe_params - (fm, mp->record_l2, mp->record_l3, mp->record_l4, + (fm, + mp->record_flags & FLOWPROBE_RECORD_FLAG_L2, + mp->record_flags & FLOWPROBE_RECORD_FLAG_L3, + mp->record_flags & FLOWPROBE_RECORD_FLAG_L4, clib_net_to_host_u32 (mp->active_timer), clib_net_to_host_u32 (mp->passive_timer)); REPLY_MACRO (VL_API_FLOWPROBE_PARAMS_REPLY); } -/* List of message types that this plugin understands */ -#define foreach_flowprobe_plugin_api_msg \ -_(FLOWPROBE_TX_INTERFACE_ADD_DEL, flowprobe_tx_interface_add_del) \ -_(FLOWPROBE_PARAMS, flowprobe_params) - /* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, @@ -787,6 +740,43 @@ format_flowprobe_entry (u8 * s, va_list * args) return s; } +u8 * +format_flowprobe_feature (u8 * s, va_list * args) +{ + u8 *which = va_arg (*args, u8 *); + if (*which == FLOW_VARIANT_IP4) + s = format (s, "ip4"); + else if (*which == FLOW_VARIANT_IP6) + s = format (s, "ip6"); + else if (*which == FLOW_VARIANT_L2) + s = format (s, "l2"); + + return s; +} + +u8 * +format_flowprobe_params (u8 * s, va_list * args) +{ + flowprobe_record_t flags = va_arg (*args, flowprobe_record_t); + u32 active_timer = va_arg (*args, u32); + u32 passive_timer = va_arg (*args, u32); + + if (flags & FLOW_RECORD_L2) + s = format (s, " l2"); + if (flags & FLOW_RECORD_L3) + s = format (s, " l3"); + if (flags & FLOW_RECORD_L4) + s = format (s, " l4"); + + if (active_timer != (u32) ~ 0) + s = format (s, " active: %d", active_timer); + + if (passive_timer != (u32) ~ 0) + s = format (s, " passive: %d", passive_timer); + + return s; +} + static clib_error_t * flowprobe_show_table_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cm) @@ -800,12 +790,12 @@ flowprobe_show_table_fn (vlib_main_t * vm, for (i = 0; i < vec_len (fm->pool_per_worker); i++) { /* *INDENT-OFF* */ - pool_foreach (e, fm->pool_per_worker[i], ( + pool_foreach (e, fm->pool_per_worker[i]) { vlib_cli_output (vm, "%U", format_flowprobe_entry, e); - })); + } /* *INDENT-ON* */ } @@ -899,6 +889,28 @@ flowprobe_tx_interface_add_del_feature_command_fn (vlib_main_t * vm, return 0; } +static clib_error_t * +flowprobe_show_feature_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + flowprobe_main_t *fm = &flowprobe_main; + u8 *which; + u32 sw_if_index; + + vec_foreach (which, fm->flow_per_interface) + { + if (*which == (u8) ~ 0) + continue; + + sw_if_index = which - fm->flow_per_interface; + vlib_cli_output (vm, " %U %U", format_vnet_sw_if_index_name, + vnet_get_main (), sw_if_index, format_flowprobe_feature, + which); + } + return 0; +} + static clib_error_t * flowprobe_params_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -942,6 +954,21 @@ flowprobe_params_command_fn (vlib_main_t * vm, return 0; } +static clib_error_t * +flowprobe_show_params_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + flowprobe_main_t *fm = &flowprobe_main; + flowprobe_record_t flags = fm->record; + u32 active_timer = fm->active_timer; + u32 passive_timer = fm->passive_timer; + + vlib_cli_output (vm, "%U", format_flowprobe_params, flags, active_timer, + passive_timer); + return 0; +} + /*? * 'flowprobe feature add-del' commands to enable/disable * per-packet IPFIX flow record generation on an interface @@ -969,6 +996,19 @@ VLIB_CLI_COMMAND (flowprobe_params_command, static) = { "flowprobe params record <[l2] [l3] [l4]> [active passive ]", .function = flowprobe_params_command_fn, }; + +VLIB_CLI_COMMAND (flowprobe_show_feature_command, static) = { + .path = "show flowprobe feature", + .short_help = + "show flowprobe feature", + .function = flowprobe_show_feature_command_fn, +}; +VLIB_CLI_COMMAND (flowprobe_show_params_command, static) = { + .path = "show flowprobe params", + .short_help = + "show flowprobe params", + .function = flowprobe_show_params_command_fn, +}; VLIB_CLI_COMMAND (flowprobe_show_table_command, static) = { .path = "show flowprobe table", .short_help = "show flowprobe table", @@ -981,42 +1021,6 @@ VLIB_CLI_COMMAND (flowprobe_show_stats_command, static) = { }; /* *INDENT-ON* */ -/** - * @brief Set up the API message handling tables - * @param vm vlib_main_t * vlib main data structure pointer - * @returns 0 to indicate all is well - */ -static clib_error_t * -flowprobe_plugin_api_hookup (vlib_main_t * vm) -{ - flowprobe_main_t *fm = &flowprobe_main; -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + fm->msg_id_base), \ - #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_flowprobe_plugin_api_msg; -#undef _ - - return 0; -} - -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (flowprobe_main_t * fm, api_main_t * am) -{ -#define _(id,n,crc) \ - vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + fm->msg_id_base); - foreach_vl_msg_name_crc_flowprobe; -#undef _ -} - /* * Main-core process, sending an interrupt to the per worker input * process that spins the per worker timer wheel. @@ -1036,13 +1040,13 @@ timer_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) vec_reset_length (event_data); int i; - if (vec_len (vlib_mains) == 0) + if (vlib_get_n_threads () == 0) vec_add1 (worker_vms, vm); else { - for (i = 0; i < vec_len (vlib_mains); i++) + for (i = 0; i < vlib_get_n_threads (); i++) { - worker_vm = vlib_mains[i]; + worker_vm = vlib_get_main_by_index (i); if (worker_vm) vec_add1 (worker_vms, worker_vm); } @@ -1077,6 +1081,8 @@ VLIB_REGISTER_NODE (flowprobe_timer_node,static) = { }; /* *INDENT-ON* */ +#include + /** * @brief Set up the API message handling tables * @param vm vlib_main_t * vlib main data structure pointer @@ -1088,34 +1094,21 @@ flowprobe_init (vlib_main_t * vm) flowprobe_main_t *fm = &flowprobe_main; vlib_thread_main_t *tm = &vlib_thread_main; clib_error_t *error = 0; - u8 *name; u32 num_threads; int i; fm->vnet_main = vnet_get_main (); - /* Construct the API name */ - name = format (0, "flowprobe_%08x%c", api_version, 0); - /* Ask for a correctly-sized block of API message decode slots */ - fm->msg_id_base = vl_msg_api_get_msg_ids - ((char *) name, VL_MSG_FIRST_AVAILABLE); - - /* Hook up message handlers */ - error = flowprobe_plugin_api_hookup (vm); - - /* Add our API messages to the global name_crc hash table */ - setup_message_id_table (fm, &api_main); - - vec_free (name); + fm->msg_id_base = setup_message_id_table (); /* Set up time reference pair */ fm->vlib_time_0 = vlib_time_now (vm); fm->nanosecond_time_0 = unix_time_now_nsec (); - memset (fm->template_reports, 0, sizeof (fm->template_reports)); - memset (fm->template_size, 0, sizeof (fm->template_size)); - memset (fm->template_per_flow, 0, sizeof (fm->template_per_flow)); + clib_memset (fm->template_reports, 0, sizeof (fm->template_reports)); + clib_memset (fm->template_size, 0, sizeof (fm->template_size)); + clib_memset (fm->template_per_flow, 0, sizeof (fm->template_per_flow)); /* Decide how many worker threads we have */ num_threads = 1 /* main thread */ + tm->n_threads;