diff options
Diffstat (limited to 'vnet/vnet/vxlan-gpe/vxlan_gpe.c')
| -rw-r--r-- | vnet/vnet/vxlan-gpe/vxlan_gpe.c | 238 |
1 files changed, 191 insertions, 47 deletions
diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.c b/vnet/vnet/vxlan-gpe/vxlan_gpe.c index 13eda440ed1..bf1623af372 100644 --- a/vnet/vnet/vxlan-gpe/vxlan_gpe.c +++ b/vnet/vnet/vxlan-gpe/vxlan_gpe.c @@ -13,6 +13,7 @@ * limitations under the License. */ #include <vnet/vxlan-gpe/vxlan_gpe.h> +#include <vnet/ip/format.h> vxlan_gpe_main_t vxlan_gpe_main; @@ -23,8 +24,10 @@ u8 * format_vxlan_gpe_tunnel (u8 * s, va_list * args) s = format (s, "[%d] local: %U remote: %U ", t - gm->tunnels, - format_ip4_address, &t->local, - format_ip4_address, &t->remote); + format_ip46_address, &t->local, + format_ip46_address, &t->remote); + + s = format (s, " vxlan VNI %d ", t->vni); switch (t->protocol) { @@ -48,8 +51,6 @@ u8 * format_vxlan_gpe_tunnel (u8 * s, va_list * args) t->encap_fib_index, t->decap_fib_index); - s = format (s, " vxlan VNI %d ", t->vni); - return s; } @@ -121,24 +122,26 @@ VNET_HW_INTERFACE_CLASS (vxlan_gpe_hw_class) = { #define foreach_gpe_copy_field \ -_(local.as_u32) \ -_(remote.as_u32) \ _(vni) \ _(protocol) \ _(encap_fib_index) \ -_(decap_fib_index) - -#define foreach_copy_field \ -_(src.as_u32) \ -_(dst.as_u32) \ -_(vni) \ -_(encap_fib_index) \ _(decap_fib_index) \ _(decap_next_index) +#define foreach_copy_ipv4 { \ + _(local.ip4.as_u32) \ + _(remote.ip4.as_u32) \ +} +#define foreach_copy_ipv6 { \ + _(local.ip6.as_u64[0]) \ + _(local.ip6.as_u64[1]) \ + _(remote.ip6.as_u64[0]) \ + _(remote.ip6.as_u64[1]) \ +} -static int vxlan_gpe_rewrite (vxlan_gpe_tunnel_t * t) + +static int vxlan4_gpe_rewrite (vxlan_gpe_tunnel_t * t) { u8 *rw = 0; ip4_header_t * ip0; @@ -158,8 +161,8 @@ static int vxlan_gpe_rewrite (vxlan_gpe_tunnel_t * t) ip0->protocol = IP_PROTOCOL_UDP; /* we fix up the ip4 header length and checksum after-the-fact */ - ip0->src_address.as_u32 = t->local.as_u32; - ip0->dst_address.as_u32 = t->remote.as_u32; + ip0->src_address.as_u32 = t->local.ip4.as_u32; + ip0->dst_address.as_u32 = t->remote.ip4.as_u32; ip0->checksum = ip4_header_checksum (ip0); /* UDP header, randomize src port on something, maybe? */ @@ -176,6 +179,44 @@ static int vxlan_gpe_rewrite (vxlan_gpe_tunnel_t * t) return (0); } +static int vxlan6_gpe_rewrite (vxlan_gpe_tunnel_t * t) +{ + u8 *rw = 0; + ip6_header_t * ip0; + ip6_vxlan_gpe_header_t * h0; + int len; + + len = sizeof (*h0); + + vec_validate_aligned (rw, len-1, CLIB_CACHE_LINE_BYTES); + + h0 = (ip6_vxlan_gpe_header_t *) rw; + + /* Fixed portion of the (outer) ip4 header */ + ip0 = &h0->ip6; + ip0->ip_version_traffic_class_and_flow_label = clib_host_to_net_u32(6 << 28); + ip0->hop_limit = 255; + ip0->protocol = IP_PROTOCOL_UDP; + + ip0->src_address.as_u64[0] = t->local.ip6.as_u64[0]; + ip0->src_address.as_u64[1] = t->local.ip6.as_u64[1]; + ip0->dst_address.as_u64[0] = t->remote.ip6.as_u64[0]; + ip0->dst_address.as_u64[1] = t->remote.ip6.as_u64[1]; + + /* UDP header, randomize src port on something, maybe? */ + h0->udp.src_port = clib_host_to_net_u16 (4790); + h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan_gpe); + + /* VXLAN header. Are we having fun yet? */ + h0->vxlan.flags = VXLAN_GPE_FLAGS_I | VXLAN_GPE_FLAGS_P; + h0->vxlan.ver_res = VXLAN_GPE_VERSION; + h0->vxlan.protocol = VXLAN_GPE_PROTOCOL_IP4; + h0->vxlan.vni_res = clib_host_to_net_u32 (t->vni<<8); + + t->rewrite = rw; + return (0); +} + int vnet_vxlan_gpe_add_del_tunnel (vnet_vxlan_gpe_add_del_tunnel_args_t *a, u32 * sw_if_indexp) { @@ -187,15 +228,29 @@ int vnet_vxlan_gpe_add_del_tunnel u32 hw_if_index = ~0; u32 sw_if_index = ~0; int rv; - vxlan_gpe_tunnel_key_t key, *key_copy; + vxlan4_gpe_tunnel_key_t key4, *key4_copy; + vxlan6_gpe_tunnel_key_t key6, *key6_copy; hash_pair_t *hp; - key.local = a->local.as_u32; - key.remote = a->remote.as_u32; - key.vni = clib_host_to_net_u32 (a->vni << 8); - key.pad = 0; - - p = hash_get_mem (gm->vxlan_gpe_tunnel_by_key, &key); + if (!a->is_ip6) + { + key4.local = a->local.ip4.as_u32; + key4.remote = a->remote.ip4.as_u32; + key4.vni = clib_host_to_net_u32 (a->vni << 8); + key4.pad = 0; + + p = hash_get_mem(gm->vxlan4_gpe_tunnel_by_key, &key4); + } + else + { + key6.local.as_u64[0] = a->local.ip6.as_u64[0]; + key6.local.as_u64[1] = a->local.ip6.as_u64[1]; + key6.remote.as_u64[0] = a->remote.ip6.as_u64[0]; + key6.remote.as_u64[1] = a->remote.ip6.as_u64[1]; + key6.vni = clib_host_to_net_u32 (a->vni << 8); + + p = hash_get(gm->vxlan6_gpe_tunnel_by_key, &key6); + } if (a->is_add) { @@ -212,21 +267,43 @@ int vnet_vxlan_gpe_add_del_tunnel /* copy from arg structure */ #define _(x) t->x = a->x; foreach_gpe_copy_field; + if (!a->is_ip6) foreach_copy_ipv4 + else foreach_copy_ipv6 #undef _ - rv = vxlan_gpe_rewrite (t); + if (a->is_ip6) { + /* copy the key */ + t->key6 = key6; + } + + if (!a->is_ip6) t->flags |= VXLAN_GPE_TUNNEL_IS_IPV4; + + if (!a->is_ip6) { + rv = vxlan4_gpe_rewrite (t); + } else { + rv = vxlan6_gpe_rewrite (t); + } if (rv) - { + { pool_put (gm->tunnels, t); return rv; - } - - key_copy = clib_mem_alloc (sizeof (*key_copy)); - clib_memcpy (key_copy, &key, sizeof (*key_copy)); + } - hash_set_mem (gm->vxlan_gpe_tunnel_by_key, key_copy, - t - gm->tunnels); + if (!a->is_ip6) + { + key4_copy = clib_mem_alloc (sizeof (*key4_copy)); + clib_memcpy (key4_copy, &key4, sizeof (*key4_copy)); + hash_set_mem (gm->vxlan4_gpe_tunnel_by_key, key4_copy, + t - gm->tunnels); + } + else + { + key6_copy = clib_mem_alloc (sizeof (*key6_copy)); + clib_memcpy (key6_copy, &key4, sizeof (*key6_copy)); + hash_set_mem (gm->vxlan4_gpe_tunnel_by_key, key6_copy, + t - gm->tunnels); + } if (vec_len (gm->free_vxlan_gpe_tunnel_hw_if_indices) > 0) { @@ -264,10 +341,20 @@ int vnet_vxlan_gpe_add_del_tunnel vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */); vec_add1 (gm->free_vxlan_gpe_tunnel_hw_if_indices, t->hw_if_index); - hp = hash_get_pair (gm->vxlan_gpe_tunnel_by_key, &key); - key_copy = (void *)(hp->key); - hash_unset_mem (gm->vxlan_gpe_tunnel_by_key, &key); - clib_mem_free (key_copy); + if (!a->is_ip6) + { + hp = hash_get_pair (gm->vxlan4_gpe_tunnel_by_key, &key4); + key4_copy = (void *)(hp->key); + hash_unset_mem (gm->vxlan4_gpe_tunnel_by_key, &key4); + clib_mem_free (key4_copy); + } + else + { + hp = hash_get_pair (gm->vxlan6_gpe_tunnel_by_key, &key6); + key6_copy = (void *)(hp->key); + hash_unset_mem (gm->vxlan4_gpe_tunnel_by_key, &key6); + clib_mem_free (key6_copy); + } vec_free (t->rewrite); pool_put (gm->tunnels, t); @@ -279,7 +366,7 @@ int vnet_vxlan_gpe_add_del_tunnel return 0; } -static u32 fib_index_from_fib_id (u32 fib_id) +static u32 fib4_index_from_fib_id (u32 fib_id) { ip4_main_t * im = &ip4_main; uword * p; @@ -291,6 +378,18 @@ static u32 fib_index_from_fib_id (u32 fib_id) return p[0]; } +static u32 fib6_index_from_fib_id (u32 fib_id) +{ + ip6_main_t * im = &ip6_main; + uword * p; + + p = hash_get (im->fib_index_by_table_id, fib_id); + if (!p) + return ~0; + + return p[0]; +} + static uword unformat_gpe_decap_next (unformat_input_t * input, va_list * args) { u32 * result = va_arg (*args, u32 *); @@ -318,9 +417,11 @@ vxlan_gpe_add_del_tunnel_command_fn (vlib_main_t * vm, { unformat_input_t _line_input, * line_input = &_line_input; u8 is_add = 1; - ip4_address_t local, remote; + ip46_address_t local, remote; u8 local_set = 0; u8 remote_set = 0; + u8 ipv4_set = 0; + u8 ipv6_set = 0; u32 encap_fib_index = 0; u32 decap_fib_index = 0; u8 protocol = VXLAN_GPE_PROTOCOL_IP4; @@ -340,20 +441,47 @@ vxlan_gpe_add_del_tunnel_command_fn (vlib_main_t * vm, if (unformat (line_input, "del")) is_add = 0; else if (unformat (line_input, "local %U", - unformat_ip4_address, &local)) + unformat_ip4_address, &local.ip4)) + { local_set = 1; + ipv4_set = 1; + } + else if (unformat (line_input, "remote %U", + unformat_ip4_address, &remote.ip4)) + { + remote_set = 1; + ipv4_set = 1; + } + else if (unformat (line_input, "local %U", + unformat_ip6_address, &local.ip6)) + { + local_set = 1; + ipv6_set = 1; + } else if (unformat (line_input, "remote %U", - unformat_ip4_address, &remote)) + unformat_ip6_address, &remote.ip6)) + { remote_set = 1; + ipv6_set = 1; + } else if (unformat (line_input, "encap-vrf-id %d", &tmp)) { - encap_fib_index = fib_index_from_fib_id (tmp); + if (ipv6_set) + encap_fib_index = fib6_index_from_fib_id (tmp); + else + encap_fib_index = fib4_index_from_fib_id (tmp); + if (encap_fib_index == ~0) return clib_error_return (0, "nonexistent encap fib id %d", tmp); } else if (unformat (line_input, "decap-vrf-id %d", &tmp)) { - decap_fib_index = fib_index_from_fib_id (tmp); + + if (ipv6_set) + decap_fib_index = fib6_index_from_fib_id (tmp); + else + decap_fib_index = fib4_index_from_fib_id (tmp); + if (decap_fib_index == ~0) return clib_error_return (0, "nonexistent decap fib id %d", tmp); } @@ -383,15 +511,25 @@ vxlan_gpe_add_del_tunnel_command_fn (vlib_main_t * vm, if (remote_set == 0) return clib_error_return (0, "tunnel remote address not specified"); + if (ipv4_set && ipv6_set) + return clib_error_return (0, "both IPv4 and IPv6 addresses specified"); + + if ((ipv4_set && memcmp(&local.ip4, &remote.ip4, sizeof(local.ip4)) == 0) || + (ipv6_set && memcmp(&local.ip6, &remote.ip6, sizeof(local.ip6)) == 0)) + return clib_error_return (0, "src and dst addresses are identical"); + if (vni_set == 0) return clib_error_return (0, "vni not specified"); memset (a, 0, sizeof (*a)); a->is_add = is_add; + a->is_ip6 = ipv6_set; #define _(x) a->x = x; foreach_gpe_copy_field; + if (ipv4_set) foreach_copy_ipv4 + else foreach_copy_ipv6 #undef _ rv = vnet_vxlan_gpe_add_del_tunnel (a, &sw_if_index); @@ -421,7 +559,7 @@ vxlan_gpe_add_del_tunnel_command_fn (vlib_main_t * vm, VLIB_CLI_COMMAND (create_vxlan_gpe_tunnel_command, static) = { .path = "create vxlan-gpe tunnel", .short_help = - "create vxlan-gpe tunnel local <ip4-addr> remote <ip4-addr>" + "create vxlan-gpe tunnel local <local-addr> remote <remote-addr>" " vni <nn> [next-ip4][next-ip6][next-ethernet][next-nsh]" " [encap-vrf-id <nn>] [decap-vrf-id <nn>]" " [del]\n", @@ -458,12 +596,18 @@ clib_error_t *vxlan_gpe_init (vlib_main_t *vm) gm->vnet_main = vnet_get_main(); gm->vlib_main = vm; - - gm->vxlan_gpe_tunnel_by_key - = hash_create_mem (0, sizeof(vxlan_gpe_tunnel_key_t), sizeof (uword)); - udp_register_dst_port (vm, UDP_DST_PORT_vxlan_gpe, - vxlan_gpe_input_node.index, 1 /* is_ip4 */); + gm->vxlan4_gpe_tunnel_by_key + = hash_create_mem (0, sizeof(vxlan4_gpe_tunnel_key_t), sizeof (uword)); + + gm->vxlan6_gpe_tunnel_by_key + = hash_create_mem (0, sizeof(vxlan6_gpe_tunnel_key_t), sizeof (uword)); + + + udp_register_dst_port (vm, UDP_DST_PORT_vxlan_gpe, + vxlan4_gpe_input_node.index, 1 /* is_ip4 */); + udp_register_dst_port (vm, UDP_DST_PORT_vxlan6_gpe, + vxlan6_gpe_input_node.index, 0 /* is_ip4 */); return 0; } |