X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fin2out_ed.c;h=3bcde10a48754f290bf40317310c13553f4b28ea;hb=c1f93067e;hp=f3999f00129de58c42e6ef7ccb5b9b8dca0aa318;hpb=6c01dceea5c612373453db7f1ccda589a2cd782e;p=vpp.git diff --git a/src/plugins/nat/in2out_ed.c b/src/plugins/nat/in2out_ed.c index f3999f00129..3bcde10a487 100644 --- a/src/plugins/nat/in2out_ed.c +++ b/src/plugins/nat/in2out_ed.c @@ -28,17 +28,27 @@ #include #include #include +#include +#include -#define foreach_nat_in2out_ed_error \ -_(UNSUPPORTED_PROTOCOL, "Unsupported protocol") \ -_(IN2OUT_PACKETS, "Good in2out packets processed") \ -_(OUT_OF_PORTS, "Out of ports") \ +#define foreach_nat_in2out_ed_error \ +_(UNSUPPORTED_PROTOCOL, "unsupported protocol") \ +_(IN2OUT_PACKETS, "good in2out packets processed") \ +_(OUT_OF_PORTS, "out of ports") \ _(BAD_ICMP_TYPE, "unsupported ICMP type") \ -_(MAX_SESSIONS_EXCEEDED, "Maximum sessions exceeded") \ -_(DROP_FRAGMENT, "Drop fragment") \ -_(MAX_REASS, "Maximum reassemblies exceeded") \ -_(MAX_FRAG, "Maximum fragments per reassembly exceeded")\ -_(NON_SYN, "non-SYN packet try to create session") +_(MAX_SESSIONS_EXCEEDED, "maximum sessions exceeded") \ +_(DROP_FRAGMENT, "drop fragment") \ +_(MAX_REASS, "maximum reassemblies exceeded") \ +_(MAX_FRAG, "maximum fragments per reassembly exceeded")\ +_(NON_SYN, "non-SYN packet try to create session") \ +_(TCP_PACKETS, "TCP packets") \ +_(UDP_PACKETS, "UDP packets") \ +_(ICMP_PACKETS, "ICMP packets") \ +_(OTHER_PACKETS, "other protocol packets") \ +_(FRAGMENTS, "fragments") \ +_(CACHED_FRAGMENTS, "cached fragments") \ +_(PROCESSED_FRAGMENTS, "processed fragments") + typedef enum { @@ -72,12 +82,6 @@ typedef struct u32 is_slow_path; } nat_in2out_ed_trace_t; -vlib_node_registration_t nat44_ed_in2out_node; -vlib_node_registration_t nat44_ed_in2out_slowpath_node; -vlib_node_registration_t nat44_ed_in2out_output_node; -vlib_node_registration_t nat44_ed_in2out_output_slowpath_node; -vlib_node_registration_t nat44_ed_in2out_reass_node; - static u8 * format_nat_in2out_ed_trace (u8 * s, va_list * args) { @@ -145,6 +149,7 @@ icmp_get_ed_key (ip4_header_t * ip0, nat_ed_ses_key_t * p_key0) return 0; } +#ifndef CLIB_MARCH_VARIANT int nat44_i2o_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg) { @@ -190,13 +195,25 @@ nat44_i2o_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg) if (snat_is_unk_proto_session (s)) goto delete; - snat_ipfix_logging_nat44_ses_delete (s->in2out.addr.as_u32, + snat_ipfix_logging_nat44_ses_delete (ctx->thread_index, + s->in2out.addr.as_u32, s->out2in.addr.as_u32, s->in2out.protocol, s->in2out.port, s->out2in.port, s->in2out.fib_index); + nat_syslog_nat44_sdel (s->user_index, s->in2out.fib_index, + &s->in2out.addr, s->in2out.port, + &s->ext_host_nat_addr, s->ext_host_nat_port, + &s->out2in.addr, s->out2in.port, + &s->ext_host_addr, s->ext_host_port, + s->in2out.protocol, is_twice_nat_session (s)); + + nat_ha_sdel (&s->out2in.addr, s->out2in.port, &s->ext_host_addr, + s->ext_host_port, s->out2in.protocol, s->out2in.fib_index, + ctx->thread_index); + if (is_twice_nat_session (s)) { for (i = 0; i < vec_len (sm->twice_nat_addresses); i++) @@ -226,6 +243,7 @@ nat44_i2o_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg) return 0; } +#endif static inline u32 icmp_in2out_ed_slow_path (snat_main_t * sm, vlib_buffer_t * b0, @@ -242,7 +260,7 @@ icmp_in2out_ed_slow_path (snat_main_t * sm, vlib_buffer_t * b0, /* Accounting */ nat44_session_update_counters (s0, now, vlib_buffer_length_in_chain - (sm->vlib_main, b0)); + (sm->vlib_main, b0), thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s0, thread_index); } @@ -255,7 +273,8 @@ slow_path_ed (snat_main_t * sm, u32 rx_fib_index, clib_bihash_kv_16_8_t * kv, snat_session_t ** sessionp, - vlib_node_runtime_t * node, u32 next, u32 thread_index, f64 now) + vlib_node_runtime_t * node, u32 next, u32 thread_index, f64 now, + tcp_header_t * tcp) { snat_session_t *s = 0; snat_user_t *u; @@ -279,7 +298,7 @@ slow_path_ed (snat_main_t * sm, if (PREDICT_FALSE (maximum_sessions_exceeded (sm, thread_index))) { b->error = node->errors[NAT_IN2OUT_ED_ERROR_MAX_SESSIONS_EXCEEDED]; - nat_ipfix_logging_max_sessions (sm->max_translations); + nat_ipfix_logging_max_sessions (thread_index, sm->max_translations); nat_log_notice ("maximum sessions exceeded"); return NAT_IN2OUT_ED_NEXT_DROP; } @@ -315,6 +334,15 @@ slow_path_ed (snat_main_t * sm, is_sm = 1; } + if (proto == SNAT_PROTOCOL_TCP) + { + if (!tcp_is_init (tcp)) + { + b->error = node->errors[NAT_IN2OUT_ED_ERROR_NON_SYN]; + return NAT_IN2OUT_ED_NEXT_DROP; + } + } + u = nat_user_get_or_create (sm, &key->l_addr, rx_fib_index, thread_index); if (!u) { @@ -394,11 +422,26 @@ slow_path_ed (snat_main_t * sm, *sessionp = s; /* log NAT event */ - snat_ipfix_logging_nat44_ses_create (s->in2out.addr.as_u32, + snat_ipfix_logging_nat44_ses_create (thread_index, + s->in2out.addr.as_u32, s->out2in.addr.as_u32, s->in2out.protocol, s->in2out.port, s->out2in.port, s->in2out.fib_index); + + nat_syslog_nat44_sadd (s->user_index, s->in2out.fib_index, + &s->in2out.addr, s->in2out.port, + &s->ext_host_nat_addr, s->ext_host_nat_port, + &s->out2in.addr, s->out2in.port, + &s->ext_host_addr, s->ext_host_port, + s->in2out.protocol, 0); + + nat_ha_sadd (&s->in2out.addr, s->in2out.port, &s->out2in.addr, + s->out2in.port, &s->ext_host_addr, s->ext_host_port, + &s->ext_host_nat_addr, s->ext_host_nat_port, + s->in2out.protocol, s->in2out.fib_index, s->flags, + thread_index, 0); + return next; } @@ -485,7 +528,8 @@ nat_not_translate_output_feature_fwd (snat_main_t * sm, ip4_header_t * ip, } /* Accounting */ nat44_session_update_counters (s, now, - vlib_buffer_length_in_chain (vm, b)); + vlib_buffer_length_in_chain (vm, b), + thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s, thread_index); return 1; @@ -520,7 +564,7 @@ nat44_ed_not_translate_output_feature (snat_main_t * sm, ip4_header_t * ip, { nat_log_debug ("TCP close connection %U", format_snat_session, &sm->per_thread_data[thread_index], s); - nat_free_session_data (sm, s, thread_index); + nat_free_session_data (sm, s, thread_index, 0); nat44_delete_session (sm, s, thread_index); } else @@ -551,6 +595,7 @@ nat44_ed_not_translate_output_feature (snat_main_t * sm, ip4_header_t * ip, return 0; } +#ifndef CLIB_MARCH_VARIANT u32 icmp_match_in2out_ed (snat_main_t * sm, vlib_node_runtime_t * node, u32 thread_index, vlib_buffer_t * b, ip4_header_t * ip, @@ -626,7 +671,7 @@ icmp_match_in2out_ed (snat_main_t * sm, vlib_node_runtime_t * node, } next = slow_path_ed (sm, b, rx_fib_index, &kv, &s, node, next, - thread_index, vlib_time_now (sm->vlib_main)); + thread_index, vlib_time_now (sm->vlib_main), 0); if (PREDICT_FALSE (next == NAT_IN2OUT_ED_NEXT_DROP)) goto out; @@ -660,6 +705,7 @@ out: *(snat_session_t **) d = s; return next; } +#endif static snat_session_t * nat44_ed_in2out_unknown_proto (snat_main_t * sm, @@ -733,7 +779,7 @@ nat44_ed_in2out_unknown_proto (snat_main_t * sm, if (PREDICT_FALSE (maximum_sessions_exceeded (sm, thread_index))) { b->error = node->errors[NAT_IN2OUT_ED_ERROR_MAX_SESSIONS_EXCEEDED]; - nat_ipfix_logging_max_sessions (sm->max_translations); + nat_ipfix_logging_max_sessions (thread_index, sm->max_translations); nat_log_notice ("maximum sessions exceeded"); return 0; } @@ -847,7 +893,8 @@ nat44_ed_in2out_unknown_proto (snat_main_t * sm, ip->checksum = ip_csum_fold (sum); /* Accounting */ - nat44_session_update_counters (s, now, vlib_buffer_length_in_chain (vm, b)); + nat44_session_update_counters (s, now, vlib_buffer_length_in_chain (vm, b), + thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s, thread_index); @@ -873,9 +920,11 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, f64 now = vlib_time_now (vm); u32 thread_index = vm->thread_index; snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index]; + u32 tcp_packets = 0, udp_packets = 0, icmp_packets = 0, other_packets = + 0, fragments = 0; - stats_node_index = is_slow_path ? nat44_ed_in2out_slowpath_node.index : - nat44_ed_in2out_node.index; + stats_node_index = is_slow_path ? sm->ed_in2out_slowpath_node_index : + sm->ed_in2out_node_index; from = vlib_frame_vector_args (frame); n_left_from = frame->n_vectors; @@ -967,6 +1016,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, node); if (!s0) next0 = NAT_IN2OUT_ED_NEXT_DROP; + other_packets++; goto trace00; } @@ -975,6 +1025,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, next0 = icmp_in2out_ed_slow_path (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node, next0, now, thread_index, &s0); + icmp_packets++; goto trace00; } } @@ -989,6 +1040,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, if (ip4_is_fragment (ip0)) { next0 = NAT_IN2OUT_ED_NEXT_REASS; + fragments++; goto trace00; } @@ -1034,16 +1086,9 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, goto trace00; } - if ((proto0 == SNAT_PROTOCOL_TCP) && !tcp_is_init (tcp0)) - { - b0->error = node->errors[NAT_IN2OUT_ED_ERROR_NON_SYN]; - next0 = NAT_IN2OUT_ED_NEXT_DROP; - goto trace00; - } - next0 = slow_path_ed (sm, b0, rx_fib_index0, &kv0, &s0, node, - next0, thread_index, now); + next0, thread_index, now, tcp0); if (PREDICT_FALSE (next0 == NAT_IN2OUT_ED_NEXT_DROP)) goto trace00; @@ -1101,6 +1146,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, } mss_clamping (sm, tcp0, &sum0); tcp0->checksum = ip_csum_fold (sum0); + tcp_packets++; if (nat44_set_tcp_session_state_i2o (sm, s0, tcp0, thread_index)) goto trace00; @@ -1114,12 +1160,14 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, udp0->dst_port = s0->ext_host_port; ip0->dst_address.as_u32 = s0->ext_host_addr.as_u32; } + udp_packets++; } /* Accounting */ nat44_session_update_counters (s0, now, vlib_buffer_length_in_chain (vm, - b0)); + b0), + thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s0, thread_index); @@ -1137,7 +1185,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, t->session_index = s0 - tsm->sessions; } - pkts_processed += next0 != NAT_IN2OUT_ED_NEXT_DROP; + pkts_processed += next0 == NAT_IN2OUT_ED_NEXT_LOOKUP; next1 = NAT_IN2OUT_ED_NEXT_LOOKUP; @@ -1178,6 +1226,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, node); if (!s1) next1 = NAT_IN2OUT_ED_NEXT_DROP; + other_packets++; goto trace01; } @@ -1186,6 +1235,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, next1 = icmp_in2out_ed_slow_path (sm, b1, ip1, icmp1, sw_if_index1, rx_fib_index1, node, next1, now, thread_index, &s1); + icmp_packets++; goto trace01; } } @@ -1200,6 +1250,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, if (ip4_is_fragment (ip1)) { next1 = NAT_IN2OUT_ED_NEXT_REASS; + fragments++; goto trace01; } @@ -1245,16 +1296,9 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, goto trace01; } - if ((proto1 == SNAT_PROTOCOL_TCP) && !tcp_is_init (tcp1)) - { - b1->error = node->errors[NAT_IN2OUT_ED_ERROR_NON_SYN]; - next1 = NAT_IN2OUT_ED_NEXT_DROP; - goto trace01; - } - next1 = slow_path_ed (sm, b1, rx_fib_index1, &kv1, &s1, node, - next1, thread_index, now); + next1, thread_index, now, tcp1); if (PREDICT_FALSE (next1 == NAT_IN2OUT_ED_NEXT_DROP)) goto trace01; @@ -1312,6 +1356,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, } tcp1->checksum = ip_csum_fold (sum1); mss_clamping (sm, tcp1, &sum1); + tcp_packets++; if (nat44_set_tcp_session_state_i2o (sm, s1, tcp1, thread_index)) goto trace01; @@ -1325,12 +1370,13 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, udp1->dst_port = s1->ext_host_port; ip1->dst_address.as_u32 = s1->ext_host_addr.as_u32; } + udp_packets++; } /* Accounting */ nat44_session_update_counters (s1, now, - vlib_buffer_length_in_chain (vm, - b1)); + vlib_buffer_length_in_chain (vm, b1), + thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s1, thread_index); @@ -1348,7 +1394,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, t->session_index = s1 - tsm->sessions; } - pkts_processed += next1 != NAT_IN2OUT_ED_NEXT_DROP; + pkts_processed += next1 == NAT_IN2OUT_ED_NEXT_LOOKUP; /* verify speculative enqueues, maybe switch current next frame */ vlib_validate_buffer_enqueue_x2 (vm, node, next_index, @@ -1418,6 +1464,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, node); if (!s0) next0 = NAT_IN2OUT_ED_NEXT_DROP; + other_packets++; goto trace0; } @@ -1426,6 +1473,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, next0 = icmp_in2out_ed_slow_path (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node, next0, now, thread_index, &s0); + icmp_packets++; goto trace0; } } @@ -1440,6 +1488,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, if (ip4_is_fragment (ip0)) { next0 = NAT_IN2OUT_ED_NEXT_REASS; + fragments++; goto trace0; } @@ -1485,16 +1534,9 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, goto trace0; } - if ((proto0 == SNAT_PROTOCOL_TCP) && !tcp_is_init (tcp0)) - { - b0->error = node->errors[NAT_IN2OUT_ED_ERROR_NON_SYN]; - next0 = NAT_IN2OUT_ED_NEXT_DROP; - goto trace0; - } - next0 = slow_path_ed (sm, b0, rx_fib_index0, &kv0, &s0, node, - next0, thread_index, now); + next0, thread_index, now, tcp0); if (PREDICT_FALSE (next0 == NAT_IN2OUT_ED_NEXT_DROP)) goto trace0; @@ -1552,6 +1594,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, } mss_clamping (sm, tcp0, &sum0); tcp0->checksum = ip_csum_fold (sum0); + tcp_packets++; if (nat44_set_tcp_session_state_i2o (sm, s0, tcp0, thread_index)) goto trace0; @@ -1565,12 +1608,13 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, udp0->dst_port = s0->ext_host_port; ip0->dst_address.as_u32 = s0->ext_host_addr.as_u32; } + udp_packets++; } /* Accounting */ nat44_session_update_counters (s0, now, - vlib_buffer_length_in_chain (vm, - b0)); + vlib_buffer_length_in_chain (vm, b0), + thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s0, thread_index); @@ -1588,7 +1632,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, t->session_index = s0 - tsm->sessions; } - pkts_processed += next0 != NAT_IN2OUT_ED_NEXT_DROP; + pkts_processed += next0 == NAT_IN2OUT_ED_NEXT_LOOKUP; /* verify speculative enqueue, maybe switch current next frame */ vlib_validate_buffer_enqueue_x1 (vm, node, next_index, @@ -1602,20 +1646,31 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm, vlib_node_increment_counter (vm, stats_node_index, NAT_IN2OUT_ED_ERROR_IN2OUT_PACKETS, pkts_processed); + vlib_node_increment_counter (vm, stats_node_index, + NAT_IN2OUT_ED_ERROR_TCP_PACKETS, tcp_packets); + vlib_node_increment_counter (vm, stats_node_index, + NAT_IN2OUT_ED_ERROR_UDP_PACKETS, tcp_packets); + vlib_node_increment_counter (vm, stats_node_index, + NAT_IN2OUT_ED_ERROR_ICMP_PACKETS, + icmp_packets); + vlib_node_increment_counter (vm, stats_node_index, + NAT_IN2OUT_ED_ERROR_OTHER_PACKETS, + other_packets); + vlib_node_increment_counter (vm, stats_node_index, + NAT_IN2OUT_ED_ERROR_FRAGMENTS, fragments); + return frame->n_vectors; } -static uword -nat44_ed_in2out_fast_path_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (nat44_ed_in2out_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return nat44_ed_in2out_node_fn_inline (vm, node, frame, 0, 0); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat44_ed_in2out_node) = { - .function = nat44_ed_in2out_fast_path_fn, .name = "nat44-ed-in2out", .vector_size = sizeof (u32), .format_trace = format_nat_in2out_ed_trace, @@ -1634,20 +1689,15 @@ VLIB_REGISTER_NODE (nat44_ed_in2out_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_in2out_node, - nat44_ed_in2out_fast_path_fn); - -static uword -nat44_ed_in2out_output_fast_path_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (nat44_ed_in2out_output_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return nat44_ed_in2out_node_fn_inline (vm, node, frame, 0, 1); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat44_ed_in2out_output_node) = { - .function = nat44_ed_in2out_output_fast_path_fn, .name = "nat44-ed-in2out-output", .vector_size = sizeof (u32), .format_trace = format_nat_in2out_ed_trace, @@ -1666,20 +1716,15 @@ VLIB_REGISTER_NODE (nat44_ed_in2out_output_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_in2out_output_node, - nat44_ed_in2out_output_fast_path_fn); - -static uword -nat44_ed_in2out_slow_path_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (nat44_ed_in2out_slowpath_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return nat44_ed_in2out_node_fn_inline (vm, node, frame, 1, 0); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat44_ed_in2out_slowpath_node) = { - .function = nat44_ed_in2out_slow_path_fn, .name = "nat44-ed-in2out-slowpath", .vector_size = sizeof (u32), .format_trace = format_nat_in2out_ed_trace, @@ -1698,20 +1743,16 @@ VLIB_REGISTER_NODE (nat44_ed_in2out_slowpath_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_in2out_slowpath_node, - nat44_ed_in2out_slow_path_fn); - -static uword -nat44_ed_in2out_output_slow_path_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (nat44_ed_in2out_output_slowpath_node) (vlib_main_t * vm, + vlib_node_runtime_t * + node, + vlib_frame_t * frame) { return nat44_ed_in2out_node_fn_inline (vm, node, frame, 1, 1); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat44_ed_in2out_output_slowpath_node) = { - .function = nat44_ed_in2out_output_slow_path_fn, .name = "nat44-ed-in2out-output-slowpath", .vector_size = sizeof (u32), .format_trace = format_nat_in2out_ed_trace, @@ -1730,9 +1771,6 @@ VLIB_REGISTER_NODE (nat44_ed_in2out_output_slowpath_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_in2out_output_slowpath_node, - nat44_ed_in2out_output_slow_path_fn); - static inline uword nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm, vlib_node_runtime_t * node, @@ -1741,7 +1779,7 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm, { u32 n_left_from, *from, *to_next; nat_in2out_ed_next_t next_index; - u32 pkts_processed = 0; + u32 pkts_processed = 0, cached_fragments = 0; snat_main_t *sm = &snat_main; f64 now = vlib_time_now (vm); u32 thread_index = vm->thread_index; @@ -1892,15 +1930,9 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm, } } - if ((proto0 == SNAT_PROTOCOL_TCP) && !tcp_is_init (tcp0)) - { - b0->error = node->errors[NAT_IN2OUT_ED_ERROR_NON_SYN]; - next0 = NAT_IN2OUT_ED_NEXT_DROP; - goto trace0; - } - next0 = slow_path_ed (sm, b0, rx_fib_index0, &kv0, - &s0, node, next0, thread_index, now); + &s0, node, next0, thread_index, now, + tcp0); if (PREDICT_FALSE (next0 == NAT_IN2OUT_ED_NEXT_DROP)) goto trace0; @@ -1928,7 +1960,7 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm, if (PREDICT_FALSE (reass0->sess_index == (u32) ~ 0)) { if (nat_ip4_reass_add_fragment - (reass0, bi0, &fragments_to_drop)) + (thread_index, reass0, bi0, &fragments_to_drop)) { b0->error = node->errors[NAT_IN2OUT_ED_ERROR_MAX_FRAG]; nat_log_notice @@ -2006,8 +2038,8 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm, /* Accounting */ nat44_session_update_counters (s0, now, - vlib_buffer_length_in_chain (vm, - b0)); + vlib_buffer_length_in_chain (vm, b0), + thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s0, thread_index); @@ -2026,6 +2058,7 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm, { n_left_to_next++; to_next--; + cached_fragments++; } else { @@ -2062,9 +2095,12 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } - vlib_node_increment_counter (vm, nat44_ed_in2out_reass_node.index, - NAT_IN2OUT_ED_ERROR_IN2OUT_PACKETS, + vlib_node_increment_counter (vm, sm->ed_in2out_reass_node_index, + NAT_IN2OUT_ED_ERROR_PROCESSED_FRAGMENTS, pkts_processed); + vlib_node_increment_counter (vm, sm->ed_in2out_reass_node_index, + NAT_IN2OUT_ED_ERROR_CACHED_FRAGMENTS, + cached_fragments); nat_send_all_to_node (vm, fragments_to_drop, node, &node->errors[NAT_IN2OUT_ED_ERROR_DROP_FRAGMENT], @@ -2075,17 +2111,15 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm, return frame->n_vectors; } -static uword -nat44_ed_in2out_reass_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (nat44_ed_in2out_reass_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return nat44_ed_in2out_reass_node_fn_inline (vm, node, frame, 0); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat44_ed_in2out_reass_node) = { - .function = nat44_ed_in2out_reass_node_fn, .name = "nat44-ed-in2out-reass", .vector_size = sizeof (u32), .format_trace = format_nat44_reass_trace, @@ -2103,20 +2137,15 @@ VLIB_REGISTER_NODE (nat44_ed_in2out_reass_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_in2out_reass_node, - nat44_ed_in2out_reass_node_fn); - -static uword -nat44_ed_in2out_reass_output_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (nat44_ed_in2out_reass_output_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return nat44_ed_in2out_reass_node_fn_inline (vm, node, frame, 1); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat44_ed_in2out_reass_output_node) = { - .function = nat44_ed_in2out_reass_output_node_fn, .name = "nat44-ed-in2out-reass-output", .vector_size = sizeof (u32), .format_trace = format_nat44_reass_trace, @@ -2134,9 +2163,6 @@ VLIB_REGISTER_NODE (nat44_ed_in2out_reass_output_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_in2out_reass_output_node, - nat44_ed_in2out_reass_output_node_fn); - /* * fd.io coding-style-patch-verification: ON *