X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Facl%2Fsess_mgmt_node.c;h=a6c5e8049d6a60fe815f13148b7c1e0fdeeae4fd;hb=46fb787e21c758f6e88729ea34d3d721cd9b34eb;hp=b4faf55461288aa7c7694ad9d95ea09824a1b04e;hpb=3e0ee6ec3ce1d3f32c1faca7514048e55412220e;p=vpp.git diff --git a/src/plugins/acl/sess_mgmt_node.c b/src/plugins/acl/sess_mgmt_node.c index b4faf554612..a6c5e8049d6 100644 --- a/src/plugins/acl/sess_mgmt_node.c +++ b/src/plugins/acl/sess_mgmt_node.c @@ -30,24 +30,47 @@ #include #include -// #include - +static u8 * +format_ip6_session_bihash_kv (u8 * s, va_list * args) +{ + clib_bihash_kv_40_8_t *kv_40_8 = va_arg (*args, clib_bihash_kv_40_8_t *); + fa_5tuple_t a5t; + + a5t.kv_40_8 = *kv_40_8; + fa_full_session_id_t *sess = (fa_full_session_id_t *) & a5t.pkt; + + return (format (s, "l3 %U -> %U" + " l4 lsb_of_sw_if_index %d proto %d l4_is_input %d l4_slow_path %d l4_reserved0 %d port %d -> %d | sess id %d thread id %d epoch %04x", + format_ip6_address, &a5t.ip6_addr[0], + format_ip6_address, &a5t.ip6_addr[1], + a5t.l4.lsb_of_sw_if_index, + a5t.l4.proto, a5t.l4.is_input, a5t.l4.is_slowpath, + a5t.l4.reserved0, a5t.l4.port[0], a5t.l4.port[1], + sess->session_index, sess->thread_index, + sess->intf_policy_epoch)); +} -static u64 -fa_session_get_shortest_timeout (acl_main_t * am) +static u8 * +format_ip4_session_bihash_kv (u8 * s, va_list * args) { - int timeout_type; - u64 timeout = ~0LL; - for (timeout_type = 0; timeout_type < ACL_N_TIMEOUTS; timeout_type++) - { - if (timeout > am->session_timeout_sec[timeout_type]) - { - timeout = am->session_timeout_sec[timeout_type]; - } - } - return timeout; + clib_bihash_kv_16_8_t *kv_16_8 = va_arg (*args, clib_bihash_kv_16_8_t *); + fa_5tuple_t a5t; + + a5t.kv_16_8 = *kv_16_8; + fa_full_session_id_t *sess = (fa_full_session_id_t *) & a5t.pkt; + + return (format (s, "l3 %U -> %U" + " l4 lsb_of_sw_if_index %d proto %d l4_is_input %d l4_slow_path %d l4_reserved0 %d port %d -> %d | sess id %d thread id %d epoch %04x", + format_ip4_address, &a5t.ip4_addr[0], + format_ip4_address, &a5t.ip4_addr[1], + a5t.l4.lsb_of_sw_if_index, + a5t.l4.proto, a5t.l4.is_input, a5t.l4.is_slowpath, + a5t.l4.reserved0, a5t.l4.port[0], a5t.l4.port[1], + sess->session_index, sess->thread_index, + sess->intf_policy_epoch)); } + static void acl_fa_verify_init_sessions (acl_main_t * am) { @@ -69,10 +92,20 @@ acl_fa_verify_init_sessions (acl_main_t * am) } /* ... and the interface session hash table */ - clib_bihash_init_40_8 (&am->fa_sessions_hash, - "ACL plugin FA session bihash", + clib_bihash_init_40_8 (&am->fa_ip6_sessions_hash, + "ACL plugin FA IPv6 session bihash", + am->fa_conn_table_hash_num_buckets, + am->fa_conn_table_hash_memory_size); + clib_bihash_set_kvp_format_fn_40_8 (&am->fa_ip6_sessions_hash, + format_ip6_session_bihash_kv); + + clib_bihash_init_16_8 (&am->fa_ip4_sessions_hash, + "ACL plugin FA IPv4 session bihash", am->fa_conn_table_hash_num_buckets, am->fa_conn_table_hash_memory_size); + clib_bihash_set_kvp_format_fn_16_8 (&am->fa_ip4_sessions_hash, + format_ip4_session_bihash_kv); + am->fa_sessions_hash_is_initialized = 1; } } @@ -85,12 +118,10 @@ acl_fa_verify_init_sessions (acl_main_t * am) static u64 fa_session_get_list_timeout (acl_main_t * am, fa_session_t * sess) { - u64 timeout = am->vlib_main->clib_time.clocks_per_second; - /* - * we have the shortest possible timeout type in all the lists - * (see README-multicore for the rationale) - */ - timeout *= fa_session_get_shortest_timeout (am); + u64 timeout = am->vlib_main->clib_time.clocks_per_second / 1000; + timeout = fa_session_get_timeout (am, sess); + /* for all user lists, check them twice per timeout */ + timeout >>= (sess->link_list_id != ACL_TIMEOUT_PURGATORY); return timeout; } @@ -99,28 +130,15 @@ acl_fa_get_list_head_expiry_time (acl_main_t * am, acl_fa_per_worker_data_t * pw, u64 now, u16 thread_index, int timeout_type) { - fa_session_t *sess = - get_session_ptr (am, thread_index, pw->fa_conn_list_head[timeout_type]); - /* - * We can not check just the index here because inbetween the worker thread might - * dequeue the connection from the head just as we are about to check it. - */ - if (!is_valid_session_ptr (am, thread_index, sess)) - { - return ~0LL; // infinity. - } - else - { - u64 timeout_time = - sess->link_enqueue_time + fa_session_get_list_timeout (am, sess); - return timeout_time; - } + return pw->fa_conn_list_head_expiry_time[timeout_type]; } static int acl_fa_conn_time_to_check (acl_main_t * am, acl_fa_per_worker_data_t * pw, u64 now, u16 thread_index, u32 session_index) { + if (session_index == FA_SESSION_BOGUS_INDEX) + return 0; fa_session_t *sess = get_session_ptr (am, thread_index, session_index); u64 timeout_time = sess->link_enqueue_time + fa_session_get_list_timeout (am, sess); @@ -141,26 +159,67 @@ acl_fa_check_idle_sessions (acl_main_t * am, u16 thread_index, u64 now) fsid.thread_index = thread_index; int total_expired = 0; + /* let the other threads enqueue more requests while we process, if they like */ + aclp_swap_wip_and_pending_session_change_requests (am, thread_index); + u64 *psr = NULL; + + vec_foreach (psr, pw->wip_session_change_requests) + { + acl_fa_sess_req_t op = *psr >> 32; + fsid.session_index = *psr & 0xffffffff; + switch (op) + { + case ACL_FA_REQ_SESS_RESCHEDULE: + acl_fa_restart_timer_for_session (am, now, fsid); + break; + default: + /* do nothing */ + break; + } + } + if (pw->wip_session_change_requests) + _vec_len (pw->wip_session_change_requests) = 0; + + { u8 tt = 0; + int n_pending_swipes = 0; for (tt = 0; tt < ACL_N_TIMEOUTS; tt++) { - while ((vec_len (pw->expired) < - am->fa_max_deleted_sessions_per_interval) - && (~0 != pw->fa_conn_list_head[tt]) - && - (acl_fa_conn_time_to_check - (am, pw, now, thread_index, pw->fa_conn_list_head[tt]))) + int n_expired = 0; + while (n_expired < am->fa_max_deleted_sessions_per_interval) { fsid.session_index = pw->fa_conn_list_head[tt]; - elog_acl_maybe_trace_X2 (am, - "acl_fa_check_idle_sessions: expire session %d on thread %d", - "i4i4", (u32) fsid.session_index, - (u32) thread_index); + if (!acl_fa_conn_time_to_check + (am, pw, now, thread_index, pw->fa_conn_list_head[tt])) + { + break; + } + if (am->trace_sessions > 3) + { + elog_acl_maybe_trace_X3 (am, + "acl_fa_check_idle_sessions: expire session %d in list %d on thread %d", + "i4i4i4", (u32) fsid.session_index, + (u32) tt, (u32) thread_index); + } vec_add1 (pw->expired, fsid.session_index); - acl_fa_conn_list_delete_session (am, fsid); + n_expired++; + acl_fa_conn_list_delete_session (am, fsid, now); } } + for (tt = 0; tt < ACL_N_TIMEOUTS; tt++) + { + u32 session_index = pw->fa_conn_list_head[tt]; + if (session_index == FA_SESSION_BOGUS_INDEX) + break; + fa_session_t *sess = + get_session_ptr (am, thread_index, session_index); + n_pending_swipes += sess->link_enqueue_time <= pw->swipe_end_time; + } + if (n_pending_swipes == 0) + { + pw->swipe_end_time = 0; + } } u32 *psid = NULL; @@ -174,32 +233,63 @@ acl_fa_check_idle_sessions (acl_main_t * am, u16 thread_index, u64 now) u32 sw_if_index = sess->sw_if_index; u64 sess_timeout_time = sess->last_active_time + fa_session_get_timeout (am, sess); - if ((now < sess_timeout_time) - && (0 == - clib_bitmap_get (pw->pending_clear_sw_if_index_bitmap, - sw_if_index))) + int timeout_passed = (now >= sess_timeout_time); + int clearing_interface = + clib_bitmap_get (pw->pending_clear_sw_if_index_bitmap, sw_if_index); + if (am->trace_sessions > 3) { -#ifdef FA_NODE_VERBOSE_DEBUG - clib_warning - ("ACL_FA_NODE_CLEAN: Restarting timer for session %d, sw_if_index %d", - (int) fsid.session_index, sess->sw_if_index); -#endif + elog_acl_maybe_trace_X2 (am, + "acl_fa_check_idle_sessions: now %lu sess_timeout_time %lu", + "i8i8", now, sess_timeout_time); + elog_acl_maybe_trace_X4 (am, + "acl_fa_check_idle_sessions: session %d sw_if_index %d timeout_passed %d clearing_interface %d", + "i4i4i4i4", (u32) fsid.session_index, + (u32) sess->sw_if_index, + (u32) timeout_passed, + (u32) clearing_interface); + } + if (timeout_passed || clearing_interface) + { + if (acl_fa_two_stage_delete_session (am, sw_if_index, fsid, now)) + { + if (am->trace_sessions > 3) + { + elog_acl_maybe_trace_X2 (am, + "acl_fa_check_idle_sessions: deleted session %d sw_if_index %d", + "i4i4", (u32) fsid.session_index, + (u32) sess->sw_if_index); + } + /* the session has been put */ + pw->cnt_deleted_sessions++; + } + else + { + /* the connection marked as deleted and put to purgatory */ + if (am->trace_sessions > 3) + { + elog_acl_maybe_trace_X2 (am, + "acl_fa_check_idle_sessions: session %d sw_if_index %d marked as deleted, put to purgatory", + "i4i4", (u32) fsid.session_index, + (u32) sess->sw_if_index); + } + } + } + else + + { + if (am->trace_sessions > 3) + { + elog_acl_maybe_trace_X2 (am, + "acl_fa_check_idle_sessions: restart timer for session %d sw_if_index %d", + "i4i4", (u32) fsid.session_index, + (u32) sess->sw_if_index); + } /* There was activity on the session, so the idle timeout has not passed. Enqueue for another time period. */ acl_fa_conn_list_add_session (am, fsid, now); pw->cnt_session_timer_restarted++; } - else - { -#ifdef FA_NODE_VERBOSE_DEBUG - clib_warning - ("ACL_FA_NODE_CLEAN: Deleting session %d, sw_if_index %d", - (int) fsid.session_index, sess->sw_if_index); -#endif - acl_fa_delete_session (am, sw_if_index, fsid); - pw->cnt_deleted_sessions++; - } } else { @@ -215,6 +305,10 @@ acl_fa_check_idle_sessions (acl_main_t * am, u16 thread_index, u64 now) if (pw->swipe_end_time && 0 == total_expired) pw->swipe_end_time = 0; + + elog_acl_maybe_trace_X1 (am, + "acl_fa_check_idle_sessions: done, total sessions expired: %d", + "i4", (u32) total_expired); return (total_expired); } @@ -249,6 +343,75 @@ static char *acl_fa_cleaner_error_strings[] = { static vlib_node_registration_t acl_fa_session_cleaner_process_node; static vlib_node_registration_t acl_fa_worker_session_cleaner_process_node; +static void +send_one_worker_interrupt (vlib_main_t * vm, acl_main_t * am, + int thread_index) +{ + acl_fa_per_worker_data_t *pw = &am->per_worker_data[thread_index]; + if (!pw->interrupt_is_pending) + { + pw->interrupt_is_pending = 1; + vlib_node_set_interrupt_pending (vlib_mains[thread_index], + acl_fa_worker_session_cleaner_process_node.index); + elog_acl_maybe_trace_X1 (am, + "send_one_worker_interrupt: send interrupt to worker %u", + "i4", ((u32) thread_index)); + /* if the interrupt was requested, mark that done. */ + /* pw->interrupt_is_needed = 0; */ + CLIB_MEMORY_BARRIER (); + } +} + +void +aclp_post_session_change_request (acl_main_t * am, u32 target_thread, + u32 target_session, u32 request_type) +{ + acl_fa_per_worker_data_t *pw_me = + &am->per_worker_data[os_get_thread_index ()]; + acl_fa_per_worker_data_t *pw = &am->per_worker_data[target_thread]; + clib_spinlock_lock_if_init (&pw->pending_session_change_request_lock); + /* vec_add1 might cause a reallocation, change the heap just in case */ + void *oldheap = clib_mem_set_heap (am->acl_mheap); + vec_add1 (pw->pending_session_change_requests, + (((u64) request_type) << 32) | target_session); + clib_mem_set_heap (oldheap); + + pw->rcvd_session_change_requests++; + pw_me->sent_session_change_requests++; + if (vec_len (pw->pending_session_change_requests) == 1) + { + /* ensure the requests get processed */ + send_one_worker_interrupt (am->vlib_main, am, target_thread); + } + clib_spinlock_unlock_if_init (&pw->pending_session_change_request_lock); +} + +void +aclp_swap_wip_and_pending_session_change_requests (acl_main_t * am, + u32 target_thread) +{ + acl_fa_per_worker_data_t *pw = &am->per_worker_data[target_thread]; + u64 *tmp; + clib_spinlock_lock_if_init (&pw->pending_session_change_request_lock); + tmp = pw->pending_session_change_requests; + pw->pending_session_change_requests = pw->wip_session_change_requests; + pw->wip_session_change_requests = tmp; + clib_spinlock_unlock_if_init (&pw->pending_session_change_request_lock); +} + + +static int +purgatory_has_connections (vlib_main_t * vm, acl_main_t * am, + int thread_index) +{ + acl_fa_per_worker_data_t *pw = &am->per_worker_data[thread_index]; + + return (FA_SESSION_BOGUS_INDEX != + pw->fa_conn_list_head[ACL_TIMEOUT_PURGATORY]); + +} + + /* * Per-worker thread interrupt-driven cleaner thread * to clean idle connections if there are no packets @@ -311,6 +474,7 @@ acl_fa_worker_conn_cleaner_process (vlib_main_t * vm, "acl_fa_worker_conn_cleaner: now %lu, clearing done, nothing to do", "i8", now); pw->clear_in_process = 0; + pw->swipe_end_time = 0; } else { @@ -336,7 +500,7 @@ acl_fa_worker_conn_cleaner_process (vlib_main_t * vm, (u32) pw->clear_in_process); if (pw->clear_in_process) { - if (0 == num_expired) + if (pw->swipe_end_time == 0) { /* we were clearing but we could not process any more connections. time to stop. */ clib_bitmap_zero (pw->pending_clear_sw_if_index_bitmap); @@ -351,23 +515,19 @@ acl_fa_worker_conn_cleaner_process (vlib_main_t * vm, "acl_fa_worker_conn_cleaner: now %lu, more work to do - requesting interrupt", "i8", now); /* should continue clearing.. So could they please sent an interrupt again? */ - pw->interrupt_is_needed = 1; + send_one_worker_interrupt (vm, am, thread_index); + // pw->interrupt_is_needed = 1; } } else { - if (num_expired >= am->fa_max_deleted_sessions_per_interval) + if (num_expired > 0) { /* there was too much work, we should get an interrupt ASAP */ - pw->interrupt_is_needed = 1; + // pw->interrupt_is_needed = 1; + send_one_worker_interrupt (vm, am, thread_index); pw->interrupt_is_unwanted = 0; } - else if (num_expired <= am->fa_min_deleted_sessions_per_interval) - { - /* signal that they should trigger us less */ - pw->interrupt_is_needed = 0; - pw->interrupt_is_unwanted = 1; - } else { /* the current rate of interrupts is ok */ @@ -379,26 +539,13 @@ acl_fa_worker_conn_cleaner_process (vlib_main_t * vm, "i8i4i4", now, ((u32) pw->interrupt_is_needed), ((u32) pw->interrupt_is_unwanted)); } - pw->interrupt_generation = am->fa_interrupt_generation; - return 0; -} - -static void -send_one_worker_interrupt (vlib_main_t * vm, acl_main_t * am, - int thread_index) -{ - acl_fa_per_worker_data_t *pw = &am->per_worker_data[thread_index]; - if (!pw->interrupt_is_pending) + /* be persistent about quickly deleting the connections from the purgatory */ + if (purgatory_has_connections (vm, am, thread_index)) { - pw->interrupt_is_pending = 1; - vlib_node_set_interrupt_pending (vlib_mains[thread_index], - acl_fa_worker_session_cleaner_process_node.index); - elog_acl_maybe_trace_X1 (am, - "send_one_worker_interrupt: send interrupt to worker %d", - "i4", ((u32) thread_index)); - /* if the interrupt was requested, mark that done. */ - /* pw->interrupt_is_needed = 0; */ + send_one_worker_interrupt (vm, am, thread_index); } + pw->interrupt_generation = am->fa_interrupt_generation; + return 0; } static void @@ -460,14 +607,14 @@ acl_fa_session_cleaner_process (vlib_main_t * vm, vlib_node_runtime_t * rt, if ((head_expiry < next_expire) && !pw->interrupt_is_pending) { elog_acl_maybe_trace_X3 (am, - "acl_fa_session_cleaner_process: now %lu, worker: %d tt: %d", + "acl_fa_session_cleaner_process: now %lu, worker: %u tt: %u", "i8i2i2", now, ti, tt); elog_acl_maybe_trace_X2 (am, "acl_fa_session_cleaner_process: head expiry: %lu, is earlier than curr next expire: %lu", "i8i8", head_expiry, next_expire); next_expire = head_expiry; } - if (~0 != pw->fa_conn_list_head[tt]) + if (FA_SESSION_BOGUS_INDEX != pw->fa_conn_list_head[tt]) { has_pending_conns = 1; } @@ -524,7 +671,7 @@ acl_fa_session_cleaner_process (vlib_main_t * vm, vlib_node_runtime_t * rt, { am->fa_cleaner_cnt_delete_by_sw_index++; elog_acl_maybe_trace_X1 (am, - "acl_fa_session_cleaner_process: ACL_FA_CLEANER_DELETE_BY_SW_IF_INDEX %d", + "acl_fa_session_cleaner_process: ACL_FA_CLEANER_DELETE_BY_SW_IF_INDEX %u", "i4", *sw_if_index0); if (*sw_if_index0 == ~0) { @@ -542,10 +689,9 @@ acl_fa_session_cleaner_process (vlib_main_t * vm, vlib_node_runtime_t * rt, } } } -#ifdef FA_NODE_VERBOSE_DEBUG - clib_warning ("ACL_FA_CLEANER_DELETE_BY_SW_IF_INDEX bitmap: %U", - format_bitmap_hex, clear_sw_if_index_bitmap); -#endif + acl_log_info + ("ACL_FA_CLEANER_DELETE_BY_SW_IF_INDEX bitmap: %U, clear_all: %u", + format_bitmap_hex, clear_sw_if_index_bitmap, clear_all); vec_foreach (pw0, am->per_worker_data) { CLIB_MEMORY_BARRIER (); @@ -553,7 +699,7 @@ acl_fa_session_cleaner_process (vlib_main_t * vm, vlib_node_runtime_t * rt, { CLIB_MEMORY_BARRIER (); elog_acl_maybe_trace_X1 (am, - "ACL_FA_NODE_CLEAN: waiting previous cleaning cycle to finish on %d", + "ACL_FA_NODE_CLEAN: waiting previous cleaning cycle to finish on %u", "i4", (u32) (pw0 - am->per_worker_data)); vlib_process_suspend (vm, 0.0001); @@ -565,7 +711,7 @@ acl_fa_session_cleaner_process (vlib_main_t * vm, vlib_node_runtime_t * rt, } if (pw0->clear_in_process) { - clib_warning + acl_log_err ("ERROR-BUG! Could not initiate cleaning on worker because another cleanup in progress"); } else @@ -581,6 +727,10 @@ acl_fa_session_cleaner_process (vlib_main_t * vm, vlib_node_runtime_t * rt, pw0->pending_clear_sw_if_index_bitmap = clib_bitmap_dup (clear_sw_if_index_bitmap); } + acl_log_info + ("ACL_FA_CLEANER: thread %u, pending clear bitmap: %U", + (am->per_worker_data - pw0), format_bitmap_hex, + pw0->pending_clear_sw_if_index_bitmap); pw0->clear_in_process = 1; } } @@ -588,11 +738,9 @@ acl_fa_session_cleaner_process (vlib_main_t * vm, vlib_node_runtime_t * rt, send_interrupts_to_workers (vm, am); /* now wait till they all complete */ -#ifdef FA_NODE_VERBOSE_DEBUG - clib_warning ("CLEANER mains len: %d per-worker len: %d", + acl_log_info ("CLEANER mains len: %u per-worker len: %d", vec_len (vlib_mains), vec_len (am->per_worker_data)); -#endif vec_foreach (pw0, am->per_worker_data) { CLIB_MEMORY_BARRIER (); @@ -600,7 +748,7 @@ acl_fa_session_cleaner_process (vlib_main_t * vm, vlib_node_runtime_t * rt, { CLIB_MEMORY_BARRIER (); elog_acl_maybe_trace_X1 (am, - "ACL_FA_NODE_CLEAN: waiting for my cleaning cycle to finish on %d", + "ACL_FA_NODE_CLEAN: waiting for my cleaning cycle to finish on %u", "i4", (u32) (pw0 - am->per_worker_data)); vlib_process_suspend (vm, 0.0001); @@ -611,11 +759,10 @@ acl_fa_session_cleaner_process (vlib_main_t * vm, vlib_node_runtime_t * rt, } } } -#ifdef FA_NODE_VERBOSE_DEBUG - clib_warning ("ACL_FA_NODE_CLEAN: cleaning done"); -#endif + acl_log_info ("ACL_FA_NODE_CLEAN: cleaning done"); clib_bitmap_free (clear_sw_if_index_bitmap); } + am->fa_cleaner_cnt_delete_by_sw_index_ok++; break; default: #ifdef FA_NODE_VERBOSE_DEBUG @@ -764,8 +911,13 @@ show_fa_sessions_hash (vlib_main_t * vm, u32 verbose) acl_main_t *am = &acl_main; if (am->fa_sessions_hash_is_initialized) { - vlib_cli_output (vm, "\nSession lookup hash table:\n%U\n\n", - format_bihash_40_8, &am->fa_sessions_hash, verbose); + vlib_cli_output (vm, "\nIPv6 Session lookup hash table:\n%U\n\n", + format_bihash_40_8, &am->fa_ip6_sessions_hash, + verbose); + + vlib_cli_output (vm, "\nIPv4 Session lookup hash table:\n%U\n\n", + format_bihash_16_8, &am->fa_ip4_sessions_hash, + verbose); } else {