X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_if.c;h=cb7e89a68e61624f9d19f41407622beddd8c3457;hb=717de096c4d715eab6b783aaa28f26a9114925da;hp=852b142717f2bb4b5402502ecfc39d4ff26b10c3;hpb=537eeeca36dcc08a3c337a7cfd1c1c426d43f563;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_if.c b/src/vnet/ipsec/ipsec_if.c index 852b142717f..cb7e89a68e6 100644 --- a/src/vnet/ipsec/ipsec_if.c +++ b/src/vnet/ipsec/ipsec_if.c @@ -28,17 +28,134 @@ static u8 * format_ipsec_name (u8 * s, va_list * args) { u32 dev_instance = va_arg (*args, u32); - return format (s, "ipsec%d", dev_instance); + ipsec_main_t *im = &ipsec_main; + ipsec_tunnel_if_t *t = im->tunnel_interfaces + dev_instance; + + return format (s, "ipsec%d", t->show_instance); +} + +/* Statistics (not really errors) */ +#define foreach_ipsec_if_tx_error \ +_(TX, "good packets transmitted") + +static char *ipsec_if_tx_error_strings[] = { +#define _(sym,string) string, + foreach_ipsec_if_tx_error +#undef _ +}; + +typedef enum +{ +#define _(sym,str) IPSEC_IF_OUTPUT_ERROR_##sym, + foreach_ipsec_if_tx_error +#undef _ + IPSEC_IF_TX_N_ERROR, +} ipsec_if_tx_error_t; + +typedef struct +{ + u32 spi; + u32 seq; +} ipsec_if_tx_trace_t; + +u8 * +format_ipsec_if_tx_trace (u8 * s, va_list * args) +{ + CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); + CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); + ipsec_if_tx_trace_t *t = va_arg (*args, ipsec_if_tx_trace_t *); + + s = format (s, "IPSec: spi %u seq %u", t->spi, t->seq); + return s; } static uword -dummy_interface_tx (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +ipsec_if_tx_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { - clib_warning ("you shouldn't be here, leaking buffers..."); - return frame->n_vectors; + ipsec_main_t *im = &ipsec_main; + vnet_main_t *vnm = im->vnet_main; + vnet_interface_main_t *vim = &vnm->interface_main; + u32 *from, *to_next = 0, next_index; + u32 n_left_from, sw_if_index0, last_sw_if_index = ~0; + u32 thread_index = vm->thread_index; + u32 n_bytes = 0, n_packets = 0; + + from = vlib_frame_vector_args (from_frame); + n_left_from = from_frame->n_vectors; + next_index = node->cached_next_index; + + while (n_left_from > 0) + { + u32 n_left_to_next; + + vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); + + while (n_left_from > 0 && n_left_to_next > 0) + { + u32 bi0, next0, len0; + vlib_buffer_t *b0; + ipsec_tunnel_if_t *t0; + vnet_hw_interface_t *hi0; + + bi0 = to_next[0] = from[0]; + from += 1; + n_left_from -= 1; + to_next += 1; + n_left_to_next -= 1; + b0 = vlib_get_buffer (vm, bi0); + sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX]; + hi0 = vnet_get_sup_hw_interface (vnm, sw_if_index0); + t0 = pool_elt_at_index (im->tunnel_interfaces, hi0->dev_instance); + vnet_buffer (b0)->ipsec.sad_index = t0->output_sa_index; + next0 = IPSEC_OUTPUT_NEXT_ESP_ENCRYPT; + + len0 = vlib_buffer_length_in_chain (vm, b0); + + if (PREDICT_TRUE (sw_if_index0 == last_sw_if_index)) + { + n_packets++; + n_bytes += len0; + } + else + { + vlib_increment_combined_counter (vim->combined_sw_if_counters + + VNET_INTERFACE_COUNTER_TX, + thread_index, sw_if_index0, + n_packets, n_bytes); + last_sw_if_index = sw_if_index0; + n_packets = 1; + n_bytes = len0; + } + + if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) + { + ipsec_if_tx_trace_t *tr = + vlib_add_trace (vm, node, b0, sizeof (*tr)); + ipsec_sa_t *sa0 = + pool_elt_at_index (im->sad, t0->output_sa_index); + tr->spi = sa0->spi; + tr->seq = sa0->seq; + } + + vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, + n_left_to_next, bi0, next0); + } + vlib_put_next_frame (vm, node, next_index, n_left_to_next); + } + + if (last_sw_if_index != ~0) + { + vlib_increment_combined_counter (vim->combined_sw_if_counters + + VNET_INTERFACE_COUNTER_TX, + thread_index, + last_sw_if_index, n_packets, n_bytes); + } + + return from_frame->n_vectors; } + static clib_error_t * ipsec_admin_up_down_function (vnet_main_t * vnm, u32 hw_if_index, u32 flags) { @@ -110,13 +227,16 @@ ipsec_admin_up_down_function (vnet_main_t * vnm, u32 hw_if_index, u32 flags) return /* no error */ 0; } + /* *INDENT-OFF* */ VNET_DEVICE_CLASS (ipsec_device_class, static) = { .name = "IPSec", .format_device_name = format_ipsec_name, - .format_tx_trace = format_ipsec_if_output_trace, - .tx_function = dummy_interface_tx, + .format_tx_trace = format_ipsec_if_tx_trace, + .tx_function = ipsec_if_tx_node_fn, + .tx_function_n_errors = IPSEC_IF_TX_N_ERROR, + .tx_function_error_strings = ipsec_if_tx_error_strings, .admin_up_down_function = ipsec_admin_up_down_function, }; /* *INDENT-ON* */ @@ -158,6 +278,8 @@ ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm, u32 hw_if_index = ~0; uword *p; ipsec_sa_t *sa; + u32 dev_instance; + u32 slot; u64 key = (u64) args->remote_ip.as_u32 << 32 | (u64) args->remote_spi; p = hash_get (im->ipsec_if_pool_index_by_key, key); @@ -171,6 +293,21 @@ ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm, pool_get_aligned (im->tunnel_interfaces, t, CLIB_CACHE_LINE_BYTES); memset (t, 0, sizeof (*t)); + dev_instance = t - im->tunnel_interfaces; + if (args->renumber) + t->show_instance = args->show_instance; + else + t->show_instance = dev_instance; + + if (hash_get (im->ipsec_if_real_dev_by_show_dev, t->show_instance)) + { + pool_put (im->tunnel_interfaces, t); + return VNET_API_ERROR_INSTANCE_IN_USE; + } + + hash_set (im->ipsec_if_real_dev_by_show_dev, t->show_instance, + dev_instance); + pool_get (im->sad, sa); memset (sa, 0, sizeof (*sa)); t->input_sa_index = sa - im->sad; @@ -181,6 +318,7 @@ ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm, sa->use_esn = args->esn; sa->use_anti_replay = args->anti_replay; sa->integ_alg = args->integ_alg; + sa->udp_encap = args->udp_encap; if (args->remote_integ_key_len <= sizeof (args->remote_integ_key)) { sa->integ_key_len = args->remote_integ_key_len; @@ -205,6 +343,7 @@ ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm, sa->use_esn = args->esn; sa->use_anti_replay = args->anti_replay; sa->integ_alg = args->integ_alg; + sa->udp_encap = args->udp_encap; if (args->local_integ_key_len <= sizeof (args->local_integ_key)) { sa->integ_key_len = args->local_integ_key_len; @@ -222,24 +361,19 @@ ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm, hash_set (im->ipsec_if_pool_index_by_key, key, t - im->tunnel_interfaces); - if (vec_len (im->free_tunnel_if_indices) > 0) - { - hw_if_index = - im->free_tunnel_if_indices[vec_len (im->free_tunnel_if_indices) - - 1]; - _vec_len (im->free_tunnel_if_indices) -= 1; - } - else - { - hw_if_index = - vnet_register_interface (vnm, ipsec_device_class.index, - t - im->tunnel_interfaces, - ipsec_hw_class.index, - t - im->tunnel_interfaces); - } + hw_if_index = vnet_register_interface (vnm, ipsec_device_class.index, + t - im->tunnel_interfaces, + ipsec_hw_class.index, + t - im->tunnel_interfaces); hi = vnet_get_hw_interface (vnm, hw_if_index); - hi->output_node_index = ipsec_if_output_node.index; + + slot = vlib_node_add_next_with_slot + (vnm->vlib_main, hi->tx_node_index, im->esp_encrypt_node_index, + IPSEC_OUTPUT_NEXT_ESP_ENCRYPT); + + ASSERT (slot == IPSEC_OUTPUT_NEXT_ESP_ENCRYPT); + t->hw_if_index = hw_if_index; vnet_feature_enable_disable ("interface-output", "ipsec-if-output", @@ -253,8 +387,6 @@ ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm, } else { - vnet_interface_main_t *vim = &vnm->interface_main; - /* check if exists */ if (!p) return VNET_API_ERROR_INVALID_VALUE; @@ -266,25 +398,19 @@ ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm, vnet_feature_enable_disable ("interface-output", "ipsec-if-output", hi->sw_if_index, 0, 0, 0); - vec_add1 (im->free_tunnel_if_indices, t->hw_if_index); - - vnet_interface_counter_lock (vim); - vlib_zero_combined_counter (vim->combined_sw_if_counters + - VNET_INTERFACE_COUNTER_TX, hi->sw_if_index); - vlib_zero_combined_counter (vim->combined_sw_if_counters + - VNET_INTERFACE_COUNTER_RX, hi->sw_if_index); - vnet_interface_counter_unlock (vim); + vnet_delete_hw_interface (vnm, t->hw_if_index); /* delete input and output SA */ - sa = pool_elt_at_index (im->sad, t->input_sa_index); + sa = pool_elt_at_index (im->sad, t->input_sa_index); pool_put (im->sad, sa); sa = pool_elt_at_index (im->sad, t->output_sa_index); - pool_put (im->sad, sa); hash_unset (im->ipsec_if_pool_index_by_key, key); + hash_unset (im->ipsec_if_real_dev_by_show_dev, t->show_instance); + pool_put (im->tunnel_interfaces, t); } @@ -491,6 +617,7 @@ ipsec_tunnel_if_init (vlib_main_t * vm) ipsec_main_t *im = &ipsec_main; im->ipsec_if_pool_index_by_key = hash_create (0, sizeof (uword)); + im->ipsec_if_real_dev_by_show_dev = hash_create (0, sizeof (uword)); return 0; }