ipsec: Store thread-index in buffer meta-data during SA handoff

[vpp.git] / src / vnet / buffer.h

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index b174587..27aeb3b 100644 (file)
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -209,13 +209,13 @@ typedef struct
              /* shallow virtual reassembly output variables */
              struct
              {
-               u8 ip_proto;    /* protocol in ip header */
-               u8 icmp_type_or_tcp_flags;
-               u8 is_non_first_fragment;
-               u8 save_rewrite_length;
                u16 l4_src_port;        /* tcp/udp/icmp src port */
                u16 l4_dst_port;        /* tcp/udp/icmp dst port */
                u32 tcp_ack_number;
+               u8 save_rewrite_length;
+               u8 ip_proto;    /* protocol in ip header */
+               u8 icmp_type_or_tcp_flags;
+               u8 is_non_first_fragment;
                u32 tcp_seq_number;
              };
              /* full reassembly output variables */
@@ -309,8 +309,11 @@ typedef struct
     /* interface output features */
     struct
     {
+      /* don't overlap the adjcencies nor flow-hash */
+      u32 __pad[3];
       u32 sad_index;
       u32 protect_index;
+      u16 thread_index;
     } ipsec;
 
     /* MAP */
@@ -378,6 +381,7 @@ typedef struct
     struct
     {
       u32 flags;
+      u32 required_thread_index;
     } snat;
 
     u32 unused[6];
@@ -397,6 +401,15 @@ STATIC_ASSERT (STRUCT_SIZE_OF (vnet_buffer_opaque_t, ip.save_rewrite_length)
               && VNET_REWRITE_TOTAL_BYTES < UINT8_MAX,
               "save_rewrite_length member must be able to hold the max value of rewrite length");
 
+STATIC_ASSERT (STRUCT_OFFSET_OF (vnet_buffer_opaque_t, ip.save_rewrite_length)
+              == STRUCT_OFFSET_OF (vnet_buffer_opaque_t,
+                                   ip.reass.save_rewrite_length)
+              && STRUCT_OFFSET_OF (vnet_buffer_opaque_t,
+                                   mpls.save_rewrite_length) ==
+              STRUCT_OFFSET_OF (vnet_buffer_opaque_t,
+                                ip.reass.save_rewrite_length),
+              "save_rewrite_length must be aligned so that reass doesn't overwrite it");
+
 /*
  * The opaque field of the vlib_buffer_t is interpreted as a
  * vnet_buffer_opaque_t. Hence it should be big enough to accommodate one.
@@ -446,6 +459,13 @@ typedef struct
   /* The union below has a u64 alignment, so this space is unused */
   u32 __unused2[1];
 
+  struct
+  {
+    u32 arc_next;
+    /* cached session index from previous node */
+    u32 cached_session_index;
+  } nat;
+
   union
   {
     struct