VXLAN tunnel encap forwarding optimization with FIB 2.0

[vpp.git] / vnet / vnet / vxlan / vxlan.h

diff --git a/vnet/vnet/vxlan/vxlan.h b/vnet/vnet/vxlan/vxlan.h
index b38e65d..e37f09a 100644 (file)
--- a/vnet/vnet/vxlan/vxlan.h
+++ b/vnet/vnet/vxlan/vxlan.h
@@ -20,11 +20,14 @@
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
 #include <vnet/l2/l2_input.h>
+#include <vnet/l2/l2_output.h>
 #include <vnet/l2/l2_bd.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/vxlan/vxlan_packet.h>
 #include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
 #include <vnet/ip/udp.h>
+#include <vnet/dpo/dpo.h>
 
 typedef CLIB_PACKED (struct {
   ip4_header_t ip4;            /* 20 bytes */
@@ -32,6 +35,12 @@ typedef CLIB_PACKED (struct {
   vxlan_header_t vxlan;        /* 8 bytes */
 }) ip4_vxlan_header_t;
 
+typedef CLIB_PACKED (struct {
+  ip6_header_t ip6;            /* 40 bytes */
+  udp_header_t udp;            /* 8 bytes */
+  vxlan_header_t vxlan;        /* 8 bytes */
+}) ip6_vxlan_header_t;
+
 typedef CLIB_PACKED(struct {
   /* 
    * Key fields: ip src and vxlan vni on incoming VXLAN packet
@@ -44,35 +53,64 @@ typedef CLIB_PACKED(struct {
     };
     u64 as_u64;
   };
-}) vxlan_tunnel_key_t;
+}) vxlan4_tunnel_key_t;
+
+typedef CLIB_PACKED(struct {
+  /*
+   * Key fields: ip src and vxlan vni on incoming VXLAN packet
+   * all fields in NET byte order
+   */
+  ip6_address_t src;
+  u32 vni;                 /* shifted left 8 bits */
+}) vxlan6_tunnel_key_t;
 
 typedef struct {
   /* Rewrite string. $$$$ embed vnet_rewrite header */
   u8 * rewrite;
 
-  /* decap next index */
-  u32 decap_next_index;
+  /* FIB DPO for IP forwarding of VXLAN encap packet */
+  dpo_id_t next_dpo;  
 
-  /* tunnel src and dst addresses */
-  ip4_address_t src;
-  ip4_address_t dst;
+  /* storage for the hash key */
+  union {
+    vxlan4_tunnel_key_t *key4; /* unused for now */
+    vxlan6_tunnel_key_t *key6;
+  };
 
   /* vxlan VNI in HOST byte order */
   u32 vni;
 
-  /* L3 FIB index and L2 BD ID */
-  u16 encap_fib_index;          /* tunnel partner IP lookup here */
+  /* tunnel src and dst addresses */
+  ip46_address_t src;
+  ip46_address_t dst;
+
+  /* The FIB index for src/dst addresses */
+  u32 encap_fib_index;
 
-  /* vnet intfc hw/sw_if_index */
-  u16 hw_if_index;
+  /* vnet intfc index */
   u32 sw_if_index;
+  u32 hw_if_index;
+
+  /**
+   * Linkage into the FIB object graph
+   */
+  fib_node_t node;
+
+  /* The FIB entry sourced by the tunnel for its destination prefix */
+  fib_node_index_t fib_entry_index;
+
+  /**
+   * The tunnel is a child of the FIB entry for its desintion. This is
+   * so it receives updates when the forwarding information for that entry
+   * changes.
+   * The tunnels sibling index on the FIB entry's dependency list.
+   */
+  u32 sibling_index;
 } vxlan_tunnel_t;
 
 #define foreach_vxlan_input_next        \
 _(DROP, "error-drop")                   \
-_(L2_INPUT, "l2-input")                 \
-_(IP4_INPUT, "ip4-input")               \
-_(IP6_INPUT, "ip6-input")
+_(L2_INPUT, "l2-input")
 
 typedef enum {
 #define _(s,n) VXLAN_INPUT_NEXT_##s,
@@ -93,15 +131,12 @@ typedef struct {
   vxlan_tunnel_t *tunnels;
 
   /* lookup tunnel by key */
-  uword * vxlan_tunnel_by_key;
+  uword * vxlan4_tunnel_by_key; /* keyed on ipv4.dst + vni */
+  uword * vxlan6_tunnel_by_key; /* keyed on ipv6.dst + vni */
 
   /* Free vlib hw_if_indices */
   u32 * free_vxlan_tunnel_hw_if_indices;
 
-  /* Dummy rewrite for deleted vxlan_tunnels with hw_if_indices as above */
-  u64 dummy_str [sizeof(ip4_vxlan_header_t)/sizeof(u64) + 2];
-#define vxlan_dummy_rewrite ((u8 *) &vxlan_main.dummy_str[1])
-
   /* Mapping from sw_if_index to tunnel index */
   u32 * tunnel_index_by_sw_if_index;
 
@@ -112,14 +147,20 @@ typedef struct {
 
 vxlan_main_t vxlan_main;
 
-vlib_node_registration_t vxlan_input_node;
-vlib_node_registration_t vxlan_encap_node;
+extern vlib_node_registration_t vxlan4_input_node;
+extern vlib_node_registration_t vxlan6_input_node;
+extern vlib_node_registration_t vxlan4_encap_node;
+extern vlib_node_registration_t vxlan6_encap_node;
 
 u8 * format_vxlan_encap_trace (u8 * s, va_list * args);
 
 typedef struct {
   u8 is_add;
-  ip4_address_t src, dst;
+
+  /* we normally use is_ip4, but since this adds to the
+   * structure, this seems less of abreaking change */
+  u8 is_ip6;
+  ip46_address_t src, dst;
   u32 encap_fib_index;
   u32 decap_next_index;
   u32 vni;