X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_if_in.c;h=a9aab820b915a1de61db2d145cc36a268bc8bc69;hb=b4d3053;hp=db75ab92da97e589ad3fbcbb97f8eed62ba12ef7;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_if_in.c b/src/vnet/ipsec/ipsec_if_in.c index db75ab92da9..a9aab820b91 100644 --- a/src/vnet/ipsec/ipsec_if_in.c +++ b/src/vnet/ipsec/ipsec_if_in.c @@ -22,15 +22,10 @@ #include #include -#if DPDK_CRYPTO==1 -#define ESP_NODE "dpdk-esp-decrypt" -#else -#define ESP_NODE "esp-decrypt" -#endif - /* Statistics (not really errors) */ -#define foreach_ipsec_if_input_error \ -_(RX, "good packets received") +#define foreach_ipsec_if_input_error \ +_(RX, "good packets received") \ +_(DISABLED, "ipsec packets received on disabled interface") static char *ipsec_if_input_error_strings[] = { #define _(sym,string) string, @@ -46,12 +41,6 @@ typedef enum IPSEC_IF_INPUT_N_ERROR, } ipsec_if_input_error_t; -typedef enum -{ - IPSEC_IF_INPUT_NEXT_ESP_DECRYPT, - IPSEC_IF_INPUT_NEXT_DROP, - IPSEC_IF_INPUT_N_NEXT, -} ipsec_if_input_next_t; typedef struct { @@ -59,7 +48,6 @@ typedef struct u32 seq; } ipsec_if_input_trace_t; - u8 * format_ipsec_if_input_trace (u8 * s, va_list * args) { @@ -71,13 +59,27 @@ format_ipsec_if_input_trace (u8 * s, va_list * args) return s; } -static uword -ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (ipsec_if_input_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { ipsec_main_t *im = &ipsec_main; + vnet_main_t *vnm = im->vnet_main; + vnet_interface_main_t *vim = &vnm->interface_main; + ipsec_proto_main_t *em = &ipsec_proto_main; u32 *from, *to_next = 0, next_index; - u32 n_left_from; + u32 n_left_from, last_sw_if_index = ~0; + u32 thread_index = vm->thread_index; + u64 n_bytes = 0, n_packets = 0; + u8 icv_len; + ipsec_tunnel_if_t *last_t = NULL; + ipsec_sa_t *sa0; + vlib_combined_counter_main_t *rx_counter; + vlib_combined_counter_main_t *drop_counter; + u32 n_disabled = 0; + + rx_counter = vim->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX; + drop_counter = vim->combined_sw_if_counters + VNET_INTERFACE_COUNTER_DROP; from = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; @@ -91,11 +93,12 @@ ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, while (n_left_from > 0 && n_left_to_next > 0) { - u32 bi0, next0; + u32 bi0, next0, sw_if_index0; vlib_buffer_t *b0; ip4_header_t *ip0; esp_header_t *esp0; uword *p; + u32 len0; bi0 = to_next[0] = from[0]; from += 1; @@ -106,24 +109,80 @@ ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, ip0 = vlib_buffer_get_current (b0); esp0 = (esp_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0)); - next0 = IPSEC_IF_INPUT_NEXT_DROP; + next0 = IPSEC_INPUT_NEXT_DROP; u64 key = (u64) ip0->src_address.as_u32 << 32 | (u64) clib_net_to_host_u32 (esp0->spi); p = hash_get (im->ipsec_if_pool_index_by_key, key); + len0 = vlib_buffer_length_in_chain (vm, b0); + if (p) { ipsec_tunnel_if_t *t; t = pool_elt_at_index (im->tunnel_interfaces, p[0]); vnet_buffer (b0)->ipsec.sad_index = t->input_sa_index; - vnet_buffer (b0)->ipsec.flags = - t->hw_if_index == ~0 ? IPSEC_FLAG_IPSEC_GRE_TUNNEL : 0; + if (t->hw_if_index != ~0) + { + vnet_hw_interface_t *hi; + + vnet_buffer (b0)->ipsec.flags = 0; + hi = vnet_get_hw_interface (vnm, t->hw_if_index); + sw_if_index0 = hi->sw_if_index; + vnet_buffer (b0)->sw_if_index[VLIB_RX] = sw_if_index0; + + if (PREDICT_FALSE + (!(hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP))) + { + vlib_increment_combined_counter + (drop_counter, thread_index, sw_if_index0, 1, len0); + b0->error = node->errors[IPSEC_IF_INPUT_ERROR_DISABLED]; + n_disabled++; + goto trace; + } + + if (PREDICT_TRUE (sw_if_index0 == last_sw_if_index)) + { + n_packets++; + n_bytes += len0; + } + else + { + sa0 = pool_elt_at_index (im->sad, t->input_sa_index); + icv_len = + em->ipsec_proto_main_integ_algs[sa0-> + integ_alg].trunc_size; + + /* length = packet length - ESP/tunnel overhead */ + n_bytes -= n_packets * (sizeof (ip4_header_t) + + sizeof (esp_header_t) + + sizeof (esp_footer_t) + + 16 /* aes-cbc IV */ + icv_len); + + if (last_t) + { + vlib_increment_combined_counter + (rx_counter, thread_index, sw_if_index0, + n_packets, n_bytes); + } + + last_sw_if_index = sw_if_index0; + last_t = t; + n_packets = 1; + n_bytes = len0; + } + } + else + { + vnet_buffer (b0)->ipsec.flags = IPSEC_FLAG_IPSEC_GRE_TUNNEL; + } + vlib_buffer_advance (b0, ip4_header_bytes (ip0)); - next0 = IPSEC_IF_INPUT_NEXT_ESP_DECRYPT; + next0 = im->esp4_decrypt_next_index; } + trace: if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) { ipsec_if_input_trace_t *tr = @@ -138,16 +197,31 @@ ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } + if (last_t) + { + sa0 = pool_elt_at_index (im->sad, last_t->input_sa_index); + icv_len = em->ipsec_proto_main_integ_algs[sa0->integ_alg].trunc_size; + + n_bytes -= n_packets * (sizeof (ip4_header_t) + sizeof (esp_header_t) + + sizeof (esp_footer_t) + 16 /* aes-cbc IV */ + + icv_len); + vlib_increment_combined_counter (rx_counter, + thread_index, + last_sw_if_index, n_packets, n_bytes); + } + vlib_node_increment_counter (vm, ipsec_if_input_node.index, IPSEC_IF_INPUT_ERROR_RX, - from_frame->n_vectors); + from_frame->n_vectors - n_disabled); + + vlib_node_increment_counter (vm, ipsec_if_input_node.index, + IPSEC_IF_INPUT_ERROR_DISABLED, n_disabled); return from_frame->n_vectors; } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ipsec_if_input_node) = { - .function = ipsec_if_input_node_fn, .name = "ipsec-if-input", .vector_size = sizeof (u32), .format_trace = format_ipsec_if_input_trace, @@ -156,16 +230,10 @@ VLIB_REGISTER_NODE (ipsec_if_input_node) = { .n_errors = ARRAY_LEN(ipsec_if_input_error_strings), .error_strings = ipsec_if_input_error_strings, - .n_next_nodes = IPSEC_IF_INPUT_N_NEXT, - - .next_nodes = { - [IPSEC_IF_INPUT_NEXT_ESP_DECRYPT] = ESP_NODE, - [IPSEC_IF_INPUT_NEXT_DROP] = "error-drop", - }, + .sibling_of = "ipsec4-input", }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (ipsec_if_input_node, ipsec_if_input_node_fn) /* * fd.io coding-style-patch-verification: ON *