X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbuffer.h;h=aed72c5031aec05461ae5c75076a1527f957f832;hb=b15d796dbf1da6a229df4e10a3a2bdd700f0354e;hp=d1edbe54805d6a6facc6fe0a6ed1f02f694bb06e;hpb=be16020c5034bc69df25a8ecd7081aec9898d93c;p=vpp.git

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index d1edbe54805..aed72c5031a 100644
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -66,14 +66,14 @@
   _(17, FLOW_REPORT, "flow-report", 1)                  \
   _(18, IS_DVR, "dvr", 1)                               \
   _(19, QOS_DATA_VALID, "qos-data-valid", 0)            \
-  _(20, AVAIL1, "avail1", 1)                            \
-  _(21, AVAIL2, "avail2", 1)                            \
-  _(22, AVAIL3, "avail3", 1)                            \
-  _(23, AVAIL4, "avail4", 1)                            \
-  _(24, AVAIL5, "avail5", 1)                            \
-  _(25, AVAIL6, "avail6", 1)                            \
-  _(26, AVAIL7, "avail7", 1)                            \
-  _(27, AVAIL8, "avail8", 1)
+  _(20, GSO, "gso", 0)                                  \
+  _(21, AVAIL1, "avail1", 1)                            \
+  _(22, AVAIL2, "avail2", 1)                            \
+  _(23, AVAIL3, "avail3", 1)                            \
+  _(24, AVAIL4, "avail4", 1)                            \
+  _(25, AVAIL5, "avail5", 1)                            \
+  _(26, AVAIL6, "avail6", 1)                            \
+  _(27, AVAIL7, "avail7", 1)
 
 /*
  * Please allocate the FIRST available bit, redefine
@@ -185,11 +185,41 @@ typedef struct
 	/* reassembly */
 	union
 	{
-	  /* in/out variables */
+	  /* group input/output/handoff to simplify the code, this way:
+	   * we can handoff while keeping input variables intact
+	   * and also we can write the output and still use next_index later */
 	  struct
 	  {
-	    u32 next_index;	/* index of next node - ignored if "feature" node */
-	    u16 estimated_mtu;	/* estimated MTU calculated during reassembly */
+	    /* input variables */
+	    struct
+	    {
+	      u32 next_index;	/* index of next node - used by custom apps */
+	      u32 error_next_index;	/* index of next node if error - used by custom apps */
+	    };
+	    /* handoff variables */
+	    struct
+	    {
+	      u16 owner_thread_index;
+	    };
+	    /* output variables */
+	    struct
+	    {
+	      union
+	      {
+		/* shallow virtual reassembly output variables */
+		struct
+		{
+		  u8 ip_proto;	/* protocol in ip header */
+		  u16 l4_src_port;	/* tcp/udp/icmp src port */
+		  u16 l4_dst_port;	/* tcp/udp/icmp dst port */
+		};
+		/* full reassembly output variables */
+		struct
+		{
+		  u16 estimated_mtu;	/* estimated MTU calculated during reassembly */
+		};
+	      };
+	    };
 	  };
 	  /* internal variables used during reassembly */
 	  struct
@@ -203,7 +233,6 @@ typedef struct
 	  };
 	} reass;
       };
-
     } ip;
 
     /*
@@ -218,8 +247,12 @@ typedef struct
       u8 ttl;
       u8 exp;
       u8 first;
+      u8 pyld_proto:3;		/* dpo_proto_t */
+      u8 rsvd:5;
       /* Rewrite length */
       u32 save_rewrite_length;
+      /* Save the mpls header length including all label stack */
+      u8 mpls_hdr_length;
       /*
        * BIER - the number of bytes in the header.
        *  the len field in the header is not authoritative. It's the
@@ -236,9 +269,9 @@ typedef struct
     {
       u32 feature_bitmap;
       u16 bd_index;		/* bridge-domain index */
+      u16 l2fib_sn;		/* l2fib bd/int seq_num */
       u8 l2_len;		/* ethernet header length */
       u8 shg;			/* split-horizon group */
-      u16 l2fib_sn;		/* l2fib bd/int seq_num */
       u8 bd_age;		/* aging enabled */
     } l2;
 
@@ -272,12 +305,8 @@ typedef struct
     /* interface output features */
     struct
     {
-      u32 flags;
       u32 sad_index;
-      u32 ip_version_traffic_class_and_flow_label;
-      u8 tos;
-      u8 ttl_or_hop_limit;
-      u32 seq;
+      u32 protect_index;
     } ipsec;
 
     /* MAP */
@@ -328,7 +357,11 @@ typedef struct
     struct
     {
       u32 connection_index;
-      u32 seq_number;
+      union
+      {
+	u32 seq_number;
+	u32 next_node_opaque;
+      };
       u32 seq_end;
       u32 ack_number;
       u16 hdr_offset;		/**< offset relative to ip hdr */
@@ -337,20 +370,6 @@ typedef struct
       u8 flags;
     } tcp;
 
-    /* SCTP */
-    struct
-    {
-      u32 connection_index;
-      u16 sid; /**< Stream ID */
-      u16 ssn; /**< Stream Sequence Number */
-      u32 tsn; /**< Transmission Sequence Number */
-      u16 hdr_offset;		/**< offset relative to ip hdr */
-      u16 data_offset;		/**< offset relative to ip hdr */
-      u16 data_len;		/**< data len */
-      u8 subconn_idx; /**< index of the sub_connection being used */
-      u8 flags;
-    } sctp;
-
     /* SNAT */
     struct
     {
@@ -393,9 +412,23 @@ typedef struct
   {
     u8 __unused;
     u8 flags;
-    u16 src_epg;
+    u16 sclass;
   } gbp;
 
+  /**
+   * The L4 payload size set on input on GSO enabled interfaces
+   * when we receive a GSO packet (a chain of buffers with the first one
+   * having GSO bit set), and needs to persist all the way to the interface-output,
+   * in case the egress interface is not GSO-enabled - then we need to perform
+   * the segmentation, and use this value to cut the payload appropriately.
+   */
+  u16 gso_size;
+  /* size of L4 prototol header */
+  u16 gso_l4_hdr_sz;
+
+  /* The union below has a u64 alignment, so this space is unused */
+  u32 __unused2[1];
+
   union
   {
     struct
@@ -410,7 +443,7 @@ typedef struct
       u64 pad[1];
       u64 pg_replay_timestamp;
     };
-    u32 unused[10];
+    u32 unused[8];
   };
 } vnet_buffer_opaque2_t;
 
@@ -424,6 +457,12 @@ STATIC_ASSERT (sizeof (vnet_buffer_opaque2_t) <=
 	       STRUCT_SIZE_OF (vlib_buffer_t, opaque2),
 	       "VNET buffer opaque2 meta-data too large for vlib_buffer");
 
+#define gso_mtu_sz(b) (vnet_buffer2(b)->gso_size + \
+                       vnet_buffer2(b)->gso_l4_hdr_sz + \
+                       vnet_buffer(b)->l4_hdr_offset - \
+                       vnet_buffer (b)->l3_hdr_offset)
+
+
 format_function_t format_vnet_buffer;
 
 #endif /* included_vnet_buffer_h */