X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Facl%2Facl.c;h=a237f40a0038890a6f8648cea07f2565ea779712;hb=0404c682613c163c54d787a86e4b281bd3bba340;hp=645c6c94a2cd201cbec7b131fa74cbcc3cb468aa;hpb=e9ab1c0b4a8d9ae930fbc5522c8d56a0a7a49608;p=vpp.git diff --git a/src/plugins/acl/acl.c b/src/plugins/acl/acl.c index 645c6c94a2c..a237f40a003 100644 --- a/src/plugins/acl/acl.c +++ b/src/plugins/acl/acl.c @@ -25,7 +25,6 @@ #include #include -#include /* define message IDs */ #include @@ -71,6 +70,7 @@ _(ACL_INTERFACE_SET_ACL_LIST, acl_interface_set_acl_list) \ _(ACL_DUMP, acl_dump) \ _(ACL_INTERFACE_LIST_DUMP, acl_interface_list_dump) \ _(MACIP_ACL_ADD, macip_acl_add) \ +_(MACIP_ACL_ADD_REPLACE, macip_acl_add_replace) \ _(MACIP_ACL_DEL, macip_acl_del) \ _(MACIP_ACL_INTERFACE_ADD_DEL, macip_acl_interface_add_del) \ _(MACIP_ACL_DUMP, macip_acl_dump) \ @@ -90,7 +90,7 @@ static void * acl_set_heap(acl_main_t *am) { if (0 == am->acl_mheap) { - am->acl_mheap = mheap_alloc (0 /* use VM */ , 2 << 29); + am->acl_mheap = mheap_alloc (0 /* use VM */ , am->acl_mheap_size); mheap_t *h = mheap_header (am->acl_mheap); h->flags |= MHEAP_FLAG_THREAD_SAFE; } @@ -258,13 +258,13 @@ acl_del_list (u32 acl_list_index) } if (acl_list_index < vec_len(am->input_sw_if_index_vec_by_acl)) { - if (vec_len(am->input_sw_if_index_vec_by_acl[acl_list_index]) > 0) { + if (vec_len(vec_elt(am->input_sw_if_index_vec_by_acl, acl_list_index)) > 0) { /* ACL is applied somewhere inbound. Refuse to delete */ return -1; } } if (acl_list_index < vec_len(am->output_sw_if_index_vec_by_acl)) { - if (vec_len(am->output_sw_if_index_vec_by_acl[acl_list_index]) > 0) { + if (vec_len(vec_elt(am->output_sw_if_index_vec_by_acl, acl_list_index)) > 0) { /* ACL is applied somewhere outbound. Refuse to delete */ return -1; } @@ -306,7 +306,7 @@ acl_del_list (u32 acl_list_index) hash_acl_delete(am, acl_list_index); /* now we can delete the ACL itself */ - a = &am->acls[acl_list_index]; + a = pool_elt_at_index (am->acls, acl_list_index); if (a->rules) vec_free (a->rules); @@ -562,9 +562,6 @@ acl_hook_l2_input_classify (acl_main_t * am, u32 sw_if_index) rv = vnet_l2_input_classify_set_tables (sw_if_index, ip4_table_index, ip6_table_index, ~0); - clib_warning - ("ACL enabling on interface sw_if_index %d, setting tables to the following: ip4: %d ip6: %d\n", - sw_if_index, ip4_table_index, ip6_table_index); if (rv) { acl_classify_add_del_table_tiny (cm, ip6_5tuple_mask, @@ -893,7 +890,6 @@ acl_interface_add_del_inout_acl (u32 sw_if_index, u8 is_add, u8 is_input, { int rv = -1; acl_main_t *am = &acl_main; - void *oldheap = acl_set_heap(am); if (is_add) { rv = @@ -909,7 +905,6 @@ acl_interface_add_del_inout_acl (u32 sw_if_index, u8 is_add, u8 is_input, rv = acl_interface_del_inout_acl (sw_if_index, is_input, acl_list_index); } - clib_mem_set_heap (oldheap); return rv; } @@ -949,8 +944,22 @@ macip_find_match_type (macip_match_type_t * mv, u8 * mac_mask, u8 prefix_len, static int match_type_metric (macip_match_type_t * m) { - /* FIXME: count the ones in the MAC mask as well, check how well this heuristic works in real life */ - return m->prefix_len + m->is_ipv6 + 10 * m->count; + unsigned int mac_bits_set = 0; + unsigned int mac_byte; + int i; + for (i=0; i<6; i++) + { + mac_byte = m->mac_mask[i]; + for (; mac_byte; mac_byte >>= 1) + mac_bits_set += mac_byte & 1; + } + /* + * Attempt to place the more specific and the more used rules on top. + * There are obvious caveat corner cases to this, but they do not + * seem to be sensible in real world (e.g. specific IPv4 with wildcard MAC + * going with a wildcard IPv4 with a specific MAC). + */ + return m->prefix_len + mac_bits_set + m->is_ipv6 + 10 * m->count; } static int @@ -975,7 +984,7 @@ macip_create_classify_tables (acl_main_t * am, u32 macip_acl_index) { macip_match_type_t *mvec = NULL; macip_match_type_t *mt; - macip_acl_list_t *a = &am->macip_acls[macip_acl_index]; + macip_acl_list_t *a = pool_elt_at_index (am->macip_acls, macip_acl_index); int i; u32 match_type_index; u32 last_table; @@ -994,7 +1003,7 @@ macip_create_classify_tables (acl_main_t * am, u32 macip_acl_index) match_type_index = vec_len (mvec); vec_validate (mvec, match_type_index); memcpy (mvec[match_type_index].mac_mask, - a->rules[match_type_index].src_mac_mask, 6); + a->rules[i].src_mac_mask, 6); mvec[match_type_index].prefix_len = a->rules[i].src_prefixlen; mvec[match_type_index].is_ipv6 = a->rules[i].is_ipv6; mvec[match_type_index].table_index = ~0; @@ -1060,8 +1069,8 @@ macip_create_classify_tables (acl_main_t * am, u32 macip_acl_index) 1); last_table = mt->table_index; } - a->ip4_table_index = ~0; - a->ip6_table_index = ~0; + a->ip4_table_index = last_table; + a->ip6_table_index = last_table; a->l2_table_index = last_table; /* Populate the classifier tables with rules from the MACIP ACL */ @@ -1116,7 +1125,7 @@ static void macip_destroy_classify_tables (acl_main_t * am, u32 macip_acl_index) { vnet_classify_main_t *cm = &vnet_classify_main; - macip_acl_list_t *a = &am->macip_acls[macip_acl_index]; + macip_acl_list_t *a = pool_elt_at_index (am->macip_acls, macip_acl_index); if (a->ip4_table_index != ~0) { @@ -1144,6 +1153,18 @@ macip_acl_add_list (u32 count, vl_api_macip_acl_rule_t rules[], macip_acl_rule_t *r; macip_acl_rule_t *acl_new_rules = 0; int i; + + if (*acl_list_index != ~0) + { + /* They supplied some number, let's see if this MACIP ACL exists */ + if (pool_is_free_index (am->macip_acls, *acl_list_index)) + { + /* tried to replace a non-existent ACL, no point doing anything */ + clib_warning("acl-plugin-error: Trying to replace nonexistent MACIP ACL %d (tag %s)", *acl_list_index, tag); + return -1; + } + } + if (0 == count) { clib_warning("acl-plugin-warning: Trying to create empty MACIP ACL (tag %s)", tag); } @@ -1166,11 +1187,23 @@ macip_acl_add_list (u32 count, vl_api_macip_acl_rule_t rules[], r->src_prefixlen = rules[i].src_ip_prefix_len; } - /* Get ACL index */ - pool_get_aligned (am->macip_acls, a, CLIB_CACHE_LINE_BYTES); - memset (a, 0, sizeof (*a)); - /* Will return the newly allocated ACL index */ - *acl_list_index = a - am->macip_acls; + if (~0 == *acl_list_index) + { + /* Get ACL index */ + pool_get_aligned (am->macip_acls, a, CLIB_CACHE_LINE_BYTES); + memset (a, 0, sizeof (*a)); + /* Will return the newly allocated ACL index */ + *acl_list_index = a - am->macip_acls; + } + else + { + a = pool_elt_at_index (am->macip_acls, *acl_list_index); + if (a->rules) + { + vec_free (a->rules); + } + macip_destroy_classify_tables (am, *acl_list_index); + } a->rules = acl_new_rules; a->count = count; @@ -1198,7 +1231,7 @@ macip_acl_interface_del_acl (acl_main_t * am, u32 sw_if_index) /* No point in deleting MACIP ACL which is not applied */ if (~0 == macip_acl_index) return -1; - a = &am->macip_acls[macip_acl_index]; + a = pool_elt_at_index (am->macip_acls, macip_acl_index); /* remove the classifier tables off the interface L2 ACL */ rv = vnet_set_input_acl_intfc (am->vlib_main, sw_if_index, a->ip4_table_index, @@ -1221,13 +1254,13 @@ macip_acl_interface_add_acl (acl_main_t * am, u32 sw_if_index, return -1; } void *oldheap = acl_set_heap(am); - a = &am->macip_acls[macip_acl_index]; + a = pool_elt_at_index (am->macip_acls, macip_acl_index); vec_validate_init_empty (am->macip_acl_by_sw_if_index, sw_if_index, ~0); + clib_mem_set_heap (oldheap); /* If there already a MACIP ACL applied, unapply it */ if (~0 != am->macip_acl_by_sw_if_index[sw_if_index]) macip_acl_interface_del_acl(am, sw_if_index); am->macip_acl_by_sw_if_index[sw_if_index] = macip_acl_index; - clib_mem_set_heap (oldheap); /* Apply the classifier tables for L2 ACLs */ rv = @@ -1240,7 +1273,6 @@ static int macip_acl_del_list (u32 acl_list_index) { acl_main_t *am = &acl_main; - void *oldheap = acl_set_heap(am); macip_acl_list_t *a; int i; if (pool_is_free_index (am->macip_acls, acl_list_index)) @@ -1257,11 +1289,12 @@ macip_acl_del_list (u32 acl_list_index) } } + void *oldheap = acl_set_heap(am); /* Now that classifier tables are detached, clean them up */ macip_destroy_classify_tables (am, acl_list_index); /* now we can delete the ACL itself */ - a = &am->macip_acls[acl_list_index]; + a = pool_elt_at_index (am->macip_acls, acl_list_index); if (a->rules) { vec_free (a->rules); @@ -1277,7 +1310,6 @@ macip_acl_interface_add_del_acl (u32 sw_if_index, u8 is_add, u32 acl_list_index) { acl_main_t *am = &acl_main; - void *oldheap = acl_set_heap(am); int rv = -1; if (is_add) { @@ -1287,7 +1319,6 @@ macip_acl_interface_add_del_acl (u32 sw_if_index, u8 is_add, { rv = macip_acl_interface_del_acl (am, sw_if_index); } - clib_mem_set_heap (oldheap); return rv; } @@ -1464,7 +1495,6 @@ send_acl_details (acl_main_t * am, unix_shared_memory_queue_t * q, copy_acl_rule_to_api_rule (&rules[i], &acl->rules[i]); } - clib_warning("Sending acl details for ACL index %d", ntohl(mp->acl_index)); clib_mem_set_heap (oldheap); vl_msg_api_send_shmem (q, (u8 *) & mp); } @@ -1500,10 +1530,10 @@ vl_api_acl_dump_t_handler (vl_api_acl_dump_t * mp) { acl_index = ntohl (mp->acl_index); if (!pool_is_free_index (am->acls, acl_index)) - { - acl = &am->acls[acl_index]; - send_acl_details (am, q, acl, mp->context); - } + { + acl = pool_elt_at_index (am->acls, acl_index); + send_acl_details (am, q, acl, mp->context); + } } if (rv == -1) @@ -1619,6 +1649,30 @@ vl_api_macip_acl_add_t_handler (vl_api_macip_acl_add_t * mp) /* *INDENT-ON* */ } +static void +vl_api_macip_acl_add_replace_t_handler (vl_api_macip_acl_add_replace_t * mp) +{ + vl_api_macip_acl_add_replace_reply_t *rmp; + acl_main_t *am = &acl_main; + int rv; + u32 acl_list_index = ntohl (mp->acl_index); + u32 acl_count = ntohl (mp->count); + u32 expected_len = sizeof(*mp) + acl_count*sizeof(mp->r[0]); + + if (verify_message_len(mp, expected_len, "macip_acl_add_replace")) { + rv = macip_acl_add_list (acl_count, mp->r, &acl_list_index, mp->tag); + } else { + rv = VNET_API_ERROR_INVALID_VALUE; + } + + /* *INDENT-OFF* */ + REPLY_MACRO2(VL_API_MACIP_ACL_ADD_REPLACE_REPLY, + ({ + rmp->acl_index = htonl(acl_list_index); + })); + /* *INDENT-ON* */ +} + static void vl_api_macip_acl_del_t_handler (vl_api_macip_acl_del_t * mp) { @@ -1730,10 +1784,10 @@ vl_api_macip_acl_dump_t_handler (vl_api_macip_acl_dump_t * mp) { u32 acl_index = ntohl (mp->acl_index); if (!pool_is_free_index (am->macip_acls, acl_index)) - { - acl = &am->macip_acls[acl_index]; - send_macip_acl_details (am, q, acl, mp->context); - } + { + acl = pool_elt_at_index (am->macip_acls, acl_index); + send_macip_acl_details (am, q, acl, mp->context); + } } } @@ -2110,7 +2164,8 @@ my_macip_acl_rule_t_pretty_format (u8 *out, va_list *args) out = format(out, "%s action %d ip %U/%d mac %U mask %U", a->is_ipv6 ? "ipv6" : "ipv4", a->is_permit, - format_ip46_address, &a->src_ip_addr, IP46_TYPE_ANY, + format_ip46_address, &a->src_ip_addr, + a->is_ipv6 ? IP46_TYPE_IP6: IP46_TYPE_IP4, a->src_prefixlen, my_format_mac_address, a->src_mac, my_format_mac_address, a->src_mac_mask); @@ -2141,352 +2196,432 @@ macip_acl_print(acl_main_t *am, u32 macip_acl_index) } static clib_error_t * -acl_show_aclplugin_macip_fn (vlib_main_t * vm, +acl_show_aclplugin_macip_acl_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { clib_error_t *error = 0; acl_main_t *am = &acl_main; int i; - if (unformat (input, "interface")) - { - for(i=0; i < vec_len(am->macip_acl_by_sw_if_index); i++) - { - vlib_cli_output(vm, " sw_if_index %d: %d\n", i, vec_elt(am->macip_acl_by_sw_if_index, i)); - } - } - else if (unformat (input, "acl")) + for(i=0; i < vec_len(am->macip_acls); i++) + macip_acl_print(am, i); + return error; +} + +static clib_error_t * +acl_show_aclplugin_macip_interface_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + clib_error_t *error = 0; + acl_main_t *am = &acl_main; + int i; + for(i=0; i < vec_len(am->macip_acl_by_sw_if_index); i++) { - for(i=0; i < vec_len(am->macip_acls); i++) - macip_acl_print(am, i); + vlib_cli_output(vm, " sw_if_index %d: %d\n", i, vec_elt(am->macip_acl_by_sw_if_index, i)); } return error; } +#define PRINT_AND_RESET(vm, out0) do { vlib_cli_output(vm, "%v", out0); vec_reset_length(out0); } while(0) +static +void acl_print_acl(vlib_main_t *vm, acl_main_t *am, int acl_index) +{ + acl_rule_t *r; + u8 *out0 = format(0, "acl-index %u count %u tag {%s}\n", acl_index, am->acls[acl_index].count, am->acls[acl_index].tag); + int j; + PRINT_AND_RESET(vm, out0); + for(j=0; jacls[acl_index].count; j++) { + r = &am->acls[acl_index].rules[j]; + out0 = format(out0, " %4d: %s ", j, r->is_ipv6 ? "ipv6" : "ipv4"); + out0 = format_acl_action(out0, r->is_permit); + out0 = format(out0, " src %U/%d", format_ip46_address, &r->src, + r->is_ipv6 ? IP46_TYPE_IP6: IP46_TYPE_IP4, r->src_prefixlen); + out0 = format(out0, " dst %U/%d", format_ip46_address, &r->dst, + r->is_ipv6 ? IP46_TYPE_IP6: IP46_TYPE_IP4, r->dst_prefixlen); + out0 = format(out0, " proto %d", r->proto); + out0 = format(out0, " sport %d", r->src_port_or_type_first); + if (r->src_port_or_type_first != r->src_port_or_type_last) { + out0 = format(out0, "-%d", r->src_port_or_type_last); + } + out0 = format(out0, " dport %d", r->dst_port_or_code_first); + if (r->dst_port_or_code_first != r->dst_port_or_code_last) { + out0 = format(out0, "-%d", r->dst_port_or_code_last); + } + if (r->tcp_flags_mask || r->tcp_flags_value) { + out0 = format(out0, " tcpflags %d mask %d", r->tcp_flags_value, r->tcp_flags_mask); + } + out0 = format(out0, "\n"); + PRINT_AND_RESET(vm, out0); + } +} +#undef PRINT_AND_RESET + +static void +acl_plugin_show_acl(acl_main_t *am, u32 acl_index) +{ + u32 i; + vlib_main_t *vm = am->vlib_main; + + for(i=0; iacls); i++) { + if (acl_is_not_defined(am, i)) { + /* don't attempt to show the ACLs that do not exist */ + continue; + } + if ((acl_index != ~0) && (acl_index != i)) { + continue; + } + acl_print_acl(vm, am, i); + + if (iinput_sw_if_index_vec_by_acl)) { + vlib_cli_output(vm, " applied inbound on sw_if_index: %U\n", format_vec32, am->input_sw_if_index_vec_by_acl[i], "%d"); + } + if (ioutput_sw_if_index_vec_by_acl)) { + vlib_cli_output(vm, " applied outbound on sw_if_index: %U\n", format_vec32, am->output_sw_if_index_vec_by_acl[i], "%d"); + } + } +} static clib_error_t * -acl_show_aclplugin_fn (vlib_main_t * vm, +acl_show_aclplugin_acl_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { clib_error_t *error = 0; acl_main_t *am = &acl_main; - vnet_interface_main_t *im = &am->vnet_main->interface_main; + + u32 acl_index = ~0; + unformat (input, "index %u", &acl_index); + + acl_plugin_show_acl(am, acl_index); + return error; +} + +static void +acl_plugin_show_interface(acl_main_t *am, u32 sw_if_index, int show_acl) +{ + vlib_main_t *vm = am->vlib_main; + u32 swi; u32 *pj; + for(swi = 0; (swi < vec_len(am->input_acl_vec_by_sw_if_index)) || + (swi < vec_len(am->output_acl_vec_by_sw_if_index)); swi++) { + /* if we need a particular interface, skip all the others */ + if ((sw_if_index != ~0) && (sw_if_index != swi)) + continue; + + vlib_cli_output(vm, "sw_if_index %d:\n", swi); + + if ((swi < vec_len(am->input_acl_vec_by_sw_if_index)) && + (vec_len(am->input_acl_vec_by_sw_if_index[swi]) > 0)) { + vlib_cli_output(vm, " input acl(s): %U", format_vec32, am->input_acl_vec_by_sw_if_index[swi], "%d"); + if (show_acl) { + vlib_cli_output(vm, "\n"); + vec_foreach(pj, am->input_acl_vec_by_sw_if_index[swi]) { + acl_print_acl(vm, am, *pj); + } + vlib_cli_output(vm, "\n"); + } + } + + if ((swi < vec_len(am->output_acl_vec_by_sw_if_index)) && + (vec_len(am->output_acl_vec_by_sw_if_index[swi]) > 0)) { + vlib_cli_output(vm, " output acl(s): %U", format_vec32, am->output_acl_vec_by_sw_if_index[swi], "%d"); + if (show_acl) { + vlib_cli_output(vm, "\n"); + vec_foreach(pj, am->output_acl_vec_by_sw_if_index[swi]) { + acl_print_acl(vm, am, *pj); + } + vlib_cli_output(vm, "\n"); + } + } + } + +} + +static clib_error_t * +acl_show_aclplugin_interface_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + clib_error_t *error = 0; + acl_main_t *am = &acl_main; + + u32 sw_if_index = ~0; + unformat (input, "sw_if_index %u", &sw_if_index); + int show_acl = unformat(input, "acl"); + + acl_plugin_show_interface(am, sw_if_index, show_acl); + return error; +} + +static clib_error_t * +acl_show_aclplugin_memory_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + clib_error_t *error = 0; + acl_main_t *am = &acl_main; + + vlib_cli_output (vm, "ACL plugin main heap statistics:\n"); + if (am->acl_mheap) { + vlib_cli_output (vm, " %U\n", format_mheap, am->acl_mheap, 1); + } else { + vlib_cli_output (vm, " Not initialized\n"); + } + vlib_cli_output (vm, "ACL hash lookup support heap statistics:\n"); + if (am->hash_lookup_mheap) { + vlib_cli_output (vm, " %U\n", format_mheap, am->hash_lookup_mheap, 1); + } else { + vlib_cli_output (vm, " Not initialized\n"); + } + return error; +} +static void +acl_plugin_show_sessions(acl_main_t *am, + u32 show_session_thread_id, u32 show_session_session_index) +{ + vlib_main_t *vm = am->vlib_main; + u16 wk; + vnet_interface_main_t *im = &am->vnet_main->interface_main; vnet_sw_interface_t *swif; - if (unformat (input, "sessions")) - { - u8 * out0 = format(0, ""); - u16 wk; - u32 show_bihash_verbose = 0; - u32 show_session_thread_id = ~0; - u32 show_session_session_index = ~0; - unformat (input, "thread %u index %u", &show_session_thread_id, &show_session_session_index); - unformat (input, "verbose %u", &show_bihash_verbose); - { - u64 n_adds = am->fa_session_total_adds; - u64 n_dels = am->fa_session_total_dels; - out0 = format(out0, "Sessions total: add %lu - del %lu = %lu\n", n_adds, n_dels, n_adds - n_dels); - } - out0 = format(out0, "\n\nPer-thread data:\n"); - for (wk = 0; wk < vec_len (am->per_worker_data); wk++) { - acl_fa_per_worker_data_t *pw = &am->per_worker_data[wk]; - out0 = format(out0, "Thread #%d:\n", wk); - if (show_session_thread_id == wk && show_session_session_index < pool_len(pw->fa_sessions_pool)) { - out0 = format(out0, " session index %u:\n", show_session_session_index); - fa_session_t *sess = pw->fa_sessions_pool + show_session_session_index; - u64 *m = (u64 *)&sess->info; - out0 = format(out0, " info: %016llx %016llx %016llx %016llx %016llx %016llx\n", m[0], m[1], m[2], m[3], m[4], m[5]); - out0 = format(out0, " sw_if_index: %u\n", sess->sw_if_index); - out0 = format(out0, " tcp_flags_seen: %x\n", sess->tcp_flags_seen.as_u16); - out0 = format(out0, " last active time: %lu\n", sess->last_active_time); - out0 = format(out0, " thread index: %u\n", sess->thread_index); - out0 = format(out0, " link enqueue time: %lu\n", sess->link_enqueue_time); - out0 = format(out0, " link next index: %u\n", sess->link_next_idx); - out0 = format(out0, " link prev index: %u\n", sess->link_prev_idx); - out0 = format(out0, " link list id: %u\n", sess->link_list_id); - } - out0 = format(out0, " connection add/del stats:\n", wk); - pool_foreach (swif, im->sw_interfaces, - ({ - u32 sw_if_index = swif->sw_if_index; - u64 n_adds = sw_if_index < vec_len(pw->fa_session_adds_by_sw_if_index) ? pw->fa_session_adds_by_sw_if_index[sw_if_index] : 0; - u64 n_dels = sw_if_index < vec_len(pw->fa_session_dels_by_sw_if_index) ? pw->fa_session_dels_by_sw_if_index[sw_if_index] : 0; - out0 = format(out0, " sw_if_index %d: add %lu - del %lu = %lu\n", sw_if_index, n_adds, n_dels, n_adds - n_dels); - })); - - out0 = format(out0, " connection timeout type lists:\n", wk); - u8 tt = 0; - for(tt = 0; tt < ACL_N_TIMEOUTS; tt++) { - u32 head_session_index = pw->fa_conn_list_head[tt]; - out0 = format(out0, " fa_conn_list_head[%d]: %d\n", tt, head_session_index); - if (~0 != head_session_index) { - fa_session_t *sess = pw->fa_sessions_pool + head_session_index; - out0 = format(out0, " last active time: %lu\n", sess->last_active_time); - out0 = format(out0, " link enqueue time: %lu\n", sess->link_enqueue_time); - } - } + { + u64 n_adds = am->fa_session_total_adds; + u64 n_dels = am->fa_session_total_dels; + vlib_cli_output(vm, "Sessions total: add %lu - del %lu = %lu", n_adds, n_dels, n_adds - n_dels); + } + vlib_cli_output(vm, "\n\nPer-thread data:"); + for (wk = 0; wk < vec_len (am->per_worker_data); wk++) { + acl_fa_per_worker_data_t *pw = &am->per_worker_data[wk]; + vlib_cli_output(vm, "Thread #%d:", wk); + if (show_session_thread_id == wk && show_session_session_index < pool_len(pw->fa_sessions_pool)) { + vlib_cli_output(vm, " session index %u:", show_session_session_index); + fa_session_t *sess = pw->fa_sessions_pool + show_session_session_index; + u64 *m = (u64 *)&sess->info; + vlib_cli_output(vm, " info: %016llx %016llx %016llx %016llx %016llx %016llx", m[0], m[1], m[2], m[3], m[4], m[5]); + vlib_cli_output(vm, " sw_if_index: %u", sess->sw_if_index); + vlib_cli_output(vm, " tcp_flags_seen: %x", sess->tcp_flags_seen.as_u16); + vlib_cli_output(vm, " last active time: %lu", sess->last_active_time); + vlib_cli_output(vm, " thread index: %u", sess->thread_index); + vlib_cli_output(vm, " link enqueue time: %lu", sess->link_enqueue_time); + vlib_cli_output(vm, " link next index: %u", sess->link_next_idx); + vlib_cli_output(vm, " link prev index: %u", sess->link_prev_idx); + vlib_cli_output(vm, " link list id: %u", sess->link_list_id); + } + vlib_cli_output(vm, " connection add/del stats:", wk); + pool_foreach (swif, im->sw_interfaces, + ({ + u32 sw_if_index = swif->sw_if_index; + u64 n_adds = sw_if_index < vec_len(pw->fa_session_adds_by_sw_if_index) ? pw->fa_session_adds_by_sw_if_index[sw_if_index] : 0; + u64 n_dels = sw_if_index < vec_len(pw->fa_session_dels_by_sw_if_index) ? pw->fa_session_dels_by_sw_if_index[sw_if_index] : 0; + vlib_cli_output(vm, " sw_if_index %d: add %lu - del %lu = %lu", sw_if_index, n_adds, n_dels, n_adds - n_dels); + })); - out0 = format(out0, " Next expiry time: %lu\n", pw->next_expiry_time); - out0 = format(out0, " Requeue until time: %lu\n", pw->requeue_until_time); - out0 = format(out0, " Current time wait interval: %lu\n", pw->current_time_wait_interval); - out0 = format(out0, " Count of deleted sessions: %lu\n", pw->cnt_deleted_sessions); - out0 = format(out0, " Delete already deleted: %lu\n", pw->cnt_already_deleted_sessions); - out0 = format(out0, " Session timers restarted: %lu\n", pw->cnt_session_timer_restarted); - out0 = format(out0, " Swipe until this time: %lu\n", pw->swipe_end_time); - out0 = format(out0, " sw_if_index serviced bitmap: %U\n", format_bitmap_hex, pw->serviced_sw_if_index_bitmap); - out0 = format(out0, " pending clear intfc bitmap : %U\n", format_bitmap_hex, pw->pending_clear_sw_if_index_bitmap); - out0 = format(out0, " clear in progress: %u\n", pw->clear_in_process); - out0 = format(out0, " interrupt is pending: %d\n", pw->interrupt_is_pending); - out0 = format(out0, " interrupt is needed: %d\n", pw->interrupt_is_needed); - out0 = format(out0, " interrupt is unwanted: %d\n", pw->interrupt_is_unwanted); + vlib_cli_output(vm, " connection timeout type lists:", wk); + u8 tt = 0; + for(tt = 0; tt < ACL_N_TIMEOUTS; tt++) { + u32 head_session_index = pw->fa_conn_list_head[tt]; + vlib_cli_output(vm, " fa_conn_list_head[%d]: %d", tt, head_session_index); + if (~0 != head_session_index) { + fa_session_t *sess = pw->fa_sessions_pool + head_session_index; + vlib_cli_output(vm, " last active time: %lu", sess->last_active_time); + vlib_cli_output(vm, " link enqueue time: %lu", sess->link_enqueue_time); } - out0 = format(out0, "\n\nConn cleaner thread counters:\n"); -#define _(cnt, desc) out0 = format(out0, " %20lu: %s\n", am->cnt, desc); - foreach_fa_cleaner_counter; + } + + vlib_cli_output(vm, " Next expiry time: %lu", pw->next_expiry_time); + vlib_cli_output(vm, " Requeue until time: %lu", pw->requeue_until_time); + vlib_cli_output(vm, " Current time wait interval: %lu", pw->current_time_wait_interval); + vlib_cli_output(vm, " Count of deleted sessions: %lu", pw->cnt_deleted_sessions); + vlib_cli_output(vm, " Delete already deleted: %lu", pw->cnt_already_deleted_sessions); + vlib_cli_output(vm, " Session timers restarted: %lu", pw->cnt_session_timer_restarted); + vlib_cli_output(vm, " Swipe until this time: %lu", pw->swipe_end_time); + vlib_cli_output(vm, " sw_if_index serviced bitmap: %U", format_bitmap_hex, pw->serviced_sw_if_index_bitmap); + vlib_cli_output(vm, " pending clear intfc bitmap : %U", format_bitmap_hex, pw->pending_clear_sw_if_index_bitmap); + vlib_cli_output(vm, " clear in progress: %u", pw->clear_in_process); + vlib_cli_output(vm, " interrupt is pending: %d", pw->interrupt_is_pending); + vlib_cli_output(vm, " interrupt is needed: %d", pw->interrupt_is_needed); + vlib_cli_output(vm, " interrupt is unwanted: %d", pw->interrupt_is_unwanted); + vlib_cli_output(vm, " interrupt generation: %d", pw->interrupt_generation); + } + vlib_cli_output(vm, "\n\nConn cleaner thread counters:"); +#define _(cnt, desc) vlib_cli_output(vm, " %20lu: %s", am->cnt, desc); + foreach_fa_cleaner_counter; #undef _ - vec_terminate_c_string(out0); - vlib_cli_output(vm, "\n\n%s\n\n", out0); - vlib_cli_output(vm, "Sessions per interval: min %lu max %lu increment: %f ms current: %f ms", - am->fa_min_deleted_sessions_per_interval, am->fa_max_deleted_sessions_per_interval, - am->fa_cleaner_wait_time_increment * 1000.0, ((f64)am->fa_current_cleaner_timer_wait_interval) * 1000.0/(f64)vm->clib_time.clocks_per_second); - - vec_free(out0); - show_fa_sessions_hash(vm, show_bihash_verbose); - } - else if (unformat (input, "interface")) - { - u32 sw_if_index = ~0; - u32 swi; - u8 * out0 = format(0, ""); - unformat (input, "sw_if_index %u", &sw_if_index); - for(swi = 0; (swi < vec_len(am->input_acl_vec_by_sw_if_index)) || - (swi < vec_len(am->output_acl_vec_by_sw_if_index)); swi++) { - out0 = format(out0, "sw_if_index %d:\n", swi); - - if ((swi < vec_len(am->input_acl_vec_by_sw_if_index)) && - (vec_len(am->input_acl_vec_by_sw_if_index[swi]) > 0)) { - out0 = format(out0, " input acl(s): "); - vec_foreach(pj, am->input_acl_vec_by_sw_if_index[swi]) { - out0 = format(out0, "%d ", *pj); - } - out0 = format(out0, "\n"); - } + vlib_cli_output(vm, "Interrupt generation: %d", am->fa_interrupt_generation); + vlib_cli_output(vm, "Sessions per interval: min %lu max %lu increment: %f ms current: %f ms", + am->fa_min_deleted_sessions_per_interval, am->fa_max_deleted_sessions_per_interval, + am->fa_cleaner_wait_time_increment * 1000.0, ((f64)am->fa_current_cleaner_timer_wait_interval) * 1000.0/(f64)vm->clib_time.clocks_per_second); +} - if ((swi < vec_len(am->output_acl_vec_by_sw_if_index)) && - (vec_len(am->output_acl_vec_by_sw_if_index[swi]) > 0)) { - out0 = format(out0, " output acl(s): "); - vec_foreach(pj, am->output_acl_vec_by_sw_if_index[swi]) { - out0 = format(out0, "%d ", *pj); - } - out0 = format(out0, "\n"); - } +static clib_error_t * +acl_show_aclplugin_sessions_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + clib_error_t *error = 0; + acl_main_t *am = &acl_main; - } - vec_terminate_c_string(out0); - vlib_cli_output(vm, "\n%s\n", out0); - vec_free(out0); - } - else if (unformat (input, "acl")) - { - u32 acl_index = ~0; - u32 i; - u8 * out0 = format(0, ""); - unformat (input, "index %u", &acl_index); - for(i=0; iacls); i++) { - if (acl_is_not_defined(am, i)) { - /* don't attempt to show the ACLs that do not exist */ - continue; - } - if ((acl_index != ~0) && (acl_index != i)) { - continue; - } - out0 = format(out0, "acl-index %u count %u tag {%s}\n", i, am->acls[i].count, am->acls[i].tag); - acl_rule_t *r; - int j; - for(j=0; jacls[i].count; j++) { - r = &am->acls[i].rules[j]; - out0 = format(out0, " %4d: %s ", j, r->is_ipv6 ? "ipv6" : "ipv4"); - out0 = format_acl_action(out0, r->is_permit); - out0 = format(out0, " src %U/%d", format_ip46_address, &r->src, IP46_TYPE_ANY, r->src_prefixlen); - out0 = format(out0, " dst %U/%d", format_ip46_address, &r->dst, IP46_TYPE_ANY, r->dst_prefixlen); - out0 = format(out0, " proto %d", r->proto); - out0 = format(out0, " sport %d", r->src_port_or_type_first); - if (r->src_port_or_type_first != r->src_port_or_type_last) { - out0 = format(out0, "-%d", r->src_port_or_type_last); - } - out0 = format(out0, " dport %d", r->dst_port_or_code_first); - if (r->dst_port_or_code_first != r->dst_port_or_code_last) { - out0 = format(out0, "-%d", r->dst_port_or_code_last); - } - if (r->tcp_flags_mask || r->tcp_flags_value) { - out0 = format(out0, " tcpflags %d mask %d", r->tcp_flags_value, r->tcp_flags_mask); - } - out0 = format(out0, "\n"); - } + u32 show_bihash_verbose = 0; + u32 show_session_thread_id = ~0; + u32 show_session_session_index = ~0; + unformat (input, "thread %u index %u", &show_session_thread_id, &show_session_session_index); + unformat (input, "verbose %u", &show_bihash_verbose); - if (iinput_sw_if_index_vec_by_acl)) { - out0 = format(out0, " applied inbound on sw_if_index: "); - vec_foreach(pj, am->input_sw_if_index_vec_by_acl[i]) { - out0 = format(out0, "%d ", *pj); - } - out0 = format(out0, "\n"); - } - if (ioutput_sw_if_index_vec_by_acl)) { - out0 = format(out0, " applied outbound on sw_if_index: "); - vec_foreach(pj, am->output_sw_if_index_vec_by_acl[i]) { - out0 = format(out0, "%d ", *pj); - } - out0 = format(out0, "\n"); - } + acl_plugin_show_sessions(am, show_session_thread_id, show_session_session_index); + show_fa_sessions_hash(vm, show_bihash_verbose); + return error; +} + +static void +acl_plugin_show_tables_mask_type(acl_main_t *am) +{ + vlib_main_t *vm = am->vlib_main; + ace_mask_type_entry_t *mte; + + vlib_cli_output(vm, "Mask-type entries:"); + /* *INDENT-OFF* */ + pool_foreach(mte, am->ace_mask_type_pool, + ({ + vlib_cli_output(vm, " %3d: %016llx %016llx %016llx %016llx %016llx %016llx refcount %d", + mte - am->ace_mask_type_pool, + mte->mask.kv.key[0], mte->mask.kv.key[1], mte->mask.kv.key[2], + mte->mask.kv.key[3], mte->mask.kv.key[4], mte->mask.kv.value, mte->refcount); + })); + /* *INDENT-ON* */ +} + +static void +acl_plugin_show_tables_acl_hash_info(acl_main_t *am, u32 acl_index) +{ + vlib_main_t *vm = am->vlib_main; + u32 i,j; + u64 *m; + vlib_cli_output(vm, "Mask-ready ACL representations\n"); + for (i=0; i< vec_len(am->hash_acl_infos); i++) { + if ((acl_index != ~0) && (acl_index != i)) { + continue; + } + hash_acl_info_t *ha = &am->hash_acl_infos[i]; + vlib_cli_output(vm, "acl-index %u bitmask-ready layout\n", i); + vlib_cli_output(vm, " applied inbound on sw_if_index list: %U\n", format_vec32, ha->inbound_sw_if_index_list, "%d"); + vlib_cli_output(vm, " applied outbound on sw_if_index list: %U\n", format_vec32, ha->outbound_sw_if_index_list, "%d"); + vlib_cli_output(vm, " mask type index bitmap: %U\n", format_bitmap_hex, ha->mask_type_index_bitmap); + for(j=0; jrules); j++) { + hash_ace_info_t *pa = &ha->rules[j]; + m = (u64 *)&pa->match; + vlib_cli_output(vm, " %4d: %016llx %016llx %016llx %016llx %016llx %016llx mask index %d acl %d rule %d action %d src/dst portrange not ^2: %d,%d\n", + j, m[0], m[1], m[2], m[3], m[4], m[5], pa->mask_type_index, + pa->acl_index, pa->ace_index, pa->action, + pa->src_portrange_not_powerof2, pa->dst_portrange_not_powerof2); } - vec_terminate_c_string(out0); - vlib_cli_output(vm, "\n%s\n", out0); - vec_free(out0); } - else if (unformat (input, "memory")) - { - vlib_cli_output (vm, "ACL plugin main heap statistics:\n"); - if (am->acl_mheap) { - vlib_cli_output (vm, " %U\n", format_mheap, am->acl_mheap, 1); - } else { - vlib_cli_output (vm, " Not initialized\n"); +} + +static void +acl_plugin_print_pae(vlib_main_t *vm, int j, applied_hash_ace_entry_t *pae) +{ + vlib_cli_output(vm, " %4d: acl %d rule %d action %d bitmask-ready rule %d next %d prev %d tail %d hitcount %lld", + j, pae->acl_index, pae->ace_index, pae->action, pae->hash_ace_info_index, + pae->next_applied_entry_index, pae->prev_applied_entry_index, pae->tail_applied_entry_index, pae->hitcount); +} + +static void +acl_plugin_show_tables_applied_info(acl_main_t *am, u32 sw_if_index) +{ + vlib_main_t *vm = am->vlib_main; + u32 swi, j; + vlib_cli_output(vm, "Applied lookup entries for interfaces"); + + for(swi = 0; (swi < vec_len(am->input_applied_hash_acl_info_by_sw_if_index)) || + (swi < vec_len(am->output_applied_hash_acl_info_by_sw_if_index)) || + (swi < vec_len(am->input_hash_entry_vec_by_sw_if_index)) || + (swi < vec_len(am->output_hash_entry_vec_by_sw_if_index)); swi++) { + if ((sw_if_index != ~0) && (sw_if_index != swi)) { + continue; } - vlib_cli_output (vm, "ACL hash lookup support heap statistics:\n"); - if (am->hash_lookup_mheap) { - vlib_cli_output (vm, " %U\n", format_mheap, am->hash_lookup_mheap, 1); - } else { - vlib_cli_output (vm, " Not initialized\n"); + vlib_cli_output(vm, "sw_if_index %d:", swi); + if (swi < vec_len(am->input_applied_hash_acl_info_by_sw_if_index)) { + applied_hash_acl_info_t *pal = &am->input_applied_hash_acl_info_by_sw_if_index[swi]; + vlib_cli_output(vm, " input lookup mask_type_index_bitmap: %U", format_bitmap_hex, pal->mask_type_index_bitmap); + vlib_cli_output(vm, " input applied acls: %U", format_vec32, pal->applied_acls, "%d"); } - } - else if (unformat (input, "tables")) - { - ace_mask_type_entry_t *mte; - u32 acl_index = ~0; - u32 sw_if_index = ~0; - int show_acl_hash_info = 0; - int show_applied_info = 0; - int show_mask_type = 0; - int show_bihash = 0; - u32 show_bihash_verbose = 0; - - if (unformat (input, "acl")) { - show_acl_hash_info = 1; - /* mask-type is handy to see as well right there */ - show_mask_type = 1; - unformat (input, "index %u", &acl_index); - } else if (unformat (input, "applied")) { - show_applied_info = 1; - unformat (input, "sw_if_index %u", &sw_if_index); - } else if (unformat (input, "mask")) { - show_mask_type = 1; - } else if (unformat (input, "hash")) { - show_bihash = 1; - unformat (input, "verbose %u", &show_bihash_verbose); + if (swi < vec_len(am->input_hash_entry_vec_by_sw_if_index)) { + vlib_cli_output(vm, " input lookup applied entries:"); + for(j=0; jinput_hash_entry_vec_by_sw_if_index[swi]); j++) { + acl_plugin_print_pae(vm, j, &am->input_hash_entry_vec_by_sw_if_index[swi][j]); + } } - if ( ! (show_mask_type || show_acl_hash_info || show_applied_info || show_bihash) ) { - /* if no qualifiers specified, show all */ - show_mask_type = 1; - show_acl_hash_info = 1; - show_applied_info = 1; - show_bihash = 1; + if (swi < vec_len(am->output_applied_hash_acl_info_by_sw_if_index)) { + applied_hash_acl_info_t *pal = &am->output_applied_hash_acl_info_by_sw_if_index[swi]; + vlib_cli_output(vm, " output lookup mask_type_index_bitmap: %U", format_bitmap_hex, pal->mask_type_index_bitmap); + vlib_cli_output(vm, " output applied acls: %U", format_vec32, pal->applied_acls, "%d"); } - - if (show_mask_type) { - vlib_cli_output(vm, "Mask-type entries:"); - /* *INDENT-OFF* */ - pool_foreach(mte, am->ace_mask_type_pool, - ({ - vlib_cli_output(vm, " %3d: %016llx %016llx %016llx %016llx %016llx %016llx refcount %d", - mte - am->ace_mask_type_pool, - mte->mask.kv.key[0], mte->mask.kv.key[1], mte->mask.kv.key[2], - mte->mask.kv.key[3], mte->mask.kv.key[4], mte->mask.kv.value, mte->refcount); - })); - /* *INDENT-ON* */ + if (swi < vec_len(am->output_hash_entry_vec_by_sw_if_index)) { + vlib_cli_output(vm, " output lookup applied entries:"); + for(j=0; joutput_hash_entry_vec_by_sw_if_index[swi]); j++) { + acl_plugin_print_pae(vm, j, &am->output_hash_entry_vec_by_sw_if_index[swi][j]); + } } + } +} - if (show_acl_hash_info) { - u32 i,j; - u8 * out0 = format(0, ""); - u64 *m; - out0 = format(out0, "Mask-ready ACL representations\n"); - for (i=0; i< vec_len(am->hash_acl_infos); i++) { - if ((acl_index != ~0) && (acl_index != i)) { - continue; - } - hash_acl_info_t *ha = &am->hash_acl_infos[i]; - out0 = format(out0, "acl-index %u bitmask-ready layout\n", i); - out0 = format(out0, " mask type index bitmap: %U\n", format_bitmap_hex, ha->mask_type_index_bitmap); - for(j=0; jrules); j++) { - hash_ace_info_t *pa = &ha->rules[j]; - m = (u64 *)&pa->match; - out0 = format(out0, " %4d: %016llx %016llx %016llx %016llx %016llx %016llx mask index %d acl %d rule %d action %d src/dst portrange not ^2: %d,%d\n", - j, m[0], m[1], m[2], m[3], m[4], m[5], pa->mask_type_index, - pa->acl_index, pa->ace_index, pa->action, - pa->src_portrange_not_powerof2, pa->dst_portrange_not_powerof2); - } - } - vec_terminate_c_string(out0); - vlib_cli_output(vm, "\n%s\n", out0); - vec_free(out0); - } +static void +acl_plugin_show_tables_bihash(acl_main_t *am, u32 show_bihash_verbose) +{ + vlib_main_t *vm = am->vlib_main; + show_hash_acl_hash(vm, am, show_bihash_verbose); +} - if (show_applied_info) { - u32 swi, j; - u8 * out0 = format(0, ""); - out0 = format(out0, "Applied lookup entries for interfaces\n"); - - for(swi = 0; (swi < vec_len(am->input_applied_hash_acl_info_by_sw_if_index)) || - (swi < vec_len(am->output_applied_hash_acl_info_by_sw_if_index)) || - (swi < vec_len(am->input_hash_entry_vec_by_sw_if_index)) || - (swi < vec_len(am->output_hash_entry_vec_by_sw_if_index)); swi++) { - if ((sw_if_index != ~0) && (sw_if_index != swi)) { - continue; - } - out0 = format(out0, "sw_if_index %d:\n", swi); - if (swi < vec_len(am->input_applied_hash_acl_info_by_sw_if_index)) { - applied_hash_acl_info_t *pal = &am->input_applied_hash_acl_info_by_sw_if_index[swi]; - out0 = format(out0, " input lookup mask_type_index_bitmap: %U\n", format_bitmap_hex, pal->mask_type_index_bitmap); - out0 = format(out0, " input applied acls: %U\n", format_vec32, pal->applied_acls, "%d"); - } - if (swi < vec_len(am->input_hash_entry_vec_by_sw_if_index)) { - out0 = format(out0, " input lookup applied entries:\n"); - for(j=0; jinput_hash_entry_vec_by_sw_if_index[swi]); j++) { - applied_hash_ace_entry_t *pae = &am->input_hash_entry_vec_by_sw_if_index[swi][j]; - out0 = format(out0, " %4d: acl %d rule %d action %d bitmask-ready rule %d next %d prev %d tail %d\n", - j, pae->acl_index, pae->ace_index, pae->action, pae->hash_ace_info_index, - pae->next_applied_entry_index, pae->prev_applied_entry_index, pae->tail_applied_entry_index); - } - } +static clib_error_t * +acl_show_aclplugin_tables_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + clib_error_t *error = 0; + acl_main_t *am = &acl_main; - if (swi < vec_len(am->output_applied_hash_acl_info_by_sw_if_index)) { - applied_hash_acl_info_t *pal = &am->output_applied_hash_acl_info_by_sw_if_index[swi]; - out0 = format(out0, " output lookup mask_type_index_bitmap: %U\n", format_bitmap_hex, pal->mask_type_index_bitmap); - out0 = format(out0, " output applied acls: %U\n", format_vec32, pal->applied_acls, "%d"); - } - if (swi < vec_len(am->output_hash_entry_vec_by_sw_if_index)) { - out0 = format(out0, " output lookup applied entries:\n"); - for(j=0; joutput_hash_entry_vec_by_sw_if_index[swi]); j++) { - applied_hash_ace_entry_t *pae = &am->output_hash_entry_vec_by_sw_if_index[swi][j]; - out0 = format(out0, " %4d: acl %d rule %d action %d bitmask-ready rule %d next %d prev %d tail %d\n", - j, pae->acl_index, pae->ace_index, pae->action, pae->hash_ace_info_index, - pae->next_applied_entry_index, pae->prev_applied_entry_index, pae->tail_applied_entry_index); - } - } + u32 acl_index = ~0; + u32 sw_if_index = ~0; + int show_acl_hash_info = 0; + int show_applied_info = 0; + int show_mask_type = 0; + int show_bihash = 0; + u32 show_bihash_verbose = 0; + + if (unformat (input, "acl")) { + show_acl_hash_info = 1; + /* mask-type is handy to see as well right there */ + show_mask_type = 1; + unformat (input, "index %u", &acl_index); + } else if (unformat (input, "applied")) { + show_applied_info = 1; + unformat (input, "sw_if_index %u", &sw_if_index); + } else if (unformat (input, "mask")) { + show_mask_type = 1; + } else if (unformat (input, "hash")) { + show_bihash = 1; + unformat (input, "verbose %u", &show_bihash_verbose); + } - } - vec_terminate_c_string(out0); - vlib_cli_output(vm, "\n%s\n", out0); - vec_free(out0); - } + if ( ! (show_mask_type || show_acl_hash_info || show_applied_info || show_bihash) ) { + /* if no qualifiers specified, show all */ + show_mask_type = 1; + show_acl_hash_info = 1; + show_applied_info = 1; + show_bihash = 1; + } + if (show_mask_type) + acl_plugin_show_tables_mask_type(am); + if (show_acl_hash_info) + acl_plugin_show_tables_acl_hash_info(am, acl_index); + if (show_applied_info) + acl_plugin_show_tables_applied_info(am, sw_if_index); + if (show_bihash) + acl_plugin_show_tables_bihash(am, show_bihash_verbose); - if (show_bihash) { - show_hash_acl_hash(vm, am, show_bihash_verbose); - } - } return error; } @@ -2509,18 +2644,47 @@ VLIB_CLI_COMMAND (aclplugin_set_command, static) = { .function = acl_set_aclplugin_fn, }; -VLIB_CLI_COMMAND (aclplugin_show_command, static) = { - .path = "show acl-plugin", - .short_help = "show acl-plugin {sessions|acl|interface|tables}", - .function = acl_show_aclplugin_fn, +VLIB_CLI_COMMAND (aclplugin_show_acl_command, static) = { + .path = "show acl-plugin acl", + .short_help = "show acl-plugin acl [index N]", + .function = acl_show_aclplugin_acl_fn, +}; + +VLIB_CLI_COMMAND (aclplugin_show_interface_command, static) = { + .path = "show acl-plugin interface", + .short_help = "show acl-plugin interface [sw_if_index N] [acl]", + .function = acl_show_aclplugin_interface_fn, +}; + +VLIB_CLI_COMMAND (aclplugin_show_memory_command, static) = { + .path = "show acl-plugin memory", + .short_help = "show acl-plugin memory", + .function = acl_show_aclplugin_memory_fn, }; -VLIB_CLI_COMMAND (aclplugin_show_macip_command, static) = { - .path = "show acl-plugin macip", - .short_help = "show acl-plugin macip {acl|interface}", - .function = acl_show_aclplugin_macip_fn, +VLIB_CLI_COMMAND (aclplugin_show_sessions_command, static) = { + .path = "show acl-plugin sessions", + .short_help = "show acl-plugin sessions", + .function = acl_show_aclplugin_sessions_fn, }; +VLIB_CLI_COMMAND (aclplugin_show_tables_command, static) = { + .path = "show acl-plugin tables", + .short_help = "show acl-plugin tables [ acl [index N] | applied [ sw_if_index N ] | mask | hash [verbose N] ]", + .function = acl_show_aclplugin_tables_fn, +}; + +VLIB_CLI_COMMAND (aclplugin_show_macip_acl_command, static) = { + .path = "show acl-plugin macip acl", + .short_help = "show acl-plugin macip acl", + .function = acl_show_aclplugin_macip_acl_fn, +}; + +VLIB_CLI_COMMAND (aclplugin_show_macip_interface_command, static) = { + .path = "show acl-plugin macip interface", + .short_help = "show acl-plugin macip interface", + .function = acl_show_aclplugin_macip_interface_fn, +}; VLIB_CLI_COMMAND (aclplugin_clear_command, static) = { .path = "clear acl-plugin sessions", @@ -2529,7 +2693,47 @@ VLIB_CLI_COMMAND (aclplugin_clear_command, static) = { }; /* *INDENT-ON* */ - +static clib_error_t * +acl_plugin_config (vlib_main_t * vm, unformat_input_t * input) +{ + acl_main_t *am = &acl_main; + u32 conn_table_hash_buckets; + u32 conn_table_hash_memory_size; + u32 conn_table_max_entries; + u32 main_heap_size; + u32 hash_heap_size; + u32 hash_lookup_hash_buckets; + u32 hash_lookup_hash_memory; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "connection hash buckets %d", &conn_table_hash_buckets)) + am->fa_conn_table_hash_num_buckets = conn_table_hash_buckets; + else if (unformat (input, "connection hash memory %d", + &conn_table_hash_memory_size)) + am->fa_conn_table_hash_memory_size = conn_table_hash_memory_size; + else if (unformat (input, "connection count max %d", + &conn_table_max_entries)) + am->fa_conn_table_max_entries = conn_table_max_entries; + else if (unformat (input, "main heap size %d", + &main_heap_size)) + am->acl_mheap_size = main_heap_size; + else if (unformat (input, "hash lookup heap size %d", + &hash_heap_size)) + am->hash_lookup_mheap_size = hash_heap_size; + else if (unformat (input, "hash lookup hash buckets %d", + &hash_lookup_hash_buckets)) + am->hash_lookup_hash_buckets = hash_lookup_hash_buckets; + else if (unformat (input, "hash lookup hash memory %d", + &hash_lookup_hash_memory)) + am->hash_lookup_hash_memory = hash_lookup_hash_memory; + else + return clib_error_return (0, "unknown input '%U'", + format_unformat_error, input); + } + return 0; +} +VLIB_CONFIG_FUNCTION (acl_plugin_config, "acl-plugin"); static clib_error_t * acl_init (vlib_main_t * vm) @@ -2555,6 +2759,12 @@ acl_init (vlib_main_t * vm) acl_setup_fa_nodes(); + am->acl_mheap_size = ACL_FA_DEFAULT_HEAP_SIZE; + am->hash_lookup_mheap_size = ACL_PLUGIN_HASH_LOOKUP_HEAP_SIZE; + + am->hash_lookup_hash_buckets = ACL_PLUGIN_HASH_LOOKUP_HASH_BUCKETS; + am->hash_lookup_hash_memory = ACL_PLUGIN_HASH_LOOKUP_HASH_MEMORY; + am->session_timeout_sec[ACL_TIMEOUT_TCP_TRANSIENT] = TCP_SESSION_TRANSIENT_TIMEOUT_SEC; am->session_timeout_sec[ACL_TIMEOUT_TCP_IDLE] = TCP_SESSION_IDLE_TIMEOUT_SEC; am->session_timeout_sec[ACL_TIMEOUT_UDP_IDLE] = UDP_SESSION_IDLE_TIMEOUT_SEC;