X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbuffer.h;h=37db4130514bf49f5da7f48007a9099f5ec85fb4;hb=25ab6c541062f436989b89962cdab10f21f1b4f0;hp=7065bd745d0ac51ddc0d9213d6c1dfbc74cda617;hpb=a342da22f35676114ca928c65b0219fac8009f7a;p=vpp.git diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h index 7065bd745d0..37db4130514 100644 --- a/src/vnet/buffer.h +++ b/src/vnet/buffer.h @@ -46,34 +46,34 @@ * Flags that are set in the high order bits of ((vlib_buffer*)b)->flags * */ -#define foreach_vnet_buffer_flag \ - _( 1, L4_CHECKSUM_COMPUTED, "l4-cksum-computed", 1) \ - _( 2, L4_CHECKSUM_CORRECT, "l4-cksum-correct", 1) \ - _( 3, VLAN_2_DEEP, "vlan-2-deep", 1) \ - _( 4, VLAN_1_DEEP, "vlan-1-deep", 1) \ - _( 5, SPAN_CLONE, "span-clone", 1) \ - _( 6, LOOP_COUNTER_VALID, "loop-counter-valid", 0) \ - _( 7, LOCALLY_ORIGINATED, "local", 1) \ - _( 8, IS_IP4, "ip4", 1) \ - _( 9, IS_IP6, "ip6", 1) \ - _(10, OFFLOAD_IP_CKSUM, "offload-ip-cksum", 1) \ - _(11, OFFLOAD_TCP_CKSUM, "offload-tcp-cksum", 1) \ - _(12, OFFLOAD_UDP_CKSUM, "offload-udp-cksum", 1) \ - _(13, IS_NATED, "natted", 1) \ - _(14, L2_HDR_OFFSET_VALID, "l2_hdr_offset_valid", 0) \ - _(15, L3_HDR_OFFSET_VALID, "l3_hdr_offset_valid", 0) \ - _(16, L4_HDR_OFFSET_VALID, "l4_hdr_offset_valid", 0) \ - _(17, FLOW_REPORT, "flow-report", 1) \ - _(18, IS_DVR, "dvr", 1) \ - _(19, QOS_DATA_VALID, "qos-data-valid", 0) \ - _(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) +#define foreach_vnet_buffer_flag \ + _ (1, L4_CHECKSUM_COMPUTED, "l4-cksum-computed", 1) \ + _ (2, L4_CHECKSUM_CORRECT, "l4-cksum-correct", 1) \ + _ (3, VLAN_2_DEEP, "vlan-2-deep", 1) \ + _ (4, VLAN_1_DEEP, "vlan-1-deep", 1) \ + _ (5, SPAN_CLONE, "span-clone", 1) \ + _ (6, LOOP_COUNTER_VALID, "loop-counter-valid", 0) \ + _ (7, LOCALLY_ORIGINATED, "local", 1) \ + _ (8, IS_IP4, "ip4", 1) \ + _ (9, IS_IP6, "ip6", 1) \ + _ (10, OFFLOAD, "offload", 0) \ + _ (11, IS_NATED, "natted", 1) \ + _ (12, L2_HDR_OFFSET_VALID, "l2_hdr_offset_valid", 0) \ + _ (13, L3_HDR_OFFSET_VALID, "l3_hdr_offset_valid", 0) \ + _ (14, L4_HDR_OFFSET_VALID, "l4_hdr_offset_valid", 0) \ + _ (15, FLOW_REPORT, "flow-report", 1) \ + _ (16, IS_DVR, "dvr", 1) \ + _ (17, QOS_DATA_VALID, "qos-data-valid", 0) \ + _ (18, GSO, "gso", 0) \ + _ (19, AVAIL1, "avail1", 1) \ + _ (20, AVAIL2, "avail2", 1) \ + _ (21, AVAIL3, "avail3", 1) \ + _ (22, AVAIL4, "avail4", 1) \ + _ (23, AVAIL5, "avail5", 1) \ + _ (24, AVAIL6, "avail6", 1) \ + _ (25, AVAIL7, "avail7", 1) \ + _ (26, AVAIL8, "avail8", 1) \ + _ (27, AVAIL9, "avail9", 1) /* * Please allocate the FIRST available bit, redefine @@ -81,10 +81,10 @@ * VNET_BUFFER_FLAGS_ALL_AVAIL definition. */ -#define VNET_BUFFER_FLAGS_ALL_AVAIL \ - (VNET_BUFFER_F_AVAIL1 | VNET_BUFFER_F_AVAIL2 | VNET_BUFFER_F_AVAIL3 | \ - VNET_BUFFER_F_AVAIL4 | VNET_BUFFER_F_AVAIL5 | VNET_BUFFER_F_AVAIL6 | \ - VNET_BUFFER_F_AVAIL7) +#define VNET_BUFFER_FLAGS_ALL_AVAIL \ + (VNET_BUFFER_F_AVAIL1 | VNET_BUFFER_F_AVAIL2 | VNET_BUFFER_F_AVAIL3 | \ + VNET_BUFFER_F_AVAIL4 | VNET_BUFFER_F_AVAIL5 | VNET_BUFFER_F_AVAIL6 | \ + VNET_BUFFER_F_AVAIL7 | VNET_BUFFER_F_AVAIL8 | VNET_BUFFER_F_AVAIL9) #define VNET_BUFFER_FLAGS_VLAN_BITS \ (VNET_BUFFER_F_VLAN_1_DEEP | VNET_BUFFER_F_VLAN_2_DEEP) @@ -168,7 +168,7 @@ typedef struct }; /* Rewrite length */ - u32 save_rewrite_length; + u8 save_rewrite_length; /* MFIB RPF ID */ u32 rpf_id; @@ -185,13 +185,45 @@ typedef struct /* reassembly */ union { - /* in/out variables */ + /* group input/output to simplify the code, this way + * we can handoff while keeping input variables intact */ struct { - u32 next_index; /* index of next node - ignored if "feature" node */ - u32 error_next_index; /* index of next node if error - ignored if 'feature' node */ - u16 estimated_mtu; /* estimated MTU calculated during reassembly */ - u16 owner_thread_index; + /* 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 + { + 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 */ + struct + { + u16 estimated_mtu; /* estimated MTU calculated during reassembly */ + }; + }; }; /* internal variables used during reassembly */ struct @@ -202,11 +234,9 @@ typedef struct u16 range_last; u32 next_range_bi; u16 ip6_frag_hdr_offset; - u16 owner_feature_thread_index; }; } reass; }; - } ip; /* @@ -221,8 +251,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; + u8 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 @@ -275,7 +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 */ @@ -326,7 +364,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 */ @@ -335,30 +377,39 @@ 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 { u32 flags; + u32 required_thread_index; } snat; u32 unused[6]; }; } vnet_buffer_opaque_t; +#define VNET_REWRITE_TOTAL_BYTES (VLIB_BUFFER_PRE_DATA_SIZE) + +STATIC_ASSERT (STRUCT_SIZE_OF (vnet_buffer_opaque_t, ip.save_rewrite_length) + == STRUCT_SIZE_OF (vnet_buffer_opaque_t, + ip.reass.save_rewrite_length) + && STRUCT_SIZE_OF (vnet_buffer_opaque_t, + ip.reass.save_rewrite_length) == + STRUCT_SIZE_OF (vnet_buffer_opaque_t, mpls.save_rewrite_length) + && STRUCT_SIZE_OF (vnet_buffer_opaque_t, + mpls.save_rewrite_length) == 1 + && 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. @@ -369,6 +420,21 @@ STATIC_ASSERT (sizeof (vnet_buffer_opaque_t) <= #define vnet_buffer(b) ((vnet_buffer_opaque_t *) (b)->opaque) +#define foreach_vnet_buffer_offload_flag \ + _ (0, IP_CKSUM, "offload-ip-cksum", 1) \ + _ (1, TCP_CKSUM, "offload-tcp-cksum", 1) \ + _ (2, UDP_CKSUM, "offload-udp-cksum", 1) \ + _ (3, OUTER_IP_CKSUM, "offload-outer-ip-cksum", 1) \ + _ (4, OUTER_TCP_CKSUM, "offload-outer-tcp-cksum", 1) \ + _ (5, OUTER_UDP_CKSUM, "offload-outer-udp-cksum", 1) + +enum +{ +#define _(bit, name, s, v) VNET_BUFFER_OFFLOAD_F_##name = (1 << bit), + foreach_vnet_buffer_offload_flag +#undef _ +}; + /* Full cache line (64 bytes) of additional space */ typedef struct { @@ -401,12 +467,22 @@ typedef struct * 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; + struct + { + u16 gso_size; + /* size of L4 prototol header */ + u16 gso_l4_hdr_sz; + + /* offload flags */ + u32 oflags; + }; - /* 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 { @@ -436,10 +512,41 @@ 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) +#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; +format_function_t format_vnet_buffer_offload; +format_function_t format_vnet_buffer_flags; +format_function_t format_vnet_buffer_opaque; +format_function_t format_vnet_buffer_opaque2; + +static_always_inline void +vnet_buffer_offload_flags_set (vlib_buffer_t *b, u32 oflags) +{ + if (b->flags & VNET_BUFFER_F_OFFLOAD) + { + /* add a flag to existing offload */ + vnet_buffer2 (b)->oflags |= oflags; + } + else + { + /* no offload yet: reset offload flags to new value */ + vnet_buffer2 (b)->oflags = oflags; + b->flags |= VNET_BUFFER_F_OFFLOAD; + } +} + +static_always_inline void +vnet_buffer_offload_flags_clear (vlib_buffer_t *b, u32 oflags) +{ + vnet_buffer2 (b)->oflags &= ~oflags; + if (0 == vnet_buffer2 (b)->oflags) + b->flags &= ~VNET_BUFFER_F_OFFLOAD; +} #endif /* included_vnet_buffer_h */