X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fout2in_ed.c;h=50abebd9cfbc52bcc46fba0ea42719b84cd454db;hb=0e182c5b1d27139764dca7059c9c91be8387977a;hp=88b248fdbcf6f087d163917eba4a32c284c88070;hpb=e69e423743630b52e13db58c3f0229df8a46c07f;p=vpp.git diff --git a/src/plugins/nat/out2in_ed.c b/src/plugins/nat/out2in_ed.c index 88b248fdbcf..50abebd9cfb 100644 --- a/src/plugins/nat/out2in_ed.c +++ b/src/plugins/nat/out2in_ed.c @@ -30,33 +30,7 @@ #include #include #include - -#define foreach_nat_out2in_ed_error \ -_(UNSUPPORTED_PROTOCOL, "unsupported protocol") \ -_(OUT2IN_PACKETS, "good out2in packets processed") \ -_(OUT_OF_PORTS, "out of ports") \ -_(BAD_ICMP_TYPE, "unsupported ICMP type") \ -_(NO_TRANSLATION, "no translation") \ -_(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 -{ -#define _(sym,str) NAT_OUT2IN_ED_ERROR_##sym, - foreach_nat_out2in_ed_error -#undef _ - NAT_OUT2IN_ED_N_ERROR, -} nat_out2in_ed_error_t; +#include static char *nat_out2in_ed_error_strings[] = { #define _(sym,string) string, @@ -116,7 +90,7 @@ icmp_out2in_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); } @@ -166,7 +140,7 @@ nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg) ed_kv.key[0] = ed_key.as_u64[0]; ed_kv.key[1] = ed_key.as_u64[1]; if (clib_bihash_add_del_16_8 (&tsm->in2out_ed, &ed_kv, 0)) - nat_log_warn ("in2out_ed key del failed"); + nat_elog_warn ("in2out_ed key del failed"); if (snat_is_unk_proto_session (s)) goto delete; @@ -186,6 +160,10 @@ nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg) &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++) @@ -239,14 +217,14 @@ create_session_for_static_mapping_ed (snat_main_t * sm, if (PREDICT_FALSE (maximum_sessions_exceeded (sm, thread_index))) { b->error = node->errors[NAT_OUT2IN_ED_ERROR_MAX_SESSIONS_EXCEEDED]; - nat_log_notice ("maximum sessions exceeded"); + nat_elog_notice ("maximum sessions exceeded"); return 0; } u = nat_user_get_or_create (sm, &l_key.addr, l_key.fib_index, thread_index); if (!u) { - nat_log_warn ("create NAT user failed"); + nat_elog_warn ("create NAT user failed"); return 0; } @@ -254,7 +232,7 @@ create_session_for_static_mapping_ed (snat_main_t * sm, if (!s) { nat44_delete_user_with_no_session (sm, u, thread_index); - nat_log_warn ("create NAT session failed"); + nat_elog_warn ("create NAT session failed"); return 0; } @@ -283,7 +261,7 @@ create_session_for_static_mapping_ed (snat_main_t * sm, if (clib_bihash_add_or_overwrite_stale_16_8 (&tsm->out2in_ed, &kv, nat44_o2i_ed_is_idle_session_cb, &ctx)) - nat_log_notice ("out2in-ed key add failed"); + nat_elog_notice ("out2in-ed key add failed"); if (twice_nat == TWICE_NAT || (twice_nat == TWICE_NAT_SELF && ip->src_address.as_u32 == l_key.addr.as_u32)) @@ -297,7 +275,7 @@ create_session_for_static_mapping_ed (snat_main_t * sm, b->error = node->errors[NAT_OUT2IN_ED_ERROR_OUT_OF_PORTS]; nat44_delete_session (sm, s, thread_index); if (clib_bihash_add_del_16_8 (&tsm->out2in_ed, &kv, 0)) - nat_log_notice ("out2in-ed key del failed"); + nat_elog_notice ("out2in-ed key del failed"); return 0; } s->ext_host_nat_addr.as_u32 = eh_key.addr.as_u32; @@ -315,7 +293,7 @@ create_session_for_static_mapping_ed (snat_main_t * sm, if (clib_bihash_add_or_overwrite_stale_16_8 (&tsm->in2out_ed, &kv, nat44_i2o_ed_is_idle_session_cb, &ctx)) - nat_log_notice ("in2out-ed key add failed"); + nat_elog_notice ("in2out-ed key add failed"); snat_ipfix_logging_nat44_ses_create (thread_index, s->in2out.addr.as_u32, @@ -324,63 +302,20 @@ create_session_for_static_mapping_ed (snat_main_t * sm, s->in2out.port, s->out2in.port, s->in2out.fib_index); - nat_syslog_nat44_sdel (s->user_index, 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, is_twice_nat_session (s)); - return s; -} - -static_always_inline int -icmp_get_ed_key (ip4_header_t * ip0, nat_ed_ses_key_t * p_key0) -{ - icmp46_header_t *icmp0; - nat_ed_ses_key_t key0; - icmp_echo_header_t *echo0, *inner_echo0 = 0; - ip4_header_t *inner_ip0; - void *l4_header = 0; - icmp46_header_t *inner_icmp0; - - icmp0 = (icmp46_header_t *) ip4_next_header (ip0); - echo0 = (icmp_echo_header_t *) (icmp0 + 1); + 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); - if (!icmp_is_error_message (icmp0)) - { - key0.proto = IP_PROTOCOL_ICMP; - key0.l_addr = ip0->dst_address; - key0.r_addr = ip0->src_address; - key0.l_port = echo0->identifier; - key0.r_port = 0; - } - else - { - inner_ip0 = (ip4_header_t *) (echo0 + 1); - l4_header = ip4_next_header (inner_ip0); - key0.proto = inner_ip0->protocol; - key0.l_addr = inner_ip0->src_address; - key0.r_addr = inner_ip0->dst_address; - switch (ip_proto_to_snat_proto (inner_ip0->protocol)) - { - case SNAT_PROTOCOL_ICMP: - inner_icmp0 = (icmp46_header_t *) l4_header; - inner_echo0 = (icmp_echo_header_t *) (inner_icmp0 + 1); - key0.l_port = inner_echo0->identifier; - key0.r_port = 0; - break; - case SNAT_PROTOCOL_UDP: - case SNAT_PROTOCOL_TCP: - key0.l_port = ((tcp_udp_header_t *) l4_header)->src_port; - key0.r_port = ((tcp_udp_header_t *) l4_header)->dst_port; - break; - default: - return -1; - } - } - *p_key0 = key0; - return 0; + return s; } static int @@ -412,7 +347,7 @@ create_bypass_for_fwd (snat_main_t * sm, ip4_header_t * ip, u32 rx_fib_index, if (ip->protocol == IP_PROTOCOL_ICMP) { - if (icmp_get_ed_key (ip, &key)) + if (get_icmp_o2i_ed_key (ip, &key)) return; } else if (ip->protocol == IP_PROTOCOL_UDP || ip->protocol == IP_PROTOCOL_TCP) @@ -441,6 +376,8 @@ create_bypass_for_fwd (snat_main_t * sm, ip4_header_t * ip, u32 rx_fib_index, } else { + u32 proto; + if (PREDICT_FALSE (maximum_sessions_exceeded (sm, thread_index))) return; @@ -448,7 +385,7 @@ create_bypass_for_fwd (snat_main_t * sm, ip4_header_t * ip, u32 rx_fib_index, thread_index); if (!u) { - nat_log_warn ("create NAT user failed"); + nat_elog_warn ("create NAT user failed"); return; } @@ -456,23 +393,30 @@ create_bypass_for_fwd (snat_main_t * sm, ip4_header_t * ip, u32 rx_fib_index, if (!s) { nat44_delete_user_with_no_session (sm, u, thread_index); - nat_log_warn ("create NAT session failed"); + nat_elog_warn ("create NAT session failed"); return; } + proto = ip_proto_to_snat_proto (key.proto); + s->ext_host_addr = key.r_addr; s->ext_host_port = key.r_port; s->flags |= SNAT_SESSION_FLAG_FWD_BYPASS; s->out2in.addr = key.l_addr; s->out2in.port = key.l_port; - s->out2in.protocol = ip_proto_to_snat_proto (key.proto); + s->out2in.protocol = proto; + if (proto == ~0) + { + s->flags |= SNAT_SESSION_FLAG_UNKNOWN_PROTO; + s->out2in.port = ip->protocol; + } s->out2in.fib_index = 0; s->in2out = s->out2in; user_session_increment (sm, u, 0); kv.value = s - tsm->sessions; if (clib_bihash_add_del_16_8 (&tsm->in2out_ed, &kv, 1)) - nat_log_notice ("in2out_ed key add failed"); + nat_elog_notice ("in2out_ed key add failed"); } if (ip->protocol == IP_PROTOCOL_TCP) @@ -483,11 +427,23 @@ create_bypass_for_fwd (snat_main_t * sm, ip4_header_t * ip, u32 rx_fib_index, } /* Accounting */ - nat44_session_update_counters (s, now, 0); + nat44_session_update_counters (s, now, 0, thread_index); /* Per-user LRU list maintenance */ nat44_session_update_lru (sm, s, thread_index); } +static inline void +create_bypass_for_fwd_worker (snat_main_t * sm, ip4_header_t * ip, + u32 rx_fib_index) +{ + ip4_header_t ip_wkr = { + .src_address = ip->dst_address, + }; + u32 thread_index = sm->worker_in2out_cb (&ip_wkr, rx_fib_index, 0); + + create_bypass_for_fwd (sm, ip, rx_fib_index, thread_index); +} + #ifndef CLIB_MARCH_VARIANT u32 icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node, @@ -508,7 +464,7 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node, sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX]; rx_fib_index = ip4_fib_table_get_index_for_sw_if_index (sw_if_index); - if (icmp_get_ed_key (ip, &key)) + if (get_icmp_o2i_ed_key (ip, &key)) { b->error = node->errors[NAT_OUT2IN_ED_ERROR_UNSUPPORTED_PROTOCOL]; next = NAT44_ED_OUT2IN_NEXT_DROP; @@ -550,7 +506,10 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node, next = NAT44_ED_OUT2IN_NEXT_IN2OUT; goto out; } - create_bypass_for_fwd (sm, ip, rx_fib_index, thread_index); + if (sm->num_workers > 1) + create_bypass_for_fwd_worker (sm, ip, rx_fib_index); + else + create_bypass_for_fwd (sm, ip, rx_fib_index, thread_index); goto out; } } @@ -639,7 +598,7 @@ nat44_ed_out2in_unknown_proto (snat_main_t * sm, if (PREDICT_FALSE (maximum_sessions_exceeded (sm, thread_index))) { b->error = node->errors[NAT_OUT2IN_ED_ERROR_MAX_SESSIONS_EXCEEDED]; - nat_log_notice ("maximum sessions exceeded"); + nat_elog_notice ("maximum sessions exceeded"); return 0; } @@ -659,7 +618,7 @@ nat44_ed_out2in_unknown_proto (snat_main_t * sm, thread_index); if (!u) { - nat_log_warn ("create NAT user failed"); + nat_elog_warn ("create NAT user failed"); return 0; } @@ -668,7 +627,7 @@ nat44_ed_out2in_unknown_proto (snat_main_t * sm, if (!s) { nat44_delete_user_with_no_session (sm, u, thread_index); - nat_log_warn ("create NAT session failed"); + nat_elog_warn ("create NAT session failed"); return 0; } @@ -686,13 +645,13 @@ nat44_ed_out2in_unknown_proto (snat_main_t * sm, /* Add to lookup tables */ s_kv.value = s - tsm->sessions; if (clib_bihash_add_del_16_8 (&tsm->out2in_ed, &s_kv, 1)) - nat_log_notice ("out2in key add failed"); + nat_elog_notice ("out2in key add failed"); make_ed_kv (&s_kv, &ip->dst_address, &ip->src_address, ip->protocol, m->fib_index, 0, 0); s_kv.value = s - tsm->sessions; if (clib_bihash_add_del_16_8 (&tsm->in2out_ed, &s_kv, 1)) - nat_log_notice ("in2out key add failed"); + nat_elog_notice ("in2out key add failed"); } /* Update IP checksum */ @@ -703,7 +662,8 @@ nat44_ed_out2in_unknown_proto (snat_main_t * sm, vnet_buffer (b)->sw_if_index[VLIB_TX] = s->in2out.fib_index; /* 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); @@ -902,8 +862,12 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, next0 = NAT44_ED_OUT2IN_NEXT_IN2OUT; goto trace00; } - create_bypass_for_fwd (sm, ip0, rx_fib_index0, - thread_index); + if (sm->num_workers > 1) + create_bypass_for_fwd_worker (sm, ip0, + rx_fib_index0); + else + create_bypass_for_fwd (sm, ip0, rx_fib_index0, + thread_index); } goto trace00; } @@ -996,8 +960,8 @@ nat44_ed_out2in_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); @@ -1136,8 +1100,12 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, next1 = NAT44_ED_OUT2IN_NEXT_IN2OUT; goto trace01; } - create_bypass_for_fwd (sm, ip1, rx_fib_index1, - thread_index); + if (sm->num_workers > 1) + create_bypass_for_fwd_worker (sm, ip1, + rx_fib_index1); + else + create_bypass_for_fwd (sm, ip1, rx_fib_index1, + thread_index); } goto trace01; } @@ -1230,8 +1198,8 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, /* 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); @@ -1404,8 +1372,12 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm, next0 = NAT44_ED_OUT2IN_NEXT_IN2OUT; goto trace0; } - create_bypass_for_fwd (sm, ip0, rx_fib_index0, - thread_index); + if (sm->num_workers > 1) + create_bypass_for_fwd_worker (sm, ip0, + rx_fib_index0); + else + create_bypass_for_fwd (sm, ip0, rx_fib_index0, + thread_index); } goto trace0; } @@ -1498,8 +1470,8 @@ nat44_ed_out2in_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); @@ -1685,7 +1657,7 @@ VLIB_NODE_FN (nat44_ed_out2in_reass_node) (vlib_main_t * vm, { next0 = NAT44_ED_OUT2IN_NEXT_DROP; b0->error = node->errors[NAT_OUT2IN_ED_ERROR_MAX_REASS]; - nat_log_notice ("maximum reassemblies exceeded"); + nat_elog_notice ("maximum reassemblies exceeded"); goto trace0; } @@ -1757,8 +1729,12 @@ VLIB_NODE_FN (nat44_ed_out2in_reass_node) (vlib_main_t * vm, next0 = NAT44_ED_OUT2IN_NEXT_IN2OUT; goto trace0; } - create_bypass_for_fwd (sm, ip0, rx_fib_index0, - thread_index); + if (sm->num_workers > 1) + create_bypass_for_fwd_worker (sm, ip0, + rx_fib_index0); + else + create_bypass_for_fwd (sm, ip0, rx_fib_index0, + thread_index); reass0->flags |= NAT_REASS_FLAG_ED_DONT_TRANSLATE; nat_ip4_reass_get_frags (reass0, &fragments_to_loopback); @@ -1813,7 +1789,7 @@ VLIB_NODE_FN (nat44_ed_out2in_reass_node) (vlib_main_t * vm, (thread_index, reass0, bi0, &fragments_to_drop)) { b0->error = node->errors[NAT_OUT2IN_ED_ERROR_MAX_FRAG]; - nat_log_notice + nat_elog_notice ("maximum fragments per reassembly exceeded"); next0 = NAT44_ED_OUT2IN_NEXT_DROP; goto trace0; @@ -1884,8 +1860,8 @@ VLIB_NODE_FN (nat44_ed_out2in_reass_node) (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);