From 770178e365b5c37ecdecfecb424003cca7343ede Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Fri, 17 Apr 2020 18:42:28 +0000 Subject: nat: improve perf - long read after short write Type: improvement Signed-off-by: Klement Sekera Change-Id: Idbbad246161d28f595c25e10d7282c8b33fa9876 --- src/plugins/nat/out2in_ed.c | 141 +++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 73 deletions(-) (limited to 'src/plugins/nat/out2in_ed.c') diff --git a/src/plugins/nat/out2in_ed.c b/src/plugins/nat/out2in_ed.c index 560dc0d89d4..1382125dcf7 100644 --- a/src/plugins/nat/out2in_ed.c +++ b/src/plugins/nat/out2in_ed.c @@ -94,7 +94,10 @@ nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg) nat44_is_idle_session_ctx_t *ctx = arg; snat_session_t *s; u64 sess_timeout_time; - nat_ed_ses_key_t ed_key; + u8 proto; + u16 r_port, l_port; + ip4_address_t *l_addr, *r_addr; + u32 fib_index; clib_bihash_kv_16_8_t ed_kv; int i; snat_address_t *a; @@ -106,28 +109,28 @@ nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg) sess_timeout_time = s->last_heard + (f64) nat44_session_get_timeout (sm, s); if (ctx->now >= sess_timeout_time) { - ed_key.l_addr = s->in2out.addr; - ed_key.r_addr = s->ext_host_addr; - ed_key.fib_index = s->in2out.fib_index; + l_addr = &s->in2out.addr; + r_addr = &s->ext_host_addr; + fib_index = s->in2out.fib_index; if (snat_is_unk_proto_session (s)) { - ed_key.proto = s->in2out.port; - ed_key.r_port = 0; - ed_key.l_port = 0; + proto = s->in2out.port; + r_port = 0; + l_port = 0; } else { - ed_key.proto = snat_proto_to_ip_proto (s->in2out.protocol); - ed_key.l_port = s->in2out.port; - ed_key.r_port = s->ext_host_port; + proto = snat_proto_to_ip_proto (s->in2out.protocol); + l_port = s->in2out.port; + r_port = s->ext_host_port; } if (is_twice_nat_session (s)) { - ed_key.r_addr = s->ext_host_nat_addr; - ed_key.r_port = s->ext_host_nat_port; + r_addr = &s->ext_host_nat_addr; + r_port = s->ext_host_nat_port; } - ed_kv.key[0] = ed_key.as_u64[0]; - ed_kv.key[1] = ed_key.as_u64[1]; + make_ed_kv (l_addr, r_addr, proto, fib_index, l_port, r_port, ~0ULL, + &ed_kv); if (clib_bihash_add_del_16_8 (&tsm->in2out_ed, &ed_kv, 0)) nat_elog_warn ("in2out_ed key del failed"); @@ -233,9 +236,9 @@ create_session_for_static_mapping_ed (snat_main_t * sm, s->in2out.protocol = s->out2in.protocol; /* Add to lookup tables */ - make_ed_kv (&kv, &e_key.addr, &s->ext_host_addr, ip->protocol, - e_key.fib_index, e_key.port, s->ext_host_port); - kv.value = s - tsm->sessions; + make_ed_kv (&e_key.addr, &s->ext_host_addr, ip->protocol, + e_key.fib_index, e_key.port, s->ext_host_port, + s - tsm->sessions, &kv); ctx.now = now; ctx.thread_index = thread_index; if (clib_bihash_add_or_overwrite_stale_16_8 (&tsm->out2in_ed, &kv, @@ -261,15 +264,16 @@ create_session_for_static_mapping_ed (snat_main_t * sm, s->ext_host_nat_addr.as_u32 = eh_key.addr.as_u32; s->ext_host_nat_port = eh_key.port; s->flags |= SNAT_SESSION_FLAG_TWICE_NAT; - make_ed_kv (&kv, &l_key.addr, &s->ext_host_nat_addr, ip->protocol, - l_key.fib_index, l_key.port, s->ext_host_nat_port); + make_ed_kv (&l_key.addr, &s->ext_host_nat_addr, ip->protocol, + l_key.fib_index, l_key.port, s->ext_host_nat_port, + s - tsm->sessions, &kv); } else { - make_ed_kv (&kv, &l_key.addr, &s->ext_host_addr, ip->protocol, - l_key.fib_index, l_key.port, s->ext_host_port); + make_ed_kv (&l_key.addr, &s->ext_host_addr, ip->protocol, + l_key.fib_index, l_key.port, s->ext_host_port, + s - tsm->sessions, &kv); } - kv.value = s - tsm->sessions; if (clib_bihash_add_or_overwrite_stale_16_8 (&tsm->in2out_ed, &kv, nat44_i2o_ed_is_idle_session_cb, &ctx)) @@ -299,14 +303,14 @@ create_session_for_static_mapping_ed (snat_main_t * sm, } static int -next_src_nat (snat_main_t * sm, ip4_header_t * ip, u8 proto, u16 src_port, +next_src_nat (snat_main_t * sm, ip4_header_t * ip, u16 src_port, u16 dst_port, u32 thread_index, u32 rx_fib_index) { clib_bihash_kv_16_8_t kv, value; snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index]; - make_ed_kv (&kv, &ip->src_address, &ip->dst_address, proto, - rx_fib_index, src_port, dst_port); + make_ed_kv (&ip->src_address, &ip->dst_address, ip->protocol, + rx_fib_index, src_port, dst_port, ~0ULL, &kv); if (!clib_bihash_search_16_8 (&tsm->in2out_ed, &kv, &value)) return 1; @@ -317,37 +321,35 @@ static void create_bypass_for_fwd (snat_main_t * sm, vlib_buffer_t * b, ip4_header_t * ip, u32 rx_fib_index, u32 thread_index) { - nat_ed_ses_key_t key; clib_bihash_kv_16_8_t kv, value; udp_header_t *udp; snat_session_t *s = 0; snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index]; f64 now = vlib_time_now (sm->vlib_main); + u16 l_port, r_port; if (ip->protocol == IP_PROTOCOL_ICMP) { - if (get_icmp_o2i_ed_key (b, ip, &key)) + if (get_icmp_o2i_ed_key + (b, ip, rx_fib_index, ~0ULL, 0, &l_port, &r_port, &kv)) return; } - else if (ip->protocol == IP_PROTOCOL_UDP || ip->protocol == IP_PROTOCOL_TCP) - { - udp = ip4_next_header (ip); - key.r_addr = ip->src_address; - key.l_addr = ip->dst_address; - key.proto = ip->protocol; - key.l_port = udp->dst_port; - key.r_port = udp->src_port; - } else { - key.r_addr = ip->src_address; - key.l_addr = ip->dst_address; - key.proto = ip->protocol; - key.l_port = key.r_port = 0; + if (ip->protocol == IP_PROTOCOL_UDP || ip->protocol == IP_PROTOCOL_TCP) + { + udp = ip4_next_header (ip); + l_port = udp->dst_port; + r_port = udp->src_port; + } + else + { + l_port = 0; + r_port = 0; + } + make_ed_kv (&ip->dst_address, &ip->src_address, ip->protocol, + rx_fib_index, l_port, r_port, ~0ULL, &kv); } - key.fib_index = 0; - kv.key[0] = key.as_u64[0]; - kv.key[1] = key.as_u64[1]; if (!clib_bihash_search_16_8 (&tsm->in2out_ed, &kv, &value)) { @@ -367,13 +369,13 @@ create_bypass_for_fwd (snat_main_t * sm, vlib_buffer_t * b, ip4_header_t * ip, return; } - proto = ip_proto_to_snat_proto (key.proto); + proto = ip_proto_to_snat_proto (ip->protocol); - s->ext_host_addr = key.r_addr; - s->ext_host_port = key.r_port; + s->ext_host_addr = ip->src_address; + s->ext_host_port = r_port; s->flags |= SNAT_SESSION_FLAG_FWD_BYPASS; - s->out2in.addr = key.l_addr; - s->out2in.port = key.l_port; + s->out2in.addr = ip->dst_address; + s->out2in.port = l_port; s->out2in.protocol = proto; if (proto == ~0) { @@ -423,32 +425,30 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node, u8 * p_dont_translate, void *d, void *e) { u32 next = ~0, sw_if_index, rx_fib_index; - nat_ed_ses_key_t key; clib_bihash_kv_16_8_t kv, value; snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index]; snat_session_t *s = 0; u8 dont_translate = 0, is_addr_only, identity_nat; snat_session_key_t e_key, l_key; + u16 l_port, r_port; 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 (get_icmp_o2i_ed_key (b, ip, &key)) + if (get_icmp_o2i_ed_key + (b, ip, rx_fib_index, ~0ULL, p_proto, &l_port, &r_port, &kv)) { b->error = node->errors[NAT_OUT2IN_ED_ERROR_UNSUPPORTED_PROTOCOL]; next = NAT_NEXT_DROP; goto out; } - key.fib_index = rx_fib_index; - kv.key[0] = key.as_u64[0]; - kv.key[1] = key.as_u64[1]; if (clib_bihash_search_16_8 (&tsm->out2in_ed, &kv, &value)) { /* Try to match static mapping */ e_key.addr = ip->dst_address; - e_key.port = key.l_port; - e_key.protocol = ip_proto_to_snat_proto (key.proto); + e_key.port = l_port; + e_key.protocol = ip_proto_to_snat_proto (ip->protocol); e_key.fib_index = rx_fib_index; if (snat_static_mapping_match (sm, e_key, &l_key, 1, &is_addr_only, 0, 0, 0, &identity_nat)) @@ -469,7 +469,7 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node, else { dont_translate = 1; - if (next_src_nat (sm, ip, key.proto, key.l_port, key.r_port, + if (next_src_nat (sm, ip, l_port, r_port, thread_index, rx_fib_index)) { next = NAT_NEXT_IN2OUT_ED_FAST_PATH; @@ -529,8 +529,6 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node, s = pool_elt_at_index (tsm->sessions, value.value); } - - *p_proto = ip_proto_to_snat_proto (key.proto); out: if (s) *p_value = s->in2out; @@ -560,8 +558,8 @@ nat44_ed_out2in_unknown_proto (snat_main_t * sm, old_addr = ip->dst_address.as_u32; - make_ed_kv (&s_kv, &ip->dst_address, &ip->src_address, ip->protocol, - rx_fib_index, 0, 0); + make_ed_kv (&ip->dst_address, &ip->src_address, ip->protocol, rx_fib_index, + 0, 0, ~0ULL, &s_kv); if (!clib_bihash_search_16_8 (&tsm->out2in_ed, &s_kv, &s_value)) { @@ -613,9 +611,8 @@ nat44_ed_out2in_unknown_proto (snat_main_t * sm, if (clib_bihash_add_del_16_8 (&tsm->out2in_ed, &s_kv, 1)) 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; + make_ed_kv (&ip->dst_address, &ip->src_address, ip->protocol, + m->fib_index, 0, 0, s - tsm->sessions, &s_kv); if (clib_bihash_add_del_16_8 (&tsm->in2out_ed, &s_kv, 1)) nat_elog_notice ("in2out key add failed"); } @@ -721,10 +718,10 @@ nat44_ed_out2in_fast_path_node_fn_inline (vlib_main_t * vm, goto trace0; } - make_ed_kv (&kv0, &ip0->dst_address, &ip0->src_address, + make_ed_kv (&ip0->dst_address, &ip0->src_address, ip0->protocol, rx_fib_index0, vnet_buffer (b0)->ip.reass.l4_dst_port, - vnet_buffer (b0)->ip.reass.l4_src_port); + vnet_buffer (b0)->ip.reass.l4_src_port, ~0ULL, &kv0); if (clib_bihash_search_16_8 (&tsm->out2in_ed, &kv0, &value0)) { @@ -1006,10 +1003,10 @@ nat44_ed_out2in_slow_path_node_fn_inline (vlib_main_t * vm, goto trace0; } - make_ed_kv (&kv0, &ip0->dst_address, &ip0->src_address, + make_ed_kv (&ip0->dst_address, &ip0->src_address, ip0->protocol, rx_fib_index0, vnet_buffer (b0)->ip.reass.l4_dst_port, - vnet_buffer (b0)->ip.reass.l4_src_port); + vnet_buffer (b0)->ip.reass.l4_src_port, ~0ULL, &kv0); s0 = NULL; if (!clib_bihash_search_16_8 (&tsm->out2in_ed, &kv0, &value0)) @@ -1059,12 +1056,10 @@ nat44_ed_out2in_slow_path_node_fn_inline (vlib_main_t * vm, } else { - if (next_src_nat (sm, ip0, ip0->protocol, - vnet_buffer (b0)->ip. - reass.l4_src_port, - vnet_buffer (b0)->ip. - reass.l4_dst_port, thread_index, - rx_fib_index0)) + if (next_src_nat + (sm, ip0, vnet_buffer (b0)->ip.reass.l4_src_port, + vnet_buffer (b0)->ip.reass.l4_dst_port, + thread_index, rx_fib_index0)) { next0 = NAT_NEXT_IN2OUT_ED_FAST_PATH; goto trace0; -- cgit 1.2.3-korg