X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_tun.c;h=ea60ab44a8c786ff379790f9c3d3557f4361491f;hb=4a58e49cf;hp=07dd9ea409bf22abe1bdc3d495db38a46cd0ae07;hpb=8d6d74cdf43d7560eab3cf609cab27e5deb816e0;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_tun.c b/src/vnet/ipsec/ipsec_tun.c index 07dd9ea409b..ea60ab44a8c 100644 --- a/src/vnet/ipsec/ipsec_tun.c +++ b/src/vnet/ipsec/ipsec_tun.c @@ -16,11 +16,22 @@ */ #include +#include #include -#include +#include #include +#include #include +/* instantiate the bihash functions */ +#include +#include +#include +#include + +#define IPSEC_TUN_DEFAULT_HASH_NUM_BUCKETS (64 * 1024) +#define IPSEC_TUN_DEFAULT_HASH_MEMORY_SIZE 512 << 20 + /** * The logger */ @@ -90,9 +101,7 @@ ipsec_tun_register_nodes (ip_address_family_t af) { if (AF_IP4 == af) { - udp_register_dst_port (vlib_get_main (), - UDP_DST_PORT_ipsec, - ipsec4_tun_input_node.index, 1); + ipsec_register_udp_port (UDP_DST_PORT_ipsec); ip4_register_protocol (IP_PROTOCOL_IPSEC_ESP, ipsec4_tun_input_node.index); } @@ -110,7 +119,7 @@ ipsec_tun_unregister_nodes (ip_address_family_t af) { if (AF_IP4 == af) { - udp_unregister_dst_port (vlib_get_main (), UDP_DST_PORT_ipsec, 1); + ipsec_unregister_udp_port (UDP_DST_PORT_ipsec); ip4_unregister_protocol (IP_PROTOCOL_IPSEC_ESP); } else @@ -118,15 +127,6 @@ ipsec_tun_unregister_nodes (ip_address_family_t af) } } -static void -ipsec_tun_protect_add_adj (adj_index_t ai, index_t sai) -{ - vec_validate_init_empty (ipsec_tun_protect_sa_by_adj_index, ai, - INDEX_INVALID); - - ipsec_tun_protect_sa_by_adj_index[ai] = sai; -} - static inline const ipsec_tun_protect_t * ipsec_tun_protect_from_const_base (const adj_delegate_t * ad) { @@ -135,60 +135,73 @@ ipsec_tun_protect_from_const_base (const adj_delegate_t * ad) return (pool_elt_at_index (ipsec_tun_protect_pool, ad->ad_index)); } -static void -ipsec_tun_protect_feature_set (ipsec_tun_protect_t * itp, u8 enable) +static u32 +ipsec_tun_protect_get_adj_next (vnet_link_t linkt, + const ipsec_tun_protect_t * itp) { - ITP_DBG2 ("%s on %U", (enable ? "enable" : "disable"), - format_vnet_sw_if_index_name, vnet_get_main (), - itp->itp_sw_if_index); + ipsec_main_t *im; + ipsec_sa_t *sa; + u32 next; - if (itp->itp_flags & IPSEC_PROTECT_L2) + if (!(itp->itp_flags & IPSEC_PROTECT_ITF)) { - /* l2-GRE only supported by the vnet ipsec code */ - vnet_feature_enable_disable ("ethernet-output", - (ip46_address_is_ip4 (&itp->itp_tun.src) ? - "esp4-encrypt-tun" : - "esp6-encrypt-tun"), - itp->itp_sw_if_index, enable, NULL, 0); + if (ip46_address_is_ip4 (&itp->itp_tun.src)) + linkt = VNET_LINK_IP4; + else + linkt = VNET_LINK_IP6; } + + sa = ipsec_sa_get (itp->itp_out_sa); + im = &ipsec_main; + next = 0; + + if ((sa->crypto_alg == IPSEC_CRYPTO_ALG_NONE && + sa->integ_alg == IPSEC_INTEG_ALG_NONE) && + !(itp->itp_flags & IPSEC_PROTECT_ITF)) + next = (VNET_LINK_IP4 == linkt ? im->esp4_no_crypto_tun_node_index : + im->esp6_no_crypto_tun_node_index); + else if (itp->itp_flags & IPSEC_PROTECT_L2) + next = (VNET_LINK_IP4 == linkt ? im->esp4_encrypt_l2_tun_node_index : + im->esp6_encrypt_l2_tun_node_index); else { - u32 fi4, fi6, sai; - ipsec_main_t *im; - ipsec_sa_t *sa; - - im = &ipsec_main; - sai = itp->itp_out_sa; - sa = ipsec_sa_get (sai); - - if (sa->crypto_alg == IPSEC_CRYPTO_ALG_NONE && - sa->integ_alg == IPSEC_INTEG_ALG_NONE) + switch (linkt) { - fi4 = im->esp4_no_crypto_tun_feature_index; - fi6 = im->esp6_no_crypto_tun_feature_index; - } - else - { - if (ip46_address_is_ip4 (&itp->itp_tun.src)) - { - /* tunnel destination is v4 so we need the Xo4 indexes */ - fi4 = im->esp44_encrypt_tun_feature_index; - fi6 = im->esp64_encrypt_tun_feature_index; - } - else - { - /* tunnel destination is v6 so we need the Xo6 indexes */ - fi4 = im->esp46_encrypt_tun_feature_index; - fi6 = im->esp66_encrypt_tun_feature_index; - } + case VNET_LINK_IP4: + next = im->esp4_encrypt_tun_node_index; + break; + case VNET_LINK_IP6: + next = im->esp6_encrypt_tun_node_index; + break; + case VNET_LINK_MPLS: + next = im->esp_mpls_encrypt_tun_node_index; + break; + case VNET_LINK_ARP: + case VNET_LINK_NSH: + case VNET_LINK_ETHERNET: + ASSERT (0); + break; } + } + return (next); +} + +static void +ipsec_tun_protect_add_adj (adj_index_t ai, const ipsec_tun_protect_t * itp) +{ + vec_validate_init_empty (ipsec_tun_protect_sa_by_adj_index, ai, + INDEX_INVALID); - vnet_feature_enable_disable_with_index - (vnet_get_feature_arc_index ("ip4-output"), - fi4, itp->itp_sw_if_index, enable, NULL, 0); - vnet_feature_enable_disable_with_index - (vnet_get_feature_arc_index ("ip6-output"), - fi6, itp->itp_sw_if_index, enable, NULL, 0); + if (NULL == itp) + { + ipsec_tun_protect_sa_by_adj_index[ai] = INDEX_INVALID; + adj_nbr_midchain_reset_next_node (ai); + } + else + { + ipsec_tun_protect_sa_by_adj_index[ai] = itp->itp_out_sa; + adj_nbr_midchain_update_next_node + (ai, ipsec_tun_protect_get_adj_next (adj_get_link_type (ai), itp)); } } @@ -232,6 +245,8 @@ ipsec_tun_protect_rx_db_add (ipsec_main_t * im, ipsec_tun_lkup_result_t res = { .tun_index = itp - ipsec_tun_protect_pool, .sa_index = sai, + .flags = itp->itp_flags, + .sw_if_index = itp->itp_sw_if_index, }; /* @@ -240,20 +255,40 @@ ipsec_tun_protect_rx_db_add (ipsec_main_t * im, */ if (ip46_address_is_ip4 (&itp->itp_crypto.dst)) { - ipsec4_tunnel_key_t key = { - .remote_ip = itp->itp_crypto.dst.ip4, - .spi = clib_host_to_net_u32 (sa->spi), + ipsec4_tunnel_kv_t key = { + .value = res, }; - hash_set (im->tun4_protect_by_key, key.as_u64, res.as_u64); + clib_bihash_kv_8_16_t *bkey = (clib_bihash_kv_8_16_t*)&key; + + ipsec4_tunnel_mk_key(&key, &itp->itp_crypto.dst.ip4, + clib_host_to_net_u32 (sa->spi)); + + if (!im->tun4_protect_by_key.nbuckets) + clib_bihash_init_8_16 (&im->tun4_protect_by_key, + "IPSec IPv4 tunnels", + IPSEC_TUN_DEFAULT_HASH_NUM_BUCKETS, + IPSEC_TUN_DEFAULT_HASH_MEMORY_SIZE); + + clib_bihash_add_del_8_16 (&im->tun4_protect_by_key, bkey, 1); ipsec_tun_register_nodes(AF_IP4); } else { - ipsec6_tunnel_key_t key = { - .remote_ip = itp->itp_crypto.dst.ip6, - .spi = clib_host_to_net_u32 (sa->spi), + ipsec6_tunnel_kv_t key = { + .key = { + .remote_ip = itp->itp_crypto.dst.ip6, + .spi = clib_host_to_net_u32 (sa->spi), + }, + .value = res, }; - hash_set_mem_alloc (&im->tun6_protect_by_key, &key, res.as_u64); + clib_bihash_kv_24_16_t *bkey = (clib_bihash_kv_24_16_t*)&key; + + if (!im->tun4_protect_by_key.nbuckets) + clib_bihash_init_24_16 (&im->tun6_protect_by_key, + "IPSec IPv6 tunnels", + IPSEC_TUN_DEFAULT_HASH_NUM_BUCKETS, + IPSEC_TUN_DEFAULT_HASH_MEMORY_SIZE); + clib_bihash_add_del_24_16 (&im->tun6_protect_by_key, bkey, 1); ipsec_tun_register_nodes(AF_IP6); } })) @@ -266,7 +301,10 @@ ipsec_tun_protect_adj_add (adj_index_t ai, void *arg) ipsec_tun_protect_t *itp = arg; adj_delegate_add (adj_get (ai), ipsec_tun_adj_delegate_type, itp - ipsec_tun_protect_pool); - ipsec_tun_protect_add_adj (ai, itp->itp_out_sa); + ipsec_tun_protect_add_adj (ai, itp); + + if (itp->itp_flags & IPSEC_PROTECT_ITF) + ipsec_itf_adj_stack (ai, itp->itp_out_sa); return (ADJ_WALK_RC_CONTINUE); } @@ -291,7 +329,7 @@ ipsec_tun_protect_tx_db_add (ipsec_tun_protect_t * itp) { if (INDEX_INVALID == idi->id_itp) { - ipsec_tun_protect_feature_set (itp, 1); + // ipsec_tun_protect_feature_set (itp, 1); } idi->id_itp = itp - ipsec_tun_protect_pool; @@ -309,7 +347,7 @@ ipsec_tun_protect_tx_db_add (ipsec_tun_protect_t * itp) * enable the encrypt feature for egress if this is the first addition * on this interface */ - ipsec_tun_protect_feature_set (itp, 1); + // ipsec_tun_protect_feature_set (itp, 1); } hash_set_mem (idi->id_hash, itp->itp_key, itp - ipsec_tun_protect_pool); @@ -337,39 +375,50 @@ ipsec_tun_protect_rx_db_remove (ipsec_main_t * im, /* *INDENT-OFF* */ FOR_EACH_IPSEC_PROTECT_INPUT_SA(itp, sa, ({ - if (ip46_address_is_ip4 (&itp->itp_crypto.dst)) - { - ipsec4_tunnel_key_t key = { - .remote_ip = itp->itp_crypto.dst.ip4, - .spi = clib_host_to_net_u32 (sa->spi), - }; - if (hash_get(im->tun4_protect_by_key, key.as_u64)) + if (ip46_address_is_ip4 (&itp->itp_crypto.dst)) + { + ipsec4_tunnel_kv_t key; + clib_bihash_kv_8_16_t res, *bkey = (clib_bihash_kv_8_16_t*)&key; + + ipsec4_tunnel_mk_key(&key, &itp->itp_crypto.dst.ip4, + clib_host_to_net_u32 (sa->spi)); + + if (!clib_bihash_search_8_16 (&im->tun4_protect_by_key, bkey, &res)) { - hash_unset (im->tun4_protect_by_key, key.as_u64); + clib_bihash_add_del_8_16 (&im->tun4_protect_by_key, bkey, 0); ipsec_tun_unregister_nodes(AF_IP4); } - } - else - { - ipsec6_tunnel_key_t key = { + } + else + { + ipsec6_tunnel_kv_t key = { + .key = { .remote_ip = itp->itp_crypto.dst.ip6, .spi = clib_host_to_net_u32 (sa->spi), - }; - if (hash_get_mem(im->tun6_protect_by_key, &key)) - { - hash_unset_mem_free (&im->tun6_protect_by_key, &key); - ipsec_tun_unregister_nodes(AF_IP6); - } - } - })) + }, + }; + clib_bihash_kv_24_16_t res, *bkey = (clib_bihash_kv_24_16_t*)&key; + + if (!clib_bihash_search_24_16 (&im->tun6_protect_by_key, bkey, &res)) + { + clib_bihash_add_del_24_16 (&im->tun6_protect_by_key, bkey, 0); + ipsec_tun_unregister_nodes(AF_IP6); + } + } + })); /* *INDENT-ON* */ } static adj_walk_rc_t ipsec_tun_protect_adj_remove (adj_index_t ai, void *arg) { + ipsec_tun_protect_t *itp = arg; + adj_delegate_remove (ai, ipsec_tun_adj_delegate_type); - ipsec_tun_protect_add_adj (ai, INDEX_INVALID); + ipsec_tun_protect_add_adj (ai, NULL); + + if (itp->itp_flags & IPSEC_PROTECT_ITF) + ipsec_itf_adj_unstack (ai); return (ADJ_WALK_RC_CONTINUE); } @@ -386,7 +435,7 @@ ipsec_tun_protect_tx_db_remove (ipsec_tun_protect_t * itp) if (vnet_sw_interface_is_p2p (vnet_get_main (), itp->itp_sw_if_index)) { - ipsec_tun_protect_feature_set (itp, 0); + // ipsec_tun_protect_feature_set (itp, 0); idi->id_itp = INDEX_INVALID; FOR_EACH_FIB_IP_PROTOCOL (nh_proto) @@ -402,7 +451,7 @@ ipsec_tun_protect_tx_db_remove (ipsec_tun_protect_t * itp) if (0 == hash_elts (idi->id_hash)) { - ipsec_tun_protect_feature_set (itp, 0); + // ipsec_tun_protect_feature_set (itp, 0); hash_free (idi->id_hash); idi->id_hash = NULL; } @@ -423,8 +472,11 @@ ipsec_tun_protect_set_crypto_addr (ipsec_tun_protect_t * itp) { itp->itp_crypto.src = sa->tunnel_dst_addr; itp->itp_crypto.dst = sa->tunnel_src_addr; - ipsec_sa_set_IS_PROTECT (sa); - itp->itp_flags |= IPSEC_PROTECT_ENCAPED; + if (!(itp->itp_flags & IPSEC_PROTECT_ITF)) + { + ipsec_sa_set_IS_PROTECT (sa); + itp->itp_flags |= IPSEC_PROTECT_ENCAPED; + } } else { @@ -492,111 +544,6 @@ ipsec_tun_protect_unconfig (ipsec_main_t * im, ipsec_tun_protect_t * itp) ITP_DBG (itp, "unconfigured"); } -int -ipsec_tun_protect_update_one (u32 sw_if_index, - const ip_address_t * nh, u32 sa_out, u32 sa_in) -{ - u32 *sas_in = NULL; - int rv; - - vec_add1 (sas_in, sa_in); - rv = ipsec_tun_protect_update (sw_if_index, nh, sa_out, sas_in); - - return (rv); -} - -int -ipsec_tun_protect_update_out (u32 sw_if_index, - const ip_address_t * nh, u32 sa_out) -{ - u32 itpi, *sas_in, sai, *saip; - ipsec_tun_protect_t *itp; - ipsec_main_t *im; - int rv; - - sas_in = NULL; - rv = 0; - im = &ipsec_main; - - itpi = ipsec_tun_protect_find (sw_if_index, nh); - - if (INDEX_INVALID == itpi) - { - return (VNET_API_ERROR_INVALID_INTERFACE); - } - - itp = pool_elt_at_index (ipsec_tun_protect_pool, itpi); - - /* *INDENT-OFF* */ - FOR_EACH_IPSEC_PROTECT_INPUT_SAI (itp, sai, - ({ - ipsec_sa_lock (sai); - vec_add1 (sas_in, sai); - })); - /* *INDENT-ON* */ - - sa_out = ipsec_sa_find_and_lock (sa_out); - - if (~0 == sa_out) - { - rv = VNET_API_ERROR_INVALID_VALUE; - goto out; - } - - ipsec_tun_protect_unconfig (im, itp); - ipsec_tun_protect_config (im, itp, sa_out, sas_in); - - ipsec_sa_unlock (sa_out); - vec_foreach (saip, sas_in) ipsec_sa_unlock (*saip); - -out: - vec_free (sas_in); - return (rv); -} - -int -ipsec_tun_protect_update_in (u32 sw_if_index, - const ip_address_t * nh, u32 sa_in) -{ - u32 itpi, *sas_in, sa_out; - ipsec_tun_protect_t *itp; - ipsec_main_t *im; - int rv; - - sas_in = NULL; - rv = 0; - im = &ipsec_main; - itpi = ipsec_tun_protect_find (sw_if_index, nh); - - if (INDEX_INVALID == itpi) - { - return (VNET_API_ERROR_INVALID_INTERFACE); - } - - sa_in = ipsec_sa_find_and_lock (sa_in); - - if (~0 == sa_in) - { - rv = VNET_API_ERROR_INVALID_VALUE; - goto out; - } - vec_add1 (sas_in, sa_in); - - itp = pool_elt_at_index (ipsec_tun_protect_pool, itpi); - sa_out = itp->itp_out_sa; - - ipsec_sa_lock (sa_out); - - ipsec_tun_protect_unconfig (im, itp); - ipsec_tun_protect_config (im, itp, sa_out, sas_in); - - ipsec_sa_unlock (sa_out); - ipsec_sa_unlock (sa_in); -out: - vec_free (sas_in); - return (rv); -} - static void ipsec_tun_protect_update_from_teib (ipsec_tun_protect_t * itp, const teib_entry_t * ne) @@ -626,6 +573,12 @@ ipsec_tun_protect_update (u32 sw_if_index, format_vnet_sw_if_index_name, vnet_get_main (), sw_if_index, format_ip_address, nh); + if (vec_len (sas_in) > ITP_MAX_N_SA_IN) + { + rv = VNET_API_ERROR_LIMIT_EXCEEDED; + goto out; + } + rv = 0; im = &ipsec_main; if (NULL == nh) @@ -670,6 +623,7 @@ ipsec_tun_protect_update (u32 sw_if_index, pool_get_zero (ipsec_tun_protect_pool, itp); itp->itp_sw_if_index = sw_if_index; + itp->itp_ai = ADJ_INDEX_INVALID; itp->itp_n_sa_in = vec_len (sas_in); for (ii = 0; ii < itp->itp_n_sa_in; ii++) @@ -686,16 +640,30 @@ ipsec_tun_protect_update (u32 sw_if_index, if (rv) goto out; - if (ip46_address_is_zero (&itp->itp_tun.dst)) + if (ip46_address_is_zero (&itp->itp_tun.src)) { - /* tunnel has no destination address, presumably because it's p2mp - in which case we use the nh that this is protection for */ - ip46_address_t peer; + /* + * must be one of those pesky ipsec interfaces that has no encap. + * the encap then MUST come from the tunnel mode SA. + */ + ipsec_sa_t *sa; - ip_address_to_46 (nh, &peer); + sa = ipsec_sa_get (itp->itp_out_sa); + + if (!ipsec_sa_is_set_IS_TUNNEL (sa)) + { + rv = VNET_API_ERROR_INVALID_DST_ADDRESS; + goto out; + } + itp->itp_flags |= IPSEC_PROTECT_ITF; + } + else if (ip46_address_is_zero (&itp->itp_tun.dst)) + { + /* tunnel has no destination address, presumably because it's p2mp + in which case we use the nh that this is protection for */ ipsec_tun_protect_update_from_teib - (itp, teib_entry_find (sw_if_index, &peer)); + (itp, teib_entry_find (sw_if_index, nh)); } if (is_l2) @@ -703,7 +671,7 @@ ipsec_tun_protect_update (u32 sw_if_index, /* * add to the tunnel DB for ingress - * - if the SA is in trasnport mode, then the packates will arrivw + * - if the SA is in trasnport mode, then the packates will arrive * with the IP src,dst of the protected tunnel, in which case we can * simply strip the IP header and hand the payload to the protocol * appropriate input handler @@ -765,6 +733,9 @@ ipsec_tun_protect_del (u32 sw_if_index, const ip_address_t * nh) itp = ipsec_tun_protect_get (itpi); ipsec_tun_protect_unconfig (im, itp); + if (ADJ_INDEX_INVALID != itp->itp_ai) + adj_unlock (itp->itp_ai); + clib_mem_free (itp->itp_key); pool_put (ipsec_tun_protect_pool, itp); @@ -777,10 +748,10 @@ ipsec_tun_protect_walk (ipsec_tun_protect_walk_cb_t fn, void *ctx) index_t itpi; /* *INDENT-OFF* */ - pool_foreach_index(itpi, ipsec_tun_protect_pool, - ({ + pool_foreach_index (itpi, ipsec_tun_protect_pool) + { fn (itpi, ctx); - })); + } /* *INDENT-ON* */ } @@ -811,8 +782,15 @@ static void ipsec_tun_protect_adj_delegate_adj_deleted (adj_delegate_t * ad) { /* remove our delegate */ + ipsec_tun_protect_add_adj (ad->ad_adj_index, NULL); adj_delegate_remove (ad->ad_adj_index, ipsec_tun_adj_delegate_type); - ipsec_tun_protect_add_adj (ad->ad_adj_index, INDEX_INVALID); +} + +static void +ipsec_tun_protect_adj_delegate_adj_modified (adj_delegate_t * ad) +{ + ipsec_tun_protect_add_adj (ad->ad_adj_index, + ipsec_tun_protect_get (ad->ad_index)); } static void @@ -823,24 +801,18 @@ ipsec_tun_protect_adj_delegate_adj_created (adj_index_t ai) ip_adjacency_t *adj; index_t itpi; - adj = adj_get (ai); - - if (adj->lookup_next_index != IP_LOOKUP_NEXT_MIDCHAIN) + if (!adj_is_midchain (ai)) return; + adj = adj_get (ai); + ip_address_from_46 (&adj->sub_type.midchain.next_hop, adj->ia_nh_proto, &ip); itpi = ipsec_tun_protect_find (adj->rewrite_header.sw_if_index, &ip); if (INDEX_INVALID != itpi) - { - const ipsec_tun_protect_t *itp; - - itp = ipsec_tun_protect_get (itpi); - adj_delegate_add (adj_get (ai), ipsec_tun_adj_delegate_type, itpi); - ipsec_tun_protect_add_adj (ai, itp->itp_out_sa); - } + ipsec_tun_protect_adj_add (ai, ipsec_tun_protect_get (itpi)); } static u8 * @@ -857,17 +829,11 @@ ipsec_tun_protect_adj_delegate_format (const adj_delegate_t * aed, u8 * s) static void ipsec_tun_teib_entry_added (const teib_entry_t * ne) { - const ip46_address_t *peer46; ipsec_tun_protect_t *itp; - ip_address_t peer; index_t itpi; - peer46 = teib_entry_get_peer (ne); - ip_address_from_46 (peer46, - (ip46_address_is_ip4 (peer46) ? - FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6), &peer); - - itpi = ipsec_tun_protect_find (teib_entry_get_sw_if_index (ne), &peer); + itpi = ipsec_tun_protect_find (teib_entry_get_sw_if_index (ne), + teib_entry_get_peer (ne)); if (INDEX_INVALID == itpi) return; @@ -884,17 +850,11 @@ ipsec_tun_teib_entry_added (const teib_entry_t * ne) static void ipsec_tun_teib_entry_deleted (const teib_entry_t * ne) { - const ip46_address_t *peer46; ipsec_tun_protect_t *itp; - ip_address_t peer; index_t itpi; - peer46 = teib_entry_get_peer (ne); - ip_address_from_46 (peer46, - (ip46_address_is_ip4 (peer46) ? - FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6), &peer); - - itpi = ipsec_tun_protect_find (teib_entry_get_sw_if_index (ne), &peer); + itpi = ipsec_tun_protect_find (teib_entry_get_sw_if_index (ne), + teib_entry_get_peer (ne)); if (INDEX_INVALID == itpi) return; @@ -913,6 +873,7 @@ ipsec_tun_teib_entry_deleted (const teib_entry_t * ne) const static adj_delegate_vft_t ipsec_tun_adj_delegate_vft = { .adv_adj_deleted = ipsec_tun_protect_adj_delegate_adj_deleted, .adv_adj_created = ipsec_tun_protect_adj_delegate_adj_created, + .adv_adj_modified = ipsec_tun_protect_adj_delegate_adj_modified, .adv_format = ipsec_tun_protect_adj_delegate_format, }; @@ -921,22 +882,45 @@ const static teib_vft_t ipsec_tun_teib_vft = { .nv_deleted = ipsec_tun_teib_entry_deleted, }; -clib_error_t * -ipsec_tunnel_protect_init (vlib_main_t * vm) +static void +ipsec_tun_table_init (ip_address_family_t af, uword table_size, u32 n_buckets) { ipsec_main_t *im; im = &ipsec_main; - im->tun6_protect_by_key = hash_create_mem (0, - sizeof (ipsec6_tunnel_key_t), - sizeof (u64)); - im->tun4_protect_by_key = hash_create (0, sizeof (u64)); + + if (AF_IP4 == af) + clib_bihash_init_8_16 (&im->tun4_protect_by_key, + "IPSec IPv4 tunnels", n_buckets, table_size); + else + clib_bihash_init_24_16 (&im->tun6_protect_by_key, + "IPSec IPv6 tunnels", n_buckets, table_size); +} + +static clib_error_t * +ipsec_tunnel_protect_init (vlib_main_t *vm) +{ + ipsec_main_t *im; + + im = &ipsec_main; + clib_bihash_init_24_16 (&im->tun6_protect_by_key, + "IPSec IPv6 tunnels", + IPSEC_TUN_DEFAULT_HASH_NUM_BUCKETS, + IPSEC_TUN_DEFAULT_HASH_MEMORY_SIZE); + clib_bihash_init_8_16 (&im->tun4_protect_by_key, + "IPSec IPv4 tunnels", + IPSEC_TUN_DEFAULT_HASH_NUM_BUCKETS, + IPSEC_TUN_DEFAULT_HASH_MEMORY_SIZE); /* set up feature nodes to drop outbound packets with no crypto alg set */ - ipsec_add_feature ("ip4-output", "esp4-no-crypto", - &im->esp4_no_crypto_tun_feature_index); - ipsec_add_feature ("ip6-output", "esp6-no-crypto", - &im->esp6_no_crypto_tun_feature_index); + im->esp4_no_crypto_tun_node_index = + vlib_get_node_by_name (vm, (u8 *) "esp4-no-crypto")->index; + im->esp6_no_crypto_tun_node_index = + vlib_get_node_by_name (vm, (u8 *) "esp6-no-crypto")->index; + im->esp6_encrypt_l2_tun_node_index = + vlib_get_node_by_name (vm, (u8 *) "esp6-encrypt-tun")->index; + im->esp4_encrypt_l2_tun_node_index = + vlib_get_node_by_name (vm, (u8 *) "esp4-encrypt-tun")->index; ipsec_tun_adj_delegate_type = adj_delegate_register_new_type (&ipsec_tun_adj_delegate_vft); @@ -950,6 +934,55 @@ ipsec_tunnel_protect_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (ipsec_tunnel_protect_init); +static clib_error_t * +ipsec_config (vlib_main_t * vm, unformat_input_t * input) +{ + unformat_input_t sub_input; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "ip4 %U", unformat_vlib_cli_sub_input, &sub_input)) + { + uword table_size = ~0; + u32 n_buckets = ~0; + + while (unformat_check_input (&sub_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (&sub_input, "num-buckets %u", &n_buckets)) + ; + else + return clib_error_return (0, "unknown input `%U'", + format_unformat_error, &sub_input); + } + + ipsec_tun_table_init (AF_IP4, table_size, n_buckets); + } + else if (unformat (input, "ip6 %U", unformat_vlib_cli_sub_input, + &sub_input)) + { + uword table_size = ~0; + u32 n_buckets = ~0; + + while (unformat_check_input (&sub_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (&sub_input, "num-buckets %u", &n_buckets)) + ; + else + return clib_error_return (0, "unknown input `%U'", + format_unformat_error, &sub_input); + } + + ipsec_tun_table_init (AF_IP6, table_size, n_buckets); + } + else + return clib_error_return (0, "unknown input `%U'", + format_unformat_error, input); + } + + return 0; +} + +VLIB_CONFIG_FUNCTION (ipsec_config, "ipsec"); /* * fd.io coding-style-patch-verification: ON