X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_sa.c;h=e3eff5869068ec69c6a9505cf4b95573768fdec9;hb=495d7ffbc82823edccabab960fc81a909f80075d;hp=3e29c0406e35c709b7aed1fc73f27e500e81f8bd;hpb=c59b9a26ed9a6bc083db2868b6993add6fd2ba5b;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_sa.c b/src/vnet/ipsec/ipsec_sa.c index 3e29c0406e3..e3eff586906 100644 --- a/src/vnet/ipsec/ipsec_sa.c +++ b/src/vnet/ipsec/ipsec_sa.c @@ -17,6 +17,7 @@ #include #include #include +#include /** * @brief @@ -66,27 +67,28 @@ ipsec_mk_key (ipsec_key_t * key, const u8 * data, u8 len) /** * 'stack' (resolve the recursion for) the SA tunnel destination */ -void +static void ipsec_sa_stack (ipsec_sa_t * sa) { ipsec_main_t *im = &ipsec_main; fib_forward_chain_type_t fct; dpo_id_t tmp = DPO_INVALID; - fct = fib_forw_chain_type_from_fib_proto ((sa->is_tunnel_ip6 ? - FIB_PROTOCOL_IP6 : - FIB_PROTOCOL_IP4)); + fct = + fib_forw_chain_type_from_fib_proto ((ipsec_sa_is_set_IS_TUNNEL_V6 (sa) ? + FIB_PROTOCOL_IP6 : + FIB_PROTOCOL_IP4)); fib_entry_contribute_forwarding (sa->fib_entry_index, fct, &tmp); - dpo_stack_from_node ((sa->is_tunnel_ip6 ? - im->ah6_encrypt_node_index : - im->ah4_encrypt_node_index), - &sa->dpo[IPSEC_PROTOCOL_AH], &tmp); - dpo_stack_from_node ((sa->is_tunnel_ip6 ? - im->esp6_encrypt_node_index : - im->esp4_encrypt_node_index), - &sa->dpo[IPSEC_PROTOCOL_ESP], &tmp); + if (IPSEC_PROTOCOL_AH == sa->protocol) + dpo_stack_from_node ((ipsec_sa_is_set_IS_TUNNEL_V6 (sa) ? + im->ah6_encrypt_node_index : + im->ah4_encrypt_node_index), &sa->dpo, &tmp); + else + dpo_stack_from_node ((ipsec_sa_is_set_IS_TUNNEL_V6 (sa) ? + im->esp6_encrypt_node_index : + im->esp4_encrypt_node_index), &sa->dpo, &tmp); dpo_reset (&tmp); } @@ -97,9 +99,16 @@ ipsec_sa_set_crypto_alg (ipsec_sa_t * sa, ipsec_crypto_alg_t crypto_alg) sa->crypto_alg = crypto_alg; sa->crypto_iv_size = im->crypto_algs[crypto_alg].iv_size; sa->crypto_block_size = im->crypto_algs[crypto_alg].block_size; - sa->crypto_enc_op_type = im->crypto_algs[crypto_alg].enc_op_type; - sa->crypto_dec_op_type = im->crypto_algs[crypto_alg].dec_op_type; + sa->crypto_enc_op_id = im->crypto_algs[crypto_alg].enc_op_id; + sa->crypto_dec_op_id = im->crypto_algs[crypto_alg].dec_op_id; + sa->crypto_calg = im->crypto_algs[crypto_alg].alg; + ASSERT (sa->crypto_iv_size <= ESP_MAX_IV_SIZE); ASSERT (sa->crypto_block_size <= ESP_MAX_BLOCK_SIZE); + if (IPSEC_CRYPTO_ALG_IS_GCM (crypto_alg)) + { + sa->integ_icv_size = im->crypto_algs[crypto_alg].icv_size; + ipsec_sa_set_IS_AEAD (sa); + } } void @@ -107,24 +116,27 @@ ipsec_sa_set_integ_alg (ipsec_sa_t * sa, ipsec_integ_alg_t integ_alg) { ipsec_main_t *im = &ipsec_main; sa->integ_alg = integ_alg; - sa->integ_trunc_size = im->integ_algs[integ_alg].trunc_size; - sa->integ_op_type = im->integ_algs[integ_alg].op_type; - ASSERT (sa->integ_trunc_size <= ESP_MAX_ICV_SIZE); + sa->integ_icv_size = im->integ_algs[integ_alg].icv_size; + sa->integ_op_id = im->integ_algs[integ_alg].op_id; + sa->integ_calg = im->integ_algs[integ_alg].alg; + ASSERT (sa->integ_icv_size <= ESP_MAX_ICV_SIZE); } int -ipsec_sa_add (u32 id, - u32 spi, - ipsec_protocol_t proto, - ipsec_crypto_alg_t crypto_alg, - const ipsec_key_t * ck, - ipsec_integ_alg_t integ_alg, - const ipsec_key_t * ik, - ipsec_sa_flags_t flags, - u32 tx_table_id, - const ip46_address_t * tun_src, - const ip46_address_t * tun_dst, u32 * sa_out_index) +ipsec_sa_add_and_lock (u32 id, + u32 spi, + ipsec_protocol_t proto, + ipsec_crypto_alg_t crypto_alg, + const ipsec_key_t * ck, + ipsec_integ_alg_t integ_alg, + const ipsec_key_t * ik, + ipsec_sa_flags_t flags, + u32 tx_table_id, + u32 salt, + const ip46_address_t * tun_src, + const ip46_address_t * tun_dst, u32 * sa_out_index) { + vlib_main_t *vm = vlib_get_main (); ipsec_main_t *im = &ipsec_main; clib_error_t *err; ipsec_sa_t *sa; @@ -135,9 +147,10 @@ ipsec_sa_add (u32 id, if (p) return VNET_API_ERROR_ENTRY_ALREADY_EXISTS; - pool_get_zero (im->sad, sa); + pool_get_aligned_zero (im->sad, sa, CLIB_CACHE_LINE_BYTES); fib_node_init (&sa->node, FIB_NODE_TYPE_IPSEC_SA); + fib_node_lock (&sa->node); sa_index = sa - im->sad; vlib_validate_combined_counter (&ipsec_sa_counters, sa_index); @@ -147,23 +160,32 @@ ipsec_sa_add (u32 id, sa->spi = spi; sa->stat_index = sa_index; sa->protocol = proto; - ipsec_sa_set_crypto_alg (sa, crypto_alg); - clib_memcpy (&sa->crypto_key, ck, sizeof (sa->crypto_key)); + sa->flags = flags; + sa->salt = salt; ipsec_sa_set_integ_alg (sa, integ_alg); clib_memcpy (&sa->integ_key, ik, sizeof (sa->integ_key)); + ipsec_sa_set_crypto_alg (sa, crypto_alg); + clib_memcpy (&sa->crypto_key, ck, sizeof (sa->crypto_key)); ip46_address_copy (&sa->tunnel_src_addr, tun_src); ip46_address_copy (&sa->tunnel_dst_addr, tun_dst); - if (flags & IPSEC_SA_FLAG_USE_EXTENDED_SEQ_NUM) - sa->use_esn = 1; - if (flags & IPSEC_SA_FLAG_USE_ANTI_REPLAY) - sa->use_anti_replay = 1; - if (flags & IPSEC_SA_FLAG_IS_TUNNEL) - sa->is_tunnel = 1; - if (flags & IPSEC_SA_FLAG_IS_TUNNEL_V6) - sa->is_tunnel_ip6 = 1; - if (flags & IPSEC_SA_FLAG_UDP_ENCAP) - sa->udp_encap = 1; + sa->crypto_key_index = vnet_crypto_key_add (vm, + im->crypto_algs[crypto_alg].alg, + (u8 *) ck->data, ck->len); + if (~0 == sa->crypto_key_index) + { + pool_put (im->sad, sa); + return VNET_API_ERROR_KEY_LENGTH; + } + + sa->integ_key_index = vnet_crypto_key_add (vm, + im->integ_algs[integ_alg].alg, + (u8 *) ik->data, ik->len); + if (~0 == sa->integ_key_index) + { + pool_put (im->sad, sa); + return VNET_API_ERROR_KEY_LENGTH; + } err = ipsec_check_support_cb (im, sa); if (err) @@ -180,13 +202,13 @@ ipsec_sa_add (u32 id, return VNET_API_ERROR_SYSCALL_ERROR_1; } - if (sa->is_tunnel) + if (ipsec_sa_is_set_IS_TUNNEL (sa) && !ipsec_sa_is_set_IS_INBOUND (sa)) { - fib_protocol_t fproto = (sa->is_tunnel_ip6 ? + fib_protocol_t fproto = (ipsec_sa_is_set_IS_TUNNEL_V6 (sa) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4); fib_prefix_t pfx = { .fp_addr = sa->tunnel_dst_addr, - .fp_len = (sa->is_tunnel_ip6 ? 128 : 32), + .fp_len = (ipsec_sa_is_set_IS_TUNNEL_V6 (sa) ? 128 : 32), .fp_proto = fproto, }; sa->tx_fib_index = fib_table_find (fproto, tx_table_id); @@ -205,7 +227,7 @@ ipsec_sa_add (u32 id, ipsec_sa_stack (sa); /* generate header templates */ - if (sa->is_tunnel_ip6) + if (ipsec_sa_is_set_IS_TUNNEL_V6 (sa)) { sa->ip6_hdr.ip_version_traffic_class_and_flow_label = 0x60; sa->ip6_hdr.hop_limit = 254; @@ -217,7 +239,7 @@ ipsec_sa_add (u32 id, sa->tunnel_dst_addr.ip6.as_u64[0]; sa->ip6_hdr.dst_address.as_u64[1] = sa->tunnel_dst_addr.ip6.as_u64[1]; - if (sa->udp_encap) + if (ipsec_sa_is_set_UDP_ENCAP (sa)) sa->ip6_hdr.protocol = IP_PROTOCOL_UDP; else sa->ip6_hdr.protocol = IP_PROTOCOL_IPSEC_ESP; @@ -229,7 +251,7 @@ ipsec_sa_add (u32 id, sa->ip4_hdr.src_address.as_u32 = sa->tunnel_src_addr.ip4.as_u32; sa->ip4_hdr.dst_address.as_u32 = sa->tunnel_dst_addr.ip4.as_u32; - if (sa->udp_encap) + if (ipsec_sa_is_set_UDP_ENCAP (sa)) sa->ip4_hdr.protocol = IP_PROTOCOL_UDP; else sa->ip4_hdr.protocol = IP_PROTOCOL_IPSEC_ESP; @@ -237,7 +259,7 @@ ipsec_sa_add (u32 id, } } - if (sa->udp_encap) + if (ipsec_sa_is_set_UDP_ENCAP (sa)) { sa->udp_hdr.src_port = clib_host_to_net_u16 (UDP_DST_PORT_ipsec); sa->udp_hdr.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_ipsec); @@ -251,122 +273,85 @@ ipsec_sa_add (u32 id, return (0); } -u32 -ipsec_sa_del (u32 id) +static void +ipsec_sa_del (ipsec_sa_t * sa) { + vlib_main_t *vm = vlib_get_main (); ipsec_main_t *im = &ipsec_main; - ipsec_sa_t *sa = 0; - uword *p; u32 sa_index; - clib_error_t *err; - p = hash_get (im->sa_index_by_sa_id, id); + sa_index = sa - im->sad; + hash_unset (im->sa_index_by_sa_id, sa->id); - if (!p) - return VNET_API_ERROR_NO_SUCH_ENTRY; + /* no recovery possible when deleting an SA */ + (void) ipsec_call_add_del_callbacks (im, sa, sa_index, 0); - sa_index = p[0]; - sa = pool_elt_at_index (im->sad, sa_index); - if (ipsec_is_sa_used (sa_index)) - { - clib_warning ("sa_id %u used in policy", sa->id); - /* sa used in policy */ - return VNET_API_ERROR_SYSCALL_ERROR_1; - } - hash_unset (im->sa_index_by_sa_id, sa->id); - err = ipsec_call_add_del_callbacks (im, sa, sa_index, 0); - if (err) - return VNET_API_ERROR_SYSCALL_ERROR_1; - if (sa->is_tunnel) + if (ipsec_sa_is_set_IS_TUNNEL (sa) && !ipsec_sa_is_set_IS_INBOUND (sa)) { fib_entry_child_remove (sa->fib_entry_index, sa->sibling); fib_table_entry_special_remove (sa->tx_fib_index, fib_entry_get_prefix (sa->fib_entry_index), FIB_SOURCE_RR); - dpo_reset (&sa->dpo[IPSEC_PROTOCOL_AH]); - dpo_reset (&sa->dpo[IPSEC_PROTOCOL_ESP]); + dpo_reset (&sa->dpo); } + vnet_crypto_key_del (vm, sa->crypto_key_index); + vnet_crypto_key_del (vm, sa->integ_key_index); pool_put (im->sad, sa); - return 0; } -u8 -ipsec_is_sa_used (u32 sa_index) +void +ipsec_sa_unlock (index_t sai) { ipsec_main_t *im = &ipsec_main; - ipsec_tunnel_if_t *t; - ipsec_policy_t *p; + ipsec_sa_t *sa; - /* *INDENT-OFF* */ - pool_foreach(p, im->policies, ({ - if (p->policy == IPSEC_POLICY_ACTION_PROTECT) - { - if (p->sa_index == sa_index) - return 1; - } - })); + if (INDEX_INVALID == sai) + return; - pool_foreach(t, im->tunnel_interfaces, ({ - if (t->input_sa_index == sa_index) - return 1; - if (t->output_sa_index == sa_index) - return 1; - })); - /* *INDENT-ON* */ + sa = pool_elt_at_index (im->sad, sai); - return 0; + fib_node_unlock (&sa->node); } -int -ipsec_set_sa_key (u32 id, const ipsec_key_t * ck, const ipsec_key_t * ik) +index_t +ipsec_sa_find_and_lock (u32 id) { ipsec_main_t *im = &ipsec_main; + ipsec_sa_t *sa; uword *p; - u32 sa_index; - ipsec_sa_t *sa = 0; - clib_error_t *err; p = hash_get (im->sa_index_by_sa_id, id); - if (!p) - return VNET_API_ERROR_SYSCALL_ERROR_1; /* no such sa-id */ - sa_index = p[0]; - sa = pool_elt_at_index (im->sad, sa_index); + if (!p) + return INDEX_INVALID; - /* new crypto key */ - if (ck) - { - clib_memcpy (&sa->crypto_key, ck, sizeof (sa->crypto_key)); - } + sa = pool_elt_at_index (im->sad, p[0]); - /* new integ key */ - if (ik) - { - clib_memcpy (&sa->integ_key, 0, sizeof (sa->integ_key)); - } + fib_node_lock (&sa->node); - if (ck || ik) - { - err = ipsec_call_add_del_callbacks (im, sa, sa_index, 0); - if (err) - { - clib_error_free (err); - return VNET_API_ERROR_SYSCALL_ERROR_1; - } - } - - return 0; + return (p[0]); } -u32 -ipsec_get_sa_index_by_sa_id (u32 sa_id) +int +ipsec_sa_unlock_id (u32 id) { ipsec_main_t *im = &ipsec_main; - uword *p = hash_get (im->sa_index_by_sa_id, sa_id); + uword *p; + + p = hash_get (im->sa_index_by_sa_id, id); + if (!p) - return ~0; + return VNET_API_ERROR_NO_SUCH_ENTRY; + + ipsec_sa_unlock (p[0]); - return p[0]; + return (0); +} + +void +ipsec_sa_clear (index_t sai) +{ + vlib_zero_combined_counter (&ipsec_sa_counters, sai); } void @@ -399,6 +384,15 @@ ipsec_sa_fib_node_get (fib_node_index_t index) return (&sa->node); } +static ipsec_sa_t * +ipsec_sa_from_fib_node (fib_node_t * node) +{ + ASSERT (FIB_NODE_TYPE_IPSEC_SA == node->fn_type); + return ((ipsec_sa_t *) (((char *) node) - + STRUCT_OFFSET_OF (ipsec_sa_t, node))); + +} + /** * Function definition to inform the FIB node that its last lock has gone. */ @@ -409,16 +403,7 @@ ipsec_sa_last_lock_gone (fib_node_t * node) * The ipsec SA is a root of the graph. As such * it never has children and thus is never locked. */ - ASSERT (0); -} - -static ipsec_sa_t * -ipsec_sa_from_fib_node (fib_node_t * node) -{ - ASSERT (FIB_NODE_TYPE_IPSEC_SA == node->fn_type); - return ((ipsec_sa_t *) (((char *) node) - - STRUCT_OFFSET_OF (ipsec_sa_t, node))); - + ipsec_sa_del (ipsec_sa_from_fib_node (node)); } /** @@ -433,7 +418,7 @@ ipsec_sa_back_walk (fib_node_t * node, fib_node_back_walk_ctx_t * ctx) } /* - * Virtual function table registered by MPLS GRE tunnels + * Virtual function table registered by SAs * for participation in the FIB object graph. */ const static fib_node_vft_t ipsec_sa_vft = {