Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
IPSEC-GRE: fixes and API update to common types.
[vpp.git]
/
src
/
vnet
/
ipsec
/
ipsec_input.c
diff --git
a/src/vnet/ipsec/ipsec_input.c
b/src/vnet/ipsec/ipsec_input.c
index
19c3b5b
..
5be72c3
100644
(file)
--- a/
src/vnet/ipsec/ipsec_input.c
+++ b/
src/vnet/ipsec/ipsec_input.c
@@
-23,10
+23,11
@@
#include <vnet/ipsec/ipsec.h>
#include <vnet/ipsec/esp.h>
#include <vnet/ipsec/ah.h>
#include <vnet/ipsec/ipsec.h>
#include <vnet/ipsec/esp.h>
#include <vnet/ipsec/ah.h>
+#include <vnet/ipsec/ipsec_io.h>
-#define foreach_ipsec_input_error
\
-
_(RX_PKTS, "IPSEC pkts received")
\
-
_(DECRYPTION_FAILED, "IPSEC decryption fail
ed")
+#define foreach_ipsec_input_error \
+
_(RX_PKTS, "IPSEC pkts received")
\
+
_(RX_MATCH_PKTS, "IPSEC pkts match
ed")
typedef enum
{
typedef enum
{
@@
-44,6
+45,9
@@
static char *ipsec_input_error_strings[] = {
typedef struct
{
typedef struct
{
+ ip_protocol_t proto;
+ u32 spd;
+ u32 policy_index;
u32 sa_id;
u32 spi;
u32 seq;
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 *);
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;
}
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;
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;
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;
{
if (da != clib_net_to_host_u32 (s->tunnel_dst_addr.ip4.as_u32))
continue;
@@
-138,15
+132,15
@@
ipsec6_input_protect_policy_match (ipsec_spd_t * spd,
ipsec_sa_t *s;
u32 *i;
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;
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;
{
if (!ip6_address_is_equal (sa, &s->tunnel_src_addr.ip6))
continue;
@@
-174,11
+168,14
@@
VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
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;
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;
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;
next_index = node->cached_next_index;
@@
-190,7
+187,7
@@
VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm,
while (n_left_from > 0 && n_left_to_next > 0)
{
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;
vlib_buffer_t *b0;
ip4_header_t *ip0;
esp_header_t *esp0;
@@
-245,37
+242,44
@@
VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm,
clib_net_to_host_u32
(esp0->spi));
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.sad_index = p0->sa_index;
- vnet_buffer (b0)->ipsec.flags = 0;
next0 = im->esp4_decrypt_next_index;
vlib_buffer_advance (b0, ((u8 *) esp0 - (u8 *) ip0));
goto trace0;
}
next0 = im->esp4_decrypt_next_index;
vlib_buffer_advance (b0, ((u8 *) esp0 - (u8 *) ip0));
goto trace0;
}
+ else
+ {
+ pi0 = ~0;
+ };
/* FIXME bypass and discard */
trace0:
/* 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));
{
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,
{
ah0 = (ah_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
p0 = ipsec_input_protect_policy_match (spd0,
@@
-290,28
+294,43
@@
VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm,
if (PREDICT_TRUE (p0 != 0))
{
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.sad_index = p0->sa_index;
- vnet_buffer (b0)->ipsec.flags = 0;
next0 = im->ah4_decrypt_next_index;
goto trace1;
}
next0 = im->ah4_decrypt_next_index;
goto trace1;
}
+ else
+ {
+ pi0 = ~0;
+ }
/* FIXME bypass and discard */
trace1:
/* 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));
{
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,
vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
to_next, n_left_to_next, bi0,
@@
-319,24
+338,26
@@
VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm,
}
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
}
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
+
vlib_node_increment_counter (vm, ipsec4_input_node.index,
IPSEC_INPUT_ERROR_RX_PKTS,
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 (ipsec4_input_node,static) = {
return from_frame->n_vectors;
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (ipsec4_input_node,static) = {
- .name = "ipsec4-input",
+ .name = "ipsec4-input
-feature
",
.vector_size = sizeof (u32),
.format_trace = format_ipsec_input_trace,
.type = VLIB_NODE_TYPE_INTERNAL,
.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_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,
.n_next_nodes = IPSEC_INPUT_N_NEXT,
.next_nodes = {
#define _(s,n) [IPSEC_INPUT_NEXT_##s] = n,
@@
-353,11
+374,14
@@
VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
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;
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;
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;
next_index = node->cached_next_index;
@@
-369,7
+393,7
@@
VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
while (n_left_from > 0 && n_left_to_next > 0)
{
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;
vlib_buffer_t *b0;
ip6_header_t *ip0;
esp_header_t *esp0;
@@
-414,16
+438,24
@@
VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
if (PREDICT_TRUE (p0 != 0))
{
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.sad_index = p0->sa_index;
- vnet_buffer (b0)->ipsec.flags = 0;
next0 = im->esp6_decrypt_next_index;
vlib_buffer_advance (b0, header_size);
goto trace0;
}
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)
{
}
else if (ip0->protocol == IP_PROTOCOL_IPSEC_AH)
{
@@
-435,29
+467,41
@@
VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
if (PREDICT_TRUE (p0 != 0))
{
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.sad_index = p0->sa_index;
- vnet_buffer (b0)->ipsec.flags = 0;
next0 = im->ah6_decrypt_next_index;
goto trace0;
}
next0 = im->ah6_decrypt_next_index;
goto trace0;
}
+ else
+ {
+ pi0 = ~0;
+ }
+ }
+ else
+ {
+ ipsec_unprocessed += 1;
}
trace0:
}
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));
{
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_ne
t_u32 (esp0->spi);
-
tr->seq = clib_host_to_ne
t_u32 (esp0->seq);
- }
+
+ if (p0)
+ tr->sa_id = p0->sa_id;
+
tr->proto = ip0->protocol
;
+
tr->spi = clib_net_to_hos
t_u32 (esp0->spi);
+
tr->seq = clib_net_to_hos
t_u32 (esp0->seq);
+ tr->spd = spd0->id;
}
vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
}
vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
@@
-465,9
+509,14
@@
VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
}
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
}
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
+
vlib_node_increment_counter (vm, ipsec6_input_node.index,
IPSEC_INPUT_ERROR_RX_PKTS,
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;
}
return from_frame->n_vectors;
}
@@
-475,15
+524,18
@@
VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (ipsec6_input_node,static) = {
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (ipsec6_input_node,static) = {
- .name = "ipsec6-input",
+ .name = "ipsec6-input
-feature
",
.vector_size = sizeof (u32),
.format_trace = format_ipsec_input_trace,
.type = VLIB_NODE_TYPE_INTERNAL,
.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_errors = ARRAY_LEN(ipsec_input_error_strings),
.error_strings = ipsec_input_error_strings,
-
- .sibling_of = "ipsec4-input",
+ .n_next_nodes = IPSEC_INPUT_N_NEXT,
+ .next_nodes = {
+#define _(s,n) [IPSEC_INPUT_NEXT_##s] = n,
+ foreach_ipsec_input_next
+#undef _
+ },
};
/* *INDENT-ON* */
};
/* *INDENT-ON* */