#include <vnet/ip/ip.h>
#include <vnet/fib/fib.h>
#include <vnet/udp/udp.h>
+#include <vnet/adj/adj_midchain.h>
#include <vnet/ipsec/ipsec.h>
#include <vnet/ipsec/esp.h>
#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)
+static void
+ipsec_if_tunnel_stack (adj_index_t ai)
{
- 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 *);
+ ipsec_main_t *ipm = &ipsec_main;
+ ipsec_tunnel_if_t *it;
+ ip_adjacency_t *adj;
+ u32 sw_if_index;
- s = format (s, "IPSec: spi %u seq %u", t->spi, t->seq);
- return s;
-}
+ adj = adj_get (ai);
+ sw_if_index = adj->rewrite_header.sw_if_index;
-static void
-ipsec_output_trace (vlib_main_t * vm,
- vlib_node_runtime_t * node,
- vlib_frame_t * frame, const ipsec_tunnel_if_t * t0)
-{
- ipsec_main_t *im = &ipsec_main;
- u32 *from, n_left;
+ if ((vec_len (ipm->ipsec_if_by_sw_if_index) <= sw_if_index) ||
+ (~0 == ipm->ipsec_if_by_sw_if_index[sw_if_index]))
+ return;
- n_left = frame->n_vectors;
- from = vlib_frame_vector_args (frame);
+ it = pool_elt_at_index (ipm->tunnel_interfaces,
+ ipm->ipsec_if_by_sw_if_index[sw_if_index]);
- while (n_left > 0)
+ if (!vnet_hw_interface_is_link_up (vnet_get_main (), it->hw_if_index))
{
- vlib_buffer_t *b0;
+ adj_midchain_delegate_unstack (ai);
+ }
+ else
+ {
+ ipsec_sa_t *sa;
- b0 = vlib_get_buffer (vm, from[0]);
+ sa = ipsec_sa_get (it->output_sa_index);
- if (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;
- }
+ /* *INDENT-OFF* */
+ fib_prefix_t pfx = {
+ .fp_addr = sa->tunnel_dst_addr,
+ .fp_len = (ipsec_sa_is_set_IS_TUNNEL_V6(sa) ? 128 : 32),
+ .fp_proto = (ipsec_sa_is_set_IS_TUNNEL_V6(sa) ?
+ FIB_PROTOCOL_IP6 :
+ FIB_PROTOCOL_IP4),
+ };
+ /* *INDENT-ON* */
- from += 1;
- n_left -= 1;
+ adj_midchain_delegate_stack (ai, sa->tx_fib_index, &pfx);
}
}
-VNET_DEVICE_CLASS_TX_FN (ipsec_device_class) (vlib_main_t * vm,
- vlib_node_runtime_t * node,
- vlib_frame_t * frame)
+/**
+ * @brief Call back when restacking all adjacencies on a GRE interface
+ */
+static adj_walk_rc_t
+ipsec_if_adj_walk_cb (adj_index_t ai, void *ctx)
{
- ipsec_main_t *im = &ipsec_main;
- u32 *from, n_left;
- vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
- const ipsec_tunnel_if_t *t0;
- vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b;
- u16 nexts[VLIB_FRAME_SIZE];
-
- from = vlib_frame_vector_args (frame);
- t0 = pool_elt_at_index (im->tunnel_interfaces, rd->dev_instance);
- n_left = frame->n_vectors;
- b = bufs;
-
- /* All going to encrypt */
- clib_memset (nexts, 0, sizeof (nexts));
-
- if (node->flags & VLIB_NODE_FLAG_TRACE)
- ipsec_output_trace (vm, node, frame, t0);
-
- vlib_get_buffers (vm, from, bufs, n_left);
-
- while (n_left >= 8)
- {
- /* Prefetch the buffer header for the N+2 loop iteration */
- vlib_prefetch_buffer_header (b[4], STORE);
- vlib_prefetch_buffer_header (b[5], STORE);
- vlib_prefetch_buffer_header (b[6], STORE);
- vlib_prefetch_buffer_header (b[7], STORE);
-
- vnet_buffer (b[0])->ipsec.sad_index = t0->output_sa_index;
- vnet_buffer (b[1])->ipsec.sad_index = t0->output_sa_index;
- vnet_buffer (b[2])->ipsec.sad_index = t0->output_sa_index;
- vnet_buffer (b[3])->ipsec.sad_index = t0->output_sa_index;
-
- n_left -= 4;
- b += 4;
- }
- while (n_left > 0)
- {
- vnet_buffer (b[0])->ipsec.sad_index = t0->output_sa_index;
-
- n_left -= 1;
- b += 1;
- }
-
- vlib_buffer_enqueue_to_next (vm, node, from, nexts, frame->n_vectors);
+ ipsec_if_tunnel_stack (ai);
- return frame->n_vectors;
+ return (ADJ_WALK_RC_CONTINUE);
}
+static void
+ipsec_if_tunnel_restack (ipsec_tunnel_if_t * it)
+{
+ fib_protocol_t proto;
+
+ /*
+ * walk all the adjacencies on th GRE interface and restack them
+ */
+ FOR_EACH_FIB_IP_PROTOCOL (proto)
+ {
+ adj_nbr_walk (it->sw_if_index, proto, ipsec_if_adj_walk_cb, NULL);
+ }
+}
static clib_error_t *
ipsec_admin_up_down_function (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
return err;
}
- return /* no error */ 0;
+ ipsec_if_tunnel_restack (t);
+
+ return (NULL);
}
+static u8 *
+ipsec_if_build_rewrite (vnet_main_t * vnm,
+ u32 sw_if_index,
+ vnet_link_t link_type, const void *dst_address)
+{
+ return (NULL);
+}
+
+static void
+ipsec_if_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai)
+{
+ adj_nbr_midchain_update_rewrite
+ (ai, NULL, NULL, ADJ_FLAG_MIDCHAIN_IP_STACK,
+ ipsec_if_build_rewrite (vnm, sw_if_index, adj_get_link_type (ai), NULL));
+
+ ipsec_if_tunnel_stack (ai);
+}
/* *INDENT-OFF* */
VNET_DEVICE_CLASS (ipsec_device_class) =
{
.name = "IPSec",
.format_device_name = format_ipsec_name,
- .format_tx_trace = format_ipsec_if_tx_trace,
- .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* */
{
.name = "IPSec",
.build_rewrite = default_build_rewrite,
+ .update_adjacency = ipsec_if_update_adj,
.flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
};
/* *INDENT-ON* */
return (0xc0000000 | ti);
}
+static void
+ipsec_tunnel_feature_set (ipsec_main_t * im, ipsec_tunnel_if_t * t, u8 enable)
+{
+ u8 arc;
+
+ arc = vnet_get_feature_arc_index ("ip4-output");
+
+ vnet_feature_enable_disable_with_index (arc,
+ im->esp4_encrypt_tun_feature_index,
+ t->sw_if_index, enable,
+ &t->output_sa_index,
+ sizeof (t->output_sa_index));
+
+ arc = vnet_get_feature_arc_index ("ip6-output");
+
+ vnet_feature_enable_disable_with_index (arc,
+ im->esp6_encrypt_tun_feature_index,
+ t->sw_if_index, enable,
+ &t->output_sa_index,
+ sizeof (t->output_sa_index));
+}
+
int
ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm,
ipsec_add_del_tunnel_args_t * args,
if (args->udp_encap)
flags |= IPSEC_SA_FLAG_UDP_ENCAP;
if (args->esn)
- flags |= IPSEC_SA_FLAG_USE_EXTENDED_SEQ_NUM;
+ flags |= IPSEC_SA_FLAG_USE_ESN;
if (args->anti_replay)
flags |= IPSEC_SA_FLAG_USE_ANTI_REPLAY;
&crypto_key,
args->integ_alg,
&integ_key,
- flags,
+ (flags | IPSEC_SA_FLAG_IS_INBOUND),
args->tx_table_id,
+ args->salt,
&args->remote_ip,
&args->local_ip, &t->input_sa_index);
if (rv)
- return VNET_API_ERROR_UNIMPLEMENTED;
+ return VNET_API_ERROR_INVALID_SRC_ADDRESS;
ipsec_mk_key (&crypto_key,
args->local_crypto_key, args->local_crypto_key_len);
&integ_key,
flags,
args->tx_table_id,
+ args->salt,
&args->local_ip,
&args->remote_ip, &t->output_sa_index);
if (rv)
- return VNET_API_ERROR_UNIMPLEMENTED;
+ return VNET_API_ERROR_INVALID_DST_ADDRESS;
/* copy the key */
if (is_ip6)
hi = vnet_get_hw_interface (vnm, hw_if_index);
- /* add esp4/6 as the next-node-index of this tx-node */
- uword slot = vlib_node_add_next_with_slot
- (vnm->vlib_main, hi->tx_node_index,
- is_ip6 ? im->esp6_encrypt_node_index : im->esp4_encrypt_node_index,
- 0);
-
- ASSERT (slot == 0);
-
t->hw_if_index = hw_if_index;
t->sw_if_index = hi->sw_if_index;
- vnet_feature_enable_disable ("interface-output",
- args->is_ip6 ? "ipsec6-if-output" :
- "ipsec4-if-output", hi->sw_if_index, 1, 0,
- 0);
+ /* Standard default jumbo MTU. */
+ vnet_sw_interface_set_mtu (vnm, t->sw_if_index, 9000);
+
+ /* Add the new tunnel to the DB of tunnels per sw_if_index ... */
+ vec_validate_init_empty (im->ipsec_if_by_sw_if_index, t->sw_if_index,
+ ~0);
+ im->ipsec_if_by_sw_if_index[t->sw_if_index] = dev_instance;
+
+ ipsec_tunnel_feature_set (im, t, 1);
+
/*1st interface, register protocol */
if (pool_elts (im->tunnel_interfaces) == 1)
{
hi = vnet_get_hw_interface (vnm, t->hw_if_index);
vnet_sw_interface_set_flags (vnm, hi->sw_if_index, 0); /* admin down */
- vnet_feature_enable_disable ("interface-output",
- args->is_ip6 ? "ipsec6-if-output" :
- "ipsec4-if-output", hi->sw_if_index, 0, 0,
- 0);
+ ipsec_tunnel_feature_set (im, t, 0);
vnet_delete_hw_interface (vnm, t->hw_if_index);
if (is_ip6)
hash_unset (im->ipsec4_if_pool_index_by_key, key4.as_u64);
hash_unset (im->ipsec_if_real_dev_by_show_dev, t->show_instance);
+ im->ipsec_if_by_sw_if_index[t->sw_if_index] = ~0;
pool_put (im->tunnel_interfaces, t);
int
ipsec_add_del_ipsec_gre_tunnel (vnet_main_t * vnm,
- ipsec_add_del_ipsec_gre_tunnel_args_t * args)
+ const ipsec_gre_tunnel_add_del_args_t * args)
{
ipsec_tunnel_if_t *t = 0;
ipsec_main_t *im = &ipsec_main;
p = hash_get (im->sa_index_by_sa_id, args->local_sa_id);
if (!p)
return VNET_API_ERROR_INVALID_VALUE;
- isa = p[0];
+ osa = p[0];
+ sa = pool_elt_at_index (im->sad, p[0]);
+ ipsec_sa_set_IS_GRE (sa);
p = hash_get (im->sa_index_by_sa_id, args->remote_sa_id);
if (!p)
return VNET_API_ERROR_INVALID_VALUE;
- osa = p[0];
+ isa = p[0];
sa = pool_elt_at_index (im->sad, p[0]);
+ ipsec_sa_set_IS_GRE (sa);
- if (sa->is_tunnel)
+ /* we form the key from the input/remote SA whose tunnel is srouce
+ * at the remote end */
+ if (ipsec_sa_is_set_IS_TUNNEL (sa))
{
- key.remote_ip = sa->tunnel_dst_addr.ip4.as_u32;
+ key.remote_ip = sa->tunnel_src_addr.ip4.as_u32;
key.spi = clib_host_to_net_u32 (sa->spi);
}
else
{
- key.remote_ip = args->remote_ip.as_u32;
+ key.remote_ip = args->src.as_u32;
key.spi = clib_host_to_net_u32 (sa->spi);
}
return 0;
}
-int
-ipsec_set_interface_key (vnet_main_t * vnm, u32 hw_if_index,
- ipsec_if_set_key_type_t type, u8 alg, u8 * key)
-{
- ipsec_main_t *im = &ipsec_main;
- vnet_hw_interface_t *hi;
- ipsec_tunnel_if_t *t;
- ipsec_sa_t *sa;
-
- hi = vnet_get_hw_interface (vnm, hw_if_index);
- t = pool_elt_at_index (im->tunnel_interfaces, hi->dev_instance);
-
- if (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP)
- return VNET_API_ERROR_SYSCALL_ERROR_1;
-
- if (type == IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO)
- {
- sa = pool_elt_at_index (im->sad, t->output_sa_index);
- ipsec_sa_set_crypto_alg (sa, alg);
- ipsec_mk_key (&sa->crypto_key, key, vec_len (key));
- }
- else if (type == IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG)
- {
- sa = pool_elt_at_index (im->sad, t->output_sa_index);
- ipsec_sa_set_integ_alg (sa, alg);
- ipsec_mk_key (&sa->integ_key, key, vec_len (key));
- }
- else if (type == IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO)
- {
- sa = pool_elt_at_index (im->sad, t->input_sa_index);
- ipsec_sa_set_crypto_alg (sa, alg);
- ipsec_mk_key (&sa->crypto_key, key, vec_len (key));
- }
- else if (type == IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG)
- {
- sa = pool_elt_at_index (im->sad, t->input_sa_index);
- ipsec_sa_set_integ_alg (sa, alg);
- ipsec_mk_key (&sa->integ_key, key, vec_len (key));
- }
- else
- return VNET_API_ERROR_INVALID_VALUE;
-
- return 0;
-}
-
-
int
ipsec_set_interface_sa (vnet_main_t * vnm, u32 hw_if_index, u32 sa_id,
u8 is_outbound)
old_sa_index = t->input_sa_index;
old_sa = pool_elt_at_index (im->sad, old_sa_index);
- if (sa->is_tunnel_ip6 ^ old_sa->is_tunnel_ip6)
+ if (ipsec_sa_is_set_IS_TUNNEL_V6 (sa) ^
+ ipsec_sa_is_set_IS_TUNNEL_V6 (old_sa))
{
clib_warning ("IPsec interface SA endpoints type can't be changed");
return VNET_API_ERROR_INVALID_VALUE;
}
- if (sa->is_tunnel_ip6)
+ if (ipsec_sa_is_set_IS_TUNNEL_V6 (sa))
{
ipsec6_tunnel_key_t key;
old_sa_index = t->output_sa_index;
old_sa = pool_elt_at_index (im->sad, old_sa_index);
- if (sa->is_tunnel_ip6 ^ old_sa->is_tunnel_ip6)
+ if (ipsec_sa_is_set_IS_TUNNEL_V6 (sa) ^
+ ipsec_sa_is_set_IS_TUNNEL_V6 (old_sa))
{
clib_warning ("IPsec interface SA endpoints type can't be changed");
return VNET_API_ERROR_INVALID_VALUE;
}
+ /*
+ * re-enable the feature to get the new SA in
+ * the workers are stopped so no packets are sent in the clear
+ */
+ ipsec_tunnel_feature_set (im, t, 0);
t->output_sa_index = sa_index;
+ ipsec_tunnel_feature_set (im, t, 1);
}
/* remove sa_id to sa_index mapping on old SA */
clib_warning ("IPsec backend add/del callback returned error");
return VNET_API_ERROR_SYSCALL_ERROR_1;
}
- pool_put (im->sad, old_sa);
+ ipsec_sa_del (old_sa->id);
return 0;
}
-
clib_error_t *
ipsec_tunnel_if_init (vlib_main_t * vm)
{
Code Review / vpp.git / blobdiff