Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VPP-1507: Added binary api to dump configured ip_punt_redirect
[vpp.git]
/
src
/
vnet
/
buffer.h
diff --git
a/src/vnet/buffer.h
b/src/vnet/buffer.h
index
4e01a06
..
8071081
100644
(file)
--- a/
src/vnet/buffer.h
+++ b/
src/vnet/buffer.h
@@
-51,7
+51,7
@@
_( 3, VLAN_2_DEEP, "vlan-2-deep") \
_( 4, VLAN_1_DEEP, "vlan-1-deep") \
_( 5, SPAN_CLONE, "span-clone") \
_( 3, VLAN_2_DEEP, "vlan-2-deep") \
_( 4, VLAN_1_DEEP, "vlan-1-deep") \
_( 5, SPAN_CLONE, "span-clone") \
- _( 6,
HANDOFF_NEXT_VALID, "handoff-next-valid")
\
+ _( 6,
LOOP_COUNTER_VALID, 0)
\
_( 7, LOCALLY_ORIGINATED, "local") \
_( 8, IS_IP4, "ip4") \
_( 9, IS_IP6, "ip6") \
_( 7, LOCALLY_ORIGINATED, "local") \
_( 8, IS_IP4, "ip4") \
_( 9, IS_IP6, "ip6") \
@@
-63,7
+63,8
@@
_(15, L3_HDR_OFFSET_VALID, 0) \
_(16, L4_HDR_OFFSET_VALID, 0) \
_(17, FLOW_REPORT, "flow-report") \
_(15, L3_HDR_OFFSET_VALID, 0) \
_(16, L4_HDR_OFFSET_VALID, 0) \
_(17, FLOW_REPORT, "flow-report") \
- _(18, IS_DVR, "dvr")
+ _(18, IS_DVR, "dvr") \
+ _(19, QOS_DATA_VALID, 0)
#define VNET_BUFFER_FLAGS_VLAN_BITS \
(VNET_BUFFER_F_VLAN_1_DEEP | VNET_BUFFER_F_VLAN_2_DEEP)
#define VNET_BUFFER_FLAGS_VLAN_BITS \
(VNET_BUFFER_F_VLAN_1_DEEP | VNET_BUFFER_F_VLAN_2_DEEP)
@@
-84,12
+85,9
@@
enum
#define foreach_buffer_opaque_union_subtype \
_(ip) \
#define foreach_buffer_opaque_union_subtype \
_(ip) \
-_(swt) \
_(l2) \
_(l2t) \
_(l2) \
_(l2t) \
-_(gre) \
_(l2_classify) \
_(l2_classify) \
-_(handoff) \
_(policer) \
_(ipsec) \
_(map) \
_(policer) \
_(ipsec) \
_(map) \
@@
-115,7
+113,8
@@
typedef struct
i16 l2_hdr_offset;
i16 l3_hdr_offset;
i16 l4_hdr_offset;
i16 l2_hdr_offset;
i16 l3_hdr_offset;
i16 l4_hdr_offset;
- u16 dont_waste_me;
+ u8 feature_arc_index;
+ u8 dont_waste_me;
union
{
union
{
@@
-160,15
+159,24
@@
typedef struct
} icmp;
/* reassembly */
} icmp;
/* reassembly */
- struct
+ union
{
{
- u16 fragment_first;
- u16 fragment_last;
- u16 range_first;
- u16 range_last;
- u32 next_range_bi;
- u16 ip6_frag_hdr_offset;
- u16 estimated_mtu;
+ /* in/out variables */
+ struct
+ {
+ u32 next_index; /* index of next node - ignored if "feature" node */
+ u16 estimated_mtu; /* estimated MTU calculated during reassembly */
+ };
+ /* internal variables used during reassembly */
+ struct
+ {
+ u16 fragment_first;
+ u16 fragment_last;
+ u16 range_first;
+ u16 range_last;
+ u32 next_range_bi;
+ u16 ip6_frag_hdr_offset;
+ };
} reass;
};
} reass;
};
@@
-181,12
+189,16
@@
typedef struct
*/
struct
{
*/
struct
{
+ /* do not overlay w/ ip.adj_index[0,1] nor flow hash */
+ u32 pad[VLIB_N_RX_TX + 1];
u8 ttl;
u8 exp;
u8 first;
u8 ttl;
u8 exp;
u8 first;
+ /* Rewrite length */
+ u32 save_rewrite_length;
/*
/*
- * BIER - the nu
bm
er of bytes in the header.
- * the len field inthe header is not authoritative. It's the
+ * BIER - the nu
mb
er of bytes in the header.
+ * the len field in
the header is not authoritative. It's the
* value in the table that counts.
*/
struct
* value in the table that counts.
*/
struct
@@
-195,13
+207,6
@@
typedef struct
} bier;
} mpls;
} bier;
} mpls;
- /* ip4-in-ip6 softwire termination, only valid there */
- struct
- {
- u8 swt_disable;
- u32 mapping_index;
- } swt;
-
/* l2 bridging path, only valid there */
struct opaque_l2
{
/* l2 bridging path, only valid there */
struct opaque_l2
{
@@
-221,11
+226,6
@@
typedef struct
u32 session_index;
} l2t;
u32 session_index;
} l2t;
- struct
- {
- u32 src, dst;
- } gre;
-
/* L2 classify */
struct
{
/* L2 classify */
struct
{
@@
-238,12
+238,6
@@
typedef struct
u64 hash;
} l2_classify;
u64 hash;
} l2_classify;
- /* IO - worker thread handoff */
- struct
- {
- u32 next_index;
- } handoff;
-
/* vnet policer */
struct
{
/* vnet policer */
struct
{
@@
-283,7
+277,6
@@
typedef struct
struct
{
u32 pad[2]; /* do not overlay w/ ip.adj_index[0,1] */
struct
{
u32 pad[2]; /* do not overlay w/ ip.adj_index[0,1] */
- u16 header_offset;
u16 mtu;
u8 next_index;
u8 flags; //See ip_frag.h
u16 mtu;
u8 next_index;
u8 flags; //See ip_frag.h
@@
-303,13
+296,6
@@
typedef struct
u16 overlay_afi;
} lisp;
u16 overlay_afi;
} lisp;
- /* Driver rx feature */
- struct
- {
- u32 saved_next_index; /**< saved by drivers for short-cut */
- u16 buffer_advance;
- } device_input_feat;
-
/* TCP */
struct
{
/* TCP */
struct
{
@@
-333,7
+319,7
@@
typedef struct
u16 hdr_offset; /**< offset relative to ip hdr */
u16 data_offset; /**< offset relative to ip hdr */
u16 data_len; /**< data len */
u16 hdr_offset; /**< offset relative to ip hdr */
u16 data_offset; /**< offset relative to ip hdr */
u16 data_len; /**< data len */
- u8
conn_idx;
+ u8
subconn_idx; /**< index of the sub_connection being used */
u8 flags;
} sctp;
u8 flags;
} sctp;
@@
-348,7
+334,7
@@
typedef struct
} vnet_buffer_opaque_t;
/*
} vnet_buffer_opaque_t;
/*
- * The opaque field of the vlib_buffer_t is intepreted as a
+ * The opaque field of the vlib_buffer_t is inte
r
preted as a
* vnet_buffer_opaque_t. Hence it should be big enough to accommodate one.
*/
STATIC_ASSERT (sizeof (vnet_buffer_opaque_t) <=
* vnet_buffer_opaque_t. Hence it should be big enough to accommodate one.
*/
STATIC_ASSERT (sizeof (vnet_buffer_opaque_t) <=
@@
-360,23
+346,50
@@
STATIC_ASSERT (sizeof (vnet_buffer_opaque_t) <=
/* Full cache line (64 bytes) of additional space */
typedef struct
{
/* Full cache line (64 bytes) of additional space */
typedef struct
{
+ /**
+ * QoS marking data that needs to persist from the recording nodes
+ * (nominally in the ingress path) to the marking node (in the
+ * egress path)
+ */
+ struct
+ {
+ u8 bits;
+ u8 source;
+ } qos;
+
+ u8 loop_counter;
+ u8 __unused[1];
+
+ /* Group Based Policy */
+ struct
+ {
+ u8 __unused;
+ u8 flags;
+ u16 src_epg;
+ } gbp;
+
union
{
union
{
-#if VLIB_BUFFER_TRACE_TRAJECTORY > 0
- /* buffer trajectory tracing */
struct
{
struct
{
+#if VLIB_BUFFER_TRACE_TRAJECTORY > 0
+ /* buffer trajectory tracing */
u16 *trajectory_trace;
u16 *trajectory_trace;
- };
#endif
#endif
- u32 unused[12];
+ };
+ struct
+ {
+ u64 pad[1];
+ u64 pg_replay_timestamp;
+ };
+ u32 unused[10];
};
} vnet_buffer_opaque2_t;
#define vnet_buffer2(b) ((vnet_buffer_opaque2_t *) (b)->opaque2)
/*
};
} vnet_buffer_opaque2_t;
#define vnet_buffer2(b) ((vnet_buffer_opaque2_t *) (b)->opaque2)
/*
- * The opaque2 field of the vlib_buffer_t is intepreted as a
+ * The opaque2 field of the vlib_buffer_t is inte
r
preted as a
* vnet_buffer_opaque2_t. Hence it should be big enough to accommodate one.
*/
STATIC_ASSERT (sizeof (vnet_buffer_opaque2_t) <=
* vnet_buffer_opaque2_t. Hence it should be big enough to accommodate one.
*/
STATIC_ASSERT (sizeof (vnet_buffer_opaque2_t) <=