X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_input.c;h=5be72c3a16163fe487f69743af3f0c76b7de6bfd;hb=e524d45ef;hp=d61755597ba39382d7b00fabaee55a1139f1bcc4;hpb=65a27279af2bead3be65ab0cb2a0bc2b79e00f42;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_input.c b/src/vnet/ipsec/ipsec_input.c index d61755597ba..5be72c3a161 100644 --- a/src/vnet/ipsec/ipsec_input.c +++ b/src/vnet/ipsec/ipsec_input.c @@ -23,10 +23,11 @@ #include #include #include +#include -#define foreach_ipsec_input_error \ - _(RX_PKTS, "IPSEC pkts received") \ - _(DECRYPTION_FAILED, "IPSEC decryption failed") +#define foreach_ipsec_input_error \ +_(RX_PKTS, "IPSEC pkts received") \ +_(RX_MATCH_PKTS, "IPSEC pkts matched") typedef enum { @@ -44,6 +45,9 @@ static char *ipsec_input_error_strings[] = { typedef struct { + ip_protocol_t proto; + u32 spd; + u32 policy_index; u32 sa_id; u32 spi; u32 seq; @@ -57,20 +61,10 @@ format_ipsec_input_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); ipsec_input_trace_t *t = va_arg (*args, ipsec_input_trace_t *); - if (t->spi == 0 && t->seq == 0) - { - s = format (s, "esp: no esp packet"); - return s; - } + s = format (s, "%U: sa_id %u spd %u policy %d spi %u seq %u", + format_ip_protocol, t->proto, t->sa_id, + t->spd, t->policy_index, t->spi, t->seq); - if (t->sa_id != 0) - { - s = format (s, "esp: sa_id %u spi %u seq %u", t->sa_id, t->spi, t->seq); - } - else - { - s = format (s, "esp: no sa spi %u seq %u", t->spi, t->seq); - } return s; } @@ -82,15 +76,15 @@ ipsec_input_protect_policy_match (ipsec_spd_t * spd, u32 sa, u32 da, u32 spi) ipsec_sa_t *s; u32 *i; - vec_foreach (i, spd->ipv4_inbound_protect_policy_indices) + vec_foreach (i, spd->policies[IPSEC_SPD_POLICY_IP4_INBOUND_PROTECT]) { - p = pool_elt_at_index (spd->policies, *i); + p = pool_elt_at_index (im->policies, *i); s = pool_elt_at_index (im->sad, p->sa_index); if (spi != s->spi) continue; - if (s->is_tunnel) + if (ipsec_sa_is_set_IS_TUNNEL (s)) { if (da != clib_net_to_host_u32 (s->tunnel_dst_addr.ip4.as_u32)) continue; @@ -129,24 +123,24 @@ ip6_addr_match_range (ip6_address_t * a, ip6_address_t * la, } always_inline ipsec_policy_t * -ipsec_input_ip6_protect_policy_match (ipsec_spd_t * spd, - ip6_address_t * sa, - ip6_address_t * da, u32 spi) +ipsec6_input_protect_policy_match (ipsec_spd_t * spd, + ip6_address_t * sa, + ip6_address_t * da, u32 spi) { ipsec_main_t *im = &ipsec_main; ipsec_policy_t *p; ipsec_sa_t *s; u32 *i; - vec_foreach (i, spd->ipv6_inbound_protect_policy_indices) + vec_foreach (i, spd->policies[IPSEC_SPD_POLICY_IP6_INBOUND_PROTECT]) { - p = pool_elt_at_index (spd->policies, *i); + p = pool_elt_at_index (im->policies, *i); s = pool_elt_at_index (im->sad, p->sa_index); if (spi != s->spi) continue; - if (s->is_tunnel) + if (ipsec_sa_is_set_IS_TUNNEL (s)) { if (!ip6_address_is_equal (sa, &s->tunnel_src_addr.ip6)) continue; @@ -168,18 +162,20 @@ ipsec_input_ip6_protect_policy_match (ipsec_spd_t * spd, return 0; } -static vlib_node_registration_t ipsec_input_ip4_node; +static vlib_node_registration_t ipsec4_input_node; -static uword -ipsec_input_ip4_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { - u32 n_left_from, *from, next_index, *to_next; + u32 n_left_from, *from, next_index, *to_next, thread_index; ipsec_main_t *im = &ipsec_main; + u32 ipsec_unprocessed = 0; + u32 ipsec_matched = 0; from = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; + thread_index = vm->thread_index; next_index = node->cached_next_index; @@ -191,7 +187,7 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm, while (n_left_from > 0 && n_left_to_next > 0) { - u32 bi0, next0; + u32 bi0, next0, pi0; vlib_buffer_t *b0; ip4_header_t *ip0; esp_header_t *esp0; @@ -209,10 +205,7 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm, b0 = vlib_get_buffer (vm, bi0); b0->flags |= VNET_BUFFER_F_IS_IP4; b0->flags &= ~VNET_BUFFER_F_IS_IP6; - c0 = - vnet_feature_next_with_data (vnet_buffer (b0)->sw_if_index - [VLIB_RX], &next0, b0, - sizeof (c0[0])); + c0 = vnet_feature_next_with_data (&next0, b0, sizeof (c0[0])); spd0 = pool_elt_at_index (im->spds, c0->spd_index); @@ -249,37 +242,44 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm, clib_net_to_host_u32 (esp0->spi)); - if (PREDICT_TRUE (p0 != 0)) + if (PREDICT_TRUE (p0 != NULL)) { - p0->counter.packets++; - p0->counter.bytes += clib_net_to_host_u16 (ip0->length); + ipsec_matched += 1; + + pi0 = p0 - im->policies; + vlib_increment_combined_counter + (&ipsec_spd_policy_counters, + thread_index, pi0, 1, + clib_net_to_host_u16 (ip0->length)); + vnet_buffer (b0)->ipsec.sad_index = p0->sa_index; - vnet_buffer (b0)->ipsec.flags = 0; - next0 = im->esp_decrypt_next_index; + next0 = im->esp4_decrypt_next_index; vlib_buffer_advance (b0, ((u8 *) esp0 - (u8 *) ip0)); goto trace0; } + else + { + pi0 = ~0; + }; /* FIXME bypass and discard */ trace0: - if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) + if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE) && + PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) { ipsec_input_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr)); - if (ip0->protocol == IP_PROTOCOL_IPSEC_ESP || - ip0->protocol == IP_PROTOCOL_UDP) - { - if (p0) - tr->sa_id = p0->sa_id; - tr->spi = clib_host_to_net_u32 (esp0->spi); - tr->seq = clib_host_to_net_u32 (esp0->seq); - } - } + tr->proto = ip0->protocol; + if (p0) + tr->sa_id = p0->sa_id; + tr->spi = clib_net_to_host_u32 (esp0->spi); + tr->seq = clib_net_to_host_u32 (esp0->seq); + tr->spd = spd0->id; + tr->policy_index = pi0; + } } - - - if (PREDICT_TRUE (ip0->protocol == IP_PROTOCOL_IPSEC_AH)) + else if (ip0->protocol == IP_PROTOCOL_IPSEC_AH) { ah0 = (ah_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0)); p0 = ipsec_input_protect_policy_match (spd0, @@ -294,28 +294,43 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm, if (PREDICT_TRUE (p0 != 0)) { - p0->counter.packets++; - p0->counter.bytes += clib_net_to_host_u16 (ip0->length); + ipsec_matched += 1; + + pi0 = p0 - im->policies; + vlib_increment_combined_counter + (&ipsec_spd_policy_counters, + thread_index, pi0, 1, + clib_net_to_host_u16 (ip0->length)); + vnet_buffer (b0)->ipsec.sad_index = p0->sa_index; - vnet_buffer (b0)->ipsec.flags = 0; - next0 = im->ah_decrypt_next_index; + next0 = im->ah4_decrypt_next_index; goto trace1; } + else + { + pi0 = ~0; + } /* FIXME bypass and discard */ trace1: - if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) + if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE) && + PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) { ipsec_input_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr)); - if (ip0->protocol == IP_PROTOCOL_IPSEC_ESP) - { - if (p0) - tr->sa_id = p0->sa_id; - tr->spi = clib_host_to_net_u32 (ah0->spi); - tr->seq = clib_host_to_net_u32 (ah0->seq_no); - } + + tr->proto = ip0->protocol; + if (p0) + tr->sa_id = p0->sa_id; + tr->spi = clib_net_to_host_u32 (ah0->spi); + tr->seq = clib_net_to_host_u32 (ah0->seq_no); + tr->spd = spd0->id; + tr->policy_index = pi0; } } + else + { + ipsec_unprocessed += 1; + } vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, n_left_to_next, bi0, @@ -323,25 +338,26 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm, } vlib_put_next_frame (vm, node, next_index, n_left_to_next); } - vlib_node_increment_counter (vm, ipsec_input_ip4_node.index, + + vlib_node_increment_counter (vm, ipsec4_input_node.index, IPSEC_INPUT_ERROR_RX_PKTS, - from_frame->n_vectors); + from_frame->n_vectors - ipsec_unprocessed); + vlib_node_increment_counter (vm, ipsec4_input_node.index, + IPSEC_INPUT_ERROR_RX_MATCH_PKTS, + ipsec_matched); return from_frame->n_vectors; } /* *INDENT-OFF* */ -VLIB_REGISTER_NODE (ipsec_input_ip4_node,static) = { - .function = ipsec_input_ip4_node_fn, - .name = "ipsec-input-ip4", +VLIB_REGISTER_NODE (ipsec4_input_node,static) = { + .name = "ipsec4-input-feature", .vector_size = sizeof (u32), .format_trace = format_ipsec_input_trace, .type = VLIB_NODE_TYPE_INTERNAL, - .n_errors = ARRAY_LEN(ipsec_input_error_strings), .error_strings = ipsec_input_error_strings, - .n_next_nodes = IPSEC_INPUT_N_NEXT, .next_nodes = { #define _(s,n) [IPSEC_INPUT_NEXT_##s] = n, @@ -351,19 +367,21 @@ VLIB_REGISTER_NODE (ipsec_input_ip4_node,static) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn) - static vlib_node_registration_t ipsec_input_ip6_node; +static vlib_node_registration_t ipsec6_input_node; - static uword - ipsec_input_ip6_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * from_frame) + +VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { - u32 n_left_from, *from, next_index, *to_next; + u32 n_left_from, *from, next_index, *to_next, thread_index; ipsec_main_t *im = &ipsec_main; + u32 ipsec_unprocessed = 0; + u32 ipsec_matched = 0; from = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; + thread_index = vm->thread_index; next_index = node->cached_next_index; @@ -375,13 +393,14 @@ VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn) while (n_left_from > 0 && n_left_to_next > 0) { - u32 bi0, next0; + u32 bi0, next0, pi0; vlib_buffer_t *b0; ip6_header_t *ip0; esp_header_t *esp0; ip4_ipsec_config_t *c0; ipsec_spd_t *spd0; ipsec_policy_t *p0 = 0; + ah_header_t *ah0; u32 header_size = sizeof (ip0[0]); bi0 = to_next[0] = from[0]; @@ -393,15 +412,13 @@ VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn) b0 = vlib_get_buffer (vm, bi0); b0->flags |= VNET_BUFFER_F_IS_IP6; b0->flags &= ~VNET_BUFFER_F_IS_IP4; - c0 = - vnet_feature_next_with_data (vnet_buffer (b0)->sw_if_index - [VLIB_RX], &next0, b0, - sizeof (c0[0])); + c0 = vnet_feature_next_with_data (&next0, b0, sizeof (c0[0])); spd0 = pool_elt_at_index (im->spds, c0->spd_index); ip0 = vlib_buffer_get_current (b0); esp0 = (esp_header_t *) ((u8 *) ip0 + header_size); + ah0 = (ah_header_t *) ((u8 *) ip0 + header_size); if (PREDICT_TRUE (ip0->protocol == IP_PROTOCOL_IPSEC_ESP)) { @@ -413,38 +430,78 @@ VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn) clib_net_to_host_u16 (ip0->payload_length) + header_size, spd0->id); #endif - p0 = ipsec_input_ip6_protect_policy_match (spd0, - &ip0->src_address, - &ip0->dst_address, - clib_net_to_host_u32 - (esp0->spi)); + p0 = ipsec6_input_protect_policy_match (spd0, + &ip0->src_address, + &ip0->dst_address, + clib_net_to_host_u32 + (esp0->spi)); if (PREDICT_TRUE (p0 != 0)) { - p0->counter.packets++; - p0->counter.bytes += - clib_net_to_host_u16 (ip0->payload_length); - p0->counter.bytes += header_size; + ipsec_matched += 1; + + pi0 = p0 - im->policies; + vlib_increment_combined_counter + (&ipsec_spd_policy_counters, + thread_index, pi0, 1, + clib_net_to_host_u16 (ip0->payload_length) + + header_size); + vnet_buffer (b0)->ipsec.sad_index = p0->sa_index; - vnet_buffer (b0)->ipsec.flags = 0; - next0 = im->esp_decrypt_next_index; + next0 = im->esp6_decrypt_next_index; vlib_buffer_advance (b0, header_size); goto trace0; } + else + { + pi0 = ~0; + } + } + else if (ip0->protocol == IP_PROTOCOL_IPSEC_AH) + { + p0 = ipsec6_input_protect_policy_match (spd0, + &ip0->src_address, + &ip0->dst_address, + clib_net_to_host_u32 + (ah0->spi)); + + if (PREDICT_TRUE (p0 != 0)) + { + ipsec_matched += 1; + pi0 = p0 - im->policies; + vlib_increment_combined_counter + (&ipsec_spd_policy_counters, + thread_index, pi0, 1, + clib_net_to_host_u16 (ip0->payload_length) + + header_size); + + vnet_buffer (b0)->ipsec.sad_index = p0->sa_index; + next0 = im->ah6_decrypt_next_index; + goto trace0; + } + else + { + pi0 = ~0; + } + } + else + { + ipsec_unprocessed += 1; } trace0: - if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) + if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE) && + PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) { ipsec_input_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr)); - if (ip0->protocol == IP_PROTOCOL_IPSEC_ESP) - { - if (p0) - tr->sa_id = p0->sa_id; - tr->spi = clib_host_to_net_u32 (esp0->spi); - tr->seq = clib_host_to_net_u32 (esp0->seq); - } + + if (p0) + tr->sa_id = p0->sa_id; + tr->proto = ip0->protocol; + tr->spi = clib_net_to_host_u32 (esp0->spi); + tr->seq = clib_net_to_host_u32 (esp0->seq); + tr->spd = spd0->id; } vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, @@ -452,30 +509,36 @@ VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn) } vlib_put_next_frame (vm, node, next_index, n_left_to_next); } - vlib_node_increment_counter (vm, ipsec_input_ip6_node.index, + + vlib_node_increment_counter (vm, ipsec6_input_node.index, IPSEC_INPUT_ERROR_RX_PKTS, - from_frame->n_vectors); + from_frame->n_vectors - ipsec_unprocessed); + + vlib_node_increment_counter (vm, ipsec6_input_node.index, + IPSEC_INPUT_ERROR_RX_MATCH_PKTS, + ipsec_matched); return from_frame->n_vectors; } /* *INDENT-OFF* */ -VLIB_REGISTER_NODE (ipsec_input_ip6_node,static) = { - .function = ipsec_input_ip6_node_fn, - .name = "ipsec-input-ip6", +VLIB_REGISTER_NODE (ipsec6_input_node,static) = { + .name = "ipsec6-input-feature", .vector_size = sizeof (u32), .format_trace = format_ipsec_input_trace, .type = VLIB_NODE_TYPE_INTERNAL, - .n_errors = ARRAY_LEN(ipsec_input_error_strings), .error_strings = ipsec_input_error_strings, - - .sibling_of = "ipsec-input-ip4", + .n_next_nodes = IPSEC_INPUT_N_NEXT, + .next_nodes = { +#define _(s,n) [IPSEC_INPUT_NEXT_##s] = n, + foreach_ipsec_input_next +#undef _ + }, }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip6_node, ipsec_input_ip6_node_fn) /* * fd.io coding-style-patch-verification: ON *