unified packet type
Subsystems (2)
PATCH v4 8/18 vmxnet3: support of unified packet type
In reply to a message not in the archiveTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c +2 -2
@@ -650,9 +650,9 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)struct ipv4_hdr *ip = (struct ipv4_hdr *)(eth +1 );if (((ip->version_ihl &0xf ) <<2 ) > (int )sizeof (struct ipv4_hdr )) - rxm->ol_flags |=PKT_RX_IPV4_HDR_EXT ; + rxm->packet_type =RTE_PTYPE_L3_IPV4_EXT ;else - rxm->ol_flags |=PKT_RX_IPV4_HDR ; + rxm->packet_type =RTE_PTYPE_L3_IPV4 ;if (!rcd->cnc) {if (!rcd->ipc)
Signature · 1 line
1.9.3
PATCH v4 9/18 fm10k: support of unified packet type
In reply to a message not in the archiveTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- lib/librte_pmd_fm10k/fm10k_rxtx.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)
v4 changes:
* Supported unified packet type of fm10k from v4.
lib/librte_pmd_fm10k/fm10k_rxtx.c +21 -9
@@ -65,13 +65,29 @@ static inline void dump_rxd(union fm10k_rx_desc *rxd)static inline void rx_desc_to_ol_flags (struct rte_mbuf *m,const union fm10k_rx_desc *d) { -uint16_t ptype; -static const uint16_t pt_lut[] = {0 , -PKT_RX_IPV4_HDR ,PKT_RX_IPV4_HDR_EXT , -PKT_RX_IPV6_HDR ,PKT_RX_IPV6_HDR_EXT , -0 ,0 ,0 +static const uint32_t + ptype_table[FM10K_RXD_PKTTYPE_MASK >>FM10K_RXD_PKTTYPE_SHIFT ] + __rte_cache_aligned = { + [FM10K_PKTTYPE_OTHER ] =RTE_PTYPE_L2_MAC , + [FM10K_PKTTYPE_IPV4 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4 , + [FM10K_PKTTYPE_IPV4_EX ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [FM10K_PKTTYPE_IPV6 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6 , + [FM10K_PKTTYPE_IPV6_EX ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , }; + m->packet_type = ptype_table[(d->w.pkt_info &FM10K_RXD_PKTTYPE_MASK ) + >>FM10K_RXD_PKTTYPE_SHIFT ]; +if (d->w.pkt_info &FM10K_RXD_RSSTYPE_MASK ) m->ol_flags |=PKT_RX_RSS_HASH ;
@@ -93,10 +109,6 @@ rx_desc_to_ol_flags(struct rte_mbuf *m, const union fm10k_rx_desc *d)if (unlikely (d->d.staterr &FM10K_RXD_STATUS_RXE )) m->ol_flags |=PKT_RX_RECIP_ERR ; - - ptype = (d->d.data &FM10K_RXD_PKTTYPE_MASK_L3 ) >> -FM10K_RXD_PKTTYPE_SHIFT ; - m->ol_flags |= pt_lut[(uint8_t )ptype]; }uint16_t
Signature · 1 line
1.9.3
PATCH v4 10/18 app/test-pipeline: support of unified packet type
In reply to a message not in the archiveTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- app/test-pipeline/pipeline_hash.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
app/test-pipeline/pipeline_hash.c +4 -3
@@ -459,20 +459,21 @@ app_main_loop_rx_metadata(void) { signature =RTE_MBUF_METADATA_UINT32_PTR (m,0 ); key =RTE_MBUF_METADATA_UINT8_PTR (m,32 ); -if (m->ol_flags &PKT_RX_IPV4_HDR ) { +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { ip_hdr = (struct ipv4_hdr *) &m_data[sizeof (struct ether_hdr )]; ip_dst = ip_hdr->dst_addr; k32 = (uint32_t *) key; k32[0 ] = ip_dst &0xFFFFFF00 ; - }else { + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { ipv6_hdr = (struct ipv6_hdr *) &m_data[sizeof (struct ether_hdr )]; ipv6_dst = ipv6_hdr->dst_addr;memcpy (key, ipv6_dst,16 ); - } + }else +continue ; *signature =test_hash (key,0 ,0 ); }
Signature · 1 line
1.9.3
PATCH v4 11/18 app/testpmd: support of unified packet type
In reply to a message not in the archiveTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- app/test-pmd/csumonly.c | 10 +-- app/test-pmd/rxonly.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 177 insertions(+), 11 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v4 changes:
* Added printing logs of packet types of each received packet in rxonly mode.
app/test-pmd/csumonly.c +5 -5
@@ -203,8 +203,9 @@ parse_ethernet(struct ether_hdr *eth_hdr, struct testpmd_offload_info *info)/* Parse a vxlan header */ static void -parse_vxlan (struct udp_hdr *udp_hdr,struct testpmd_offload_info *info, -uint64_t mbuf_olflags) +parse_vxlan (struct udp_hdr *udp_hdr, +struct testpmd_offload_info *info, +uint32_t pkt_type) {struct ether_hdr *eth_hdr;
@@ -212,8 +213,7 @@ parse_vxlan(struct udp_hdr *udp_hdr, struct testpmd_offload_info *info,* (rfc7348) or that the rx offload flag is set (i40e only * currently) */ if (udp_hdr->dst_port !=_htons (4789 ) && - (mbuf_olflags & (PKT_RX_TUNNEL_IPV4_HDR | -PKT_RX_TUNNEL_IPV6_HDR )) ==0 ) +RTE_ETH_IS_TUNNEL_PKT (pkt_type) ==0 )return ; info->is_tunnel =1 ;
@@ -550,7 +550,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)struct udp_hdr *udp_hdr; udp_hdr = (struct udp_hdr *)((char *)l3_hdr + info.l3_len); -parse_vxlan (udp_hdr, &info, m->ol_flags); +parse_vxlan (udp_hdr, &info, m->packet_type); }else if (info.l4_proto ==IPPROTO_GRE ) {struct simple_gre_hdr *gre_hdr; gre_hdr = (struct simple_gre_hdr *)
app/test-pmd/rxonly.c +172 -6
202 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v4 12/18 app/test: Remove useless code
In reply to a message not in the archiveSeverl useless code lines are added accidenly, which blocks packet type unification. They should be deleted at all.
--- app/test/packet_burst_generator.c | 10 ---------- 1 file changed, 10 deletions(-)
v4 changes:
* Removed several useless code lines which block packet type unification.
app/test/packet_burst_generator.c +0 -10
@@ -272,19 +272,9 @@ nomore_mbuf:if (ipv4) { pkt->vlan_tci = ETHER_TYPE_IPv4; pkt->l3_len =sizeof (struct ipv4_hdr ); - -if (vlan_enabled) - pkt->ol_flags =PKT_RX_IPV4_HDR |PKT_RX_VLAN_PKT ; -else - pkt->ol_flags =PKT_RX_IPV4_HDR ; }else { pkt->vlan_tci = ETHER_TYPE_IPv6; pkt->l3_len =sizeof (struct ipv6_hdr ); - -if (vlan_enabled) - pkt->ol_flags =PKT_RX_IPV6_HDR |PKT_RX_VLAN_PKT ; -else - pkt->ol_flags =PKT_RX_IPV6_HDR ; } pkts_burst[nb_pkt] = pkt;
Signature · 1 line
1.9.3
A message that is not in the archive (sent off-list or not yet received): 1425042696-23162-13-git-send-email-helin.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
Gajdzica, MaciejX T
Acked-byRe: [PATCH v4 12/18] app/test: Remove useless code
Quoted 37 lines
Severl useless code lines are added accidenly, which blocks packet type unification. They should be deleted at all.
Signed-off-by Helin Zhang <[email protected]>--- app/test/packet_burst_generator.c | 10 ---------- 1 file changed, 10 deletions(-)v4 changes:
* Removed several useless code lines which block packet type unification.app/test/packet_burst_generator.c +0
-10@@ -272,19 +272,9 @@ nomore_mbuf:if (ipv4) { pkt->vlan_tci = ETHER_TYPE_IPv4; pkt->l3_len =sizeof (struct ipv4_hdr ); - -if (vlan_enabled) - pkt->ol_flags =PKT_RX_IPV4_HDR |PKT_RX_VLAN_PKT ; -else - pkt->ol_flags =PKT_RX_IPV4_HDR ; }else { pkt->vlan_tci = ETHER_TYPE_IPv6; pkt->l3_len =sizeof (struct ipv6_hdr ); - -if (vlan_enabled) - pkt->ol_flags =PKT_RX_IPV6_HDR |PKT_RX_VLAN_PKT ; -else - pkt->ol_flags =PKT_RX_IPV6_HDR ; }
Quoted 3 lines
pkts_burst[nb_pkt] = pkt;
--
1.9.3
PATCH v4 13/18 examples/ip_fragmentation: support of unified packet type
In reply to a message not in the archiveTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- examples/ip_fragmentation/main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
examples/ip_fragmentation/main.c +3 -4
@@ -286,7 +286,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, len = qconf->tx_mbufs[port_out].len;/* if this is an IPv4 packet */ -if (m->ol_flags &PKT_RX_IPV4_HDR ) { +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) {struct ipv4_hdr *ip_hdr;uint32_t ip_dst;/* Read the lookup key (i.e. ip_dst) from the input packet */
@@ -320,9 +320,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,if (unlikely (len2 <0 ))return ; } - } -/* if this is an IPv6 packet */ -else if (m->ol_flags &PKT_RX_IPV6_HDR ) { + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if this is an IPv6 packet */ struct ipv6_hdr *ip_hdr; ipv6 =1 ;
Signature · 1 line
1.9.3
PATCH v4 14/18 examples/ip_reassembly: support of unified packet type
In reply to a message not in the archiveTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- examples/ip_reassembly/main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
examples/ip_reassembly/main.c +3 -4
@@ -357,7 +357,7 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, dst_port = portid;/* if packet is IPv4 */ -if (m->ol_flags & (PKT_RX_IPV4_HDR )) { +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) {struct ipv4_hdr *ip_hdr;uint32_t ip_dst;
@@ -397,9 +397,8 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, } eth_hdr->ether_type =rte_be_to_cpu_16 (ETHER_TYPE_IPv4); - } -/* if packet is IPv6 */ -else if (m->ol_flags & (PKT_RX_IPV6_HDR |PKT_RX_IPV6_HDR_EXT )) { + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if packet is IPv6 */ struct ipv6_extension_fragment *frag_hdr;struct ipv6_hdr *ip_hdr;
Signature · 1 line
1.9.3
PATCH v4 15/18 examples/l3fwd-acl: support of unified packet type
In reply to a message not in the archiveTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- examples/l3fwd-acl/main.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
examples/l3fwd-acl/main.c +6 -13
@@ -648,9 +648,7 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,struct ipv4_hdr *ipv4_hdr;struct rte_mbuf *pkt = pkts_in[index]; -int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR ); - -if (type ==PKT_RX_IPV4_HDR ) { +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, unsigned char *) + sizeof(struct ether_hdr));
@@ -671,8 +669,7 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,rte_pktmbuf_free (pkt); } - }else if (type ==PKT_RX_IPV6_HDR ) { - + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) {/* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -690,17 +687,13 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl, {struct rte_mbuf *pkt = pkts_in[index]; -int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR ); - -if (type ==PKT_RX_IPV4_HDR ) { - +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) {/* Fill acl structure */ acl->data_ipv4[acl->num_ipv4] =MBUF_IPV4_2PROTO (pkt); acl->m_ipv4[(acl->num_ipv4)++] = pkt; - }else if (type ==PKT_RX_IPV6_HDR ) { - + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) {/* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -748,9 +741,9 @@ send_one_packet(struct rte_mbuf *m, uint32_t res)/* in the ACL list, drop it */ #ifdef L3FWDACL_DEBUG if ((res &ACL_DENY_SIGNATURE ) !=0 ) { -if (m->ol_flags &PKT_RX_IPV4_HDR ) +if (RTE_ETH_IS_IPV4_HDR (m->packet_type))dump_acl4_rule (m, res); -else +else if (RTE_ETH_IS_IPV6_HDR (m->packet_type))dump_acl6_rule (m, res); }#endif
Signature · 1 line
1.9.3
PATCH v4 16/18 examples/l3fwd-power: support of unified packet type
In reply to a message not in the archiveTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- examples/l3fwd-power/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
examples/l3fwd-power/main.c +2 -3
@@ -638,7 +638,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); -if (m->ol_flags &PKT_RX_IPV4_HDR ) { +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) {/* Handle IPv4 headers.*/ ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char*)
@@ -673,8 +673,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid,ether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); - } -else { + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) {/* Handle IPv6 headers.*/ #if (APP_LOOKUP_METHOD ==APP_LOOKUP_EXACT_MATCH )struct ipv6_hdr *ipv6_hdr;
Signature · 1 line
1.9.3
PATCH v4 17/18 examples/l3fwd: support of unified packet type
In reply to a message not in the archiveTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- examples/l3fwd/main.c | 71 +++++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 31 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v3 changes:
* Minor bug fixes and enhancements.
examples/l3fwd/main.c +40 -31
@@ -958,7 +958,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); -if (m->ol_flags &PKT_RX_IPV4_HDR ) { +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) {/* Handle IPv4 headers.*/ ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char *) +sizeof (struct ether_hdr ));
@@ -993,7 +993,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconsend_single_packet (m, dst_port); - }else { + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) {/* Handle IPv6 headers.*/ struct ipv6_hdr *ipv6_hdr;
@@ -1014,8 +1014,9 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); - } - + }else +/* Free the mbuf that contains non-IPV4/IPV6 packet */ +rte_pktmbuf_free (m); }#ifdef DO_RFC_1812_CHECKS
@@ -1039,11 +1040,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon* to BAD_PORT value. */ static inline __attribute__((always_inline))void -rfc1812_process (struct ipv4_hdr *ipv4_hdr,uint16_t *dp,uint32_t flags) +rfc1812_process (struct ipv4_hdr *ipv4_hdr,uint16_t *dp,uint32_t ptype) {uint8_t ihl; -if ((flags &PKT_RX_IPV4_HDR ) !=0 ) { +if (RTE_ETH_IS_IPV4_HDR (ptype)) { ihl = ipv4_hdr->version_ihl -IPV4_MIN_VER_IHL ;
@@ -1074,11 +1075,11 @@ get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,struct ipv6_hdr *ipv6_hdr;struct ether_hdr *eth_hdr; -if (pkt->ol_flags &PKT_RX_IPV4_HDR ) { +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) {if (rte_lpm_lookup (qconf->ipv4_lookup_struct, dst_ipv4, &next_hop) !=0 ) next_hop = portid; - }else if (pkt->ol_flags &PKT_RX_IPV6_HDR ) { + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *); ipv6_hdr = (struct ipv6_hdr *)(eth_hdr +1 ); if (rte_lpm6_lookup(qconf->ipv6_lookup_struct,
@@ -1112,17 +1113,19 @@ process_packet(struct lcore_conf *qconf, struct rte_mbuf *pkt, ve = val_eth[dp]; dst_port[0 ] = dp; -rfc1812_process (ipv4_hdr, dst_port, pkt->ol_flags); +rfc1812_process (ipv4_hdr, dst_port, pkt->packet_type); te =_mm_blend_epi16 (te, ve,MASK_ETH );_mm_store_si128 ((__m128i *)eth_hdr, te); }/* -* Read ol_flags and destination IPV4 addresses from 4 mbufs. +* Read packet_type and destination IPV4 addresses from 4 mbufs. */ static inline void -processx4_step1 (struct rte_mbuf *pkt[FWDSTEP ],__m128i *dip,uint32_t *flag) +processx4_step1 (struct rte_mbuf *pkt[FWDSTEP ], +__m128i *dip, +uint32_t *ipv4_flag) {struct ipv4_hdr *ipv4_hdr;struct ether_hdr *eth_hdr;
@@ -1131,22 +1134,22 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag) eth_hdr = rte_pktmbuf_mtod(pkt[0], struct ether_hdr *); ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); x0 = ipv4_hdr->dst_addr; - flag[0 ] = pkt[0 ]->ol_flags &PKT_RX_IPV4_HDR ; + ipv4_flag[0 ] = pkt[0 ]->packet_type &RTE_PTYPE_L3_IPV4 ; eth_hdr = rte_pktmbuf_mtod(pkt[1], struct ether_hdr *); ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); x1 = ipv4_hdr->dst_addr; - flag[0 ] &= pkt[1 ]->ol_flags; + ipv4_flag[0 ] &= pkt[1 ]->packet_type; eth_hdr = rte_pktmbuf_mtod(pkt[2], struct ether_hdr *); ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); x2 = ipv4_hdr->dst_addr; - flag[0 ] &= pkt[2 ]->ol_flags; + ipv4_flag[0 ] &= pkt[2 ]->packet_type; eth_hdr = rte_pktmbuf_mtod(pkt[3], struct ether_hdr *); ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); x3 = ipv4_hdr->dst_addr; - flag[0 ] &= pkt[3 ]->ol_flags; + ipv4_flag[0 ] &= pkt[3 ]->packet_type; dip[0 ] =_mm_set_epi32 (x3, x2, x1, x0); }
@@ -1156,8 +1159,12 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag)* If lookup fails, use incoming port (portid) as destination port. */ static inline void -processx4_step2 (const struct lcore_conf *qconf,__m128i dip,uint32_t flag, -uint8_t portid,struct rte_mbuf *pkt[FWDSTEP ],uint16_t dprt[FWDSTEP ]) +processx4_step2 (const struct lcore_conf *qconf, +__m128i dip, +uint32_t ipv4_flag, +uint8_t portid, +struct rte_mbuf *pkt[FWDSTEP ], +uint16_t dprt[FWDSTEP ]) {rte_xmm_t dst; const __m128i bswap_mask = _mm_set_epi8(12, 13, 14, 15, 8, 9, 10, 11,
@@ -1167,7 +1174,7 @@ processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t flag, dip =_mm_shuffle_epi8 (dip, bswap_mask);/* if all 4 packets are IPV4. */ -if (likely (flag !=0 )) { +if (likely (ipv4_flag)) {rte_lpm_lookupx4 (qconf->ipv4_lookup_struct, dip, dprt, portid); }else { dst.x = dip;
@@ -1218,13 +1225,13 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])_mm_store_si128 (p[3 ], te[3 ]);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[0 ] +1 ), - &dst_port[0 ], pkt[0 ]->ol_flags); + &dst_port[0 ], pkt[0 ]->packet_type);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[1 ] +1 ), - &dst_port[1 ], pkt[1 ]->ol_flags); + &dst_port[1 ], pkt[1 ]->packet_type);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[2 ] +1 ), - &dst_port[2 ], pkt[2 ]->ol_flags); + &dst_port[2 ], pkt[2 ]->packet_type);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[3 ] +1 ), - &dst_port[3 ], pkt[3 ]->ol_flags); + &dst_port[3 ], pkt[3 ]->packet_type); }/*
@@ -1411,7 +1418,7 @@ main_loop(__attribute__((unused)) void *dummy)uint16_t *lp;uint16_t dst_port[MAX_PKT_BURST ];__m128i dip[MAX_PKT_BURST /FWDSTEP ]; -uint32_t flag[MAX_PKT_BURST /FWDSTEP ]; +uint32_t ipv4_flag[MAX_PKT_BURST /FWDSTEP ];uint16_t pnum[MAX_PKT_BURST +1 ];#endif
@@ -1481,14 +1488,16 @@ main_loop(__attribute__((unused)) void *dummy)*/ int32_t n =RTE_ALIGN_FLOOR (nb_rx,4 );for (j =0 ; j < n ; j+=4 ) { -uint32_t ol_flag = pkts_burst[j]->ol_flags - & pkts_burst[j+1 ]->ol_flags - & pkts_burst[j+2 ]->ol_flags - & pkts_burst[j+3 ]->ol_flags; -if (ol_flag &PKT_RX_IPV4_HDR ) { +uint32_t pkt_type = + pkts_burst[j]->packet_type & + pkts_burst[j+1 ]->packet_type & + pkts_burst[j+2 ]->packet_type & + pkts_burst[j+3 ]->packet_type; +if (pkt_type &RTE_PTYPE_L3_IPV4 ) {simple_ipv4_fwd_4pkts (&pkts_burst[j], portid, qconf); - }else if (ol_flag &PKT_RX_IPV6_HDR ) { + }else if (pkt_type & +RTE_PTYPE_L3_IPV6 ) {simple_ipv6_fwd_4pkts (&pkts_burst[j], portid, qconf); }else {
@@ -1513,13 +1522,13 @@ main_loop(__attribute__((unused)) void *dummy)for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step1 (&pkts_burst[j], &dip[j /FWDSTEP ], - &flag[j /FWDSTEP ]); + &ipv4_flag[j /FWDSTEP ]); } k =RTE_ALIGN_FLOOR (nb_rx,FWDSTEP );for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step2 (qconf, dip[j /FWDSTEP ], - flag[j /FWDSTEP ], portid, + ipv4_flag[j /FWDSTEP ], portid, &pkts_burst[j], &dst_port[j]); }
Signature · 1 line
1.9.3
PATCH v4 18/18 mbuf: remove old packet type bit masks
In reply to a message not in the archiveAs unified packet types are used instead, those old bit masks and the relevant macros for packet type indication need to be removed.
--- lib/librte_mbuf/rte_mbuf.c | 6 ------ lib/librte_mbuf/rte_mbuf.h | 14 ++++---------- 2 files changed, 4 insertions(+), 16 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
* Redefined the bit masks for packet RX offload flags.
lib/librte_mbuf/rte_mbuf.c +0 -6
@@ -213,14 +213,8 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask)/* case PKT_RX_HBUF_OVERFLOW: return "PKT_RX_HBUF_OVERFLOW"; */ /* case PKT_RX_RECIP_ERR: return "PKT_RX_RECIP_ERR"; */ /* case PKT_RX_MAC_ERR: return "PKT_RX_MAC_ERR"; */ -case PKT_RX_IPV4_HDR :return "PKT_RX_IPV4_HDR" ; -case PKT_RX_IPV4_HDR_EXT :return "PKT_RX_IPV4_HDR_EXT" ; -case PKT_RX_IPV6_HDR :return "PKT_RX_IPV6_HDR" ; -case PKT_RX_IPV6_HDR_EXT :return "PKT_RX_IPV6_HDR_EXT" ;case PKT_RX_IEEE1588_PTP :return "PKT_RX_IEEE1588_PTP" ;case PKT_RX_IEEE1588_TMST :return "PKT_RX_IEEE1588_TMST" ; -case PKT_RX_TUNNEL_IPV4_HDR :return "PKT_RX_TUNNEL_IPV4_HDR" ; -case PKT_RX_TUNNEL_IPV6_HDR :return "PKT_RX_TUNNEL_IPV6_HDR" ;default :return NULL ; } }
lib/librte_mbuf/rte_mbuf.h +4 -10
@@ -90,16 +90,10 @@ extern "C" {#define PKT_RX_HBUF_OVERFLOW (0ULL << 0)/**< Header buffer overflow. */ #define PKT_RX_RECIP_ERR (0ULL << 0)/**< Hardware processing error. */ #define PKT_RX_MAC_ERR (0ULL << 0)/**< MAC error. */ -#define PKT_RX_IPV4_HDR (1ULL << 5)/**< RX packet with IPv4 header. */ -#define PKT_RX_IPV4_HDR_EXT (1ULL << 6)/**< RX packet with extended IPv4 header. */ -#define PKT_RX_IPV6_HDR (1ULL << 7)/**< RX packet with IPv6 header. */ -#define PKT_RX_IPV6_HDR_EXT (1ULL << 8)/**< RX packet with extended IPv6 header. */ -#define PKT_RX_IEEE1588_PTP (1ULL << 9)/**< RX IEEE1588 L2 Ethernet PT Packet. */ -#define PKT_RX_IEEE1588_TMST (1ULL << 10)/**< RX IEEE1588 L2/L4 timestamped packet.*/ -#define PKT_RX_TUNNEL_IPV4_HDR (1ULL << 11)/**< RX tunnel packet with IPv4 header.*/ -#define PKT_RX_TUNNEL_IPV6_HDR (1ULL << 12)/**< RX tunnel packet with IPv6 header. */ -#define PKT_RX_FDIR_ID (1ULL << 13)/**< FD id reported if FDIR match. */ -#define PKT_RX_FDIR_FLX (1ULL << 14)/**< Flexible bytes reported if FDIR match. */ +#define PKT_RX_IEEE1588_PTP (1ULL << 5)/**< RX IEEE1588 L2 Ethernet PT Packet. */ +#define PKT_RX_IEEE1588_TMST (1ULL << 6)/**< RX IEEE1588 L2/L4 timestamped packet.*/ +#define PKT_RX_FDIR_ID (1ULL << 7)/**< FD id reported if FDIR match. */ +#define PKT_RX_FDIR_FLX (1ULL << 8)/**< Flexible bytes reported if FDIR match. */ /* add new RX flags here */ /* add new TX flags here */
Signature · 1 line
1.9.3
v5 cover unified packet type
In reply to Helin ZhangCurrently only 6 bits which are stored in ol_flags are used to indicate the packet types. This is not enough, as some NIC hardware can recognize quite a lot of packet types, e.g i40e hardware can recognize more than 150 packet types. Hiding those packet types hides hardware offload capabilities which could be quite useful for improving performance and for end users. So an unified packet types are needed to support all possible PMDs. A 16 bits packet_type in mbuf structure can be changed to 32 bits and used for this purpose. In addition, all packet types stored in ol_flag field should be deleted at all, and 6 bits of ol_flags can be save as the benifit.
Initially, 32 bits of packet_type can be divided into several sub fields to indicate different packet type information of a packet. The initial design is to divide those bits into fields for L2 types, L3 types, L4 types, tunnel types, inner L2 types, inner L3 types and inner L4 types. All PMDs should translate the offloaded packet types into these 7 fields of information, for user applications.
v2 changes:
* Enlarged the packet_type field from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes.
* Used redefined packet types and enlarged packet_type field for all PMDs and corresponding applications.
* Removed changes in bond and its relevant application, as there is no need at all according to the recent bond changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Put vector ixgbe changes right after mbuf changes.
* Disabled vector ixgbe PMD by default, as mbuf layout changed, and then re-enabled it after vector ixgbe PMD updated.
* Put the definitions of unified packet type into a single patch.
* Minor bug fixes and enhancements in l3fwd example.
v4 changes:
* Added detailed description of each packet types.
* Supported unified packet type of fm10k.
* Added printing logs of packet types of each received packet for rxonly mode in testpmd.
* Removed several useless code lines which block packet type unification from app/test/packet_burst_generator.c.
v5 changes:
* Added more detailed description for each packet types, together with examples.
* Rolled back the macro definitions of RX packet flags, for ABI compitability.
Helin Zhang (18):
mbuf: redefine packet_type in rte_mbuf
ixgbe: support unified packet type in vectorized PMD
mbuf: add definitions of unified packet types
e1000: replace bit mask based packet type with unified packet type
ixgbe: replace bit mask based packet type with unified packet type
i40e: replace bit mask based packet type with unified packet type
enic: replace bit mask based packet type with unified packet type
vmxnet3: replace bit mask based packet type with unified packet type
fm10k: replace bit mask based packet type with unified packet type app/test-pipeline: replace bit mask based packet type with unified
packet type
app/testpmd: replace bit mask based packet type with unified packet
type
app/test: Remove useless code
examples/ip_fragmentation: replace bit mask based packet type with
unified packet type
examples/ip_reassembly: replace bit mask based packet type with
unified packet type
examples/l3fwd-acl: replace bit mask based packet type with unified
packet type
examples/l3fwd-power: replace bit mask based packet type with unified
packet type
examples/l3fwd: replace bit mask based packet type with unified packet
type
mbuf: remove old packet type bit masks
app/test-pipeline/pipeline_hash.c | 7 +- app/test-pmd/csumonly.c | 10 +- app/test-pmd/rxonly.c | 178 ++++- app/test/packet_burst_generator.c | 10 - examples/ip_fragmentation/main.c | 7 +- examples/ip_reassembly/main.c | 7 +- examples/l3fwd-acl/main.c | 19 +- examples/l3fwd-power/main.c | 5 +- examples/l3fwd/main.c | 71 +- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 4 +- lib/librte_mbuf/rte_mbuf.c | 6 - lib/librte_mbuf/rte_mbuf.h | 514 +++++++++++++- lib/librte_pmd_e1000/igb_rxtx.c | 98 ++- lib/librte_pmd_enic/enic_main.c | 14 +- lib/librte_pmd_fm10k/fm10k_rxtx.c | 30 +- lib/librte_pmd_i40e/i40e_rxtx.c | 786 ++++++++++++++------- lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 139 +++- lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c | 49 +- lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c | 4 +- 19 files changed, 1498 insertions(+), 460 deletions(-)
Signature · 1 line
1.9.3
PATCH v5 1/18 mbuf: redefine packet_type in rte_mbuf
In order to unify the packet type, the field of 'packet_type' in 'struct rte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'struct rte_mbuf' are re-organized to support this change for Vector PMD. As 'struct rte_kni_mbuf' for KNI should be right mapped to 'struct rte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'struct rte_mbuf' changed.
--- config/common_linuxapp | 2 +- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 4 ++-- lib/librte_mbuf/rte_mbuf.h | 23 +++++++++++++++------- 3 files changed, 19 insertions(+), 10 deletions(-)
v2 changes:
* Enlarged the packet_type field from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Disabled vector ixgbe PMD by default, as mbuf layout changed.
v5 changes:
* Re-worded the commit logs.
config/common_linuxapp +1 -1
@@ -167,7 +167,7 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_IXGBE_INC_VECTOR=y +CONFIG_RTE_IXGBE_INC_VECTOR=n CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y #
lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +2 -2
@@ -117,9 +117,9 @@ struct rte_kni_mbuf {uint16_t data_off;/**< Start address of data in segment buffer. */ char pad1[4 ];uint64_t ol_flags;/**< Offload features. */ -char pad2[2 ]; -uint16_t data_len;/**< Amount of data in segment buffer. */ +char pad2[4 ];uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ /* fields on second cache line */ char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_SIZE)));
lib/librte_mbuf/rte_mbuf.h +16 -7
@@ -269,17 +269,26 @@ struct rte_mbuf {/* remaining bytes are set on RX when pulling packet from descriptor */ MARKER rx_descriptor_fields1; -/** -* The packet type, which is used to indicate ordinary packet and also -* tunneled packet format, i.e. each number is represented a type of -* packet. +/* +* The packet type, which is the combination of outer/inner L2, L3, L4 +* and tunnel types. */ -uint16_t packet_type; +union { +uint32_t packet_type;/**< L2/L3/L4 and tunnel information. */ +struct { +uint32_t l2_type:4 ;/**< (Outer) L2 type. */ +uint32_t l3_type:4 ;/**< (Outer) L3 type. */ +uint32_t l4_type:4 ;/**< (Outer) L4 type. */ +uint32_t tun_type:4 ;/**< Tunnel type. */ +uint32_t inner_l2_type:4 ;/**< Inner L2 type. */ +uint32_t inner_l3_type:4 ;/**< Inner L3 type. */ +uint32_t inner_l4_type:4 ;/**< Inner L4 type. */ + }; + }; -uint16_t data_len;/**< Amount of data in segment buffer. */ uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ -uint16_t reserved;union {uint32_t rss;/**< RSS hash result if RSS enabled */ struct {
Signature · 1 line
1.9.3
Re: [PATCH v5 01/18] mbuf: redefine packet_type in rte_mbuf
Quoted 85 lines · Helin Zhang
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.Signed-off-by Helin Zhang <[email protected]>Signed-off-by Cunming Liang <[email protected]>--- config/common_linuxapp | 2 +- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 4 ++-- lib/librte_mbuf/rte_mbuf.h | 23 +++++++++++++++------- 3 files changed, 19 insertions(+), 10 deletions(-)v2 changes:
* Enlarged thepacket_typefield from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'structrte_kni_mbuf' for KNI according to the mbuf changes.v3 changes:
* Put the mbuf layout changes into a single patch.
* Disabled vector ixgbe PMD by default, as mbuf layout changed.v5 changes:
* Re-worded the commit logs.config/common_linuxapp +1
-1@@ -167,7 +167,7 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_IXGBE_INC_VECTOR=y +CONFIG_RTE_IXGBE_INC_VECTOR=n CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y #lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +2
-2@@ -117,9 +117,9 @@ struct rte_kni_mbuf {uint16_t data_off;/**< Start address of data in segment buffer. */ char pad1[4 ];uint64_t ol_flags;/**< Offload features. */ -char pad2[2 ]; -uint16_t data_len;/**< Amount of data in segment buffer. */ +char pad2[4 ];uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ /* fields on second cache line */ char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_SIZE)));lib/librte_mbuf/rte_mbuf.h +14
-5@@ -269,17 +269,26 @@ struct rte_mbuf {/* remaining bytes are set on RX when pulling packet from descriptor */ MARKER rx_descriptor_fields1; -/** -* The packet type, which is used to indicate ordinary packet and also -* tunneled packet format, i.e. each number is represented a type of -* packet. +/* +* The packet type, which is the combination of outer/inner L2, L3, L4 +* and tunnel types. */ -uint16_t packet_type; +union { +uint32_t packet_type;/**< L2/L3/L4 and tunnel information. */ +struct { +uint32_t l2_type:4 ;/**< (Outer) L2 type. */ +uint32_t l3_type:4 ;/**< (Outer) L3 type. */ +uint32_t l4_type:4 ;/**< (Outer) L4 type. */ +uint32_t tun_type:4 ;/**< Tunnel type. */ +uint32_t inner_l2_type:4 ;/**< Inner L2 type. */ +uint32_t inner_l3_type:4 ;/**< Inner L3 type. */ +uint32_t inner_l4_type:4 ;/**< Inner L4 type. */ + };
lib/librte_mbuf/rte_mbuf.h struct rte_mbuf { · line 294
Quoted 10 lines
lib/librte_mbuf/rte_mbuf.h +2
-2+ }; -uint16_t data_len;/**< Amount of data in segment buffer. */ uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ -uint16_t reserved;union {uint32_t rss;/**< RSS hash result if RSS enabled */ struct {
ABI Compatibility process?
Neil
PATCH v5 2/18 ixgbe: support unified packet type in vectorized PMD
In reply to Helin ZhangTo unify the packet type, bit masks of packet type for ol_flags are replaced. In addition, more packet types (UDP, TCP and SCTP) are supported in vectorized ixgbe PMD.
Note that around 2% performance drop (64B) was observed of doing 4 ports (1 port per 82599 card) IO forwarding on the same SNB core.
--- config/common_linuxapp | 2 +- lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c | 49 +++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 24 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v3 changes:
* Put vector ixgbe changes right after mbuf changes.
* Enabled vector ixgbe PMD by default together with changes for updated vector PMD.
v5 changes:
* Re-worded the commit logs.
config/common_linuxapp +1 -1
@@ -167,7 +167,7 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_IXGBE_INC_VECTOR=n +CONFIG_RTE_IXGBE_INC_VECTOR=y CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y #
lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c +26 -23
114 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v5 3/18 mbuf: add definitions of unified packet types
In reply to Helin ZhangAs there are only 6 bit flags in ol_flags for indicating packet types, which is not enough to describe all the possible packet types hardware can recognize. For example, i40e hardware can recognize more than 150 packet types. Unified packet type is composed of L2 type, L3 type, L4 type, tunnel type, inner L2 type, inner L3 type and inner L4 type fields, and can be stored in 'struct rte_mbuf' of 32 bits field 'packet_type'.
--- lib/librte_mbuf/rte_mbuf.h | 485 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 485 insertions(+)
v3 changes:
* Put the definitions of unified packet type into a single patch.
v4 changes:
* Added detailed description of each packet types.
v5 changes:
* Re-worded the commit logs.
* Added more detailed description for all packet types, together with examples.
lib/librte_mbuf/rte_mbuf.h +485 -0
@@ -195,6 +195,491 @@ extern "C" {/* Use final bit of flags to indicate a control mbuf */ #define CTRL_MBUF_FLAG (1ULL << 63)/**< Mbuf contains control data */ +/* +* 32 bits are divided into several fields to mark packet types. Note that +* each field is indexical. +* - Bit 3:0 is for L2 types. +* - Bit 7:4 is for L3 or outer L3 (for tunneling case) types. +* - Bit 11:8 is for L4 or outer L4 (for tunneling case) types. +* - Bit 15:12 is for tunnel types. +* - Bit 19:16 is for inner L2 types. +* - Bit 23:20 is for inner L3 types. +* - Bit 27:24 is for inner L4 types. +* - Bit 31:28 is reserved. +* +* To be compatible with Vector PMD, RTE_PTYPE_L3_IPV4, RTE_PTYPE_L3_IPV4_EXT, +* RTE_PTYPE_L3_IPV6, RTE_PTYPE_L3_IPV6_EXT, RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP +* and RTE_PTYPE_L4_SCTP should be kept as below in a contiguous 7 bits. +* +* Note that L3 types values are selected for checking IPV4/IPV6 header from +* performance point of view. Reading annotations of RTE_ETH_IS_IPV4_HDR and +* RTE_ETH_IS_IPV6_HDR is needed for any future changes of L3 type values. +* +* Note that the packet types of the same packet recognized by different +* hardware may be different, as different hardware may have different +* capability of packet type recognition. +* +* examples: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=0x29 +* | 'version'=6, 'next header'=0x3A +* | 'ICMPv6 header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_IP | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_ICMP. +* +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x2F +* | 'GRE header' +* | 'version'=6, 'next header'=0x11 +* | 'UDP header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_GRENAT | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_UDP. +*/ +#define RTE_PTYPE_UNKNOWN 0x00000000 +/** +* MAC (Media Access Control) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=[0x0800|0x86DD|others]> +*/ +#define RTE_PTYPE_L2_MAC 0x00000001 +/** +* MAC (Media Access Control) packet type for time sync. +* +* Packet format: +* <'ether type'=0x88F7> +*/ +#define RTE_PTYPE_L2_MAC_TIMESYNC 0x00000002 +/** +* ARP (Address Resolution Protocol) packet type. +* +* Packet format: +* <'ether type'=0x0806> +*/ +#define RTE_PTYPE_L2_ARP 0x00000003 +/** +* LLDP (Link Layer Discovery Protocol) packet type. +* +* Packet format: +* <'ether type'=0x88CC> +*/ +#define RTE_PTYPE_L2_LLDP 0x00000004 +/** +* Mask of layer 2 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L2_MASK 0x0000000f +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* header option. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_L3_IPV4 0x00000010 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and contains header +* options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_L3_IPV4_EXT 0x00000030 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* extension header. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_L3_IPV6 0x00000040 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* header options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_L3_IPV4_EXT_UNKNOWN 0x00000090 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and contains extension +* headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_L3_IPV6_EXT 0x000000c0 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* extension headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_L3_IPV6_EXT_UNKNOWN 0x000000e0 +/** +* Mask of layer 3 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L3_MASK 0x000000f0 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_L4_TCP 0x00000100 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_L4_UDP 0x00000200 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, which can be recognized as +* fragmented. A fragmented packet cannot be recognized as any other L4 types +* (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP, +* RTE_PTYPE_L4_NONFRAG). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_L4_FRAG 0x00000300 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_L4_SCTP 0x00000400 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_L4_ICMP 0x00000500 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, while cannot be recognized as +* any of above L4 types (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, +* RTE_PTYPE_L4_FRAG, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_L4_NONFRAG 0x00000600 +/** +* Mask of layer 4 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L4_MASK 0x00000f00 +/** +* IP (Internet Protocol) in IP (Internet Protocol) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=[4|41]> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[4|41]> +*/ +#define RTE_PTYPE_TUNNEL_IP 0x00001000 +/** +* GRE (Generic Routing Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47> +*/ +#define RTE_PTYPE_TUNNEL_GRE 0x00002000 +/** +* VXLAN (Virtual eXtensible Local Area Network) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=4798> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=4798> +*/ +#define RTE_PTYPE_TUNNEL_VXLAN 0x00003000 +/** +* NVGRE (Network Virtualization using Generic Routing Encapsulation) tunneling +* packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47 +* | 'protocol type'=0x6558> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47 +* | 'protocol type'=0x6558'> +*/ +#define RTE_PTYPE_TUNNEL_NVGRE 0x00004000 +/** +* GENEVE (Generic Network Virtualization Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=6081> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=6081> +*/ +#define RTE_PTYPE_TUNNEL_GENEVE 0x00005000 +/** +* Tunneling packet type of Teredo, VXLAN (Virtual eXtensible Local Area +* Network) or GRE (Generic Routing Encapsulation) could be recognized as this +* packet type, if they can not be recognized independently as of hardware +* capability. +*/ +#define RTE_PTYPE_TUNNEL_GRENAT 0x00006000 +/** +* Mask of tunneling packet types. +*/ +#define RTE_PTYPE_TUNNEL_MASK 0x0000f000 +/** +* MAC (Media Access Control) packet type. +* It is used for inner packet type only. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD]> +*/ +#define RTE_PTYPE_INNER_L2_MAC 0x00010000 +/** +* MAC (Media Access Control) packet type with VLAN (Virtual Local Area +* Network) tag. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD], vlan=[1-4095]> +*/ +#define RTE_PTYPE_INNER_L2_MAC_VLAN 0x00020000 +/** +* Mask of inner layer 2 packet types. +*/ +#define RTE_PTYPE_INNER_L2_MASK 0x000f0000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and does not contain any header option. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_INNER_L3_IPV4 0x00100000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and contains header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT 0x00200000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and does not contain any extension header. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_INNER_L3_IPV6 0x00300000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and may or maynot contain header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN 0x00400000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and contains extension headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT 0x00500000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and may or maynot contain extension +* headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN 0x00600000 +/** +* Mask of inner layer 3 packet types. +*/ +#define RTE_PTYPE_INNER_INNER_L3_MASK 0x00f00000 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_INNER_L4_TCP 0x01000000 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_INNER_L4_UDP 0x02000000 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have layer 4 packet. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_INNER_L4_FRAG 0x03000000 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_INNER_L4_SCTP 0x04000000 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_INNER_L4_ICMP 0x05000000 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have other unknown layer +* 4 packet types. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_INNER_L4_NONFRAG 0x06000000 +/** +* Mask of inner layer 4 packet types. +*/ +#define RTE_PTYPE_INNER_L4_MASK 0x0f000000 + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 4 is selected to be used for IPv4 only. Then checking bit 4 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV4_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV4) + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 6 is selected to be used for IPv4 only. Then checking bit 6 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV6_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV6) + +/* Check if it is a tunneling packet */ +#define RTE_ETH_IS_TUNNEL_PKT (ptype) ((ptype) & RTE_PTYPE_TUNNEL_MASK) +/** * Get the name of a RX offload flag *
Signature · 1 line
1.9.3
PATCH v5 4/18 e1000: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- lib/librte_pmd_e1000/igb_rxtx.c | 98 ++++++++++++++++++++++++++++++++++------- 1 file changed, 83 insertions(+), 15 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
lib/librte_pmd_e1000/igb_rxtx.c +83 -15
@@ -590,17 +590,85 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,* RX functions * **********************************************************************/ +#define IGB_PACKET_TYPE_IPV4 0X01 +#define IGB_PACKET_TYPE_IPV4_TCP 0X11 +#define IGB_PACKET_TYPE_IPV4_UDP 0X21 +#define IGB_PACKET_TYPE_IPV4_SCTP 0X41 +#define IGB_PACKET_TYPE_IPV4_EXT 0X03 +#define IGB_PACKET_TYPE_IPV4_EXT_SCTP 0X43 +#define IGB_PACKET_TYPE_IPV6 0X04 +#define IGB_PACKET_TYPE_IPV6_TCP 0X14 +#define IGB_PACKET_TYPE_IPV6_UDP 0X24 +#define IGB_PACKET_TYPE_IPV6_EXT 0X0C +#define IGB_PACKET_TYPE_IPV6_EXT_TCP 0X1C +#define IGB_PACKET_TYPE_IPV6_EXT_UDP 0X2C +#define IGB_PACKET_TYPE_IPV4_IPV6 0X05 +#define IGB_PACKET_TYPE_IPV4_IPV6_TCP 0X15 +#define IGB_PACKET_TYPE_IPV4_IPV6_UDP 0X25 +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT 0X0D +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D +#define IGB_PACKET_TYPE_MAX 0X80 +#define IGB_PACKET_TYPE_MASK 0X7F +#define IGB_PACKET_TYPE_SHIFT 0X04 +static inline uint32_t +igb_rxd_pkt_info_to_pkt_type (uint16_t pkt_info) +{ +static const uint32_t + ptype_table[IGB_PACKET_TYPE_MAX] __rte_cache_aligned = { + [IGB_PACKET_TYPE_IPV4 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4 , + [IGB_PACKET_TYPE_IPV4_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [IGB_PACKET_TYPE_IPV6 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6 , + [IGB_PACKET_TYPE_IPV4_IPV6 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 , + [IGB_PACKET_TYPE_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT , + [IGB_PACKET_TYPE_IPV4_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV4_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_TCP , + [IGB_PACKET_TYPE_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_TCP , + [IGB_PACKET_TYPE_IPV4_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV4_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_UDP , + [IGB_PACKET_TYPE_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_UDP , + [IGB_PACKET_TYPE_IPV4_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_SCTP , + [IGB_PACKET_TYPE_IPV4_EXT_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT |RTE_PTYPE_L4_SCTP , + }; +if (unlikely (pkt_info &E1000_RXDADV_PKTTYPE_ETQF )) +return RTE_PTYPE_UNKNOWN ; + + pkt_info = (pkt_info >>IGB_PACKET_TYPE_SHIFT ) &IGB_PACKET_TYPE_MASK ; + +return ptype_table[pkt_info]; +} +static inline uint64_t rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) { -uint64_t pkt_flags; - -static uint64_t ip_pkt_types_map[16 ] = { -0 ,PKT_RX_IPV4_HDR ,PKT_RX_IPV4_HDR_EXT ,PKT_RX_IPV4_HDR_EXT , -PKT_RX_IPV6_HDR ,0 ,0 ,0 , -PKT_RX_IPV6_HDR_EXT ,0 ,0 ,0 , -PKT_RX_IPV6_HDR_EXT ,0 ,0 ,0 , - }; +uint64_t pkt_flags = ((hl_tp_rs &0x0F ) ==0 ) ?0 :PKT_RX_RSS_HASH ;#if defined(RTE_LIBRTE_IEEE1588 ) static uint32_t ip_pkt_etqf_map[8] = {
@@ -608,14 +676,10 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)0 ,0 ,0 ,0 , }; - pkt_flags = (hl_tp_rs &E1000_RXDADV_PKTTYPE_ETQF ) ? - ip_pkt_etqf_map[(hl_tp_rs >>4 ) &0x07 ] : - ip_pkt_types_map[(hl_tp_rs >>4 ) &0x0F ]; -#else - pkt_flags = (hl_tp_rs &E1000_RXDADV_PKTTYPE_ETQF ) ?0 : - ip_pkt_types_map[(hl_tp_rs >>4 ) &0x0F ]; + pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >>4 ) &0x07 ];#endif -return pkt_flags | (((hl_tp_rs &0x0F ) ==0 ) ?0 :PKT_RX_RSS_HASH ); + +return pkt_flags; } static inline uint64_t
@@ -790,6 +854,8 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); rxm->ol_flags = pkt_flags; + rxm->packet_type =igb_rxd_pkt_info_to_pkt_type (rxd.wb.lower. + lo_dword.hs_rss.pkt_info);/* * Store the mbuf address into the next entry of the array
@@ -1024,6 +1090,8 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); first_seg->ol_flags = pkt_flags; + first_seg->packet_type =igb_rxd_pkt_info_to_pkt_type (rxd.wb. + lower.lo_dword.hs_rss.pkt_info);/* Prefetch data of first segment, if configured to do so. */ rte_packet_prefetch((char *)first_seg->buf_addr +
Signature · 1 line
1.9.3
PATCH v5 5/18 ixgbe: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet type among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
Note that around 2.5% performance drop (64B) was observed of doing 4 ports (1 port per 82599 card) IO forwarding on the same SNB core.
--- lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 139 +++++++++++++++++++++++++++++--------- 1 file changed, 108 insertions(+), 31 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
lib/librte_pmd_ixgbe/ixgbe_rxtx.c +108 -31
@@ -855,40 +855,107 @@ end_of_tx:* RX functions * **********************************************************************/ -static inline uint64_t -rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) +#define IXGBE_PACKET_TYPE_IPV4 0X01 +#define IXGBE_PACKET_TYPE_IPV4_TCP 0X11 +#define IXGBE_PACKET_TYPE_IPV4_UDP 0X21 +#define IXGBE_PACKET_TYPE_IPV4_SCTP 0X41 +#define IXGBE_PACKET_TYPE_IPV4_EXT 0X03 +#define IXGBE_PACKET_TYPE_IPV4_EXT_SCTP 0X43 +#define IXGBE_PACKET_TYPE_IPV6 0X04 +#define IXGBE_PACKET_TYPE_IPV6_TCP 0X14 +#define IXGBE_PACKET_TYPE_IPV6_UDP 0X24 +#define IXGBE_PACKET_TYPE_IPV6_EXT 0X0C +#define IXGBE_PACKET_TYPE_IPV6_EXT_TCP 0X1C +#define IXGBE_PACKET_TYPE_IPV6_EXT_UDP 0X2C +#define IXGBE_PACKET_TYPE_IPV4_IPV6 0X05 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_TCP 0X15 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_UDP 0X25 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT 0X0D +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D +#define IXGBE_PACKET_TYPE_MAX 0X80 +#define IXGBE_PACKET_TYPE_MASK 0X7F +#define IXGBE_PACKET_TYPE_SHIFT 0X04 +static inline uint32_t +ixgbe_rxd_pkt_info_to_pkt_type (uint16_t pkt_info) { -uint64_t pkt_flags; - -static const uint64_t ip_pkt_types_map[16 ] = { -0 ,PKT_RX_IPV4_HDR ,PKT_RX_IPV4_HDR_EXT ,PKT_RX_IPV4_HDR_EXT , -PKT_RX_IPV6_HDR ,0 ,0 ,0 , -PKT_RX_IPV6_HDR_EXT ,0 ,0 ,0 , -PKT_RX_IPV6_HDR_EXT ,0 ,0 ,0 , +static const uint32_t + ptype_table[IXGBE_PACKET_TYPE_MAX] __rte_cache_aligned = { + [IXGBE_PACKET_TYPE_IPV4 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 , + [IXGBE_PACKET_TYPE_IPV4_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [IXGBE_PACKET_TYPE_IPV6 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 , + [IXGBE_PACKET_TYPE_IPV4_IPV6 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 , + [IXGBE_PACKET_TYPE_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT , + [IXGBE_PACKET_TYPE_IPV4_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_TCP , + [IXGBE_PACKET_TYPE_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_UDP , + [IXGBE_PACKET_TYPE_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_SCTP , + [IXGBE_PACKET_TYPE_IPV4_EXT_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT |RTE_PTYPE_L4_SCTP , }; +if (unlikely (pkt_info &IXGBE_RXDADV_PKTTYPE_ETQF )) +return RTE_PTYPE_UNKNOWN ; + + pkt_info = (pkt_info >>IXGBE_PACKET_TYPE_SHIFT ) & +IXGBE_PACKET_TYPE_MASK ; + +return ptype_table[pkt_info]; +} -static const uint64_t ip_rss_types_map[16 ] = { +static inline uint64_t +ixgbe_rxd_pkt_info_to_pkt_flags (uint16_t pkt_info) +{ + static uint64_t ip_rss_types_map[16] __rte_cache_aligned = {0 ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH ,0 ,PKT_RX_RSS_HASH ,0 ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH ,0 ,0 ,0 ,0 ,0 ,0 ,PKT_RX_FDIR , }; -#ifdef RTE_LIBRTE_IEEE1588 static uint64_t ip_pkt_etqf_map[8 ] = {0 ,0 ,0 ,PKT_RX_IEEE1588_PTP ,0 ,0 ,0 ,0 , }; - pkt_flags = (hl_tp_rs &IXGBE_RXDADV_PKTTYPE_ETQF ) ? - ip_pkt_etqf_map[(hl_tp_rs >>4 ) &0x07 ] : - ip_pkt_types_map[(hl_tp_rs >>4 ) &0x0F ]; +if (likely (pkt_info &IXGBE_RXDADV_PKTTYPE_ETQF )) +return ip_pkt_etqf_map[(pkt_info >>4 ) &0X07 ] | + ip_rss_types_map[pkt_info &0xF ]; +else +return ip_rss_types_map[pkt_info &0xF ];#else - pkt_flags = (hl_tp_rs &IXGBE_RXDADV_PKTTYPE_ETQF ) ?0 : - ip_pkt_types_map[(hl_tp_rs >>4 ) &0x0F ]; - +return ip_rss_types_map[pkt_info &0xF ];#endif -return pkt_flags | ip_rss_types_map[hl_tp_rs &0xF ]; } static inline uint64_t
@@ -945,7 +1012,9 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq)struct rte_mbuf *mb;uint16_t pkt_len;uint64_t pkt_flags; -int s[LOOK_AHEAD ], nb_dd; +int nb_dd; +uint32_t s[LOOK_AHEAD ]; +uint16_t pkt_info[LOOK_AHEAD ];int i, j, nb_rx =0 ;
@@ -968,6 +1037,9 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq)for (j =LOOK_AHEAD -1 ; j >=0 ; --j) s[j] = rxdp[j].wb.upper.status_error; +for (j =LOOK_AHEAD -1 ; j >=0 ; --j) + pkt_info[j] = rxdp[j].wb.lower.lo_dword.hs_rss.pkt_info; +/* Compute how many status bits were set */ nb_dd =0 ;for (j =0 ; j <LOOK_AHEAD ; ++j)
@@ -985,12 +1057,13 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq) mb->vlan_tci =rte_le_to_cpu_16 (rxdp[j].wb.upper.vlan);/* convert descriptor fields to rte mbuf flags */ - pkt_flags =rx_desc_hlen_type_rss_to_pkt_flags ( - rxdp[j].wb.lower.lo_dword.data); -/* reuse status field from scan list */ - pkt_flags |=rx_desc_status_to_pkt_flags (s[j]); + pkt_flags =rx_desc_status_to_pkt_flags (s[j]); pkt_flags |=rx_desc_error_to_pkt_flags (s[j]); + pkt_flags |= +ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info[j]); mb->ol_flags = pkt_flags; + mb->packet_type = +ixgbe_rxd_pkt_info_to_pkt_type (pkt_info[j]);if (likely (pkt_flags &PKT_RX_RSS_HASH )) mb->hash.rss = rxdp[j].wb.lower.hi_dword.rss;
@@ -1207,7 +1280,7 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,union ixgbe_adv_rx_desc rxd;uint64_t dma_addr;uint32_t staterr; -uint32_t hlen_type_rss; +uint32_t pkt_info;uint16_t pkt_len;uint16_t rx_id;uint16_t nb_rx;
@@ -1325,14 +1398,17 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, rxm->data_len = pkt_len; rxm->port = rxq->port_id; - hlen_type_rss =rte_le_to_cpu_32 (rxd.wb.lower.lo_dword.data); + pkt_info =rte_le_to_cpu_32 (rxd.wb.lower.lo_dword.hs_rss. + pkt_info);/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ rxm->vlan_tci =rte_le_to_cpu_16 (rxd.wb.upper.vlan); - pkt_flags =rx_desc_hlen_type_rss_to_pkt_flags (hlen_type_rss); - pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); + pkt_flags =rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); + pkt_flags = pkt_flags | +ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info); rxm->ol_flags = pkt_flags; + rxm->packet_type =ixgbe_rxd_pkt_info_to_pkt_type (pkt_info);if (likely (pkt_flags &PKT_RX_RSS_HASH )) rxm->hash.rss = rxd.wb.lower.hi_dword.rss;
@@ -1406,7 +1482,7 @@ ixgbe_fill_cluster_head_buf( uint8_t port_id, uint32_t staterr) { -uint32_t hlen_type_rss; +uint16_t pkt_info;uint64_t pkt_flags; head->port = port_id;
@@ -1416,11 +1492,12 @@ ixgbe_fill_cluster_head_buf(* set in the pkt_flags field. */ head->vlan_tci =rte_le_to_cpu_16 (desc->wb.upper.vlan); - hlen_type_rss =rte_le_to_cpu_32 (desc->wb.lower.lo_dword.data); - pkt_flags =rx_desc_hlen_type_rss_to_pkt_flags (hlen_type_rss); - pkt_flags |=rx_desc_status_to_pkt_flags (staterr); + pkt_info =rte_le_to_cpu_32 (desc->wb.lower.lo_dword.hs_rss.pkt_info); + pkt_flags =rx_desc_status_to_pkt_flags (staterr); pkt_flags |=rx_desc_error_to_pkt_flags (staterr); + pkt_flags |=ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info); head->ol_flags = pkt_flags; + head->packet_type =ixgbe_rxd_pkt_info_to_pkt_type (pkt_info);if (likely (pkt_flags &PKT_RX_RSS_HASH )) head->hash.rss =rte_le_to_cpu_32 (desc->wb.lower.hi_dword.rss);
Signature · 1 line
1.9.3
PATCH v5 6/18 i40e: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- lib/librte_pmd_i40e/i40e_rxtx.c | 786 ++++++++++++++++++++++++++-------------- 1 file changed, 512 insertions(+), 274 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
lib/librte_pmd_i40e/i40e_rxtx.c +512 -274
@@ -151,272 +151,511 @@ i40e_rxd_error_to_pkt_flags(uint64_t qword)return flags; } -/* Translate pkt types to pkt flags */ -static inline uint64_t -i40e_rxd_ptype_to_pkt_flags (uint64_t qword) +/* For each value it means, datasheet of hardware can tell more details */ +static inline uint32_t +i40e_rxd_pkt_type_mapping (uint8_t ptype) { -uint8_t ptype = (uint8_t )((qword &I40E_RXD_QW1_PTYPE_MASK ) >> -I40E_RXD_QW1_PTYPE_SHIFT ); -static const uint64_t ip_ptype_map[I40E_MAX_PKT_TYPE ] = { -0 ,/* PTYPE 0 */ -0 ,/* PTYPE 1 */ -0 ,/* PTYPE 2 */ -0 ,/* PTYPE 3 */ -0 ,/* PTYPE 4 */ -0 ,/* PTYPE 5 */ -0 ,/* PTYPE 6 */ -0 ,/* PTYPE 7 */ -0 ,/* PTYPE 8 */ -0 ,/* PTYPE 9 */ -0 ,/* PTYPE 10 */ -0 ,/* PTYPE 11 */ -0 ,/* PTYPE 12 */ -0 ,/* PTYPE 13 */ -0 ,/* PTYPE 14 */ -0 ,/* PTYPE 15 */ -0 ,/* PTYPE 16 */ -0 ,/* PTYPE 17 */ -0 ,/* PTYPE 18 */ -0 ,/* PTYPE 19 */ -0 ,/* PTYPE 20 */ -0 ,/* PTYPE 21 */ -PKT_RX_IPV4_HDR ,/* PTYPE 22 */ -PKT_RX_IPV4_HDR ,/* PTYPE 23 */ -PKT_RX_IPV4_HDR ,/* PTYPE 24 */ -0 ,/* PTYPE 25 */ -PKT_RX_IPV4_HDR ,/* PTYPE 26 */ -PKT_RX_IPV4_HDR ,/* PTYPE 27 */ -PKT_RX_IPV4_HDR ,/* PTYPE 28 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 29 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 30 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 31 */ -0 ,/* PTYPE 32 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 33 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 34 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 35 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 36 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 37 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 38 */ -0 ,/* PTYPE 39 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 40 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 41 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 42 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 43 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 44 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 45 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 46 */ -0 ,/* PTYPE 47 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 48 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 49 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 50 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 51 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 52 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 53 */ -0 ,/* PTYPE 54 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 55 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 56 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 57 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 58 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 59 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 60 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 61 */ -0 ,/* PTYPE 62 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 63 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 64 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 65 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 66 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 67 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 68 */ -0 ,/* PTYPE 69 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 70 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 71 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 72 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 73 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 74 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 75 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 76 */ -0 ,/* PTYPE 77 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 78 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 79 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 80 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 81 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 82 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 83 */ -0 ,/* PTYPE 84 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 85 */ -PKT_RX_TUNNEL_IPV4_HDR ,/* PTYPE 86 */ -PKT_RX_IPV4_HDR_EXT ,/* PTYPE 87 */ -PKT_RX_IPV6_HDR ,/* PTYPE 88 */ -PKT_RX_IPV6_HDR ,/* PTYPE 89 */ -PKT_RX_IPV6_HDR ,/* PTYPE 90 */ -0 ,/* PTYPE 91 */ -PKT_RX_IPV6_HDR ,/* PTYPE 92 */ -PKT_RX_IPV6_HDR ,/* PTYPE 93 */ -PKT_RX_IPV6_HDR ,/* PTYPE 94 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 95 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 96 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 97 */ -0 ,/* PTYPE 98 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 99 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 100 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 101 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 102 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 103 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 104 */ -0 ,/* PTYPE 105 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 106 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 107 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 108 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 109 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 110 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 111 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 112 */ -0 ,/* PTYPE 113 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 114 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 115 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 116 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 117 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 118 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 119 */ -0 ,/* PTYPE 120 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 121 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 122 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 123 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 124 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 125 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 126 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 127 */ -0 ,/* PTYPE 128 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 129 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 130 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 131 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 132 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 133 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 134 */ -0 ,/* PTYPE 135 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 136 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 137 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 138 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 139 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 140 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 141 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 142 */ -0 ,/* PTYPE 143 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 144 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 145 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 146 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 147 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 148 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 149 */ -0 ,/* PTYPE 150 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 151 */ -PKT_RX_TUNNEL_IPV6_HDR ,/* PTYPE 152 */ -PKT_RX_IPV6_HDR_EXT ,/* PTYPE 153 */ -0 ,/* PTYPE 154 */ -0 ,/* PTYPE 155 */ -0 ,/* PTYPE 156 */ -0 ,/* PTYPE 157 */ -0 ,/* PTYPE 158 */ -0 ,/* PTYPE 159 */ -0 ,/* PTYPE 160 */ -0 ,/* PTYPE 161 */ -0 ,/* PTYPE 162 */ -0 ,/* PTYPE 163 */ -0 ,/* PTYPE 164 */ -0 ,/* PTYPE 165 */ -0 ,/* PTYPE 166 */ -0 ,/* PTYPE 167 */ -0 ,/* PTYPE 168 */ -0 ,/* PTYPE 169 */ -0 ,/* PTYPE 170 */ -0 ,/* PTYPE 171 */ -0 ,/* PTYPE 172 */ -0 ,/* PTYPE 173 */ -0 ,/* PTYPE 174 */ -0 ,/* PTYPE 175 */ -0 ,/* PTYPE 176 */ -0 ,/* PTYPE 177 */ -0 ,/* PTYPE 178 */ -0 ,/* PTYPE 179 */ -0 ,/* PTYPE 180 */ -0 ,/* PTYPE 181 */ -0 ,/* PTYPE 182 */ -0 ,/* PTYPE 183 */ -0 ,/* PTYPE 184 */ -0 ,/* PTYPE 185 */ -0 ,/* PTYPE 186 */ -0 ,/* PTYPE 187 */ -0 ,/* PTYPE 188 */ -0 ,/* PTYPE 189 */ -0 ,/* PTYPE 190 */ -0 ,/* PTYPE 191 */ -0 ,/* PTYPE 192 */ -0 ,/* PTYPE 193 */ -0 ,/* PTYPE 194 */ -0 ,/* PTYPE 195 */ -0 ,/* PTYPE 196 */ -0 ,/* PTYPE 197 */ -0 ,/* PTYPE 198 */ -0 ,/* PTYPE 199 */ -0 ,/* PTYPE 200 */ -0 ,/* PTYPE 201 */ -0 ,/* PTYPE 202 */ -0 ,/* PTYPE 203 */ -0 ,/* PTYPE 204 */ -0 ,/* PTYPE 205 */ -0 ,/* PTYPE 206 */ -0 ,/* PTYPE 207 */ -0 ,/* PTYPE 208 */ -0 ,/* PTYPE 209 */ -0 ,/* PTYPE 210 */ -0 ,/* PTYPE 211 */ -0 ,/* PTYPE 212 */ -0 ,/* PTYPE 213 */ -0 ,/* PTYPE 214 */ -0 ,/* PTYPE 215 */ -0 ,/* PTYPE 216 */ -0 ,/* PTYPE 217 */ -0 ,/* PTYPE 218 */ -0 ,/* PTYPE 219 */ -0 ,/* PTYPE 220 */ -0 ,/* PTYPE 221 */ -0 ,/* PTYPE 222 */ -0 ,/* PTYPE 223 */ -0 ,/* PTYPE 224 */ -0 ,/* PTYPE 225 */ -0 ,/* PTYPE 226 */ -0 ,/* PTYPE 227 */ -0 ,/* PTYPE 228 */ -0 ,/* PTYPE 229 */ -0 ,/* PTYPE 230 */ -0 ,/* PTYPE 231 */ -0 ,/* PTYPE 232 */ -0 ,/* PTYPE 233 */ -0 ,/* PTYPE 234 */ -0 ,/* PTYPE 235 */ -0 ,/* PTYPE 236 */ -0 ,/* PTYPE 237 */ -0 ,/* PTYPE 238 */ -0 ,/* PTYPE 239 */ -0 ,/* PTYPE 240 */ -0 ,/* PTYPE 241 */ -0 ,/* PTYPE 242 */ -0 ,/* PTYPE 243 */ -0 ,/* PTYPE 244 */ -0 ,/* PTYPE 245 */ -0 ,/* PTYPE 246 */ -0 ,/* PTYPE 247 */ -0 ,/* PTYPE 248 */ -0 ,/* PTYPE 249 */ -0 ,/* PTYPE 250 */ -0 ,/* PTYPE 251 */ -0 ,/* PTYPE 252 */ -0 ,/* PTYPE 253 */ -0 ,/* PTYPE 254 */ -0 ,/* PTYPE 255 */ + static const uint32_t ptype_table[UINT8_MAX] __rte_cache_aligned = { +/* L2 types */ +/* [0] reserved */ + [1 ] =RTE_PTYPE_L2_MAC , + [2 ] =RTE_PTYPE_L2_MAC_TIMESYNC , +/* [3] - [5] reserved */ + [6 ] =RTE_PTYPE_L2_LLDP , +/* [7] - [10] reserved */ + [11 ] =RTE_PTYPE_L2_ARP , +/* [12] - [21] reserved */ + +/* Non tunneled IPv4 */ + [22 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_FRAG , + [23 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_NONFRAG , + [24 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_UDP , +/* [25] reserved */ + [26 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_TCP , + [27 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_SCTP , + [28 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_ICMP , + +/* IPv4 --> IPv4 */ + [29 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [30 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [31 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [32] reserved */ + [33 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [34 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [35 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> IPv6 */ + [36 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [37 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [38 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [39] reserved */ + [40 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [41 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [42 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN */ + [43 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT , + +/* IPv4 --> GRE/Teredo/VXLAN --> IPv4 */ + [44 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [45 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [46 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [47] reserved */ + [48 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [49 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [50 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> IPv6 */ + [51 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [52 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [53 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [54] reserved */ + [55 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [56 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [57 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC */ + [58 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */ + [59 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [60 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [61 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [62] reserved */ + [63 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [64 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [65 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */ + [66 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [67 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [68 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [69] reserved */ + [70 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [71 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [72 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN */ + [73 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */ + [74 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [75 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [76 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [77] reserved */ + [78 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [79 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [80 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */ + [81 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [82 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [83 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [84] reserved */ + [85 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [86 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [87 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* Non tunneled IPv6 */ + [88 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_FRAG , + [89 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_NONFRAG , + [90 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_UDP , +/* [91] reserved */ + [92 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_TCP , + [93 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_SCTP , + [94 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_ICMP , + +/* IPv6 --> IPv4 */ + [95 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [96 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [97 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [98] reserved */ + [99 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [100 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [101 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> IPv6 */ + [102 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [103 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [104 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [105] reserved */ + [106 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [107 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [108 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN */ + [109 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT , + +/* IPv6 --> GRE/Teredo/VXLAN --> IPv4 */ + [110 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [111 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [112 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [113] reserved */ + [114 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [115 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [116 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> IPv6 */ + [117 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [118 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [119 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [120] reserved */ + [121 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [122 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [123 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC */ + [124 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */ + [125 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [126 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [127 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [128] reserved */ + [129 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [130 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [131 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */ + [132 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [133 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [134 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [135] reserved */ + [136 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [137 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [138 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN */ + [139 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */ + [140 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [141 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [142 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [143] reserved */ + [144 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [145 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [146 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */ + [147 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [148 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [149 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [150] reserved */ + [151 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [152 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [153 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* All others reserved */ }; -return ip_ptype_map[ptype]; +return ptype_table[ptype]; }#define I40E_RX_DESC_EXT_STATUS_FLEXBH_MASK 0x03
@@ -709,11 +948,11 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq) rxdp[j].wb.qword0.lo_dword.l2tag1) : 0; pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); - pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); - mb->packet_type = (uint16_t )((qword1 & -I40E_RXD_QW1_PTYPE_MASK ) >> -I40E_RXD_QW1_PTYPE_SHIFT ); + mb->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >> +I40E_RXD_QW1_PTYPE_SHIFT ));if (pkt_flags &PKT_RX_RSS_HASH ) mb->hash.rss =rte_le_to_cpu_32 (\ rxdp[j].wb.qword0.hi_dword.rss);
@@ -952,9 +1191,9 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rte_le_to_cpu_16(rxd.wb.qword0.lo_dword.l2tag1) : 0; pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); - pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); - rxm->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >> -I40E_RXD_QW1_PTYPE_SHIFT ); + rxm->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ));if (pkt_flags &PKT_RX_RSS_HASH ) rxm->hash.rss =rte_le_to_cpu_32 (rxd.wb.qword0.hi_dword.rss);
@@ -1111,10 +1350,9 @@ i40e_recv_scattered_pkts(void *rx_queue, rte_le_to_cpu_16(rxd.wb.qword0.lo_dword.l2tag1) : 0; pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); - pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); - first_seg->packet_type = (uint16_t )((qword1 & -I40E_RXD_QW1_PTYPE_MASK ) >> -I40E_RXD_QW1_PTYPE_SHIFT ); + first_seg->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ));if (pkt_flags &PKT_RX_RSS_HASH ) rxm->hash.rss =rte_le_to_cpu_32 (rxd.wb.qword0.hi_dword.rss);
Signature · 1 line
1.9.3
PATCH v5 7/18 enic: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- lib/librte_pmd_enic/enic_main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
lib/librte_pmd_enic/enic_main.c +8 -6
@@ -423,7 +423,7 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->pkt_len = bytes_written;if (ipv4) { - rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; + rx_pkt->packet_type =RTE_PTYPE_L3_IPV4 ;if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) rx_pkt->ol_flags |=PKT_RX_IP_CKSUM_BAD ;
@@ -432,7 +432,7 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->ol_flags |=PKT_RX_L4_CKSUM_BAD ; } }else if (ipv6) - rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; + rx_pkt->packet_type =RTE_PTYPE_L3_IPV6 ; }else {/* Header split */ if (sop && !eop) {
@@ -445,7 +445,7 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, *rx_pkt_bucket = rx_pkt; rx_pkt->pkt_len = bytes_written;if (ipv4) { - rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; + rx_pkt->packet_type =RTE_PTYPE_L3_IPV4 ;if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) rx_pkt->ol_flags |=
@@ -457,13 +457,14 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,PKT_RX_L4_CKSUM_BAD ; } }else if (ipv6) - rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; + rx_pkt->packet_type =RTE_PTYPE_L3_IPV6 ; }else {/* Payload */ hdr_rx_pkt = *rx_pkt_bucket; hdr_rx_pkt->pkt_len += bytes_written;if (ipv4) { - hdr_rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; + hdr_rx_pkt->packet_type = +RTE_PTYPE_L3_IPV4 ;if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) hdr_rx_pkt->ol_flags |=
@@ -475,7 +476,8 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,PKT_RX_L4_CKSUM_BAD ; } }else if (ipv6) - hdr_rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; + hdr_rx_pkt->packet_type = +RTE_PTYPE_L3_IPV6 ; } }
Signature · 1 line
1.9.3
PATCH v5 8/18 vmxnet3: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c +2 -2
@@ -649,9 +649,9 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)struct ipv4_hdr *ip = (struct ipv4_hdr *)(eth +1 );if (((ip->version_ihl &0xf ) <<2 ) > (int )sizeof (struct ipv4_hdr )) - rxm->ol_flags |=PKT_RX_IPV4_HDR_EXT ; + rxm->packet_type =RTE_PTYPE_L3_IPV4_EXT ;else - rxm->ol_flags |=PKT_RX_IPV4_HDR ; + rxm->packet_type =RTE_PTYPE_L3_IPV4 ;if (!rcd->cnc) {if (!rcd->ipc)
Signature · 1 line
1.9.3
PATCH v5 9/18 fm10k: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- lib/librte_pmd_fm10k/fm10k_rxtx.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)
v4 changes:
* Supported unified packet type of fm10k from v4.
v5 changes:
* Re-worded the commit logs.
lib/librte_pmd_fm10k/fm10k_rxtx.c +21 -9
@@ -68,13 +68,29 @@ static inline void dump_rxd(union fm10k_rx_desc *rxd)static inline void rx_desc_to_ol_flags (struct rte_mbuf *m,const union fm10k_rx_desc *d) { -uint16_t ptype; -static const uint16_t pt_lut[] = {0 , -PKT_RX_IPV4_HDR ,PKT_RX_IPV4_HDR_EXT , -PKT_RX_IPV6_HDR ,PKT_RX_IPV6_HDR_EXT , -0 ,0 ,0 +static const uint32_t + ptype_table[FM10K_RXD_PKTTYPE_MASK >>FM10K_RXD_PKTTYPE_SHIFT ] + __rte_cache_aligned = { + [FM10K_PKTTYPE_OTHER ] =RTE_PTYPE_L2_MAC , + [FM10K_PKTTYPE_IPV4 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4 , + [FM10K_PKTTYPE_IPV4_EX ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [FM10K_PKTTYPE_IPV6 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6 , + [FM10K_PKTTYPE_IPV6_EX ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , }; + m->packet_type = ptype_table[(d->w.pkt_info &FM10K_RXD_PKTTYPE_MASK ) + >>FM10K_RXD_PKTTYPE_SHIFT ]; +if (d->w.pkt_info &FM10K_RXD_RSSTYPE_MASK ) m->ol_flags |=PKT_RX_RSS_HASH ;
@@ -96,10 +112,6 @@ rx_desc_to_ol_flags(struct rte_mbuf *m, const union fm10k_rx_desc *d)if (unlikely (d->d.staterr &FM10K_RXD_STATUS_RXE )) m->ol_flags |=PKT_RX_RECIP_ERR ; - - ptype = (d->d.data &FM10K_RXD_PKTTYPE_MASK_L3 ) >> -FM10K_RXD_PKTTYPE_SHIFT ; - m->ol_flags |= pt_lut[(uint8_t )ptype]; }uint16_t
Signature · 1 line
1.9.3
PATCH v5 10/18 app/test-pipeline: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- app/test-pipeline/pipeline_hash.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
app/test-pipeline/pipeline_hash.c +4 -3
@@ -459,20 +459,21 @@ app_main_loop_rx_metadata(void) { signature =RTE_MBUF_METADATA_UINT32_PTR (m,0 ); key =RTE_MBUF_METADATA_UINT8_PTR (m,32 ); -if (m->ol_flags &PKT_RX_IPV4_HDR ) { +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { ip_hdr = (struct ipv4_hdr *) &m_data[sizeof (struct ether_hdr )]; ip_dst = ip_hdr->dst_addr; k32 = (uint32_t *) key; k32[0 ] = ip_dst &0xFFFFFF00 ; - }else { + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { ipv6_hdr = (struct ipv6_hdr *) &m_data[sizeof (struct ether_hdr )]; ipv6_dst = ipv6_hdr->dst_addr;memcpy (key, ipv6_dst,16 ); - } + }else +continue ; *signature =test_hash (key,0 ,0 ); }
Signature · 1 line
1.9.3
PATCH v5 11/18 app/testpmd: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- app/test-pmd/csumonly.c | 10 +-- app/test-pmd/rxonly.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 177 insertions(+), 11 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v4 changes:
* Added printing logs of packet types of each received packet in rxonly mode.
v5 changes:
* Re-worded the commit logs.
app/test-pmd/csumonly.c +5 -5
@@ -202,8 +202,9 @@ parse_ethernet(struct ether_hdr *eth_hdr, struct testpmd_offload_info *info)/* Parse a vxlan header */ static void -parse_vxlan (struct udp_hdr *udp_hdr,struct testpmd_offload_info *info, -uint64_t mbuf_olflags) +parse_vxlan (struct udp_hdr *udp_hdr, +struct testpmd_offload_info *info, +uint32_t pkt_type) {struct ether_hdr *eth_hdr;
@@ -211,8 +212,7 @@ parse_vxlan(struct udp_hdr *udp_hdr, struct testpmd_offload_info *info,* (rfc7348) or that the rx offload flag is set (i40e only * currently) */ if (udp_hdr->dst_port !=_htons (4789 ) && - (mbuf_olflags & (PKT_RX_TUNNEL_IPV4_HDR | -PKT_RX_TUNNEL_IPV6_HDR )) ==0 ) +RTE_ETH_IS_TUNNEL_PKT (pkt_type) ==0 )return ; info->is_tunnel =1 ;
@@ -549,7 +549,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)struct udp_hdr *udp_hdr; udp_hdr = (struct udp_hdr *)((char *)l3_hdr + info.l3_len); -parse_vxlan (udp_hdr, &info, m->ol_flags); +parse_vxlan (udp_hdr, &info, m->packet_type); }else if (info.l4_proto ==IPPROTO_GRE ) {struct simple_gre_hdr *gre_hdr; gre_hdr = (struct simple_gre_hdr *)
app/test-pmd/rxonly.c +172 -6
202 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v5 12/18 app/test: Remove useless code
In reply to Helin ZhangSeverl useless code lines are added accidently, which blocks packet type unification. They should be deleted at all.
--- app/test/packet_burst_generator.c | 10 ---------- 1 file changed, 10 deletions(-)
v4 changes:
* Removed several useless code lines which block packet type unification.
v5 changes:
* Re-worded the commit logs.
app/test/packet_burst_generator.c +0 -10
@@ -272,19 +272,9 @@ nomore_mbuf:if (ipv4) { pkt->vlan_tci = ETHER_TYPE_IPv4; pkt->l3_len =sizeof (struct ipv4_hdr ); - -if (vlan_enabled) - pkt->ol_flags =PKT_RX_IPV4_HDR |PKT_RX_VLAN_PKT ; -else - pkt->ol_flags =PKT_RX_IPV4_HDR ; }else { pkt->vlan_tci = ETHER_TYPE_IPv6; pkt->l3_len =sizeof (struct ipv6_hdr ); - -if (vlan_enabled) - pkt->ol_flags =PKT_RX_IPV6_HDR |PKT_RX_VLAN_PKT ; -else - pkt->ol_flags =PKT_RX_IPV6_HDR ; } pkts_burst[nb_pkt] = pkt;
Signature · 1 line
1.9.3
PATCH v5 13/18 examples/ip_fragmentation: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- examples/ip_fragmentation/main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
examples/ip_fragmentation/main.c +3 -4
@@ -283,7 +283,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, len = qconf->tx_mbufs[port_out].len;/* if this is an IPv4 packet */ -if (m->ol_flags &PKT_RX_IPV4_HDR ) { +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) {struct ipv4_hdr *ip_hdr;uint32_t ip_dst;/* Read the lookup key (i.e. ip_dst) from the input packet */
@@ -317,9 +317,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,if (unlikely (len2 <0 ))return ; } - } -/* if this is an IPv6 packet */ -else if (m->ol_flags &PKT_RX_IPV6_HDR ) { + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if this is an IPv6 packet */ struct ipv6_hdr *ip_hdr; ipv6 =1 ;
Signature · 1 line
1.9.3
PATCH v5 14/18 examples/ip_reassembly: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- examples/ip_reassembly/main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
examples/ip_reassembly/main.c +3 -4
@@ -356,7 +356,7 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, dst_port = portid;/* if packet is IPv4 */ -if (m->ol_flags & (PKT_RX_IPV4_HDR )) { +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) {struct ipv4_hdr *ip_hdr;uint32_t ip_dst;
@@ -396,9 +396,8 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, } eth_hdr->ether_type =rte_be_to_cpu_16 (ETHER_TYPE_IPv4); - } -/* if packet is IPv6 */ -else if (m->ol_flags & (PKT_RX_IPV6_HDR |PKT_RX_IPV6_HDR_EXT )) { + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if packet is IPv6 */ struct ipv6_extension_fragment *frag_hdr;struct ipv6_hdr *ip_hdr;
Signature · 1 line
1.9.3
PATCH v5 15/18 examples/l3fwd-acl: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- examples/l3fwd-acl/main.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
examples/l3fwd-acl/main.c +6 -13
@@ -645,9 +645,7 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,struct ipv4_hdr *ipv4_hdr;struct rte_mbuf *pkt = pkts_in[index]; -int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR ); - -if (type ==PKT_RX_IPV4_HDR ) { +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, unsigned char *) + sizeof(struct ether_hdr));
@@ -668,8 +666,7 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,rte_pktmbuf_free (pkt); } - }else if (type ==PKT_RX_IPV6_HDR ) { - + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) {/* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -687,17 +684,13 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl, {struct rte_mbuf *pkt = pkts_in[index]; -int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR ); - -if (type ==PKT_RX_IPV4_HDR ) { - +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) {/* Fill acl structure */ acl->data_ipv4[acl->num_ipv4] =MBUF_IPV4_2PROTO (pkt); acl->m_ipv4[(acl->num_ipv4)++] = pkt; - }else if (type ==PKT_RX_IPV6_HDR ) { - + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) {/* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -745,9 +738,9 @@ send_one_packet(struct rte_mbuf *m, uint32_t res)/* in the ACL list, drop it */ #ifdef L3FWDACL_DEBUG if ((res &ACL_DENY_SIGNATURE ) !=0 ) { -if (m->ol_flags &PKT_RX_IPV4_HDR ) +if (RTE_ETH_IS_IPV4_HDR (m->packet_type))dump_acl4_rule (m, res); -else +else if (RTE_ETH_IS_IPV6_HDR (m->packet_type))dump_acl6_rule (m, res); }#endif
Signature · 1 line
1.9.3
PATCH v5 16/18 examples/l3fwd-power: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- examples/l3fwd-power/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
examples/l3fwd-power/main.c +2 -3
@@ -635,7 +635,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); -if (m->ol_flags &PKT_RX_IPV4_HDR ) { +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) {/* Handle IPv4 headers.*/ ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char*)
@@ -670,8 +670,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid,ether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); - } -else { + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) {/* Handle IPv6 headers.*/ #if (APP_LOOKUP_METHOD ==APP_LOOKUP_EXACT_MATCH )struct ipv6_hdr *ipv6_hdr;
Signature · 1 line
1.9.3
PATCH v5 17/18 examples/l3fwd: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
--- examples/l3fwd/main.c | 71 +++++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 31 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v3 changes:
* Minor bug fixes and enhancements.
v5 changes:
* Re-worded the commit logs.
examples/l3fwd/main.c +40 -31
@@ -955,7 +955,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); -if (m->ol_flags &PKT_RX_IPV4_HDR ) { +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) {/* Handle IPv4 headers.*/ ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char *) +sizeof (struct ether_hdr ));
@@ -990,7 +990,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconsend_single_packet (m, dst_port); - }else { + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) {/* Handle IPv6 headers.*/ struct ipv6_hdr *ipv6_hdr;
@@ -1011,8 +1011,9 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); - } - + }else +/* Free the mbuf that contains non-IPV4/IPV6 packet */ +rte_pktmbuf_free (m); }#ifdef DO_RFC_1812_CHECKS
@@ -1036,11 +1037,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon* to BAD_PORT value. */ static inline __attribute__((always_inline))void -rfc1812_process (struct ipv4_hdr *ipv4_hdr,uint16_t *dp,uint32_t flags) +rfc1812_process (struct ipv4_hdr *ipv4_hdr,uint16_t *dp,uint32_t ptype) {uint8_t ihl; -if ((flags &PKT_RX_IPV4_HDR ) !=0 ) { +if (RTE_ETH_IS_IPV4_HDR (ptype)) { ihl = ipv4_hdr->version_ihl -IPV4_MIN_VER_IHL ;
@@ -1071,11 +1072,11 @@ get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,struct ipv6_hdr *ipv6_hdr;struct ether_hdr *eth_hdr; -if (pkt->ol_flags &PKT_RX_IPV4_HDR ) { +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) {if (rte_lpm_lookup (qconf->ipv4_lookup_struct, dst_ipv4, &next_hop) !=0 ) next_hop = portid; - }else if (pkt->ol_flags &PKT_RX_IPV6_HDR ) { + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *); ipv6_hdr = (struct ipv6_hdr *)(eth_hdr +1 ); if (rte_lpm6_lookup(qconf->ipv6_lookup_struct,
@@ -1109,17 +1110,19 @@ process_packet(struct lcore_conf *qconf, struct rte_mbuf *pkt, ve = val_eth[dp]; dst_port[0 ] = dp; -rfc1812_process (ipv4_hdr, dst_port, pkt->ol_flags); +rfc1812_process (ipv4_hdr, dst_port, pkt->packet_type); te =_mm_blend_epi16 (te, ve,MASK_ETH );_mm_store_si128 ((__m128i *)eth_hdr, te); }/* -* Read ol_flags and destination IPV4 addresses from 4 mbufs. +* Read packet_type and destination IPV4 addresses from 4 mbufs. */ static inline void -processx4_step1 (struct rte_mbuf *pkt[FWDSTEP ],__m128i *dip,uint32_t *flag) +processx4_step1 (struct rte_mbuf *pkt[FWDSTEP ], +__m128i *dip, +uint32_t *ipv4_flag) {struct ipv4_hdr *ipv4_hdr;struct ether_hdr *eth_hdr;
@@ -1128,22 +1131,22 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag) eth_hdr = rte_pktmbuf_mtod(pkt[0], struct ether_hdr *); ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); x0 = ipv4_hdr->dst_addr; - flag[0 ] = pkt[0 ]->ol_flags &PKT_RX_IPV4_HDR ; + ipv4_flag[0 ] = pkt[0 ]->packet_type &RTE_PTYPE_L3_IPV4 ; eth_hdr = rte_pktmbuf_mtod(pkt[1], struct ether_hdr *); ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); x1 = ipv4_hdr->dst_addr; - flag[0 ] &= pkt[1 ]->ol_flags; + ipv4_flag[0 ] &= pkt[1 ]->packet_type; eth_hdr = rte_pktmbuf_mtod(pkt[2], struct ether_hdr *); ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); x2 = ipv4_hdr->dst_addr; - flag[0 ] &= pkt[2 ]->ol_flags; + ipv4_flag[0 ] &= pkt[2 ]->packet_type; eth_hdr = rte_pktmbuf_mtod(pkt[3], struct ether_hdr *); ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); x3 = ipv4_hdr->dst_addr; - flag[0 ] &= pkt[3 ]->ol_flags; + ipv4_flag[0 ] &= pkt[3 ]->packet_type; dip[0 ] =_mm_set_epi32 (x3, x2, x1, x0); }
@@ -1153,8 +1156,12 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag)* If lookup fails, use incoming port (portid) as destination port. */ static inline void -processx4_step2 (const struct lcore_conf *qconf,__m128i dip,uint32_t flag, -uint8_t portid,struct rte_mbuf *pkt[FWDSTEP ],uint16_t dprt[FWDSTEP ]) +processx4_step2 (const struct lcore_conf *qconf, +__m128i dip, +uint32_t ipv4_flag, +uint8_t portid, +struct rte_mbuf *pkt[FWDSTEP ], +uint16_t dprt[FWDSTEP ]) {rte_xmm_t dst; const __m128i bswap_mask = _mm_set_epi8(12, 13, 14, 15, 8, 9, 10, 11,
@@ -1164,7 +1171,7 @@ processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t flag, dip =_mm_shuffle_epi8 (dip, bswap_mask);/* if all 4 packets are IPV4. */ -if (likely (flag !=0 )) { +if (likely (ipv4_flag)) {rte_lpm_lookupx4 (qconf->ipv4_lookup_struct, dip, dprt, portid); }else { dst.x = dip;
@@ -1215,13 +1222,13 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])_mm_store_si128 (p[3 ], te[3 ]);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[0 ] +1 ), - &dst_port[0 ], pkt[0 ]->ol_flags); + &dst_port[0 ], pkt[0 ]->packet_type);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[1 ] +1 ), - &dst_port[1 ], pkt[1 ]->ol_flags); + &dst_port[1 ], pkt[1 ]->packet_type);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[2 ] +1 ), - &dst_port[2 ], pkt[2 ]->ol_flags); + &dst_port[2 ], pkt[2 ]->packet_type);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[3 ] +1 ), - &dst_port[3 ], pkt[3 ]->ol_flags); + &dst_port[3 ], pkt[3 ]->packet_type); }/*
@@ -1408,7 +1415,7 @@ main_loop(__attribute__((unused)) void *dummy)uint16_t *lp;uint16_t dst_port[MAX_PKT_BURST ];__m128i dip[MAX_PKT_BURST /FWDSTEP ]; -uint32_t flag[MAX_PKT_BURST /FWDSTEP ]; +uint32_t ipv4_flag[MAX_PKT_BURST /FWDSTEP ];uint16_t pnum[MAX_PKT_BURST +1 ];#endif
@@ -1478,14 +1485,16 @@ main_loop(__attribute__((unused)) void *dummy)*/ int32_t n =RTE_ALIGN_FLOOR (nb_rx,4 );for (j =0 ; j < n ; j+=4 ) { -uint32_t ol_flag = pkts_burst[j]->ol_flags - & pkts_burst[j+1 ]->ol_flags - & pkts_burst[j+2 ]->ol_flags - & pkts_burst[j+3 ]->ol_flags; -if (ol_flag &PKT_RX_IPV4_HDR ) { +uint32_t pkt_type = + pkts_burst[j]->packet_type & + pkts_burst[j+1 ]->packet_type & + pkts_burst[j+2 ]->packet_type & + pkts_burst[j+3 ]->packet_type; +if (pkt_type &RTE_PTYPE_L3_IPV4 ) {simple_ipv4_fwd_4pkts (&pkts_burst[j], portid, qconf); - }else if (ol_flag &PKT_RX_IPV6_HDR ) { + }else if (pkt_type & +RTE_PTYPE_L3_IPV6 ) {simple_ipv6_fwd_4pkts (&pkts_burst[j], portid, qconf); }else {
@@ -1510,13 +1519,13 @@ main_loop(__attribute__((unused)) void *dummy)for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step1 (&pkts_burst[j], &dip[j /FWDSTEP ], - &flag[j /FWDSTEP ]); + &ipv4_flag[j /FWDSTEP ]); } k =RTE_ALIGN_FLOOR (nb_rx,FWDSTEP );for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step2 (qconf, dip[j /FWDSTEP ], - flag[j /FWDSTEP ], portid, + ipv4_flag[j /FWDSTEP ], portid, &pkts_burst[j], &dst_port[j]); }
Signature · 1 line
1.9.3
PATCH v5 18/18 mbuf: remove old packet type bit masks
In reply to Helin ZhangAs unified packet types are used instead, those old bit masks and the relevant macros for packet type indication need to be removed.
--- lib/librte_mbuf/rte_mbuf.c | 6 ------ lib/librte_mbuf/rte_mbuf.h | 6 ------ 2 files changed, 12 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
* Redefined the bit masks for packet RX offload flags.
v5 changes:
* Rolled back the bit masks of RX flags, for ABI compatibility.
lib/librte_mbuf/rte_mbuf.c +0 -6
@@ -251,14 +251,8 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask)/* case PKT_RX_HBUF_OVERFLOW: return "PKT_RX_HBUF_OVERFLOW"; */ /* case PKT_RX_RECIP_ERR: return "PKT_RX_RECIP_ERR"; */ /* case PKT_RX_MAC_ERR: return "PKT_RX_MAC_ERR"; */ -case PKT_RX_IPV4_HDR :return "PKT_RX_IPV4_HDR" ; -case PKT_RX_IPV4_HDR_EXT :return "PKT_RX_IPV4_HDR_EXT" ; -case PKT_RX_IPV6_HDR :return "PKT_RX_IPV6_HDR" ; -case PKT_RX_IPV6_HDR_EXT :return "PKT_RX_IPV6_HDR_EXT" ;case PKT_RX_IEEE1588_PTP :return "PKT_RX_IEEE1588_PTP" ;case PKT_RX_IEEE1588_TMST :return "PKT_RX_IEEE1588_TMST" ; -case PKT_RX_TUNNEL_IPV4_HDR :return "PKT_RX_TUNNEL_IPV4_HDR" ; -case PKT_RX_TUNNEL_IPV6_HDR :return "PKT_RX_TUNNEL_IPV6_HDR" ;default :return NULL ; } }
lib/librte_mbuf/rte_mbuf.h +0 -6
@@ -91,14 +91,8 @@ extern "C" {#define PKT_RX_HBUF_OVERFLOW (0ULL << 0)/**< Header buffer overflow. */ #define PKT_RX_RECIP_ERR (0ULL << 0)/**< Hardware processing error. */ #define PKT_RX_MAC_ERR (0ULL << 0)/**< MAC error. */ -#define PKT_RX_IPV4_HDR (1ULL << 5)/**< RX packet with IPv4 header. */ -#define PKT_RX_IPV4_HDR_EXT (1ULL << 6)/**< RX packet with extended IPv4 header. */ -#define PKT_RX_IPV6_HDR (1ULL << 7)/**< RX packet with IPv6 header. */ -#define PKT_RX_IPV6_HDR_EXT (1ULL << 8)/**< RX packet with extended IPv6 header. */ #define PKT_RX_IEEE1588_PTP (1ULL << 9)/**< RX IEEE1588 L2 Ethernet PT Packet. */ #define PKT_RX_IEEE1588_TMST (1ULL << 10)/**< RX IEEE1588 L2/L4 timestamped packet.*/ -#define PKT_RX_TUNNEL_IPV4_HDR (1ULL << 11)/**< RX tunnel packet with IPv4 header.*/ -#define PKT_RX_TUNNEL_IPV6_HDR (1ULL << 12)/**< RX tunnel packet with IPv6 header. */ #define PKT_RX_FDIR_ID (1ULL << 13)/**< FD id reported if FDIR match. */ #define PKT_RX_FDIR_FLX (1ULL << 14)/**< Flexible bytes reported if FDIR match. */ /* add new RX flags here */
Signature · 1 line
1.9.3
v6 cover unified packet type
In reply to Helin ZhangCurrently only 6 bits which are stored in ol_flags are used to indicate the packet types. This is not enough, as some NIC hardware can recognize quite a lot of packet types, e.g i40e hardware can recognize more than 150 packet types. Hiding those packet types hides hardware offload capabilities which could be quite useful for improving performance and for end users. So an unified packet types are needed to support all possible PMDs. A 16 bits packet_type in mbuf structure can be changed to 32 bits and used for this purpose. In addition, all packet types stored in ol_flag field should be deleted at all, and 6 bits of ol_flags can be save as the benifit.
Initially, 32 bits of packet_type can be divided into several sub fields to indicate different packet type information of a packet. The initial design is to divide those bits into fields for L2 types, L3 types, L4 types, tunnel types, inner L2 types, inner L3 types and inner L4 types. All PMDs should translate the offloaded packet types into these 7 fields of information, for user applications.
To avoid breaking ABI compatibility, currently all the code changes for unified packet type are disabled at compile time by default. Users can enable it manually by defining the macro of RTE_UNIFIED_PKT_TYPE. The code changes will be valid by default in a future release, and the old version will be deleted accordingly, after the ABI change process is done.
v2 changes:
* Enlarged the packet_type field from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes.
* Used redefined packet types and enlarged packet_type field for all PMDs and corresponding applications.
* Removed changes in bond and its relevant application, as there is no need at all according to the recent bond changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Put vector ixgbe changes right after mbuf changes.
* Disabled vector ixgbe PMD by default, as mbuf layout changed, and then re-enabled it after vector ixgbe PMD updated.
* Put the definitions of unified packet type into a single patch.
* Minor bug fixes and enhancements in l3fwd example.
v4 changes:
* Added detailed description of each packet types.
* Supported unified packet type of fm10k.
* Added printing logs of packet types of each received packet for rxonly mode in testpmd.
* Removed several useless code lines which block packet type unification from app/test/packet_burst_generator.c.
v5 changes:
* Added more detailed description for each packet types, together with examples.
* Rolled back the macro definitions of RX packet flags, for ABI compitability.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
Helin Zhang (18):
mbuf: redefine packet_type in rte_mbuf
ixgbe: support unified packet type in vectorized PMD
mbuf: add definitions of unified packet types
e1000: replace bit mask based packet type with unified packet type
ixgbe: replace bit mask based packet type with unified packet type
i40e: replace bit mask based packet type with unified packet type
enic: replace bit mask based packet type with unified packet type
vmxnet3: replace bit mask based packet type with unified packet type
fm10k: replace bit mask based packet type with unified packet type app/test-pipeline: replace bit mask based packet type with unified
packet type
app/testpmd: replace bit mask based packet type with unified packet
type
app/test: Remove useless code
examples/ip_fragmentation: replace bit mask based packet type with
unified packet type
examples/ip_reassembly: replace bit mask based packet type with
unified packet type
examples/l3fwd-acl: replace bit mask based packet type with unified
packet type
examples/l3fwd-power: replace bit mask based packet type with unified
packet type
examples/l3fwd: replace bit mask based packet type with unified packet
type
mbuf: remove old packet type bit masks
app/test-pipeline/pipeline_hash.c | 13 + app/test-pmd/csumonly.c | 14 + app/test-pmd/rxonly.c | 183 +++++++ app/test/packet_burst_generator.c | 6 +- drivers/net/e1000/igb_rxtx.c | 102 ++++ drivers/net/enic/enic_main.c | 26 + drivers/net/fm10k/fm10k_rxtx.c | 27 ++ drivers/net/i40e/i40e_rxtx.c | 528 +++++++++++++++++++++ drivers/net/ixgbe/ixgbe_rxtx.c | 163 +++++++ drivers/net/ixgbe/ixgbe_rxtx_vec.c | 75 ++- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 + examples/ip_fragmentation/main.c | 9 + examples/ip_reassembly/main.c | 9 + examples/l3fwd-acl/main.c | 29 +- examples/l3fwd-power/main.c | 8 + examples/l3fwd/main.c | 123 ++++- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 + lib/librte_mbuf/rte_mbuf.c | 4 + lib/librte_mbuf/rte_mbuf.h | 514 ++++++++++++++++++++ 19 files changed, 1834 insertions(+), 13 deletions(-)
Signature · 1 line
1.9.3
PATCH v6 1/18 mbuf: redefine packet_type in rte_mbuf
In order to unify the packet type, the field of 'packet_type' in 'struct rte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'struct rte_mbuf' are re-organized to support this change for Vector PMD. As 'struct rte_kni_mbuf' for KNI should be right mapped to 'struct rte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'struct rte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- config/common_linuxapp | 2 +- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 ++++++ lib/librte_mbuf/rte_mbuf.h | 23 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-)
v2 changes:
* Enlarged the packet_type field from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Disabled vector ixgbe PMD by default, as mbuf layout changed.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
config/common_linuxapp +1 -1
@@ -167,7 +167,7 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_IXGBE_INC_VECTOR=y +CONFIG_RTE_IXGBE_INC_VECTOR=n CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y #
lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +6 -0
@@ -117,9 +117,15 @@ struct rte_kni_mbuf {uint16_t data_off;/**< Start address of data in segment buffer. */ char pad1[4 ];uint64_t ol_flags;/**< Offload features. */ +#ifdef RTE_UNIFIED_PKT_TYPE +char pad2[4 ]; +uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ +#else char pad2[2 ];uint16_t data_len;/**< Amount of data in segment buffer. */ uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +#endif /* fields on second cache line */ char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_SIZE)));
lib/librte_mbuf/rte_mbuf.h +23 -0
@@ -269,6 +269,28 @@ struct rte_mbuf {/* remaining bytes are set on RX when pulling packet from descriptor */ MARKER rx_descriptor_fields1; +#ifdef RTE_UNIFIED_PKT_TYPE +/* +* The packet type, which is the combination of outer/inner L2, L3, L4 +* and tunnel types. +*/ +union { +uint32_t packet_type;/**< L2/L3/L4 and tunnel information. */ +struct { +uint32_t l2_type:4 ;/**< (Outer) L2 type. */ +uint32_t l3_type:4 ;/**< (Outer) L3 type. */ +uint32_t l4_type:4 ;/**< (Outer) L4 type. */ +uint32_t tun_type:4 ;/**< Tunnel type. */ +uint32_t inner_l2_type:4 ;/**< Inner L2 type. */ +uint32_t inner_l3_type:4 ;/**< Inner L3 type. */ +uint32_t inner_l4_type:4 ;/**< Inner L4 type. */ + }; + }; + +uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ +uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ +#else /** * The packet type, which is used to indicate ordinary packet and also * tunneled packet format, i.e. each number is represented a type of
@@ -280,6 +302,7 @@ struct rte_mbuf {uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ uint16_t reserved; +#endif union {uint32_t rss;/**< RSS hash result if RSS enabled */ struct {
Signature · 1 line
1.9.3
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
Hi Helin,
+CC Neil
Quoted 9 lines · Helin Zhang
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.
What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.
In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rst
(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
Regards,
Olivier
Quoted 100 lines
Signed-off-by Helin Zhang <[email protected]>Signed-off-by Cunming Liang <[email protected]>--- config/common_linuxapp | 2 +- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 ++++++ lib/librte_mbuf/rte_mbuf.h | 23 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-)v2 changes:
* Enlarged thepacket_typefield from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'structrte_kni_mbuf' for KNI according to the mbuf changes.v3 changes:
* Put the mbuf layout changes into a single patch.
* Disabled vector ixgbe PMD by default, as mbuf layout changed.v5 changes:
* Re-worded the commit logs.v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.config/common_linuxapp +1
-1@@ -167,7 +167,7 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_IXGBE_INC_VECTOR=y +CONFIG_RTE_IXGBE_INC_VECTOR=n CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y #lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +6
-0@@ -117,9 +117,15 @@ struct rte_kni_mbuf {uint16_t data_off;/**< Start address of data in segment buffer. */ char pad1[4 ];uint64_t ol_flags;/**< Offload features. */ +#ifdef RTE_UNIFIED_PKT_TYPE +char pad2[4 ]; +uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ +#else char pad2[2 ];uint16_t data_len;/**< Amount of data in segment buffer. */ uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +#endif /* fields on second cache line */ char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_SIZE)));lib/librte_mbuf/rte_mbuf.h +23
-0@@ -269,6 +269,28 @@ struct rte_mbuf {/* remaining bytes are set on RX when pulling packet from descriptor */ MARKER rx_descriptor_fields1; +#ifdef RTE_UNIFIED_PKT_TYPE +/* +* The packet type, which is the combination of outer/inner L2, L3, L4 +* and tunnel types. +*/ +union { +uint32_t packet_type;/**< L2/L3/L4 and tunnel information. */ +struct { +uint32_t l2_type:4 ;/**< (Outer) L2 type. */ +uint32_t l3_type:4 ;/**< (Outer) L3 type. */ +uint32_t l4_type:4 ;/**< (Outer) L4 type. */ +uint32_t tun_type:4 ;/**< Tunnel type. */ +uint32_t inner_l2_type:4 ;/**< Inner L2 type. */ +uint32_t inner_l3_type:4 ;/**< Inner L3 type. */ +uint32_t inner_l4_type:4 ;/**< Inner L4 type. */ + }; + }; + +uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ +uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ +#else /** * The packet type, which is used to indicate ordinary packet and also * tunneled packet format, i.e. each number is represented a type of @@ -280,6 +302,7 @@ struct rte_mbuf {uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ uint16_t reserved; +#endif union {uint32_t rss;/**< RSS hash result if RSS enabled */ struct {
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
Quoted 36 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Sent: Monday, June 1, 2015 9:15 AM
To: Zhang, Helin; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufHi Helin,
+CC Neil
Quoted 9 lines · Helin Zhang
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.
In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rst
Quoted 7 lines
(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
Regards,
Olivier
This is just like the change that Steve (Cunming) Liang submitted for Interrupt Mode. We have the same problem in both cases: we want to find a way to get the features included, but need to comply with our ABI policy. So, in both cases, the proposal is to add a config option to enable the change by default, so we maintain backward compatibility. Users that want these changes, and are willing to accept the associated ABI change, have to specifically enable them.
We can note in the Deprecation Notices in the Release Notes for 2.1 that these config options will be removed in 2.2. The features will then be enabled by default.
This seems like a good compromise which allows us to get these changes into 2.1 but avoids breaking the ABI policy.
Tim
Quoted 118 lines
Quoted 9 lines
Signed-off-by Helin Zhang <[email protected]>Signed-off-by Cunming Liang <[email protected]>--- config/common_linuxapp | 2 +- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 ++++++ lib/librte_mbuf/rte_mbuf.h | 23++++++++++++++++++++++
Quoted 6 lines
3 files changed, 30 insertions(+), 1 deletion(-)v2 changes:
* Enlarged thepacket_typefield from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'structrte_kni_mbuf' for KNI according to the mbufchanges.
Review
Quoted 26 lines
v3 changes:
* Put the mbuf layout changes into a single patch.
* Disabled vector ixgbe PMD by default, as mbuf layout changed.v5 changes:
* Re-worded the commit logs.v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.config/common_linuxapp +1
-1@@ -167,7 +167,7 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_IXGBE_INC_VECTOR=y +CONFIG_RTE_IXGBE_INC_VECTOR=n CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y #(quoted diff) +0
-0
env/rte_kni_common.hb/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.hlib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h struct rte_kni_mbuf { · line 117
Quoted 5 lines
index 1e55c2d..7a2abbb 100644
lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +0
-0@@ -117,9 +117,15 @@ struct rte_kni_mbuf {uint16_t data_off;/**< Start address of data in segment buffer. */
lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h struct rte_kni_mbuf {
Quoted 5 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +3
-0char pad1[4 ];uint64_t ol_flags;/**< Offload features. */ +#ifdef RTE_UNIFIED_PKT_TYPE +char pad2[4 ]; +uint32_t pkt_len;/**< Total pkt len: sum of all segment
data_len. */lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h struct rte_kni_mbuf {
Quoted 5 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +2
-0+uint16_t data_len;/**< Amount of data in segment buffer. */ +#else char pad2[2 ];uint16_t data_len;/**< Amount of data in segment buffer. */ uint32_t pkt_len;/**< Total pkt len: sum of all segment
data_len. */lib/librte_mbuf/rte_mbuf.h struct rte_mbuf { · line 269
Quoted 10 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +1
-0+#endif /* fields on second cache line */ char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_SIZE)));lib/librte_mbuf/rte_mbuf.h +0
-0@@ -269,6 +269,28 @@ struct rte_mbuf {/* remaining bytes are set on RX when pulling packet from descriptor */
lib/librte_mbuf/rte_mbuf.h struct rte_mbuf {
Quoted 5 lines
lib/librte_mbuf/rte_mbuf.h +3
-0MARKER rx_descriptor_fields1; +#ifdef RTE_UNIFIED_PKT_TYPE +/* +* The packet type, which is the combination of outer/inner L2, L3, L4
lib/librte_mbuf/rte_mbuf.h struct rte_mbuf {
Quoted 4 lines
lib/librte_mbuf/rte_mbuf.h +4
-0+* and tunnel types. +*/ +union { +uint32_t packet_type;/**< L2/L3/L4 and tunnel information. */
lib/librte_mbuf/rte_mbuf.h struct rte_mbuf {
Quoted 12 lines
lib/librte_mbuf/rte_mbuf.h +12
-0+struct { +uint32_t l2_type:4 ;/**< (Outer) L2 type. */ +uint32_t l3_type:4 ;/**< (Outer) L3 type. */ +uint32_t l4_type:4 ;/**< (Outer) L4 type. */ +uint32_t tun_type:4 ;/**< Tunnel type. */ +uint32_t inner_l2_type:4 ;/**< Inner L2 type. */ +uint32_t inner_l3_type:4 ;/**< Inner L3 type. */ +uint32_t inner_l4_type:4 ;/**< Inner L4 type. */ + }; + }; + +uint32_t pkt_len;/**< Total pkt len: sum of all segments. */
lib/librte_mbuf/rte_mbuf.h struct rte_mbuf { · line 292
Quoted 2 lines
lib/librte_mbuf/rte_mbuf.h +2
-0+uint16_t data_len;/**< Amount of data in segment buffer. */ +uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */
lib/librte_mbuf/rte_mbuf.h struct rte_mbuf {
Quoted 3 lines
lib/librte_mbuf/rte_mbuf.h +1
-0+#else /** * The packet type, which is used to indicate ordinary packet and also
lib/librte_mbuf/rte_mbuf.h struct rte_mbuf { · line 296
Quoted 1 line
lib/librte_mbuf/rte_mbuf.h +0
-0* tunneled packet format, i.e. each number is represented a type of
lib/librte_mbuf/rte_mbuf.h struct rte_mbuf { · line 302
Quoted 2 lines
lib/librte_mbuf/rte_mbuf.h +0
-0@@ -280,6 +302,7 @@ struct rte_mbuf {uint32_t pkt_len;/**< Total pkt len: sum of all segments. */
lib/librte_mbuf/rte_mbuf.h struct rte_mbuf { · line 303
Quoted 1 line
lib/librte_mbuf/rte_mbuf.h +0
-0uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */
Quoted 6 lines
lib/librte_mbuf/rte_mbuf.h +1
-0uint16_t reserved; +#endif union {uint32_t rss;/**< RSS hash result if RSS enabled */ struct {
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
Hi Tim, Helin,
Quoted 44 lines · Tim
Quoted 36 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Sent: Monday, June 1, 2015 9:15 AM
To: Zhang, Helin; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufHi Helin,
+CC Neil
Quoted 9 lines · Helin Zhang
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.
In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rstQuoted 7 lines
(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
Regards,
Olivier
Quoted 5 lines
This is just like the change that Steve (Cunming) Liang submitted for Interrupt Mode. We have the same problem in both cases: we want to find a way to get the features included, but need to comply with our ABI policy. So, in both cases, the proposal is to add a config option to enable the change by default, so we maintain backward compatibility. Users that want these changes, and are willing to accept the associated ABI change, have to specifically enable them.
We can note in the Deprecation Notices in the Release Notes for 2.1 that these config options will be removed in 2.2. The features will then be enabled by default.
This seems like a good compromise which allows us to get these changes into 2.1 but avoids breaking the ABI policy.
Sorry for the late answer.
After some thoughts on this topic, I understand that having a compile-time option is perhaps a good compromise between keeping compatibility and having new features earlier.
I'm just afraid about having one #ifdef in the code for each new feature that cannot keep the ABI compatibility. What do you think about having one option -- let's call it "CONFIG_RTE_NEXT_ABI" --, that is disabled by default, and that would surround any new feature that breaks the ABI?
This would have several advantages:
- only 2 cases (on or off), the combinatorial is smaller than having one option per feature
- all next features breaking the abi can be identified by a grep
- the code inside the #ifdef can be enabled in a simple operation by Thomas after each release.
Thomas, any comment?
Regards,
Olivier
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
Hi Oliver
Quoted 75 lines
-----Original Message-----
From: Olivier MATZ [mailto:[email protected]]
Sent: Wednesday, June 10, 2015 10:33 PM
To: O'Driscoll, Tim; Zhang, Helin; [email protected]
Cc: Thomas Monjalon
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufHi Tim, Helin,
Quoted 40 lines · Tim
Quoted 40 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Sent: Monday, June 1, 2015 9:15 AM
To: Zhang, Helin; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufHi Helin,
+CC Neil
Quoted 9 lines · Helin Zhang
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI
compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rst(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
Quoted 5 lines
Quoted 3 lines
Regards,
OlivierThis is just like the change that Steve (Cunming) Liang submitted for Interrupt
Mode. We have the same problem in both cases: we want to find a way to get the features included, but need to comply with our ABI policy. So, in both cases, the proposal is to add a config option to enable the change by default, so we maintain backward compatibility. Users that want these changes, and are willing to accept the associated ABI change, have to specifically enable them.
Quoted 2 lines
We can note in the Deprecation Notices in the Release Notes for 2.1 that these
config options will be removed in 2.2. The features will then be enabled by default.
Quoted 2 lines
This seems like a good compromise which allows us to get these changes into
2.1 but avoids breaking the ABI policy.
Sorry for the late answer.
After some thoughts on this topic, I understand that having a compile-time option is perhaps a good compromise between keeping compatibility and having new features earlier.
Quoted 5 lines
I'm just afraid about having one #ifdef in the code for each new feature that cannot keep the ABI compatibility.
What do you think about having one option -- let's call it "CONFIG_RTE_NEXT_ABI" --, that is disabled by default, and that would surround any new feature that breaks the ABI?
Will we allow this type of workaround for a long time? If yes, agree with your good idea.
Regards,
Helin
Quoted 13 lines
This would have several advantages:
- only 2 cases (on or off), the combinatorial is smaller than having one option per feature
- all next features breaking the abi can be identified by a grep
- the code inside the #ifdef can be enabled in a simple operation by Thomas after each release.Thomas, any comment?
Regards,
Olivier
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
In reply to Olivier MATZHi Olivier,
Quoted 69 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Sent: Wednesday, June 10, 2015 3:33 PM
To: O'Driscoll, Tim; Zhang, Helin; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufHi Tim, Helin,
Quoted 40 lines · Tim
Quoted 40 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Sent: Monday, June 1, 2015 9:15 AM
To: Zhang, Helin; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufHi Helin,
+CC Neil
Quoted 9 lines · Helin Zhang
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.
In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rst(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
Quoted 5 lines
Quoted 3 lines
Regards,
OlivierThis is just like the change that Steve (Cunming) Liang submitted for Interrupt Mode. We have the same problem in both cases: we
want to find a way to get the features included, but need to comply with our ABI policy. So, in both cases, the proposal is to add a config option to enable the change by default, so we maintain backward compatibility. Users that want these changes, and are willing to accept the associated ABI change, have to specifically enable them.
Quoted 2 lines
We can note in the Deprecation Notices in the Release Notes for 2.1 that these config options will be removed in 2.2. The features
will then be enabled by default.
Quoted 2 lines
This seems like a good compromise which allows us to get these changes into 2.1 but avoids breaking the ABI policy.
Sorry for the late answer.
After some thoughts on this topic, I understand that having a compile-time option is perhaps a good compromise between keeping compatibility and having new features earlier.
Quoted 6 lines
I'm just afraid about having one #ifdef in the code for each new feature that cannot keep the ABI compatibility. What do you think about having one option -- let's call it "
CONFIG_RTE_NEXT_ABI" --, that is disabled by default, and that would surround any new feature that breaks the ABI?
I am not Tim/Helin, but really like that idea :)
Konstantin
Quoted 13 lines
This would have several advantages:
- only 2 cases (on or off), the combinatorial is smaller than having one option per feature
- all next features breaking the abi can be identified by a grep
- the code inside the #ifdef can be enabled in a simple operation by Thomas after each release.Thomas, any comment?
Regards,
Olivier
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
Quoted 86 lines
-----Original Message-----
From: Ananyev, Konstantin
Sent: Wednesday, June 10, 2015 11:40 PM
To: Olivier MATZ; O'Driscoll, Tim; Zhang, Helin; [email protected]
Subject: RE: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufHi Olivier,
Quoted 54 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Sent: Wednesday, June 10, 2015 3:33 PM
To: O'Driscoll, Tim; Zhang, Helin; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufHi Tim, Helin,
Quoted 44 lines · Tim
Quoted 43 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Sent: Monday, June 1, 2015 9:15 AM
To: Zhang, Helin; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufHi Helin,
+CC Neil
Quoted 9 lines · Helin Zhang
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.
In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rst(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
Regards,
OlivierQuoted 5 lines
Quoted 2 lines
This is just like the change that Steve (Cunming) Liang submitted for Interrupt Mode. We have the same problem in both cases: we
want to find a way to get the features included, but need to comply with our ABI policy. So, in both cases, the proposal is to add a config option to enable the change by default, so we maintain backward
compatibility. Users that want these changes, and are willing to accept the associated ABI change, have to specifically enable them.
Quoted 6 lines
Quoted 3 lines
We can note in the Deprecation Notices in the Release Notes for 2.1 that these config options will be removed in 2.2. The features
will then be enabled by default.
Quoted 2 lines
This seems like a good compromise which allows us to get these changes into
2.1 but avoids breaking the ABI policy.
Quoted 7 lines
Sorry for the late answer.
After some thoughts on this topic, I understand that having a compile-time option is perhaps a good compromise between keeping compatibility and having new features earlier.
Quoted 7 lines
Quoted 5 lines
I'm just afraid about having one #ifdef in the code for each new feature that cannot keep the ABI compatibility.
What do you think about having one option -- let's call it "CONFIG_RTE_NEXT_ABI" --, that is disabled by default, and that would surround any new feature that breaks the ABI?I am not Tim/Helin, but really like that idea :) Konstantin
It seems more guys like Oliver's idea of introducing CONFIG_RTE_NEXT_ABI. Any objections? If none, I will rework my patches with that.
- Helin
Quoted 15 lines
Quoted 15 lines
This would have several advantages:
- only 2 cases (on or off), the combinatorial is smaller than having one option per feature
- all next features breaking the abi can be identified by a grep
- the code inside the #ifdef can be enabled in a simple operation by Thomas after each release.Thomas, any comment?
Regards,
Olivier
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
In reply to Olivier MATZ2015-06-10 16:32, Olivier MATZ:
Quoted 57 lines · Tim
Quoted 36 lines
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Quoted 18 lines · Helin Zhang
Quoted 9 lines
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.
Quoted 8 lines
In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rst(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
This is just like the change that Steve (Cunming) Liang submitted for Interrupt Mode. We have the same problem in both cases: we want to find a way to get the features included, but need to comply with our ABI policy. So, in both cases, the proposal is to add a config option to enable the change by default, so we maintain backward compatibility. Users that want these changes, and are willing to accept the associated ABI change, have to specifically enable them.
Quoted 6 lines
We can note in the Deprecation Notices in the Release Notes for 2.1 that these config options will be removed in 2.2. The features will then be enabled by default.
This seems like a good compromise which allows us to get these changes into 2.1 but avoids breaking the ABI policy.
Sorry for the late answer.
After some thoughts on this topic, I understand that having a compile-time option is perhaps a good compromise between keeping compatibility and having new features earlier.
I'm just afraid about having one #ifdef in the code for each new feature that cannot keep the ABI compatibility. What do you think about having one option -- let's call it "
CONFIG_RTE_NEXT_ABI" --, that is disabled by default, and that would surround any new feature that breaks the ABI?
Quoted 8 lines
This would have several advantages:
- only 2 cases (on or off), the combinatorial is smaller than having one option per feature
- all next features breaking the abi can be identified by a grep
- the code inside the #ifdef can be enabled in a simple operation by Thomas after each release.Thomas, any comment?
As previously discussed (1to1) with Olivier, I think that's a good proposal to introduce changes breaking deeply the ABI.
Let's sum up the current policy:
1/ For changes which have a limited impact on the ABI, the backward compatibility must be kept during 1 release including the notice in doc/guides/rel_notes/abi.rst. 2/ For important changes like mbuf rework, there was an agreement on skipping the backward compatibility after having 3 acknowledgements and an 1-release long notice. Then the ABI numbering must be incremented.
This CONFIG_RTE_NEXT_ABI proposal would change the rules for the second case. In order to be adopted, a patch for the file doc/guides/rel_notes/abi.rst must be submitted and strongly acknowledged.
The ABI numbering must be also clearly explained:
1/ Should we have different libraries version number depending of CONFIG_RTE_NEXT_ABI? It seems straightforward to use "ifeq" when LIBABIVER in the Makefiles 2/ Are we able to have some "if CONFIG_RTE_NEXT_ABI" statement in the .map files? Maybe we should remove these files and generate them with some preprocessing.
Neil, as the ABI policy author, what is your opinion?
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
Quoted 77 lines · Thomas Monjalon
2015-06-10 16:32, Olivier MATZ:
Quoted 57 lines · Tim
Quoted 36 lines
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Quoted 18 lines · Helin Zhang
Quoted 9 lines
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.
Quoted 8 lines
In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rst(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
This is just like the change that Steve (Cunming) Liang submitted for Interrupt Mode. We have the same problem in both cases: we want to find a way to get the features included, but need to comply with our ABI policy. So, in both cases, the proposal is to add a config option to enable the change by default, so we maintain backward compatibility. Users that want these changes, and are willing to accept the associated ABI change, have to specifically enable them.
Quoted 6 lines
We can note in the Deprecation Notices in the Release Notes for 2.1 that these config options will be removed in 2.2. The features will then be enabled by default.
This seems like a good compromise which allows us to get these changes into 2.1 but avoids breaking the ABI policy.
Sorry for the late answer.
After some thoughts on this topic, I understand that having a compile-time option is perhaps a good compromise between keeping compatibility and having new features earlier.
I'm just afraid about having one #ifdef in the code for each new feature that cannot keep the ABI compatibility. What do you think about having one option -- let's call it "
CONFIG_RTE_NEXT_ABI" --, that is disabled by default, and that would surround any new feature that breaks the ABI?Quoted 8 lines
This would have several advantages:
- only 2 cases (on or off), the combinatorial is smaller than having one option per feature
- all next features breaking the abi can be identified by a grep
- the code inside the #ifdef can be enabled in a simple operation by Thomas after each release.Thomas, any comment?
As previously discussed (1to1) with Olivier, I think that's a good proposal to introduce changes breaking deeply the ABI.
Let's sum up the current policy:
1/ For changes which have a limited impact on the ABI, the backward compatibility must be kept during 1 release including the notice indoc/guides/rel_notes/abi.rst. 2/ For important changes like mbuf rework, there was an agreement on skipping the backward compatibility after having 3 acknowledgements and an 1-release long notice. Then the ABI numbering must be incremented.
Quoted 7 lines
This
CONFIG_RTE_NEXT_ABIproposal would change the rules for the second case. In order to be adopted, a patch for the filedoc/guides/rel_notes/abi.rstmust be submitted and strongly acknowledged.The ABI numbering must be also clearly explained:
1/ Should we have different libraries version number depending ofCONFIG_RTE_NEXT_ABI? It seems straightforward to use "ifeq" when LIBABIVER in the Makefiles
An incompatible ABI must be reflected by a soname change, otherwise the whole library versioning is irrelevant.
Quoted 4 lines
2/ Are we able to have some "if
CONFIG_RTE_NEXT_ABI" statement in the .map files? Maybe we should remove these files and generate them with some preprocessing.Neil, as the ABI policy author, what is your opinion?
I'm not Neil but my 5c...
Working around ABI compatibility policy via config options seems like a slippery slope. Going forward this will likely mean there are always two different ABIs for any given version, and the thought of keeping track of it all in a truly compatible manner makes my head hurt.
That said its easy to understand the desire to move faster than the ABI policy allows. In a project where so many structs are in the open it gets hard to do much anything at all without breaking the ABI.
The issue could be mitigated somewhat by reserving some space at the end of the structs eg when the ABI needs to be changed anyway, but it has obvious downsides as well. The other options I see tend to revolve around changing release policies one way or the other: releasing ABI compatible micro versions between minor versions and relaxing the ABI policy a bit, or just releasing new minor versions more often than the current cycle.
- Panu -
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
Quoted 122 lines
-----Original Message-----
From: Panu Matilainen [mailto:[email protected]]
Sent: Friday, June 12, 2015 3:24 PM
To: Thomas Monjalon; Olivier MATZ; O'Driscoll, Tim; Zhang, Helin; [email protected]
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufQuoted 35 lines · Thomas Monjalon
2015-06-10 16:32, Olivier MATZ:
Quoted 34 lines · Tim
Quoted 33 lines
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Quoted 18 lines · Helin Zhang
Quoted 9 lines
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.
Quoted 8 lines
In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rst(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
This is just like the change that Steve (Cunming) Liang submitted for Interrupt Mode. We have the same problem in both cases: we want to find a way to get the features included, but need to comply with our ABI policy. So, in both cases, the proposal is to add a config option to enable the change by default, so we maintain backward
compatibility.
Quoted 29 lines
Quoted 29 lines
Quoted 9 lines
Users that want these changes, and are willing to accept the associated ABI change, have to specifically enable them.
We can note in the Deprecation Notices in the Release Notes for 2.1 that these config options will be removed in 2.2. The features will then be enabled by default.
This seems like a good compromise which allows us to get these changes into 2.1 but avoids breaking the ABI policy.
Sorry for the late answer.
After some thoughts on this topic, I understand that having a compile-time option is perhaps a good compromise between keeping compatibility and having new features earlier.
I'm just afraid about having one #ifdef in the code for each new feature that cannot keep the ABI compatibility.
What do you think about having one option -- let's call it "CONFIG_RTE_NEXT_ABI" --, that is disabled by default, and that would surround any new feature that breaks the ABI?This would have several advantages:
- only 2 cases (on or off), the combinatorial is smaller than having one option per feature
- all next features breaking the abi can be identified by a grep
- the code inside the #ifdef can be enabled in a simple operation by Thomas after each release.Quoted 8 lines
Quoted 1 line
Thomas, any comment?
As previously discussed (1to1) with Olivier, I think that's a good proposal to introduce changes breaking deeply the ABI.
Let's sum up the current policy:
1/ For changes which have a limited impact on the ABI, the backward compatibility must be kept during 1 release including the notice in
doc/guides/rel_notes/abi.rst.Quoted 2 lines
2/ For important changes like mbuf rework, there was an agreement on skipping the backward compatibility after having 3 acknowledgements and an
1-release long notice.
Quoted 3 lines
Then the ABI numbering must be incremented.
This
CONFIG_RTE_NEXT_ABIproposal would change the rules for the secondcase.
Quoted 5 lines
In order to be adopted, a patch for the file
doc/guides/rel_notes/abi.rstmust be submitted and strongly acknowledged.The ABI numbering must be also clearly explained:
1/ Should we have different libraries version number depending of
CONFIG_RTE_NEXT_ABI?Quoted 1 line
It seems straightforward to use "ifeq" when LIBABIVER in the Makefiles
An incompatible ABI must be reflected by a soname change, otherwise the whole library versioning is irrelevant.
Quoted 1 line
2/ Are we able to have some "if
CONFIG_RTE_NEXT_ABI" statement inthe .map files?
Quoted 1 line
Maybe we should remove these files and generate them with some
preprocessing.
Quoted 2 lines
Neil, as the ABI policy author, what is your opinion?
I'm not Neil but my 5c...
Working around ABI compatibility policy via config options seems like a slippery slope. Going forward this will likely mean there are always two different ABIs for any given version, and the thought of keeping track of it all in a truly compatible manner makes my head hurt.
That said its easy to understand the desire to move faster than the ABI policy allows. In a project where so many structs are in the open it gets hard to do much anything at all without breaking the ABI.
Quoted 8 lines
The issue could be mitigated somewhat by reserving some space at the end of the structs eg when the ABI needs to be changed anyway, but it has obvious downsides as well. The other options I see tend to revolve around changing release policies one way or the other: releasing ABI compatible micro versions between minor versions and relaxing the ABI policy a bit, or just releasing new minor versions more often than the current cycle.
- Panu -
Does it mean releasing R2.01 right now with announcement of all ABI changes, which based on R2.0 first, and then releasing R2.1 several weeks later with all the code changes?
- Helin
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
Quoted 129 lines · Helin
Quoted 129 lines
-----Original Message-----
From: Panu Matilainen [mailto:[email protected]]
Sent: Friday, June 12, 2015 3:24 PM
To: Thomas Monjalon; Olivier MATZ; O'Driscoll, Tim; Zhang, Helin; [email protected]
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufQuoted 35 lines · Thomas Monjalon
2015-06-10 16:32, Olivier MATZ:
Quoted 34 lines · Tim
Quoted 33 lines
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Quoted 18 lines · Helin Zhang
Quoted 9 lines
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.
Quoted 8 lines
In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rst(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
This is just like the change that Steve (Cunming) Liang submitted for Interrupt Mode. We have the same problem in both cases: we want to find a way to get the features included, but need to comply with our ABI policy. So, in both cases, the proposal is to add a config option to enable the change by default, so we maintain backward
compatibility.
Quoted 29 lines
Quoted 29 lines
Quoted 9 lines
Users that want these changes, and are willing to accept the associated ABI change, have to specifically enable them.
We can note in the Deprecation Notices in the Release Notes for 2.1 that these config options will be removed in 2.2. The features will then be enabled by default.
This seems like a good compromise which allows us to get these changes into 2.1 but avoids breaking the ABI policy.
Sorry for the late answer.
After some thoughts on this topic, I understand that having a compile-time option is perhaps a good compromise between keeping compatibility and having new features earlier.
I'm just afraid about having one #ifdef in the code for each new feature that cannot keep the ABI compatibility.
What do you think about having one option -- let's call it "CONFIG_RTE_NEXT_ABI" --, that is disabled by default, and that would surround any new feature that breaks the ABI?This would have several advantages:
- only 2 cases (on or off), the combinatorial is smaller than having one option per feature
- all next features breaking the abi can be identified by a grep
- the code inside the #ifdef can be enabled in a simple operation by Thomas after each release.Quoted 8 lines
Quoted 1 line
Thomas, any comment?
As previously discussed (1to1) with Olivier, I think that's a good proposal to introduce changes breaking deeply the ABI.
Let's sum up the current policy:
1/ For changes which have a limited impact on the ABI, the backward compatibility must be kept during 1 release including the notice in
doc/guides/rel_notes/abi.rst.Quoted 2 lines
2/ For important changes like mbuf rework, there was an agreement on skipping the backward compatibility after having 3 acknowledgements and an
1-release long notice.
Quoted 3 lines
Then the ABI numbering must be incremented.
This
CONFIG_RTE_NEXT_ABIproposal would change the rules for the secondcase.
Quoted 5 lines
In order to be adopted, a patch for the file
doc/guides/rel_notes/abi.rstmust be submitted and strongly acknowledged.The ABI numbering must be also clearly explained:
1/ Should we have different libraries version number depending of
CONFIG_RTE_NEXT_ABI?Quoted 1 line
It seems straightforward to use "ifeq" when LIBABIVER in the Makefiles
An incompatible ABI must be reflected by a soname change, otherwise the whole library versioning is irrelevant.
Quoted 1 line
2/ Are we able to have some "if
CONFIG_RTE_NEXT_ABI" statement inthe .map files?
Quoted 1 line
Maybe we should remove these files and generate them with some
preprocessing.
Quoted 2 lines
Neil, as the ABI policy author, what is your opinion?
I'm not Neil but my 5c...
Working around ABI compatibility policy via config options seems like a slippery slope. Going forward this will likely mean there are always two different ABIs for any given version, and the thought of keeping track of it all in a truly compatible manner makes my head hurt.
That said its easy to understand the desire to move faster than the ABI policy allows. In a project where so many structs are in the open it gets hard to do much anything at all without breaking the ABI.
The issue could be mitigated somewhat by reserving some space at the end of the structs eg when the ABI needs to be changed anyway, but it has obvious downsides as well. The other options I see tend to revolve around changing release policies one way or the other: releasing ABI compatible micro versions between minor versions and relaxing the ABI policy a bit, or just releasing new minor versions more often than the current cycle.
Quoted 4 lines
Quoted 1 line
- Panu -
Does it mean releasing R2.01 right now with announcement of all ABI changes, which based on R2.0 first, and then releasing R2.1 several weeks later with all the code changes?
Something like that, but I'd think its too late for any big release model / policy changes for this particular cycle.
I also do not want to undermine the ABI policy we just got in place, but since people are actively looking for ways to work around it anyway its better to map out all the possibilities. One of them is committing to longer term maintenance of releases (via ABI compatible micro version updates), another one is shortening the cycles. Both achieve roughly the same goals with differences in emphasis perhaps, but more releases requires more resources on maintaining, testing etc so...
- Panu -
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
Quoted 156 lines
-----Original Message-----
From: Panu Matilainen [mailto:[email protected]]
Sent: Friday, June 12, 2015 4:15 PM
To: Zhang, Helin; Thomas Monjalon; Olivier MATZ; O'Driscoll, Tim; [email protected]
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufQuoted 90 lines · Helin
Quoted 90 lines
-----Original Message-----
From: Panu Matilainen [mailto:[email protected]]
Sent: Friday, June 12, 2015 3:24 PM
To: Thomas Monjalon; Olivier MATZ; O'Driscoll, Tim; Zhang, Helin; [email protected]
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufQuoted 36 lines · Thomas Monjalon
2015-06-10 16:32, Olivier MATZ:
Quoted 35 lines · Tim
Quoted 34 lines
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Quoted 18 lines · Helin Zhang
Quoted 9 lines
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.
Quoted 8 lines
In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rst(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
This is just like the change that Steve (Cunming) Liang submitted for Interrupt Mode. We have the same problem in both cases: we want to find a way to get the features included, but need to comply with our ABI policy. So, in both cases, the proposal is to add a config option to enable the change by default, so we maintain backward
compatibility.
Quoted 29 lines
Quoted 29 lines
Quoted 9 lines
Users that want these changes, and are willing to accept the associated ABI change, have to specifically enable them.
We can note in the Deprecation Notices in the Release Notes for 2.1 that these config options will be removed in 2.2. The features will then be enabled by default.
This seems like a good compromise which allows us to get these changes into 2.1 but avoids breaking the ABI policy.
Sorry for the late answer.
After some thoughts on this topic, I understand that having a compile-time option is perhaps a good compromise between keeping compatibility and having new features earlier.
I'm just afraid about having one #ifdef in the code for each new feature that cannot keep the ABI compatibility.
What do you think about having one option -- let's call it "CONFIG_RTE_NEXT_ABI" --, that is disabled by default, and that would surround any new feature that breaks the ABI?This would have several advantages:
- only 2 cases (on or off), the combinatorial is smaller than having one option per feature
- all next features breaking the abi can be identified by a grep
- the code inside the #ifdef can be enabled in a simple operation by Thomas after each release.Quoted 8 lines
Quoted 1 line
Thomas, any comment?
As previously discussed (1to1) with Olivier, I think that's a good proposal to introduce changes breaking deeply the ABI.
Let's sum up the current policy:
1/ For changes which have a limited impact on the ABI, the backward compatibility must be kept during 1 release including the notice in
doc/guides/rel_notes/abi.rst.Quoted 3 lines
2/ For important changes like mbuf rework, there was an agreement on skipping the backward compatibility after having 3 acknowledgements and an
Quoted 8 lines
Quoted 8 lines
1-release long notice.
Quoted 4 lines
Then the ABI numbering must be incremented.
This
CONFIG_RTE_NEXT_ABIproposal would change the rules for the secondcase.
Quoted 2 lines
In order to be adopted, a patch for the file
doc/guides/rel_notes/abi.rstmust be submitted and stronglyacknowledged.
Quoted 28 lines
Quoted 28 lines
Quoted 3 lines
The ABI numbering must be also clearly explained:
1/ Should we have different libraries version number depending of
CONFIG_RTE_NEXT_ABI?Quoted 2 lines
It seems straightforward to use "ifeq" when LIBABIVER in the Makefiles
An incompatible ABI must be reflected by a soname change, otherwise the whole library versioning is irrelevant.
Quoted 1 line
2/ Are we able to have some "if
CONFIG_RTE_NEXT_ABI" statement inthe .map files?
Quoted 1 line
Maybe we should remove these files and generate them with some
preprocessing.
Quoted 2 lines
Neil, as the ABI policy author, what is your opinion?
I'm not Neil but my 5c...
Working around ABI compatibility policy via config options seems like a slippery slope. Going forward this will likely mean there are always two different ABIs for any given version, and the thought of keeping track of it all in a truly compatible manner makes my head hurt.
That said its easy to understand the desire to move faster than the ABI policy allows. In a project where so many structs are in the open it gets hard to do much anything at all without breaking the ABI.
Quoted 6 lines
Quoted 6 lines
The issue could be mitigated somewhat by reserving some space at the end of the structs eg when the ABI needs to be changed anyway, but it has obvious downsides as well. The other options I see tend to revolve around changing release policies one way or the other:
releasing ABI compatible micro versions between minor versions and relaxing the ABI policy a bit, or just releasing new minor versions more oftenthan the current cycle.
Quoted 5 lines
Quoted 2 lines
- Panu -
Does it mean releasing R2.01 right now with announcement of all ABI changes, which based on R2.0 first, and then releasing R2.1 several weeks later
with all the code changes?
Something like that, but I'd think its too late for any big release model / policy changes for this particular cycle.
Quoted 7 lines
I also do not want to undermine the ABI policy we just got in place, but since people are actively looking for ways to work around it anyway its better to map out all the possibilities. One of them is committing to longer term maintenance of releases (via ABI compatible micro version updates), another one is shortening the cycles. Both achieve roughly the same goals with differences in emphasis perhaps, but more releases requires more resources on maintaining, testing etc so...
R2.01 could just have all the same of R2.0, with an additional ABI announcement. Then nothing needs to be tested.
- Helin
Quoted 2 lines
- Panu -
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
Quoted 163 lines · Helin
Quoted 156 lines
-----Original Message-----
From: Panu Matilainen [mailto:[email protected]]
Sent: Friday, June 12, 2015 4:15 PM
To: Zhang, Helin; Thomas Monjalon; Olivier MATZ; O'Driscoll, Tim; [email protected]
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufQuoted 90 lines · Helin
Quoted 90 lines
-----Original Message-----
From: Panu Matilainen [mailto:[email protected]]
Sent: Friday, June 12, 2015 3:24 PM
To: Thomas Monjalon; Olivier MATZ; O'Driscoll, Tim; Zhang, Helin; [email protected]
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufQuoted 36 lines · Thomas Monjalon
2015-06-10 16:32, Olivier MATZ:
Quoted 35 lines · Tim
Quoted 34 lines
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Quoted 18 lines · Helin Zhang
Quoted 9 lines
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.
Quoted 8 lines
In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rst(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
This is just like the change that Steve (Cunming) Liang submitted for Interrupt Mode. We have the same problem in both cases: we want to find a way to get the features included, but need to comply with our ABI policy. So, in both cases, the proposal is to add a config option to enable the change by default, so we maintain backward
compatibility.
Quoted 29 lines
Quoted 29 lines
Quoted 9 lines
Users that want these changes, and are willing to accept the associated ABI change, have to specifically enable them.
We can note in the Deprecation Notices in the Release Notes for 2.1 that these config options will be removed in 2.2. The features will then be enabled by default.
This seems like a good compromise which allows us to get these changes into 2.1 but avoids breaking the ABI policy.
Sorry for the late answer.
After some thoughts on this topic, I understand that having a compile-time option is perhaps a good compromise between keeping compatibility and having new features earlier.
I'm just afraid about having one #ifdef in the code for each new feature that cannot keep the ABI compatibility.
What do you think about having one option -- let's call it "CONFIG_RTE_NEXT_ABI" --, that is disabled by default, and that would surround any new feature that breaks the ABI?This would have several advantages:
- only 2 cases (on or off), the combinatorial is smaller than having one option per feature
- all next features breaking the abi can be identified by a grep
- the code inside the #ifdef can be enabled in a simple operation by Thomas after each release.Quoted 8 lines
Quoted 1 line
Thomas, any comment?
As previously discussed (1to1) with Olivier, I think that's a good proposal to introduce changes breaking deeply the ABI.
Let's sum up the current policy:
1/ For changes which have a limited impact on the ABI, the backward compatibility must be kept during 1 release including the notice in
doc/guides/rel_notes/abi.rst.Quoted 3 lines
2/ For important changes like mbuf rework, there was an agreement on skipping the backward compatibility after having 3 acknowledgements and an
Quoted 8 lines
Quoted 8 lines
1-release long notice.
Quoted 4 lines
Then the ABI numbering must be incremented.
This
CONFIG_RTE_NEXT_ABIproposal would change the rules for the secondcase.
Quoted 2 lines
In order to be adopted, a patch for the file
doc/guides/rel_notes/abi.rstmust be submitted and stronglyacknowledged.
Quoted 28 lines
Quoted 28 lines
Quoted 3 lines
The ABI numbering must be also clearly explained:
1/ Should we have different libraries version number depending of
CONFIG_RTE_NEXT_ABI?Quoted 2 lines
It seems straightforward to use "ifeq" when LIBABIVER in the Makefiles
An incompatible ABI must be reflected by a soname change, otherwise the whole library versioning is irrelevant.
Quoted 1 line
2/ Are we able to have some "if
CONFIG_RTE_NEXT_ABI" statement inthe .map files?
Quoted 1 line
Maybe we should remove these files and generate them with some
preprocessing.
Quoted 2 lines
Neil, as the ABI policy author, what is your opinion?
I'm not Neil but my 5c...
Working around ABI compatibility policy via config options seems like a slippery slope. Going forward this will likely mean there are always two different ABIs for any given version, and the thought of keeping track of it all in a truly compatible manner makes my head hurt.
That said its easy to understand the desire to move faster than the ABI policy allows. In a project where so many structs are in the open it gets hard to do much anything at all without breaking the ABI.
Quoted 6 lines
Quoted 6 lines
The issue could be mitigated somewhat by reserving some space at the end of the structs eg when the ABI needs to be changed anyway, but it has obvious downsides as well. The other options I see tend to revolve around changing release policies one way or the other:
releasing ABI compatible micro versions between minor versions and relaxing the ABI policy a bit, or just releasing new minor versions more oftenthan the current cycle.
Quoted 5 lines
Quoted 2 lines
- Panu -
Does it mean releasing R2.01 right now with announcement of all ABI changes, which based on R2.0 first, and then releasing R2.1 several weeks later
with all the code changes?
Something like that, but I'd think its too late for any big release model / policy changes for this particular cycle.
Quoted 7 lines
I also do not want to undermine the ABI policy we just got in place, but since people are actively looking for ways to work around it anyway its better to map out all the possibilities. One of them is committing to longer term maintenance of releases (via ABI compatible micro version updates), another one is shortening the cycles. Both achieve roughly the same goals with differences in emphasis perhaps, but more releases requires more resources on maintaining, testing etc so...
Quoted 2 lines
R2.01 could just have all the same of R2.0, with an additional ABI announcement. Then nothing needs to be tested.
That's also entirely missing the point of having an ABI policy in the first place. Its purpose is not to force people to find loopholes in the policy but for the benefit of other developers building apps on top of DPDK.
- Panu -
Re: [PATCH v6 01/18] mbuf: redefine packet_type in rte_mbuf
In reply to Zhang, HelinQuoted 163 lines · Helin
Quoted 156 lines
-----Original Message-----
From: Panu Matilainen [mailto:[email protected]]
Sent: Friday, June 12, 2015 4:15 PM
To: Zhang, Helin; Thomas Monjalon; Olivier MATZ; O'Driscoll, Tim; [email protected]
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufQuoted 90 lines · Helin
Quoted 90 lines
-----Original Message-----
From: Panu Matilainen [mailto:[email protected]]
Sent: Friday, June 12, 2015 3:24 PM
To: Thomas Monjalon; Olivier MATZ; O'Driscoll, Tim; Zhang, Helin; [email protected]
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v6 01/18] mbuf: redefinepacket_typeinrte_mbufQuoted 36 lines · Thomas Monjalon
2015-06-10 16:32, Olivier MATZ:
Quoted 35 lines · Tim
Quoted 34 lines
From: dev [mailto:[email protected]] On Behalf Of Olivier MATZ
Quoted 18 lines · Helin Zhang
Quoted 9 lines
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_UNIFIED_PKT_TYPE, which is disabled by default.What are the plans for this compile-time option in the future?
I wonder what are the benefits of having this option in terms of ABI compatibility: when it is disabled, it is ABI-compatible but the packet-type feature is not present, and when it is enabled we have the feature but it breaks the compatibility.
Quoted 8 lines
In my opinion, the v5 is preferable: for this kind of features, I don't see how the ABI can be preserved, and I think packet-type won't be the only feature that will modify the mbuf structure. I think the process described here should be applied:
http://dpdk.org/browse/dpdk/tree/doc/guides/rel_notes/abi.rst(starting from "Some ABI changes may be too significant to reasonably maintain multiple versions of").
This is just like the change that Steve (Cunming) Liang submitted for Interrupt Mode. We have the same problem in both cases: we want to find a way to get the features included, but need to comply with our ABI policy. So, in both cases, the proposal is to add a config option to enable the change by default, so we maintain backward
compatibility.
Quoted 29 lines
Quoted 29 lines
Quoted 9 lines
Users that want these changes, and are willing to accept the associated ABI change, have to specifically enable them.
We can note in the Deprecation Notices in the Release Notes for 2.1 that these config options will be removed in 2.2. The features will then be enabled by default.
This seems like a good compromise which allows us to get these changes into 2.1 but avoids breaking the ABI policy.
Sorry for the late answer.
After some thoughts on this topic, I understand that having a compile-time option is perhaps a good compromise between keeping compatibility and having new features earlier.
I'm just afraid about having one #ifdef in the code for each new feature that cannot keep the ABI compatibility.
What do you think about having one option -- let's call it "CONFIG_RTE_NEXT_ABI" --, that is disabled by default, and that would surround any new feature that breaks the ABI?This would have several advantages:
- only 2 cases (on or off), the combinatorial is smaller than having one option per feature
- all next features breaking the abi can be identified by a grep
- the code inside the #ifdef can be enabled in a simple operation by Thomas after each release.Quoted 8 lines
Quoted 1 line
Thomas, any comment?
As previously discussed (1to1) with Olivier, I think that's a good proposal to introduce changes breaking deeply the ABI.
Let's sum up the current policy:
1/ For changes which have a limited impact on the ABI, the backward compatibility must be kept during 1 release including the notice in
doc/guides/rel_notes/abi.rst.Quoted 3 lines
2/ For important changes like mbuf rework, there was an agreement on skipping the backward compatibility after having 3 acknowledgements and an
Quoted 8 lines
Quoted 8 lines
1-release long notice.
Quoted 4 lines
Then the ABI numbering must be incremented.
This
CONFIG_RTE_NEXT_ABIproposal would change the rules for the secondcase.
Quoted 2 lines
In order to be adopted, a patch for the file
doc/guides/rel_notes/abi.rstmust be submitted and stronglyacknowledged.
Quoted 28 lines
Quoted 28 lines
Quoted 3 lines
The ABI numbering must be also clearly explained:
1/ Should we have different libraries version number depending of
CONFIG_RTE_NEXT_ABI?Quoted 2 lines
It seems straightforward to use "ifeq" when LIBABIVER in the Makefiles
An incompatible ABI must be reflected by a soname change, otherwise the whole library versioning is irrelevant.
Quoted 1 line
2/ Are we able to have some "if
CONFIG_RTE_NEXT_ABI" statement inthe .map files?
Quoted 1 line
Maybe we should remove these files and generate them with some
preprocessing.
Quoted 2 lines
Neil, as the ABI policy author, what is your opinion?
I'm not Neil but my 5c...
Working around ABI compatibility policy via config options seems like a slippery slope. Going forward this will likely mean there are always two different ABIs for any given version, and the thought of keeping track of it all in a truly compatible manner makes my head hurt.
That said its easy to understand the desire to move faster than the ABI policy allows. In a project where so many structs are in the open it gets hard to do much anything at all without breaking the ABI.
Quoted 6 lines
Quoted 6 lines
The issue could be mitigated somewhat by reserving some space at the end of the structs eg when the ABI needs to be changed anyway, but it has obvious downsides as well. The other options I see tend to revolve around changing release policies one way or the other:
releasing ABI compatible micro versions between minor versions and relaxing the ABI policy a bit, or just releasing new minor versions more oftenthan the current cycle.
Quoted 5 lines
Quoted 2 lines
- Panu -
Does it mean releasing R2.01 right now with announcement of all ABI changes, which based on R2.0 first, and then releasing R2.1 several weeks later
with all the code changes?
Something like that, but I'd think its too late for any big release model / policy changes for this particular cycle.
Quoted 7 lines
I also do not want to undermine the ABI policy we just got in place, but since people are actively looking for ways to work around it anyway its better to map out all the possibilities. One of them is committing to longer term maintenance of releases (via ABI compatible micro version updates), another one is shortening the cycles. Both achieve roughly the same goals with differences in emphasis perhaps, but more releases requires more resources on maintaining, testing etc so...
Quoted 5 lines
R2.01 could just have all the same of R2.0, with an additional ABI announcement. Then nothing needs to be tested.
- Helin
Then it would be a paper exercise just to bypass an ABI policy, so NACK to that idea.
If (and it's a fairly big if) we do decide we need longer-term maintenance branches for maintaining ABI, then we need to do it properly.
This may including doing things liek back-porting relevant (maybe all) features from later releases that don't break the ABI to the supported version. Bug fixes would obviously have to be backported.
However, the overhead of this is obvious, since we would now have multiple development lines to be maintained.
Regards,
/Bruce
PATCH v6 2/18 ixgbe: support unified packet type in vectorized PMD
In reply to Helin ZhangTo unify the packet type, bit masks of packet type for ol_flags are replaced. In addition, more packet types (UDP, TCP and SCTP) are supported in vectorized ixgbe PMD.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default. Note that around 2% performance drop (64B) was observed of doing 4 ports (1 port per 82599 card) IO forwarding on the same SNB core.
--- config/common_linuxapp | 2 +- drivers/net/ixgbe/ixgbe_rxtx_vec.c | 75 +++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 3 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v3 changes:
* Put vector ixgbe changes right after mbuf changes.
* Enabled vector ixgbe PMD by default together with changes for updated vector PMD.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
config/common_linuxapp +1 -1
@@ -167,7 +167,7 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_IXGBE_INC_VECTOR=n +CONFIG_RTE_IXGBE_INC_VECTOR=y CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y #
drivers/net/ixgbe/ixgbe_rxtx_vec.c +73 -2
145 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v6 3/18 mbuf: add definitions of unified packet types
In reply to Helin ZhangAs there are only 6 bit flags in ol_flags for indicating packet types, which is not enough to describe all the possible packet types hardware can recognize. For example, i40e hardware can recognize more than 150 packet types. Unified packet type is composed of L2 type, L3 type, L4 type, tunnel type, inner L2 type, inner L3 type and inner L4 type fields, and can be stored in 'struct rte_mbuf' of 32 bits field 'packet_type'.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- lib/librte_mbuf/rte_mbuf.h | 487 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 487 insertions(+)
v3 changes:
* Put the definitions of unified packet type into a single patch.
v4 changes:
* Added detailed description of each packet types.
v5 changes:
* Re-worded the commit logs.
* Added more detailed description for all packet types, together with examples.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
lib/librte_mbuf/rte_mbuf.h +487 -0
@@ -195,6 +195,493 @@ extern "C" {/* Use final bit of flags to indicate a control mbuf */ #define CTRL_MBUF_FLAG (1ULL << 63)/**< Mbuf contains control data */ +#ifdef RTE_UNIFIED_PKT_TYPE +/* +* 32 bits are divided into several fields to mark packet types. Note that +* each field is indexical. +* - Bit 3:0 is for L2 types. +* - Bit 7:4 is for L3 or outer L3 (for tunneling case) types. +* - Bit 11:8 is for L4 or outer L4 (for tunneling case) types. +* - Bit 15:12 is for tunnel types. +* - Bit 19:16 is for inner L2 types. +* - Bit 23:20 is for inner L3 types. +* - Bit 27:24 is for inner L4 types. +* - Bit 31:28 is reserved. +* +* To be compatible with Vector PMD, RTE_PTYPE_L3_IPV4, RTE_PTYPE_L3_IPV4_EXT, +* RTE_PTYPE_L3_IPV6, RTE_PTYPE_L3_IPV6_EXT, RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP +* and RTE_PTYPE_L4_SCTP should be kept as below in a contiguous 7 bits. +* +* Note that L3 types values are selected for checking IPV4/IPV6 header from +* performance point of view. Reading annotations of RTE_ETH_IS_IPV4_HDR and +* RTE_ETH_IS_IPV6_HDR is needed for any future changes of L3 type values. +* +* Note that the packet types of the same packet recognized by different +* hardware may be different, as different hardware may have different +* capability of packet type recognition. +* +* examples: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=0x29 +* | 'version'=6, 'next header'=0x3A +* | 'ICMPv6 header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_IP | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_ICMP. +* +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x2F +* | 'GRE header' +* | 'version'=6, 'next header'=0x11 +* | 'UDP header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_GRENAT | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_UDP. +*/ +#define RTE_PTYPE_UNKNOWN 0x00000000 +/** +* MAC (Media Access Control) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=[0x0800|0x86DD|others]> +*/ +#define RTE_PTYPE_L2_MAC 0x00000001 +/** +* MAC (Media Access Control) packet type for time sync. +* +* Packet format: +* <'ether type'=0x88F7> +*/ +#define RTE_PTYPE_L2_MAC_TIMESYNC 0x00000002 +/** +* ARP (Address Resolution Protocol) packet type. +* +* Packet format: +* <'ether type'=0x0806> +*/ +#define RTE_PTYPE_L2_ARP 0x00000003 +/** +* LLDP (Link Layer Discovery Protocol) packet type. +* +* Packet format: +* <'ether type'=0x88CC> +*/ +#define RTE_PTYPE_L2_LLDP 0x00000004 +/** +* Mask of layer 2 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L2_MASK 0x0000000f +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* header option. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_L3_IPV4 0x00000010 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and contains header +* options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_L3_IPV4_EXT 0x00000030 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* extension header. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_L3_IPV6 0x00000040 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* header options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_L3_IPV4_EXT_UNKNOWN 0x00000090 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and contains extension +* headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_L3_IPV6_EXT 0x000000c0 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* extension headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_L3_IPV6_EXT_UNKNOWN 0x000000e0 +/** +* Mask of layer 3 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L3_MASK 0x000000f0 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_L4_TCP 0x00000100 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_L4_UDP 0x00000200 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, which can be recognized as +* fragmented. A fragmented packet cannot be recognized as any other L4 types +* (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP, +* RTE_PTYPE_L4_NONFRAG). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_L4_FRAG 0x00000300 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_L4_SCTP 0x00000400 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_L4_ICMP 0x00000500 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, while cannot be recognized as +* any of above L4 types (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, +* RTE_PTYPE_L4_FRAG, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_L4_NONFRAG 0x00000600 +/** +* Mask of layer 4 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L4_MASK 0x00000f00 +/** +* IP (Internet Protocol) in IP (Internet Protocol) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=[4|41]> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[4|41]> +*/ +#define RTE_PTYPE_TUNNEL_IP 0x00001000 +/** +* GRE (Generic Routing Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47> +*/ +#define RTE_PTYPE_TUNNEL_GRE 0x00002000 +/** +* VXLAN (Virtual eXtensible Local Area Network) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=4798> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=4798> +*/ +#define RTE_PTYPE_TUNNEL_VXLAN 0x00003000 +/** +* NVGRE (Network Virtualization using Generic Routing Encapsulation) tunneling +* packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47 +* | 'protocol type'=0x6558> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47 +* | 'protocol type'=0x6558'> +*/ +#define RTE_PTYPE_TUNNEL_NVGRE 0x00004000 +/** +* GENEVE (Generic Network Virtualization Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=6081> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=6081> +*/ +#define RTE_PTYPE_TUNNEL_GENEVE 0x00005000 +/** +* Tunneling packet type of Teredo, VXLAN (Virtual eXtensible Local Area +* Network) or GRE (Generic Routing Encapsulation) could be recognized as this +* packet type, if they can not be recognized independently as of hardware +* capability. +*/ +#define RTE_PTYPE_TUNNEL_GRENAT 0x00006000 +/** +* Mask of tunneling packet types. +*/ +#define RTE_PTYPE_TUNNEL_MASK 0x0000f000 +/** +* MAC (Media Access Control) packet type. +* It is used for inner packet type only. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD]> +*/ +#define RTE_PTYPE_INNER_L2_MAC 0x00010000 +/** +* MAC (Media Access Control) packet type with VLAN (Virtual Local Area +* Network) tag. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD], vlan=[1-4095]> +*/ +#define RTE_PTYPE_INNER_L2_MAC_VLAN 0x00020000 +/** +* Mask of inner layer 2 packet types. +*/ +#define RTE_PTYPE_INNER_L2_MASK 0x000f0000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and does not contain any header option. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_INNER_L3_IPV4 0x00100000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and contains header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT 0x00200000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and does not contain any extension header. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_INNER_L3_IPV6 0x00300000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and may or maynot contain header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN 0x00400000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and contains extension headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT 0x00500000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and may or maynot contain extension +* headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN 0x00600000 +/** +* Mask of inner layer 3 packet types. +*/ +#define RTE_PTYPE_INNER_INNER_L3_MASK 0x00f00000 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_INNER_L4_TCP 0x01000000 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_INNER_L4_UDP 0x02000000 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have layer 4 packet. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_INNER_L4_FRAG 0x03000000 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_INNER_L4_SCTP 0x04000000 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_INNER_L4_ICMP 0x05000000 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have other unknown layer +* 4 packet types. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_INNER_L4_NONFRAG 0x06000000 +/** +* Mask of inner layer 4 packet types. +*/ +#define RTE_PTYPE_INNER_L4_MASK 0x0f000000 + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 4 is selected to be used for IPv4 only. Then checking bit 4 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV4_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV4) + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 6 is selected to be used for IPv4 only. Then checking bit 6 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV6_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV6) + +/* Check if it is a tunneling packet */ +#define RTE_ETH_IS_TUNNEL_PKT (ptype) ((ptype) & RTE_PTYPE_TUNNEL_MASK) +#endif /* RTE_UNIFIED_PKT_TYPE */ +/** * Get the name of a RX offload flag *
Signature · 1 line
1.9.3
PATCH v6 4/18 e1000: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- drivers/net/e1000/igb_rxtx.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
drivers/net/e1000/igb_rxtx.c +102 -0
@@ -590,6 +590,99 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,* RX functions * **********************************************************************/ +#ifdef RTE_UNIFIED_PKT_TYPE +#define IGB_PACKET_TYPE_IPV4 0X01 +#define IGB_PACKET_TYPE_IPV4_TCP 0X11 +#define IGB_PACKET_TYPE_IPV4_UDP 0X21 +#define IGB_PACKET_TYPE_IPV4_SCTP 0X41 +#define IGB_PACKET_TYPE_IPV4_EXT 0X03 +#define IGB_PACKET_TYPE_IPV4_EXT_SCTP 0X43 +#define IGB_PACKET_TYPE_IPV6 0X04 +#define IGB_PACKET_TYPE_IPV6_TCP 0X14 +#define IGB_PACKET_TYPE_IPV6_UDP 0X24 +#define IGB_PACKET_TYPE_IPV6_EXT 0X0C +#define IGB_PACKET_TYPE_IPV6_EXT_TCP 0X1C +#define IGB_PACKET_TYPE_IPV6_EXT_UDP 0X2C +#define IGB_PACKET_TYPE_IPV4_IPV6 0X05 +#define IGB_PACKET_TYPE_IPV4_IPV6_TCP 0X15 +#define IGB_PACKET_TYPE_IPV4_IPV6_UDP 0X25 +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT 0X0D +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D +#define IGB_PACKET_TYPE_MAX 0X80 +#define IGB_PACKET_TYPE_MASK 0X7F +#define IGB_PACKET_TYPE_SHIFT 0X04 +static inline uint32_t +igb_rxd_pkt_info_to_pkt_type (uint16_t pkt_info) +{ +static const uint32_t + ptype_table[IGB_PACKET_TYPE_MAX] __rte_cache_aligned = { + [IGB_PACKET_TYPE_IPV4 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4 , + [IGB_PACKET_TYPE_IPV4_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [IGB_PACKET_TYPE_IPV6 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6 , + [IGB_PACKET_TYPE_IPV4_IPV6 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 , + [IGB_PACKET_TYPE_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT , + [IGB_PACKET_TYPE_IPV4_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV4_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_TCP , + [IGB_PACKET_TYPE_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_TCP , + [IGB_PACKET_TYPE_IPV4_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV4_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_UDP , + [IGB_PACKET_TYPE_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_UDP , + [IGB_PACKET_TYPE_IPV4_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_SCTP , + [IGB_PACKET_TYPE_IPV4_EXT_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT |RTE_PTYPE_L4_SCTP , + }; +if (unlikely (pkt_info &E1000_RXDADV_PKTTYPE_ETQF )) +return RTE_PTYPE_UNKNOWN ; + + pkt_info = (pkt_info >>IGB_PACKET_TYPE_SHIFT ) &IGB_PACKET_TYPE_MASK ; + +return ptype_table[pkt_info]; +} + +static inline uint64_t +rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) +{ +uint64_t pkt_flags = ((hl_tp_rs &0x0F ) ==0 ) ?0 :PKT_RX_RSS_HASH ; + +#if defined(RTE_LIBRTE_IEEE1588 ) +static uint32_t ip_pkt_etqf_map[8 ] = { +0 ,0 ,0 ,PKT_RX_IEEE1588_PTP , +0 ,0 ,0 ,0 , + }; + + pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >>4 ) &0x07 ]; +#endif + +return pkt_flags; +} +#else /* RTE_UNIFIED_PKT_TYPE */ static inline uint64_t rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) {
@@ -617,6 +710,7 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)#endif return pkt_flags | (((hl_tp_rs & 0x0F) == 0) ? 0 : PKT_RX_RSS_HASH); } +#endif /* RTE_UNIFIED_PKT_TYPE */ static inline uint64_t rx_desc_status_to_pkt_flags (uint32_t rx_status)
@@ -790,6 +884,10 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); rxm->ol_flags = pkt_flags; +#ifdef RTE_UNIFIED_PKT_TYPE + rxm->packet_type =igb_rxd_pkt_info_to_pkt_type (rxd.wb.lower. + lo_dword.hs_rss.pkt_info); +#endif /* * Store the mbuf address into the next entry of the array
@@ -1024,6 +1122,10 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); first_seg->ol_flags = pkt_flags; +#ifdef RTE_UNIFIED_PKT_TYPE + first_seg->packet_type =igb_rxd_pkt_info_to_pkt_type (rxd.wb. + lower.lo_dword.hs_rss.pkt_info); +#endif /* Prefetch data of first segment, if configured to do so. */ rte_packet_prefetch((char *)first_seg->buf_addr +
Signature · 1 line
1.9.3
PATCH v6 5/18 ixgbe: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet type among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default. Note that around 2.5% performance drop (64B) was observed of doing 4 ports (1 port per 82599 card) IO forwarding on the same SNB core.
--- drivers/net/ixgbe/ixgbe_rxtx.c | 163 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
drivers/net/ixgbe/ixgbe_rxtx.c +163 -0
@@ -855,6 +855,110 @@ end_of_tx:* RX functions * **********************************************************************/ +#ifdef RTE_UNIFIED_PKT_TYPE +#define IXGBE_PACKET_TYPE_IPV4 0X01 +#define IXGBE_PACKET_TYPE_IPV4_TCP 0X11 +#define IXGBE_PACKET_TYPE_IPV4_UDP 0X21 +#define IXGBE_PACKET_TYPE_IPV4_SCTP 0X41 +#define IXGBE_PACKET_TYPE_IPV4_EXT 0X03 +#define IXGBE_PACKET_TYPE_IPV4_EXT_SCTP 0X43 +#define IXGBE_PACKET_TYPE_IPV6 0X04 +#define IXGBE_PACKET_TYPE_IPV6_TCP 0X14 +#define IXGBE_PACKET_TYPE_IPV6_UDP 0X24 +#define IXGBE_PACKET_TYPE_IPV6_EXT 0X0C +#define IXGBE_PACKET_TYPE_IPV6_EXT_TCP 0X1C +#define IXGBE_PACKET_TYPE_IPV6_EXT_UDP 0X2C +#define IXGBE_PACKET_TYPE_IPV4_IPV6 0X05 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_TCP 0X15 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_UDP 0X25 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT 0X0D +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D +#define IXGBE_PACKET_TYPE_MAX 0X80 +#define IXGBE_PACKET_TYPE_MASK 0X7F +#define IXGBE_PACKET_TYPE_SHIFT 0X04 +static inline uint32_t +ixgbe_rxd_pkt_info_to_pkt_type (uint16_t pkt_info) +{ +static const uint32_t + ptype_table[IXGBE_PACKET_TYPE_MAX] __rte_cache_aligned = { + [IXGBE_PACKET_TYPE_IPV4 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 , + [IXGBE_PACKET_TYPE_IPV4_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [IXGBE_PACKET_TYPE_IPV6 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 , + [IXGBE_PACKET_TYPE_IPV4_IPV6 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 , + [IXGBE_PACKET_TYPE_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT , + [IXGBE_PACKET_TYPE_IPV4_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_TCP , + [IXGBE_PACKET_TYPE_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_UDP , + [IXGBE_PACKET_TYPE_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_SCTP , + [IXGBE_PACKET_TYPE_IPV4_EXT_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT |RTE_PTYPE_L4_SCTP , + }; +if (unlikely (pkt_info &IXGBE_RXDADV_PKTTYPE_ETQF )) +return RTE_PTYPE_UNKNOWN ; + + pkt_info = (pkt_info >>IXGBE_PACKET_TYPE_SHIFT ) & +IXGBE_PACKET_TYPE_MASK ; + +return ptype_table[pkt_info]; +} + +static inline uint64_t +ixgbe_rxd_pkt_info_to_pkt_flags (uint16_t pkt_info) +{ + static uint64_t ip_rss_types_map[16] __rte_cache_aligned = { +0 ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH , +0 ,PKT_RX_RSS_HASH ,0 ,PKT_RX_RSS_HASH , +PKT_RX_RSS_HASH ,0 ,0 ,0 , +0 ,0 ,0 ,PKT_RX_FDIR , + }; +#ifdef RTE_LIBRTE_IEEE1588 +static uint64_t ip_pkt_etqf_map[8 ] = { +0 ,0 ,0 ,PKT_RX_IEEE1588_PTP , +0 ,0 ,0 ,0 , + }; + +if (likely (pkt_info &IXGBE_RXDADV_PKTTYPE_ETQF )) +return ip_pkt_etqf_map[(pkt_info >>4 ) &0X07 ] | + ip_rss_types_map[pkt_info &0XF ]; +else +return ip_rss_types_map[pkt_info &0XF ]; +#else +return ip_rss_types_map[pkt_info &0XF ]; +#endif +} +#else /* RTE_UNIFIED_PKT_TYPE */ static inline uint64_t rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) {
@@ -890,6 +994,7 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)#endif return pkt_flags | ip_rss_types_map[hl_tp_rs & 0xF]; } +#endif /* RTE_UNIFIED_PKT_TYPE */ static inline uint64_t rx_desc_status_to_pkt_flags (uint32_t rx_status)
@@ -945,7 +1050,13 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq)struct rte_mbuf *mb;uint16_t pkt_len;uint64_t pkt_flags; +#ifdef RTE_UNIFIED_PKT_TYPE +int nb_dd; +uint32_t s[LOOK_AHEAD ]; +uint16_t pkt_info[LOOK_AHEAD ]; +#else int s[LOOK_AHEAD ], nb_dd; +#endif /* RTE_UNIFIED_PKT_TYPE */ int i, j, nb_rx =0 ;
@@ -968,6 +1079,12 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq)for (j =LOOK_AHEAD -1 ; j >=0 ; --j) s[j] = rxdp[j].wb.upper.status_error; +#ifdef RTE_UNIFIED_PKT_TYPE +for (j =LOOK_AHEAD -1 ; j >=0 ; --j) + pkt_info[j] = rxdp[j].wb.lower.lo_dword. + hs_rss.pkt_info; +#endif /* RTE_UNIFIED_PKT_TYPE */ +/* Compute how many status bits were set */ nb_dd =0 ;for (j =0 ; j <LOOK_AHEAD ; ++j)
@@ -985,12 +1102,22 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq) mb->vlan_tci =rte_le_to_cpu_16 (rxdp[j].wb.upper.vlan);/* convert descriptor fields to rte mbuf flags */ +#ifdef RTE_UNIFIED_PKT_TYPE + pkt_flags =rx_desc_status_to_pkt_flags (s[j]); + pkt_flags |=rx_desc_error_to_pkt_flags (s[j]); + pkt_flags |= +ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info[j]); + mb->ol_flags = pkt_flags; + mb->packet_type = +ixgbe_rxd_pkt_info_to_pkt_type (pkt_info[j]); +#else /* RTE_UNIFIED_PKT_TYPE */ pkt_flags =rx_desc_hlen_type_rss_to_pkt_flags ( rxdp[j].wb.lower.lo_dword.data);/* reuse status field from scan list */ pkt_flags |=rx_desc_status_to_pkt_flags (s[j]); pkt_flags |=rx_desc_error_to_pkt_flags (s[j]); mb->ol_flags = pkt_flags; +#endif /* RTE_UNIFIED_PKT_TYPE */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) mb->hash.rss = rxdp[j].wb.lower.hi_dword.rss;
@@ -1207,7 +1334,11 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,union ixgbe_adv_rx_desc rxd;uint64_t dma_addr;uint32_t staterr; +#ifdef RTE_UNIFIED_PKT_TYPE +uint32_t pkt_info; +#else uint32_t hlen_type_rss; +#endif uint16_t pkt_len;uint16_t rx_id;uint16_t nb_rx;
@@ -1325,6 +1456,19 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, rxm->data_len = pkt_len; rxm->port = rxq->port_id; +#ifdef RTE_UNIFIED_PKT_TYPE + pkt_info =rte_le_to_cpu_32 (rxd.wb.lower.lo_dword.hs_rss. + pkt_info); +/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ + rxm->vlan_tci =rte_le_to_cpu_16 (rxd.wb.upper.vlan); + + pkt_flags =rx_desc_status_to_pkt_flags (staterr); + pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); + pkt_flags = pkt_flags | +ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info); + rxm->ol_flags = pkt_flags; + rxm->packet_type =ixgbe_rxd_pkt_info_to_pkt_type (pkt_info); +#else /* RTE_UNIFIED_PKT_TYPE */ hlen_type_rss =rte_le_to_cpu_32 (rxd.wb.lower.lo_dword.data);/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ rxm->vlan_tci =rte_le_to_cpu_16 (rxd.wb.upper.vlan);
@@ -1333,6 +1477,7 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); rxm->ol_flags = pkt_flags; +#endif /* RTE_UNIFIED_PKT_TYPE */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) rxm->hash.rss = rxd.wb.lower.hi_dword.rss;
@@ -1406,6 +1551,23 @@ ixgbe_fill_cluster_head_buf( uint8_t port_id, uint32_t staterr) { +#ifdef RTE_UNIFIED_PKT_TYPE +uint16_t pkt_info; +uint64_t pkt_flags; + + head->port = port_id; + +/* The vlan_tci field is only valid when PKT_RX_VLAN_PKT is +* set in the pkt_flags field. +*/ + head->vlan_tci =rte_le_to_cpu_16 (desc->wb.upper.vlan); + pkt_info =rte_le_to_cpu_32 (desc->wb.lower.lo_dword.hs_rss.pkt_info); + pkt_flags =rx_desc_status_to_pkt_flags (staterr); + pkt_flags |=rx_desc_error_to_pkt_flags (staterr); + pkt_flags |=ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info); + head->ol_flags = pkt_flags; + head->packet_type =ixgbe_rxd_pkt_info_to_pkt_type (pkt_info); +#else /* RTE_UNIFIED_PKT_TYPE */ uint32_t hlen_type_rss;uint64_t pkt_flags;
@@ -1421,6 +1583,7 @@ ixgbe_fill_cluster_head_buf( pkt_flags |=rx_desc_status_to_pkt_flags (staterr); pkt_flags |=rx_desc_error_to_pkt_flags (staterr); head->ol_flags = pkt_flags; +#endif /* RTE_UNIFIED_PKT_TYPE */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) head->hash.rss =rte_le_to_cpu_32 (desc->wb.lower.hi_dword.rss);
Signature · 1 line
1.9.3
PATCH v6 6/18 i40e: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- drivers/net/i40e/i40e_rxtx.c | 528 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 528 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
drivers/net/i40e/i40e_rxtx.c +528 -0
@@ -151,6 +151,514 @@ i40e_rxd_error_to_pkt_flags(uint64_t qword)return flags; } +#ifdef RTE_UNIFIED_PKT_TYPE +/* For each value it means, datasheet of hardware can tell more details */ +static inline uint32_t +i40e_rxd_pkt_type_mapping (uint8_t ptype) +{ + static const uint32_t ptype_table[UINT8_MAX] __rte_cache_aligned = { +/* L2 types */ +/* [0] reserved */ + [1 ] =RTE_PTYPE_L2_MAC , + [2 ] =RTE_PTYPE_L2_MAC_TIMESYNC , +/* [3] - [5] reserved */ + [6 ] =RTE_PTYPE_L2_LLDP , +/* [7] - [10] reserved */ + [11 ] =RTE_PTYPE_L2_ARP , +/* [12] - [21] reserved */ + +/* Non tunneled IPv4 */ + [22 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_FRAG , + [23 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_NONFRAG , + [24 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_UDP , +/* [25] reserved */ + [26 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_TCP , + [27 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_SCTP , + [28 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_ICMP , + +/* IPv4 --> IPv4 */ + [29 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [30 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [31 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [32] reserved */ + [33 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [34 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [35 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> IPv6 */ + [36 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [37 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [38 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [39] reserved */ + [40 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [41 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [42 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN */ + [43 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT , + +/* IPv4 --> GRE/Teredo/VXLAN --> IPv4 */ + [44 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [45 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [46 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [47] reserved */ + [48 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [49 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [50 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> IPv6 */ + [51 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [52 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [53 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [54] reserved */ + [55 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [56 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [57 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC */ + [58 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */ + [59 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [60 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [61 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [62] reserved */ + [63 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [64 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [65 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */ + [66 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [67 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [68 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [69] reserved */ + [70 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [71 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [72 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN */ + [73 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */ + [74 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [75 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [76 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [77] reserved */ + [78 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [79 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [80 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */ + [81 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [82 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [83 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [84] reserved */ + [85 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [86 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [87 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* Non tunneled IPv6 */ + [88 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_FRAG , + [89 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_NONFRAG , + [90 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_UDP , +/* [91] reserved */ + [92 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_TCP , + [93 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_SCTP , + [94 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_ICMP , + +/* IPv6 --> IPv4 */ + [95 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [96 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [97 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [98] reserved */ + [99 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [100 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [101 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> IPv6 */ + [102 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [103 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [104 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [105] reserved */ + [106 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [107 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [108 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN */ + [109 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT , + +/* IPv6 --> GRE/Teredo/VXLAN --> IPv4 */ + [110 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [111 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [112 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [113] reserved */ + [114 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [115 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [116 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> IPv6 */ + [117 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [118 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [119 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [120] reserved */ + [121 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [122 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [123 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC */ + [124 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */ + [125 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [126 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [127 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [128] reserved */ + [129 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [130 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [131 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */ + [132 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [133 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [134 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [135] reserved */ + [136 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [137 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [138 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN */ + [139 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */ + [140 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [141 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [142 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [143] reserved */ + [144 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [145 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [146 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */ + [147 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [148 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [149 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [150] reserved */ + [151 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [152 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [153 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* All others reserved */ + }; + +return ptype_table[ptype]; +} +#else /* RTE_UNIFIED_PKT_TYPE */ /* Translate pkt types to pkt flags */ static inline uint64_t i40e_rxd_ptype_to_pkt_flags (uint64_t qword)
@@ -418,6 +926,7 @@ i40e_rxd_ptype_to_pkt_flags(uint64_t qword) return ip_ptype_map[ptype]; } +#endif /* RTE_UNIFIED_PKT_TYPE */ #define I40E_RX_DESC_EXT_STATUS_FLEXBH_MASK 0x03#define I40E_RX_DESC_EXT_STATUS_FLEXBH_FD_ID 0x01
@@ -709,11 +1218,18 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq) rxdp[j].wb.qword0.lo_dword.l2tag1) : 0; pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_UNIFIED_PKT_TYPE + mb->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >> +I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); mb->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_UNIFIED_PKT_TYPE */ if (pkt_flags &PKT_RX_RSS_HASH ) mb->hash.rss =rte_le_to_cpu_32 (\ rxdp[j].wb.qword0.hi_dword.rss);
@@ -952,9 +1468,15 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rte_le_to_cpu_16(rxd.wb.qword0.lo_dword.l2tag1) : 0; pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_UNIFIED_PKT_TYPE + rxm->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); rxm->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_UNIFIED_PKT_TYPE */ if (pkt_flags &PKT_RX_RSS_HASH ) rxm->hash.rss =rte_le_to_cpu_32 (rxd.wb.qword0.hi_dword.rss);
@@ -1111,10 +1633,16 @@ i40e_recv_scattered_pkts(void *rx_queue, rte_le_to_cpu_16(rxd.wb.qword0.lo_dword.l2tag1) : 0; pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_UNIFIED_PKT_TYPE + first_seg->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); first_seg->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_UNIFIED_PKT_TYPE */ if (pkt_flags &PKT_RX_RSS_HASH ) rxm->hash.rss =rte_le_to_cpu_32 (rxd.wb.qword0.hi_dword.rss);
Signature · 1 line
1.9.3
PATCH v6 7/18 enic: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- drivers/net/enic/enic_main.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
drivers/net/enic/enic_main.c +26 -0
@@ -423,7 +423,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->pkt_len = bytes_written;if (ipv4) { +#ifdef RTE_UNIFIED_PKT_TYPE + rx_pkt->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) rx_pkt->ol_flags |=PKT_RX_IP_CKSUM_BAD ;
@@ -432,7 +436,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->ol_flags |=PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_UNIFIED_PKT_TYPE + rx_pkt->packet_type =RTE_PTYPE_L3_IPV6 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }else {/* Header split */ if (sop && !eop) {
@@ -445,7 +453,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, *rx_pkt_bucket = rx_pkt; rx_pkt->pkt_len = bytes_written;if (ipv4) { +#ifdef RTE_UNIFIED_PKT_TYPE + rx_pkt->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) rx_pkt->ol_flags |=
@@ -457,13 +469,22 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_UNIFIED_PKT_TYPE + rx_pkt->packet_type =RTE_PTYPE_L3_IPV6 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }else {/* Payload */ hdr_rx_pkt = *rx_pkt_bucket; hdr_rx_pkt->pkt_len += bytes_written;if (ipv4) { +#ifdef RTE_UNIFIED_PKT_TYPE + hdr_rx_pkt->packet_type = +RTE_PTYPE_L3_IPV4 ; +#else hdr_rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) hdr_rx_pkt->ol_flags |=
@@ -475,7 +496,12 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_UNIFIED_PKT_TYPE + hdr_rx_pkt->packet_type = +RTE_PTYPE_L3_IPV6 ; +#else hdr_rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif } }
Signature · 1 line
1.9.3
PATCH v6 8/18 vmxnet3: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 ++++++++ 1 file changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
drivers/net/vmxnet3/vmxnet3_rxtx.c +8 -0
@@ -649,9 +649,17 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)struct ipv4_hdr *ip = (struct ipv4_hdr *)(eth +1 ); if (((ip->version_ihl & 0xf) << 2) > (int)sizeof(struct ipv4_hdr)) +#ifdef RTE_UNIFIED_PKT_TYPE + rxm->packet_type =RTE_PTYPE_L3_IPV4_EXT ; +#else rxm->ol_flags |=PKT_RX_IPV4_HDR_EXT ; +#endif else +#ifdef RTE_UNIFIED_PKT_TYPE + rxm->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rxm->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!rcd->cnc) {if (!rcd->ipc)
Signature · 1 line
1.9.3
PATCH v6 9/18 fm10k: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- drivers/net/fm10k/fm10k_rxtx.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
v4 changes:
* Supported unified packet type of fm10k from v4.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
drivers/net/fm10k/fm10k_rxtx.c +27 -0
@@ -68,12 +68,37 @@ static inline void dump_rxd(union fm10k_rx_desc *rxd)static inline void rx_desc_to_ol_flags (struct rte_mbuf *m,const union fm10k_rx_desc *d) { +#ifdef RTE_UNIFIED_PKT_TYPE +static const uint32_t + ptype_table[FM10K_RXD_PKTTYPE_MASK >>FM10K_RXD_PKTTYPE_SHIFT ] + __rte_cache_aligned = { + [FM10K_PKTTYPE_OTHER ] =RTE_PTYPE_L2_MAC , + [FM10K_PKTTYPE_IPV4 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4 , + [FM10K_PKTTYPE_IPV4_EX ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [FM10K_PKTTYPE_IPV6 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6 , + [FM10K_PKTTYPE_IPV6_EX ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + }; + + m->packet_type = ptype_table[(d->w.pkt_info &FM10K_RXD_PKTTYPE_MASK ) + >>FM10K_RXD_PKTTYPE_SHIFT ]; +#else /* RTE_UNIFIED_PKT_TYPE */ uint16_t ptype;static const uint16_t pt_lut[] = {0 ,PKT_RX_IPV4_HDR ,PKT_RX_IPV4_HDR_EXT ,PKT_RX_IPV6_HDR ,PKT_RX_IPV6_HDR_EXT ,0 ,0 ,0 }; +#endif /* RTE_UNIFIED_PKT_TYPE */ if (d->w.pkt_info &FM10K_RXD_RSSTYPE_MASK ) m->ol_flags |=PKT_RX_RSS_HASH ;
@@ -97,9 +122,11 @@ rx_desc_to_ol_flags(struct rte_mbuf *m, const union fm10k_rx_desc *d)if (unlikely (d->d.staterr &FM10K_RXD_STATUS_RXE )) m->ol_flags |=PKT_RX_RECIP_ERR ; +#ifndef RTE_UNIFIED_PKT_TYPE ptype = (d->d.data &FM10K_RXD_PKTTYPE_MASK_L3 ) >>FM10K_RXD_PKTTYPE_SHIFT ; m->ol_flags |= pt_lut[(uint8_t )ptype]; +#endif }uint16_t
Signature · 1 line
1.9.3
PATCH v6 10/18 app/test-pipeline: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- app/test-pipeline/pipeline_hash.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
app/test-pipeline/pipeline_hash.c +13 -0
@@ -459,20 +459,33 @@ app_main_loop_rx_metadata(void) { signature =RTE_MBUF_METADATA_UINT32_PTR (m,0 ); key =RTE_MBUF_METADATA_UINT8_PTR (m,32 ); +#ifdef RTE_UNIFIED_PKT_TYPE +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif ip_hdr = (struct ipv4_hdr *) &m_data[sizeof (struct ether_hdr )]; ip_dst = ip_hdr->dst_addr; k32 = (uint32_t *) key; k32[0 ] = ip_dst &0xFFFFFF00 ; +#ifdef RTE_UNIFIED_PKT_TYPE + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif ipv6_hdr = (struct ipv6_hdr *) &m_data[sizeof (struct ether_hdr )]; ipv6_dst = ipv6_hdr->dst_addr;memcpy (key, ipv6_dst,16 ); +#ifdef RTE_UNIFIED_PKT_TYPE + } else + continue; +#else } +#endif *signature =test_hash (key,0 ,0 ); }
Signature · 1 line
1.9.3
PATCH v6 11/18 app/testpmd: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- app/test-pmd/csumonly.c | 14 ++++ app/test-pmd/rxonly.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v4 changes:
* Added printing logs of packet types of each received packet in rxonly mode.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
app/test-pmd/csumonly.c +14 -0
@@ -202,8 +202,14 @@ parse_ethernet(struct ether_hdr *eth_hdr, struct testpmd_offload_info *info)/* Parse a vxlan header */ static void +#ifdef RTE_UNIFIED_PKT_TYPE +parse_vxlan(struct udp_hdr *udp_hdr, + struct testpmd_offload_info *info, + uint32_t pkt_type) +#elseparse_vxlan (struct udp_hdr *udp_hdr,struct testpmd_offload_info *info, uint64_t mbuf_olflags) +#endif {struct ether_hdr *eth_hdr;
@@ -211,8 +217,12 @@ parse_vxlan(struct udp_hdr *udp_hdr, struct testpmd_offload_info *info,* (rfc7348) or that the rx offload flag is set (i40e only * currently) */ if (udp_hdr->dst_port != _htons(4789) && +#ifdef RTE_UNIFIED_PKT_TYPE + RTE_ETH_IS_TUNNEL_PKT(pkt_type) == 0) +#else (mbuf_olflags & (PKT_RX_TUNNEL_IPV4_HDR | PKT_RX_TUNNEL_IPV6_HDR)) == 0) +#endif return ; info->is_tunnel =1 ;
@@ -549,7 +559,11 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)struct udp_hdr *udp_hdr; udp_hdr = (struct udp_hdr *)((char *)l3_hdr + info.l3_len); +#ifdef RTE_UNIFIED_PKT_TYPE +parse_vxlan (udp_hdr, &info, m->packet_type); +#else parse_vxlan (udp_hdr, &info, m->ol_flags); +#endif }else if (info.l4_proto ==IPPROTO_GRE ) {struct simple_gre_hdr *gre_hdr; gre_hdr = (struct simple_gre_hdr *)
app/test-pmd/rxonly.c +183 -0
211 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v6 12/18 app/test: Remove useless code
In reply to Helin ZhangSeverl useless code lines are added accidently, which blocks packet type unification. They should be deleted at all.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- app/test/packet_burst_generator.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
v4 changes:
* Removed several useless code lines which block packet type unification.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
app/test/packet_burst_generator.c +4 -2
@@ -272,19 +272,21 @@ nomore_mbuf:if (ipv4) { pkt->vlan_tci = ETHER_TYPE_IPv4; pkt->l3_len =sizeof (struct ipv4_hdr ); - +#ifndef RTE_UNIFIED_PKT_TYPE if (vlan_enabled) pkt->ol_flags =PKT_RX_IPV4_HDR |PKT_RX_VLAN_PKT ;else pkt->ol_flags =PKT_RX_IPV4_HDR ; +#endif }else { pkt->vlan_tci = ETHER_TYPE_IPv6; pkt->l3_len =sizeof (struct ipv6_hdr ); - +#ifndef RTE_UNIFIED_PKT_TYPE if (vlan_enabled) pkt->ol_flags =PKT_RX_IPV6_HDR |PKT_RX_VLAN_PKT ;else pkt->ol_flags =PKT_RX_IPV6_HDR ; +#endif } pkts_burst[nb_pkt] = pkt;
Signature · 1 line
1.9.3
PATCH v6 13/18 examples/ip_fragmentation: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- examples/ip_fragmentation/main.c | 9 +++++++++ 1 file changed, 9 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
examples/ip_fragmentation/main.c +9 -0
@@ -283,7 +283,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, len = qconf->tx_mbufs[port_out].len;/* if this is an IPv4 packet */ +#ifdef RTE_UNIFIED_PKT_TYPE +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif struct ipv4_hdr *ip_hdr;uint32_t ip_dst;/* Read the lookup key (i.e. ip_dst) from the input packet */
@@ -317,9 +321,14 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,if (unlikely (len2 <0 ))return ; } +#ifdef RTE_UNIFIED_PKT_TYPE + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if this is an IPv6 packet */ +#else }/* if this is an IPv6 packet */ else if (m->ol_flags &PKT_RX_IPV6_HDR ) { +#endif struct ipv6_hdr *ip_hdr; ipv6 =1 ;
Signature · 1 line
1.9.3
PATCH v6 14/18 examples/ip_reassembly: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- examples/ip_reassembly/main.c | 9 +++++++++ 1 file changed, 9 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
examples/ip_reassembly/main.c +9 -0
@@ -356,7 +356,11 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, dst_port = portid;/* if packet is IPv4 */ +#ifdef RTE_UNIFIED_PKT_TYPE +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags & (PKT_RX_IPV4_HDR )) { +#endif struct ipv4_hdr *ip_hdr;uint32_t ip_dst;
@@ -396,9 +400,14 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, } eth_hdr->ether_type =rte_be_to_cpu_16 (ETHER_TYPE_IPv4); +#ifdef RTE_UNIFIED_PKT_TYPE + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if packet is IPv6 */ +#else }/* if packet is IPv6 */ else if (m->ol_flags & (PKT_RX_IPV6_HDR |PKT_RX_IPV6_HDR_EXT )) { +#endif struct ipv6_extension_fragment *frag_hdr;struct ipv6_hdr *ip_hdr;
Signature · 1 line
1.9.3
PATCH v6 15/18 examples/l3fwd-acl: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- examples/l3fwd-acl/main.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
examples/l3fwd-acl/main.c +23 -6
@@ -645,10 +645,13 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,struct ipv4_hdr *ipv4_hdr;struct rte_mbuf *pkt = pkts_in[index]; +#ifdef RTE_UNIFIED_PKT_TYPE +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR );if (type ==PKT_RX_IPV4_HDR ) { - +#endif ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, unsigned char *) + sizeof(struct ether_hdr));
@@ -667,9 +670,11 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,/* Not a valid IPv4 packet */ rte_pktmbuf_free (pkt); } - +#ifdef RTE_UNIFIED_PKT_TYPE + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (type ==PKT_RX_IPV6_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -687,17 +692,22 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl, {struct rte_mbuf *pkt = pkts_in[index]; +#ifdef RTE_UNIFIED_PKT_TYPE +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR );if (type ==PKT_RX_IPV4_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv4[acl->num_ipv4] =MBUF_IPV4_2PROTO (pkt); acl->m_ipv4[(acl->num_ipv4)++] = pkt; - +#ifdef RTE_UNIFIED_PKT_TYPE + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (type ==PKT_RX_IPV6_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -745,10 +755,17 @@ send_one_packet(struct rte_mbuf *m, uint32_t res)/* in the ACL list, drop it */ #ifdef L3FWDACL_DEBUG if ((res &ACL_DENY_SIGNATURE ) !=0 ) { +#ifdef RTE_UNIFIED_PKT_TYPE +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) +dump_acl4_rule (m, res); +else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) +dump_acl6_rule (m, res); +#else if (m->ol_flags &PKT_RX_IPV4_HDR )dump_acl4_rule (m, res);else dump_acl6_rule (m, res); +#endif /* RTE_UNIFIED_PKT_TYPE */ }#endif rte_pktmbuf_free (m);
Signature · 1 line
1.9.3
PATCH v6 16/18 examples/l3fwd-power: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- examples/l3fwd-power/main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
examples/l3fwd-power/main.c +8 -0
@@ -635,7 +635,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); +#ifdef RTE_UNIFIED_PKT_TYPE +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif /* Handle IPv4 headers.*/ ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char*)
@@ -670,8 +674,12 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid,ether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); +#ifdef RTE_UNIFIED_PKT_TYPE + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif /* Handle IPv6 headers.*/ #if (APP_LOOKUP_METHOD ==APP_LOOKUP_EXACT_MATCH )struct ipv6_hdr *ipv6_hdr;
Signature · 1 line
1.9.3
PATCH v6 17/18 examples/l3fwd: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- examples/l3fwd/main.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 3 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v3 changes:
* Minor bug fixes and enhancements.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
examples/l3fwd/main.c +120 -3
@@ -955,7 +955,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); +#ifdef RTE_UNIFIED_PKT_TYPE +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif /* Handle IPv4 headers.*/ ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char *) +sizeof (struct ether_hdr ));
@@ -989,8 +993,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); - +#ifdef RTE_UNIFIED_PKT_TYPE + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif /* Handle IPv6 headers.*/ struct ipv6_hdr *ipv6_hdr;
@@ -1011,8 +1018,13 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); +#ifdef RTE_UNIFIED_PKT_TYPE + }else +/* Free the mbuf that contains non-IPV4/IPV6 packet */ +rte_pktmbuf_free (m); +#else } - +#endif }#ifdef DO_RFC_1812_CHECKS
@@ -1036,12 +1048,19 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon* to BAD_PORT value. */ static inline __attribute__((always_inline)) void +#ifdef RTE_UNIFIED_PKT_TYPE +rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t ptype) +#else rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t flags) +#endif {uint8_t ihl; +#ifdef RTE_UNIFIED_PKT_TYPE +if (RTE_ETH_IS_IPV4_HDR (ptype)) { +#else if ((flags &PKT_RX_IPV4_HDR ) !=0 ) { - +#endif ihl = ipv4_hdr->version_ihl -IPV4_MIN_VER_IHL ; ipv4_hdr->time_to_live--;
@@ -1071,11 +1090,19 @@ get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,struct ipv6_hdr *ipv6_hdr;struct ether_hdr *eth_hdr; +#ifdef RTE_UNIFIED_PKT_TYPE +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else if (pkt->ol_flags &PKT_RX_IPV4_HDR ) { +#endif if (rte_lpm_lookup (qconf->ipv4_lookup_struct, dst_ipv4, &next_hop) !=0 ) next_hop = portid; +#ifdef RTE_UNIFIED_PKT_TYPE + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (pkt->ol_flags &PKT_RX_IPV6_HDR ) { +#endif eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *); ipv6_hdr = (struct ipv6_hdr *)(eth_hdr +1 ); if (rte_lpm6_lookup(qconf->ipv6_lookup_struct,
@@ -1109,12 +1136,52 @@ process_packet(struct lcore_conf *qconf, struct rte_mbuf *pkt, ve = val_eth[dp]; dst_port[0 ] = dp; +#ifdef RTE_UNIFIED_PKT_TYPE +rfc1812_process (ipv4_hdr, dst_port, pkt->packet_type); +#else rfc1812_process (ipv4_hdr, dst_port, pkt->ol_flags); +#endif te =_mm_blend_epi16 (te, ve,MASK_ETH );_mm_store_si128 ((__m128i *)eth_hdr, te); } +#ifdef RTE_UNIFIED_PKT_TYPE +/* +* Read packet_type and destination IPV4 addresses from 4 mbufs. +*/ +static inline void +processx4_step1 (struct rte_mbuf *pkt[FWDSTEP ], +__m128i *dip, +uint32_t *ipv4_flag) +{ +struct ipv4_hdr *ipv4_hdr; +struct ether_hdr *eth_hdr; +uint32_t x0, x1, x2, x3; + + eth_hdr = rte_pktmbuf_mtod(pkt[0], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x0 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] = pkt[0 ]->packet_type &RTE_PTYPE_L3_IPV4 ; + + eth_hdr = rte_pktmbuf_mtod(pkt[1], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x1 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[1 ]->packet_type; + + eth_hdr = rte_pktmbuf_mtod(pkt[2], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x2 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[2 ]->packet_type; + + eth_hdr = rte_pktmbuf_mtod(pkt[3], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x3 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[3 ]->packet_type; + + dip[0 ] =_mm_set_epi32 (x3, x2, x1, x0); +} +#else /* RTE_UNIFIED_PKT_TYPE */ /* * Read ol_flags and destination IPV4 addresses from 4 mbufs. */
@@ -1147,14 +1214,24 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag) dip[0 ] =_mm_set_epi32 (x3, x2, x1, x0); } +#endif /* RTE_UNIFIED_PKT_TYPE */ /* * Lookup into LPM for destination port. * If lookup fails, use incoming port (portid) as destination port. */ static inline void +#ifdef RTE_UNIFIED_PKT_TYPE +processx4_step2(const struct lcore_conf *qconf, + __m128i dip, + uint32_t ipv4_flag, + uint8_t portid, + struct rte_mbuf *pkt[FWDSTEP], + uint16_t dprt[FWDSTEP]) +#elseprocessx4_step2 (const struct lcore_conf *qconf, __m128i dip,uint32_t flag, uint8_t portid, struct rte_mbuf *pkt[FWDSTEP], uint16_t dprt[FWDSTEP]) +#endif /* RTE_UNIFIED_PKT_TYPE */ {rte_xmm_t dst; const __m128i bswap_mask = _mm_set_epi8(12, 13, 14, 15, 8, 9, 10, 11,
@@ -1164,7 +1241,11 @@ processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t flag, dip =_mm_shuffle_epi8 (dip, bswap_mask);/* if all 4 packets are IPV4. */ +#ifdef RTE_UNIFIED_PKT_TYPE +if (likely (ipv4_flag)) { +#else if (likely (flag !=0 )) { +#endif rte_lpm_lookupx4 (qconf->ipv4_lookup_struct, dip, dprt, portid); }else { dst.x = dip;
@@ -1214,6 +1295,16 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])_mm_store_si128 (p[2 ], te[2 ]);_mm_store_si128 (p[3 ], te[3 ]); +#ifdef RTE_UNIFIED_PKT_TYPE +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[0 ] +1 ), + &dst_port[0 ], pkt[0 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[1 ] +1 ), + &dst_port[1 ], pkt[1 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[2 ] +1 ), + &dst_port[2 ], pkt[2 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[3 ] +1 ), + &dst_port[3 ], pkt[3 ]->packet_type); +#else /* RTE_UNIFIED_PKT_TYPE */ rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[0 ] +1 ), &dst_port[0 ], pkt[0 ]->ol_flags); rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[1] + 1),
@@ -1222,6 +1313,7 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP]) &dst_port[2], pkt[2]->ol_flags);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[3 ] +1 ), &dst_port[3 ], pkt[3 ]->ol_flags); +#endif /* RTE_UNIFIED_PKT_TYPE */ }/*
@@ -1408,7 +1500,11 @@ main_loop(__attribute__((unused)) void *dummy)uint16_t *lp;uint16_t dst_port[MAX_PKT_BURST ];__m128i dip[MAX_PKT_BURST /FWDSTEP ]; +#ifdef RTE_UNIFIED_PKT_TYPE +uint32_t ipv4_flag[MAX_PKT_BURST /FWDSTEP ]; +#else uint32_t flag[MAX_PKT_BURST /FWDSTEP ]; +#endif uint16_t pnum[MAX_PKT_BURST +1 ];#endif
@@ -1478,6 +1574,18 @@ main_loop(__attribute__((unused)) void *dummy)*/ int32_t n =RTE_ALIGN_FLOOR (nb_rx,4 );for (j =0 ; j < n ; j+=4 ) { +#ifdef RTE_UNIFIED_PKT_TYPE +uint32_t pkt_type = + pkts_burst[j]->packet_type & + pkts_burst[j+1 ]->packet_type & + pkts_burst[j+2 ]->packet_type & + pkts_burst[j+3 ]->packet_type; +if (pkt_type &RTE_PTYPE_L3_IPV4 ) { +simple_ipv4_fwd_4pkts ( + &pkts_burst[j], portid, qconf); + }else if (pkt_type & +RTE_PTYPE_L3_IPV6 ) { +#else /* RTE_UNIFIED_PKT_TYPE */ uint32_t ol_flag = pkts_burst[j]->ol_flags & pkts_burst[j+1 ]->ol_flags & pkts_burst[j+2 ]->ol_flags
@@ -1486,6 +1594,7 @@ main_loop(__attribute__((unused)) void *dummy)simple_ipv4_fwd_4pkts (&pkts_burst[j], portid, qconf); }else if (ol_flag &PKT_RX_IPV6_HDR ) { +#endif /* RTE_UNIFIED_PKT_TYPE */ simple_ipv6_fwd_4pkts (&pkts_burst[j], portid, qconf); }else {
@@ -1510,13 +1619,21 @@ main_loop(__attribute__((unused)) void *dummy)for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step1 (&pkts_burst[j], &dip[j /FWDSTEP ], +#ifdef RTE_UNIFIED_PKT_TYPE + &ipv4_flag[j /FWDSTEP ]); +#else &flag[j / FWDSTEP]); +#endif } k =RTE_ALIGN_FLOOR (nb_rx,FWDSTEP );for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step2 (qconf, dip[j /FWDSTEP ], +#ifdef RTE_UNIFIED_PKT_TYPE + ipv4_flag[j /FWDSTEP ], portid, +#else flag[j /FWDSTEP ], portid, +#endif &pkts_burst[j], &dst_port[j]); }
Signature · 1 line
1.9.3
PATCH v6 18/18 mbuf: remove old packet type bit masks
In reply to Helin ZhangAs unified packet types are used instead, those old bit masks and the relevant macros for packet type indication need to be removed. To avoid breaking ABI compatibility, all the changes would be enabled by RTE_UNIFIED_PKT_TYPE, which is disabled by default.
--- lib/librte_mbuf/rte_mbuf.c | 4 ++++ lib/librte_mbuf/rte_mbuf.h | 4 ++++ 2 files changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
* Redefined the bit masks for packet RX offload flags.
v5 changes:
* Rolled back the bit masks of RX flags, for ABI compatibility.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
lib/librte_mbuf/rte_mbuf.c +4 -0
@@ -251,14 +251,18 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask)/* case PKT_RX_HBUF_OVERFLOW: return "PKT_RX_HBUF_OVERFLOW"; */ /* case PKT_RX_RECIP_ERR: return "PKT_RX_RECIP_ERR"; */ /* case PKT_RX_MAC_ERR: return "PKT_RX_MAC_ERR"; */ +#ifndef RTE_UNIFIED_PKT_TYPE case PKT_RX_IPV4_HDR :return "PKT_RX_IPV4_HDR" ;case PKT_RX_IPV4_HDR_EXT :return "PKT_RX_IPV4_HDR_EXT" ;case PKT_RX_IPV6_HDR :return "PKT_RX_IPV6_HDR" ;case PKT_RX_IPV6_HDR_EXT :return "PKT_RX_IPV6_HDR_EXT" ; +#endif /* RTE_UNIFIED_PKT_TYPE */ case PKT_RX_IEEE1588_PTP :return "PKT_RX_IEEE1588_PTP" ;case PKT_RX_IEEE1588_TMST :return "PKT_RX_IEEE1588_TMST" ; +#ifndef RTE_UNIFIED_PKT_TYPE case PKT_RX_TUNNEL_IPV4_HDR :return "PKT_RX_TUNNEL_IPV4_HDR" ;case PKT_RX_TUNNEL_IPV6_HDR :return "PKT_RX_TUNNEL_IPV6_HDR" ; +#endif /* RTE_UNIFIED_PKT_TYPE */ default :return NULL ; } }
lib/librte_mbuf/rte_mbuf.h +4 -0
@@ -91,14 +91,18 @@ extern "C" {#define PKT_RX_HBUF_OVERFLOW (0ULL << 0)/**< Header buffer overflow. */ #define PKT_RX_RECIP_ERR (0ULL << 0)/**< Hardware processing error. */ #define PKT_RX_MAC_ERR (0ULL << 0)/**< MAC error. */ +#ifndef RTE_UNIFIED_PKT_TYPE #define PKT_RX_IPV4_HDR (1ULL << 5)/**< RX packet with IPv4 header. */ #define PKT_RX_IPV4_HDR_EXT (1ULL << 6)/**< RX packet with extended IPv4 header. */ #define PKT_RX_IPV6_HDR (1ULL << 7)/**< RX packet with IPv6 header. */ #define PKT_RX_IPV6_HDR_EXT (1ULL << 8)/**< RX packet with extended IPv6 header. */ +#endif /* RTE_UNIFIED_PKT_TYPE */ #define PKT_RX_IEEE1588_PTP (1ULL << 9)/**< RX IEEE1588 L2 Ethernet PT Packet. */ #define PKT_RX_IEEE1588_TMST (1ULL << 10)/**< RX IEEE1588 L2/L4 timestamped packet.*/ +#ifndef RTE_UNIFIED_PKT_TYPE #define PKT_RX_TUNNEL_IPV4_HDR (1ULL << 11)/**< RX tunnel packet with IPv4 header.*/ #define PKT_RX_TUNNEL_IPV6_HDR (1ULL << 12)/**< RX tunnel packet with IPv6 header. */ +#endif /* RTE_UNIFIED_PKT_TYPE */ #define PKT_RX_FDIR_ID (1ULL << 13)/**< FD id reported if FDIR match. */ #define PKT_RX_FDIR_FLX (1ULL << 14)/**< Flexible bytes reported if FDIR match. */ /* add new RX flags here */
Signature · 1 line
1.9.3
v7 cover unified packet type
In reply to Helin ZhangCurrently only 6 bits which are stored in ol_flags are used to indicate the packet types. This is not enough, as some NIC hardware can recognize quite a lot of packet types, e.g i40e hardware can recognize more than 150 packet types. Hiding those packet types hides hardware offload capabilities which could be quite useful for improving performance and for end users. So an unified packet types are needed to support all possible PMDs. A 16 bits packet_type in mbuf structure can be changed to 32 bits and used for this purpose. In addition, all packet types stored in ol_flag field should be deleted at all, and 6 bits of ol_flags can be save as the benifit.
Initially, 32 bits of packet_type can be divided into several sub fields to indicate different packet type information of a packet. The initial design is to divide those bits into fields for L2 types, L3 types, L4 types, tunnel types, inner L2 types, inner L3 types and inner L4 types. All PMDs should translate the offloaded packet types into these 7 fields of information, for user applications.
To avoid breaking ABI compatibility, currently all the code changes for unified packet type are disabled at compile time by default. Users can enable it manually by defining the macro of RTE_NEXT_ABI. The code changes will be valid by default in a future release, and the old version will be deleted accordingly, after the ABI change process is done.
Note that this patch set should be integrated after another patch set for '[PATCH v3 0/7] support i40e QinQ stripping and insertion', to clearly solve the conflict during integration. As both patch sets modified 'struct rte_mbuf', and the final layout of the 'struct rte_mbuf' is key to vectorized ixgbe PMD.
v2 changes:
* Enlarged the packet_type field from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes.
* Used redefined packet types and enlarged packet_type field for all PMDs and corresponding applications.
* Removed changes in bond and its relevant application, as there is no need at all according to the recent bond changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Put vector ixgbe changes right after mbuf changes.
* Disabled vector ixgbe PMD by default, as mbuf layout changed, and then re-enabled it after vector ixgbe PMD updated.
* Put the definitions of unified packet type into a single patch.
* Minor bug fixes and enhancements in l3fwd example.
v4 changes:
* Added detailed description of each packet types.
* Supported unified packet type of fm10k.
* Added printing logs of packet types of each received packet for rxonly mode in testpmd.
* Removed several useless code lines which block packet type unification from app/test/packet_burst_generator.c.
v5 changes:
* Added more detailed description for each packet types, together with examples.
* Rolled back the macro definitions of RX packet flags, for ABI compitability.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
* Integrated with patch set for '[PATCH v3 0/7] support i40e QinQ stripping and insertion', to clearly solve the conflicts during merging.
Helin Zhang (18):
mbuf: redefine packet_type in rte_mbuf
ixgbe: support unified packet type in vectorized PMD
mbuf: add definitions of unified packet types
e1000: replace bit mask based packet type with unified packet type
ixgbe: replace bit mask based packet type with unified packet type
i40e: replace bit mask based packet type with unified packet type
enic: replace bit mask based packet type with unified packet type
vmxnet3: replace bit mask based packet type with unified packet type
fm10k: replace bit mask based packet type with unified packet type app/test-pipeline: replace bit mask based packet type with unified
packet type
app/testpmd: replace bit mask based packet type with unified packet
type
app/test: Remove useless code
examples/ip_fragmentation: replace bit mask based packet type with
unified packet type
examples/ip_reassembly: replace bit mask based packet type with
unified packet type
examples/l3fwd-acl: replace bit mask based packet type with unified
packet type
examples/l3fwd-power: replace bit mask based packet type with unified
packet type
examples/l3fwd: replace bit mask based packet type with unified packet
type
mbuf: remove old packet type bit masks
app/test-pipeline/pipeline_hash.c | 13 + app/test-pmd/csumonly.c | 14 + app/test-pmd/rxonly.c | 183 +++++++ app/test/packet_burst_generator.c | 6 +- drivers/net/e1000/igb_rxtx.c | 102 ++++ drivers/net/enic/enic_main.c | 26 + drivers/net/fm10k/fm10k_rxtx.c | 27 ++ drivers/net/i40e/i40e_rxtx.c | 528 +++++++++++++++++++++ drivers/net/ixgbe/ixgbe_rxtx.c | 163 +++++++ drivers/net/ixgbe/ixgbe_rxtx_vec.c | 75 ++- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 + examples/ip_fragmentation/main.c | 9 + examples/ip_reassembly/main.c | 9 + examples/l3fwd-acl/main.c | 29 +- examples/l3fwd-power/main.c | 8 + examples/l3fwd/main.c | 123 ++++- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 + lib/librte_mbuf/rte_mbuf.c | 4 + lib/librte_mbuf/rte_mbuf.h | 514 ++++++++++++++++++++ 19 files changed, 1834 insertions(+), 13 deletions(-)
Signature · 1 line
1.9.3
PATCH v7 1/18 mbuf: redefine packet_type in rte_mbuf
In order to unify the packet type, the field of 'packet_type' in 'struct rte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'struct rte_mbuf' are re-organized to support this change for Vector PMD. As 'struct rte_kni_mbuf' for KNI should be right mapped to 'struct rte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'struct rte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- config/common_linuxapp | 2 +- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 ++++++ lib/librte_mbuf/rte_mbuf.h | 23 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-)
v2 changes:
* Enlarged the packet_type field from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Disabled vector ixgbe PMD by default, as mbuf layout changed.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
* Integrated with changes of QinQ stripping/insertion.
config/common_linuxapp +1 -1
@@ -167,7 +167,7 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_IXGBE_INC_VECTOR=y +CONFIG_RTE_IXGBE_INC_VECTOR=n CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y #
lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +6 -0
@@ -117,9 +117,15 @@ struct rte_kni_mbuf {uint16_t data_off;/**< Start address of data in segment buffer. */ char pad1[4 ];uint64_t ol_flags;/**< Offload features. */ +#ifdef RTE_NEXT_ABI +char pad2[4 ]; +uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ +#else char pad2[2 ];uint16_t data_len;/**< Amount of data in segment buffer. */ uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +#endif /* fields on second cache line */ char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_SIZE)));
lib/librte_mbuf/rte_mbuf.h +23 -0
@@ -275,6 +275,28 @@ struct rte_mbuf {/* remaining bytes are set on RX when pulling packet from descriptor */ MARKER rx_descriptor_fields1; +#ifdef RTE_NEXT_ABI +/* +* The packet type, which is the combination of outer/inner L2, L3, L4 +* and tunnel types. +*/ +union { +uint32_t packet_type;/**< L2/L3/L4 and tunnel information. */ +struct { +uint32_t l2_type:4 ;/**< (Outer) L2 type. */ +uint32_t l3_type:4 ;/**< (Outer) L3 type. */ +uint32_t l4_type:4 ;/**< (Outer) L4 type. */ +uint32_t tun_type:4 ;/**< Tunnel type. */ +uint32_t inner_l2_type:4 ;/**< Inner L2 type. */ +uint32_t inner_l3_type:4 ;/**< Inner L3 type. */ +uint32_t inner_l4_type:4 ;/**< Inner L4 type. */ + }; + }; + +uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ +uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ +#else /** * The packet type, which is used to indicate ordinary packet and also * tunneled packet format, i.e. each number is represented a type of
@@ -285,6 +307,7 @@ struct rte_mbuf {uint16_t data_len;/**< Amount of data in segment buffer. */ uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ +#endif uint16_t vlan_tci_outer;/**< Outer VLAN Tag Control Identifier (CPU order) */ union {uint32_t rss;/**< RSS hash result if RSS enabled */
Signature · 1 line
1.9.3
PATCH v7 2/18 ixgbe: support unified packet type in vectorized PMD
In reply to Helin ZhangTo unify the packet type, bit masks of packet type for ol_flags are replaced. In addition, more packet types (UDP, TCP and SCTP) are supported in vectorized ixgbe PMD.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default. Note that around 2% performance drop (64B) was observed of doing 4 ports (1 port per 82599 card) IO forwarding on the same SNB core.
--- config/common_linuxapp | 2 +- drivers/net/ixgbe/ixgbe_rxtx_vec.c | 75 +++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 3 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v3 changes:
* Put vector ixgbe changes right after mbuf changes.
* Enabled vector ixgbe PMD by default together with changes for updated vector PMD.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
config/common_linuxapp +1 -1
@@ -167,7 +167,7 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_IXGBE_INC_VECTOR=n +CONFIG_RTE_IXGBE_INC_VECTOR=y CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y #
drivers/net/ixgbe/ixgbe_rxtx_vec.c +73 -2
145 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v7 3/18 mbuf: add definitions of unified packet types
In reply to Helin ZhangAs there are only 6 bit flags in ol_flags for indicating packet types, which is not enough to describe all the possible packet types hardware can recognize. For example, i40e hardware can recognize more than 150 packet types. Unified packet type is composed of L2 type, L3 type, L4 type, tunnel type, inner L2 type, inner L3 type and inner L4 type fields, and can be stored in 'struct rte_mbuf' of 32 bits field 'packet_type'.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- lib/librte_mbuf/rte_mbuf.h | 487 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 487 insertions(+)
v3 changes:
* Put the definitions of unified packet type into a single patch.
v4 changes:
* Added detailed description of each packet types.
v5 changes:
* Re-worded the commit logs.
* Added more detailed description for all packet types, together with examples.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
lib/librte_mbuf/rte_mbuf.h +487 -0
@@ -201,6 +201,493 @@ extern "C" {/* Use final bit of flags to indicate a control mbuf */ #define CTRL_MBUF_FLAG (1ULL << 63)/**< Mbuf contains control data */ +#ifdef RTE_NEXT_ABI +/* +* 32 bits are divided into several fields to mark packet types. Note that +* each field is indexical. +* - Bit 3:0 is for L2 types. +* - Bit 7:4 is for L3 or outer L3 (for tunneling case) types. +* - Bit 11:8 is for L4 or outer L4 (for tunneling case) types. +* - Bit 15:12 is for tunnel types. +* - Bit 19:16 is for inner L2 types. +* - Bit 23:20 is for inner L3 types. +* - Bit 27:24 is for inner L4 types. +* - Bit 31:28 is reserved. +* +* To be compatible with Vector PMD, RTE_PTYPE_L3_IPV4, RTE_PTYPE_L3_IPV4_EXT, +* RTE_PTYPE_L3_IPV6, RTE_PTYPE_L3_IPV6_EXT, RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP +* and RTE_PTYPE_L4_SCTP should be kept as below in a contiguous 7 bits. +* +* Note that L3 types values are selected for checking IPV4/IPV6 header from +* performance point of view. Reading annotations of RTE_ETH_IS_IPV4_HDR and +* RTE_ETH_IS_IPV6_HDR is needed for any future changes of L3 type values. +* +* Note that the packet types of the same packet recognized by different +* hardware may be different, as different hardware may have different +* capability of packet type recognition. +* +* examples: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=0x29 +* | 'version'=6, 'next header'=0x3A +* | 'ICMPv6 header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_IP | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_ICMP. +* +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x2F +* | 'GRE header' +* | 'version'=6, 'next header'=0x11 +* | 'UDP header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_GRENAT | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_UDP. +*/ +#define RTE_PTYPE_UNKNOWN 0x00000000 +/** +* MAC (Media Access Control) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=[0x0800|0x86DD|others]> +*/ +#define RTE_PTYPE_L2_MAC 0x00000001 +/** +* MAC (Media Access Control) packet type for time sync. +* +* Packet format: +* <'ether type'=0x88F7> +*/ +#define RTE_PTYPE_L2_MAC_TIMESYNC 0x00000002 +/** +* ARP (Address Resolution Protocol) packet type. +* +* Packet format: +* <'ether type'=0x0806> +*/ +#define RTE_PTYPE_L2_ARP 0x00000003 +/** +* LLDP (Link Layer Discovery Protocol) packet type. +* +* Packet format: +* <'ether type'=0x88CC> +*/ +#define RTE_PTYPE_L2_LLDP 0x00000004 +/** +* Mask of layer 2 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L2_MASK 0x0000000f +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* header option. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_L3_IPV4 0x00000010 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and contains header +* options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_L3_IPV4_EXT 0x00000030 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* extension header. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_L3_IPV6 0x00000040 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* header options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_L3_IPV4_EXT_UNKNOWN 0x00000090 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and contains extension +* headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_L3_IPV6_EXT 0x000000c0 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* extension headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_L3_IPV6_EXT_UNKNOWN 0x000000e0 +/** +* Mask of layer 3 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L3_MASK 0x000000f0 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_L4_TCP 0x00000100 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_L4_UDP 0x00000200 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, which can be recognized as +* fragmented. A fragmented packet cannot be recognized as any other L4 types +* (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP, +* RTE_PTYPE_L4_NONFRAG). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_L4_FRAG 0x00000300 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_L4_SCTP 0x00000400 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_L4_ICMP 0x00000500 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, while cannot be recognized as +* any of above L4 types (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, +* RTE_PTYPE_L4_FRAG, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_L4_NONFRAG 0x00000600 +/** +* Mask of layer 4 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L4_MASK 0x00000f00 +/** +* IP (Internet Protocol) in IP (Internet Protocol) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=[4|41]> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[4|41]> +*/ +#define RTE_PTYPE_TUNNEL_IP 0x00001000 +/** +* GRE (Generic Routing Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47> +*/ +#define RTE_PTYPE_TUNNEL_GRE 0x00002000 +/** +* VXLAN (Virtual eXtensible Local Area Network) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=4798> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=4798> +*/ +#define RTE_PTYPE_TUNNEL_VXLAN 0x00003000 +/** +* NVGRE (Network Virtualization using Generic Routing Encapsulation) tunneling +* packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47 +* | 'protocol type'=0x6558> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47 +* | 'protocol type'=0x6558'> +*/ +#define RTE_PTYPE_TUNNEL_NVGRE 0x00004000 +/** +* GENEVE (Generic Network Virtualization Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=6081> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=6081> +*/ +#define RTE_PTYPE_TUNNEL_GENEVE 0x00005000 +/** +* Tunneling packet type of Teredo, VXLAN (Virtual eXtensible Local Area +* Network) or GRE (Generic Routing Encapsulation) could be recognized as this +* packet type, if they can not be recognized independently as of hardware +* capability. +*/ +#define RTE_PTYPE_TUNNEL_GRENAT 0x00006000 +/** +* Mask of tunneling packet types. +*/ +#define RTE_PTYPE_TUNNEL_MASK 0x0000f000 +/** +* MAC (Media Access Control) packet type. +* It is used for inner packet type only. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD]> +*/ +#define RTE_PTYPE_INNER_L2_MAC 0x00010000 +/** +* MAC (Media Access Control) packet type with VLAN (Virtual Local Area +* Network) tag. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD], vlan=[1-4095]> +*/ +#define RTE_PTYPE_INNER_L2_MAC_VLAN 0x00020000 +/** +* Mask of inner layer 2 packet types. +*/ +#define RTE_PTYPE_INNER_L2_MASK 0x000f0000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and does not contain any header option. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_INNER_L3_IPV4 0x00100000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and contains header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT 0x00200000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and does not contain any extension header. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_INNER_L3_IPV6 0x00300000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and may or maynot contain header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN 0x00400000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and contains extension headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT 0x00500000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and may or maynot contain extension +* headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN 0x00600000 +/** +* Mask of inner layer 3 packet types. +*/ +#define RTE_PTYPE_INNER_INNER_L3_MASK 0x00f00000 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_INNER_L4_TCP 0x01000000 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_INNER_L4_UDP 0x02000000 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have layer 4 packet. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_INNER_L4_FRAG 0x03000000 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_INNER_L4_SCTP 0x04000000 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_INNER_L4_ICMP 0x05000000 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have other unknown layer +* 4 packet types. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_INNER_L4_NONFRAG 0x06000000 +/** +* Mask of inner layer 4 packet types. +*/ +#define RTE_PTYPE_INNER_L4_MASK 0x0f000000 + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 4 is selected to be used for IPv4 only. Then checking bit 4 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV4_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV4) + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 6 is selected to be used for IPv4 only. Then checking bit 6 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV6_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV6) + +/* Check if it is a tunneling packet */ +#define RTE_ETH_IS_TUNNEL_PKT (ptype) ((ptype) & RTE_PTYPE_TUNNEL_MASK) +#endif /* RTE_NEXT_ABI */ +/** * Get the name of a RX offload flag *
Signature · 1 line
1.9.3
PATCH v7 4/18 e1000: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/e1000/igb_rxtx.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/e1000/igb_rxtx.c +102 -0
@@ -590,6 +590,99 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,* RX functions * **********************************************************************/ +#ifdef RTE_NEXT_ABI +#define IGB_PACKET_TYPE_IPV4 0X01 +#define IGB_PACKET_TYPE_IPV4_TCP 0X11 +#define IGB_PACKET_TYPE_IPV4_UDP 0X21 +#define IGB_PACKET_TYPE_IPV4_SCTP 0X41 +#define IGB_PACKET_TYPE_IPV4_EXT 0X03 +#define IGB_PACKET_TYPE_IPV4_EXT_SCTP 0X43 +#define IGB_PACKET_TYPE_IPV6 0X04 +#define IGB_PACKET_TYPE_IPV6_TCP 0X14 +#define IGB_PACKET_TYPE_IPV6_UDP 0X24 +#define IGB_PACKET_TYPE_IPV6_EXT 0X0C +#define IGB_PACKET_TYPE_IPV6_EXT_TCP 0X1C +#define IGB_PACKET_TYPE_IPV6_EXT_UDP 0X2C +#define IGB_PACKET_TYPE_IPV4_IPV6 0X05 +#define IGB_PACKET_TYPE_IPV4_IPV6_TCP 0X15 +#define IGB_PACKET_TYPE_IPV4_IPV6_UDP 0X25 +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT 0X0D +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D +#define IGB_PACKET_TYPE_MAX 0X80 +#define IGB_PACKET_TYPE_MASK 0X7F +#define IGB_PACKET_TYPE_SHIFT 0X04 +static inline uint32_t +igb_rxd_pkt_info_to_pkt_type (uint16_t pkt_info) +{ +static const uint32_t + ptype_table[IGB_PACKET_TYPE_MAX] __rte_cache_aligned = { + [IGB_PACKET_TYPE_IPV4 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4 , + [IGB_PACKET_TYPE_IPV4_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [IGB_PACKET_TYPE_IPV6 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6 , + [IGB_PACKET_TYPE_IPV4_IPV6 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 , + [IGB_PACKET_TYPE_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT , + [IGB_PACKET_TYPE_IPV4_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV4_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_TCP , + [IGB_PACKET_TYPE_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_TCP , + [IGB_PACKET_TYPE_IPV4_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV4_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_UDP , + [IGB_PACKET_TYPE_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_UDP , + [IGB_PACKET_TYPE_IPV4_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_SCTP , + [IGB_PACKET_TYPE_IPV4_EXT_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT |RTE_PTYPE_L4_SCTP , + }; +if (unlikely (pkt_info &E1000_RXDADV_PKTTYPE_ETQF )) +return RTE_PTYPE_UNKNOWN ; + + pkt_info = (pkt_info >>IGB_PACKET_TYPE_SHIFT ) &IGB_PACKET_TYPE_MASK ; + +return ptype_table[pkt_info]; +} + +static inline uint64_t +rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) +{ +uint64_t pkt_flags = ((hl_tp_rs &0x0F ) ==0 ) ?0 :PKT_RX_RSS_HASH ; + +#if defined(RTE_LIBRTE_IEEE1588 ) +static uint32_t ip_pkt_etqf_map[8 ] = { +0 ,0 ,0 ,PKT_RX_IEEE1588_PTP , +0 ,0 ,0 ,0 , + }; + + pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >>4 ) &0x07 ]; +#endif + +return pkt_flags; +} +#else /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) {
@@ -617,6 +710,7 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)#endif return pkt_flags | (((hl_tp_rs & 0x0F) == 0) ? 0 : PKT_RX_RSS_HASH); } +#endif /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_status_to_pkt_flags (uint32_t rx_status)
@@ -790,6 +884,10 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); rxm->ol_flags = pkt_flags; +#ifdef RTE_NEXT_ABI + rxm->packet_type =igb_rxd_pkt_info_to_pkt_type (rxd.wb.lower. + lo_dword.hs_rss.pkt_info); +#endif /* * Store the mbuf address into the next entry of the array
@@ -1024,6 +1122,10 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); first_seg->ol_flags = pkt_flags; +#ifdef RTE_NEXT_ABI + first_seg->packet_type =igb_rxd_pkt_info_to_pkt_type (rxd.wb. + lower.lo_dword.hs_rss.pkt_info); +#endif /* Prefetch data of first segment, if configured to do so. */ rte_packet_prefetch((char *)first_seg->buf_addr +
Signature · 1 line
1.9.3
PATCH v7 5/18 ixgbe: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet type among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default. Note that around 2.5% performance drop (64B) was observed of doing 4 ports (1 port per 82599 card) IO forwarding on the same SNB core.
--- drivers/net/ixgbe/ixgbe_rxtx.c | 163 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/ixgbe/ixgbe_rxtx.c +163 -0
@@ -855,6 +855,110 @@ end_of_tx:* RX functions * **********************************************************************/ +#ifdef RTE_NEXT_ABI +#define IXGBE_PACKET_TYPE_IPV4 0X01 +#define IXGBE_PACKET_TYPE_IPV4_TCP 0X11 +#define IXGBE_PACKET_TYPE_IPV4_UDP 0X21 +#define IXGBE_PACKET_TYPE_IPV4_SCTP 0X41 +#define IXGBE_PACKET_TYPE_IPV4_EXT 0X03 +#define IXGBE_PACKET_TYPE_IPV4_EXT_SCTP 0X43 +#define IXGBE_PACKET_TYPE_IPV6 0X04 +#define IXGBE_PACKET_TYPE_IPV6_TCP 0X14 +#define IXGBE_PACKET_TYPE_IPV6_UDP 0X24 +#define IXGBE_PACKET_TYPE_IPV6_EXT 0X0C +#define IXGBE_PACKET_TYPE_IPV6_EXT_TCP 0X1C +#define IXGBE_PACKET_TYPE_IPV6_EXT_UDP 0X2C +#define IXGBE_PACKET_TYPE_IPV4_IPV6 0X05 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_TCP 0X15 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_UDP 0X25 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT 0X0D +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D +#define IXGBE_PACKET_TYPE_MAX 0X80 +#define IXGBE_PACKET_TYPE_MASK 0X7F +#define IXGBE_PACKET_TYPE_SHIFT 0X04 +static inline uint32_t +ixgbe_rxd_pkt_info_to_pkt_type (uint16_t pkt_info) +{ +static const uint32_t + ptype_table[IXGBE_PACKET_TYPE_MAX] __rte_cache_aligned = { + [IXGBE_PACKET_TYPE_IPV4 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 , + [IXGBE_PACKET_TYPE_IPV4_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [IXGBE_PACKET_TYPE_IPV6 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 , + [IXGBE_PACKET_TYPE_IPV4_IPV6 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 , + [IXGBE_PACKET_TYPE_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT , + [IXGBE_PACKET_TYPE_IPV4_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_TCP , + [IXGBE_PACKET_TYPE_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_UDP , + [IXGBE_PACKET_TYPE_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_SCTP , + [IXGBE_PACKET_TYPE_IPV4_EXT_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT |RTE_PTYPE_L4_SCTP , + }; +if (unlikely (pkt_info &IXGBE_RXDADV_PKTTYPE_ETQF )) +return RTE_PTYPE_UNKNOWN ; + + pkt_info = (pkt_info >>IXGBE_PACKET_TYPE_SHIFT ) & +IXGBE_PACKET_TYPE_MASK ; + +return ptype_table[pkt_info]; +} + +static inline uint64_t +ixgbe_rxd_pkt_info_to_pkt_flags (uint16_t pkt_info) +{ + static uint64_t ip_rss_types_map[16] __rte_cache_aligned = { +0 ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH , +0 ,PKT_RX_RSS_HASH ,0 ,PKT_RX_RSS_HASH , +PKT_RX_RSS_HASH ,0 ,0 ,0 , +0 ,0 ,0 ,PKT_RX_FDIR , + }; +#ifdef RTE_LIBRTE_IEEE1588 +static uint64_t ip_pkt_etqf_map[8 ] = { +0 ,0 ,0 ,PKT_RX_IEEE1588_PTP , +0 ,0 ,0 ,0 , + }; + +if (likely (pkt_info &IXGBE_RXDADV_PKTTYPE_ETQF )) +return ip_pkt_etqf_map[(pkt_info >>4 ) &0X07 ] | + ip_rss_types_map[pkt_info &0XF ]; +else +return ip_rss_types_map[pkt_info &0XF ]; +#else +return ip_rss_types_map[pkt_info &0XF ]; +#endif +} +#else /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) {
@@ -890,6 +994,7 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)#endif return pkt_flags | ip_rss_types_map[hl_tp_rs & 0xF]; } +#endif /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_status_to_pkt_flags (uint32_t rx_status)
@@ -945,7 +1050,13 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq)struct rte_mbuf *mb;uint16_t pkt_len;uint64_t pkt_flags; +#ifdef RTE_NEXT_ABI +int nb_dd; +uint32_t s[LOOK_AHEAD ]; +uint16_t pkt_info[LOOK_AHEAD ]; +#else int s[LOOK_AHEAD ], nb_dd; +#endif /* RTE_NEXT_ABI */ int i, j, nb_rx =0 ;
@@ -968,6 +1079,12 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq)for (j =LOOK_AHEAD -1 ; j >=0 ; --j) s[j] = rxdp[j].wb.upper.status_error; +#ifdef RTE_NEXT_ABI +for (j =LOOK_AHEAD -1 ; j >=0 ; --j) + pkt_info[j] = rxdp[j].wb.lower.lo_dword. + hs_rss.pkt_info; +#endif /* RTE_NEXT_ABI */ +/* Compute how many status bits were set */ nb_dd =0 ;for (j =0 ; j <LOOK_AHEAD ; ++j)
@@ -984,12 +1101,22 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq) mb->vlan_tci =rte_le_to_cpu_16 (rxdp[j].wb.upper.vlan);/* convert descriptor fields to rte mbuf flags */ +#ifdef RTE_NEXT_ABI + pkt_flags =rx_desc_status_to_pkt_flags (s[j]); + pkt_flags |=rx_desc_error_to_pkt_flags (s[j]); + pkt_flags |= +ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info[j]); + mb->ol_flags = pkt_flags; + mb->packet_type = +ixgbe_rxd_pkt_info_to_pkt_type (pkt_info[j]); +#else /* RTE_NEXT_ABI */ pkt_flags =rx_desc_hlen_type_rss_to_pkt_flags ( rxdp[j].wb.lower.lo_dword.data);/* reuse status field from scan list */ pkt_flags |=rx_desc_status_to_pkt_flags (s[j]); pkt_flags |=rx_desc_error_to_pkt_flags (s[j]); mb->ol_flags = pkt_flags; +#endif /* RTE_NEXT_ABI */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) mb->hash.rss = rxdp[j].wb.lower.hi_dword.rss;
@@ -1206,7 +1333,11 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,union ixgbe_adv_rx_desc rxd;uint64_t dma_addr;uint32_t staterr; +#ifdef RTE_NEXT_ABI +uint32_t pkt_info; +#else uint32_t hlen_type_rss; +#endif uint16_t pkt_len;uint16_t rx_id;uint16_t nb_rx;
@@ -1324,6 +1455,19 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, rxm->data_len = pkt_len; rxm->port = rxq->port_id; +#ifdef RTE_NEXT_ABI + pkt_info =rte_le_to_cpu_32 (rxd.wb.lower.lo_dword.hs_rss. + pkt_info); +/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ + rxm->vlan_tci =rte_le_to_cpu_16 (rxd.wb.upper.vlan); + + pkt_flags =rx_desc_status_to_pkt_flags (staterr); + pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); + pkt_flags = pkt_flags | +ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info); + rxm->ol_flags = pkt_flags; + rxm->packet_type =ixgbe_rxd_pkt_info_to_pkt_type (pkt_info); +#else /* RTE_NEXT_ABI */ hlen_type_rss =rte_le_to_cpu_32 (rxd.wb.lower.lo_dword.data);/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ rxm->vlan_tci =rte_le_to_cpu_16 (rxd.wb.upper.vlan);
@@ -1332,6 +1476,7 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); rxm->ol_flags = pkt_flags; +#endif /* RTE_NEXT_ABI */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) rxm->hash.rss = rxd.wb.lower.hi_dword.rss;
@@ -1405,6 +1550,23 @@ ixgbe_fill_cluster_head_buf( uint8_t port_id, uint32_t staterr) { +#ifdef RTE_NEXT_ABI +uint16_t pkt_info; +uint64_t pkt_flags; + + head->port = port_id; + +/* The vlan_tci field is only valid when PKT_RX_VLAN_PKT is +* set in the pkt_flags field. +*/ + head->vlan_tci =rte_le_to_cpu_16 (desc->wb.upper.vlan); + pkt_info =rte_le_to_cpu_32 (desc->wb.lower.lo_dword.hs_rss.pkt_info); + pkt_flags =rx_desc_status_to_pkt_flags (staterr); + pkt_flags |=rx_desc_error_to_pkt_flags (staterr); + pkt_flags |=ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info); + head->ol_flags = pkt_flags; + head->packet_type =ixgbe_rxd_pkt_info_to_pkt_type (pkt_info); +#else /* RTE_NEXT_ABI */ uint32_t hlen_type_rss;uint64_t pkt_flags;
@@ -1420,6 +1582,7 @@ ixgbe_fill_cluster_head_buf( pkt_flags |=rx_desc_status_to_pkt_flags (staterr); pkt_flags |=rx_desc_error_to_pkt_flags (staterr); head->ol_flags = pkt_flags; +#endif /* RTE_NEXT_ABI */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) head->hash.rss =rte_le_to_cpu_32 (desc->wb.lower.hi_dword.rss);
Signature · 1 line
1.9.3
PATCH v7 6/18 i40e: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/i40e/i40e_rxtx.c | 528 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 528 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/i40e/i40e_rxtx.c +528 -0
@@ -176,6 +176,514 @@ i40e_rxd_error_to_pkt_flags(uint64_t qword)return flags; } +#ifdef RTE_NEXT_ABI +/* For each value it means, datasheet of hardware can tell more details */ +static inline uint32_t +i40e_rxd_pkt_type_mapping (uint8_t ptype) +{ + static const uint32_t ptype_table[UINT8_MAX] __rte_cache_aligned = { +/* L2 types */ +/* [0] reserved */ + [1 ] =RTE_PTYPE_L2_MAC , + [2 ] =RTE_PTYPE_L2_MAC_TIMESYNC , +/* [3] - [5] reserved */ + [6 ] =RTE_PTYPE_L2_LLDP , +/* [7] - [10] reserved */ + [11 ] =RTE_PTYPE_L2_ARP , +/* [12] - [21] reserved */ + +/* Non tunneled IPv4 */ + [22 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_FRAG , + [23 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_NONFRAG , + [24 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_UDP , +/* [25] reserved */ + [26 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_TCP , + [27 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_SCTP , + [28 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_ICMP , + +/* IPv4 --> IPv4 */ + [29 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [30 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [31 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [32] reserved */ + [33 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [34 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [35 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> IPv6 */ + [36 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [37 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [38 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [39] reserved */ + [40 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [41 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [42 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN */ + [43 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT , + +/* IPv4 --> GRE/Teredo/VXLAN --> IPv4 */ + [44 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [45 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [46 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [47] reserved */ + [48 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [49 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [50 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> IPv6 */ + [51 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [52 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [53 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [54] reserved */ + [55 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [56 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [57 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC */ + [58 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */ + [59 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [60 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [61 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [62] reserved */ + [63 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [64 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [65 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */ + [66 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [67 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [68 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [69] reserved */ + [70 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [71 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [72 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN */ + [73 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */ + [74 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [75 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [76 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [77] reserved */ + [78 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [79 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [80 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */ + [81 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [82 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [83 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [84] reserved */ + [85 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [86 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [87 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* Non tunneled IPv6 */ + [88 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_FRAG , + [89 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_NONFRAG , + [90 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_UDP , +/* [91] reserved */ + [92 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_TCP , + [93 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_SCTP , + [94 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_ICMP , + +/* IPv6 --> IPv4 */ + [95 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [96 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [97 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [98] reserved */ + [99 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [100 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [101 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> IPv6 */ + [102 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [103 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [104 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [105] reserved */ + [106 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [107 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [108 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN */ + [109 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT , + +/* IPv6 --> GRE/Teredo/VXLAN --> IPv4 */ + [110 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [111 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [112 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [113] reserved */ + [114 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [115 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [116 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> IPv6 */ + [117 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [118 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [119 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [120] reserved */ + [121 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [122 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [123 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC */ + [124 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */ + [125 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [126 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [127 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [128] reserved */ + [129 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [130 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [131 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */ + [132 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [133 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [134 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [135] reserved */ + [136 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [137 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [138 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN */ + [139 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */ + [140 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [141 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [142 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [143] reserved */ + [144 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [145 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [146 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */ + [147 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [148 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [149 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [150] reserved */ + [151 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [152 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [153 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* All others reserved */ + }; + +return ptype_table[ptype]; +} +#else /* RTE_NEXT_ABI */ /* Translate pkt types to pkt flags */ static inline uint64_t i40e_rxd_ptype_to_pkt_flags (uint64_t qword)
@@ -443,6 +951,7 @@ i40e_rxd_ptype_to_pkt_flags(uint64_t qword) return ip_ptype_map[ptype]; } +#endif /* RTE_NEXT_ABI */ #define I40E_RX_DESC_EXT_STATUS_FLEXBH_MASK 0x03#define I40E_RX_DESC_EXT_STATUS_FLEXBH_FD_ID 0x01
@@ -730,11 +1239,18 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)i40e_rxd_to_vlan_tci (mb, &rxdp[j]); pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_NEXT_ABI + mb->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >> +I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); mb->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_NEXT_ABI */ if (pkt_flags &PKT_RX_RSS_HASH ) mb->hash.rss =rte_le_to_cpu_32 (\ rxdp[j].wb.qword0.hi_dword.rss);
@@ -971,9 +1487,15 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)i40e_rxd_to_vlan_tci (rxm, &rxd); pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_NEXT_ABI + rxm->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); rxm->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_NEXT_ABI */ if (pkt_flags &PKT_RX_RSS_HASH ) rxm->hash.rss =rte_le_to_cpu_32 (rxd.wb.qword0.hi_dword.rss);
@@ -1129,10 +1651,16 @@ i40e_recv_scattered_pkts(void *rx_queue,i40e_rxd_to_vlan_tci (first_seg, &rxd); pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_NEXT_ABI + first_seg->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); first_seg->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_NEXT_ABI */ if (pkt_flags &PKT_RX_RSS_HASH ) rxm->hash.rss =rte_le_to_cpu_32 (rxd.wb.qword0.hi_dword.rss);
Signature · 1 line
1.9.3
PATCH v7 7/18 enic: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/enic/enic_main.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/enic/enic_main.c +26 -0
@@ -423,7 +423,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->pkt_len = bytes_written;if (ipv4) { +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) rx_pkt->ol_flags |=PKT_RX_IP_CKSUM_BAD ;
@@ -432,7 +436,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->ol_flags |=PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV6 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }else {/* Header split */ if (sop && !eop) {
@@ -445,7 +453,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, *rx_pkt_bucket = rx_pkt; rx_pkt->pkt_len = bytes_written;if (ipv4) { +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) rx_pkt->ol_flags |=
@@ -457,13 +469,22 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV6 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }else {/* Payload */ hdr_rx_pkt = *rx_pkt_bucket; hdr_rx_pkt->pkt_len += bytes_written;if (ipv4) { +#ifdef RTE_NEXT_ABI + hdr_rx_pkt->packet_type = +RTE_PTYPE_L3_IPV4 ; +#else hdr_rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) hdr_rx_pkt->ol_flags |=
@@ -475,7 +496,12 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_NEXT_ABI + hdr_rx_pkt->packet_type = +RTE_PTYPE_L3_IPV6 ; +#else hdr_rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif } }
Signature · 1 line
1.9.3
PATCH v7 8/18 vmxnet3: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 ++++++++ 1 file changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/vmxnet3/vmxnet3_rxtx.c +8 -0
@@ -649,9 +649,17 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)struct ipv4_hdr *ip = (struct ipv4_hdr *)(eth +1 ); if (((ip->version_ihl & 0xf) << 2) > (int)sizeof(struct ipv4_hdr)) +#ifdef RTE_NEXT_ABI + rxm->packet_type =RTE_PTYPE_L3_IPV4_EXT ; +#else rxm->ol_flags |=PKT_RX_IPV4_HDR_EXT ; +#endif else +#ifdef RTE_NEXT_ABI + rxm->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rxm->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!rcd->cnc) {if (!rcd->ipc)
Signature · 1 line
1.9.3
PATCH v7 9/18 fm10k: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/fm10k/fm10k_rxtx.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
v4 changes:
* Supported unified packet type of fm10k from v4.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/fm10k/fm10k_rxtx.c +27 -0
@@ -68,12 +68,37 @@ static inline void dump_rxd(union fm10k_rx_desc *rxd)static inline void rx_desc_to_ol_flags (struct rte_mbuf *m,const union fm10k_rx_desc *d) { +#ifdef RTE_NEXT_ABI +static const uint32_t + ptype_table[FM10K_RXD_PKTTYPE_MASK >>FM10K_RXD_PKTTYPE_SHIFT ] + __rte_cache_aligned = { + [FM10K_PKTTYPE_OTHER ] =RTE_PTYPE_L2_MAC , + [FM10K_PKTTYPE_IPV4 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4 , + [FM10K_PKTTYPE_IPV4_EX ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [FM10K_PKTTYPE_IPV6 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6 , + [FM10K_PKTTYPE_IPV6_EX ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + }; + + m->packet_type = ptype_table[(d->w.pkt_info &FM10K_RXD_PKTTYPE_MASK ) + >>FM10K_RXD_PKTTYPE_SHIFT ]; +#else /* RTE_NEXT_ABI */ uint16_t ptype;static const uint16_t pt_lut[] = {0 ,PKT_RX_IPV4_HDR ,PKT_RX_IPV4_HDR_EXT ,PKT_RX_IPV6_HDR ,PKT_RX_IPV6_HDR_EXT ,0 ,0 ,0 }; +#endif /* RTE_NEXT_ABI */ if (d->w.pkt_info &FM10K_RXD_RSSTYPE_MASK ) m->ol_flags |=PKT_RX_RSS_HASH ;
@@ -97,9 +122,11 @@ rx_desc_to_ol_flags(struct rte_mbuf *m, const union fm10k_rx_desc *d)if (unlikely (d->d.staterr &FM10K_RXD_STATUS_RXE )) m->ol_flags |=PKT_RX_RECIP_ERR ; +#ifndef RTE_NEXT_ABI ptype = (d->d.data &FM10K_RXD_PKTTYPE_MASK_L3 ) >>FM10K_RXD_PKTTYPE_SHIFT ; m->ol_flags |= pt_lut[(uint8_t )ptype]; +#endif }uint16_t
Signature · 1 line
1.9.3
PATCH v7 10/18 app/test-pipeline: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- app/test-pipeline/pipeline_hash.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
app/test-pipeline/pipeline_hash.c +13 -0
@@ -459,20 +459,33 @@ app_main_loop_rx_metadata(void) { signature =RTE_MBUF_METADATA_UINT32_PTR (m,0 ); key =RTE_MBUF_METADATA_UINT8_PTR (m,32 ); +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif ip_hdr = (struct ipv4_hdr *) &m_data[sizeof (struct ether_hdr )]; ip_dst = ip_hdr->dst_addr; k32 = (uint32_t *) key; k32[0 ] = ip_dst &0xFFFFFF00 ; +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif ipv6_hdr = (struct ipv6_hdr *) &m_data[sizeof (struct ether_hdr )]; ipv6_dst = ipv6_hdr->dst_addr;memcpy (key, ipv6_dst,16 ); +#ifdef RTE_NEXT_ABI + } else + continue; +#else } +#endif *signature =test_hash (key,0 ,0 ); }
Signature · 1 line
1.9.3
PATCH v7 11/18 app/testpmd: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- app/test-pmd/csumonly.c | 14 ++++ app/test-pmd/rxonly.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v4 changes:
* Added printing logs of packet types of each received packet in rxonly mode.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
app/test-pmd/csumonly.c +14 -0
@@ -202,8 +202,14 @@ parse_ethernet(struct ether_hdr *eth_hdr, struct testpmd_offload_info *info)/* Parse a vxlan header */ static void +#ifdef RTE_NEXT_ABI +parse_vxlan(struct udp_hdr *udp_hdr, + struct testpmd_offload_info *info, + uint32_t pkt_type) +#elseparse_vxlan (struct udp_hdr *udp_hdr,struct testpmd_offload_info *info, uint64_t mbuf_olflags) +#endif {struct ether_hdr *eth_hdr;
@@ -211,8 +217,12 @@ parse_vxlan(struct udp_hdr *udp_hdr, struct testpmd_offload_info *info,* (rfc7348) or that the rx offload flag is set (i40e only * currently) */ if (udp_hdr->dst_port != _htons(4789) && +#ifdef RTE_NEXT_ABI + RTE_ETH_IS_TUNNEL_PKT(pkt_type) == 0) +#else (mbuf_olflags & (PKT_RX_TUNNEL_IPV4_HDR | PKT_RX_TUNNEL_IPV6_HDR)) == 0) +#endif return ; info->is_tunnel =1 ;
@@ -549,7 +559,11 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)struct udp_hdr *udp_hdr; udp_hdr = (struct udp_hdr *)((char *)l3_hdr + info.l3_len); +#ifdef RTE_NEXT_ABI +parse_vxlan (udp_hdr, &info, m->packet_type); +#else parse_vxlan (udp_hdr, &info, m->ol_flags); +#endif }else if (info.l4_proto ==IPPROTO_GRE ) {struct simple_gre_hdr *gre_hdr; gre_hdr = (struct simple_gre_hdr *)
app/test-pmd/rxonly.c +183 -0
211 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v7 12/18 app/test: Remove useless code
In reply to Helin ZhangSeverl useless code lines are added accidently, which blocks packet type unification. They should be deleted at all.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- app/test/packet_burst_generator.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
v4 changes:
* Removed several useless code lines which block packet type unification.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
app/test/packet_burst_generator.c +4 -2
@@ -272,19 +272,21 @@ nomore_mbuf:if (ipv4) { pkt->vlan_tci = ETHER_TYPE_IPv4; pkt->l3_len =sizeof (struct ipv4_hdr ); - +#ifndef RTE_NEXT_ABI if (vlan_enabled) pkt->ol_flags =PKT_RX_IPV4_HDR |PKT_RX_VLAN_PKT ;else pkt->ol_flags =PKT_RX_IPV4_HDR ; +#endif }else { pkt->vlan_tci = ETHER_TYPE_IPv6; pkt->l3_len =sizeof (struct ipv6_hdr ); - +#ifndef RTE_NEXT_ABI if (vlan_enabled) pkt->ol_flags =PKT_RX_IPV6_HDR |PKT_RX_VLAN_PKT ;else pkt->ol_flags =PKT_RX_IPV6_HDR ; +#endif } pkts_burst[nb_pkt] = pkt;
Signature · 1 line
1.9.3
PATCH v7 13/18 examples/ip_fragmentation: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/ip_fragmentation/main.c | 9 +++++++++ 1 file changed, 9 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/ip_fragmentation/main.c +9 -0
@@ -283,7 +283,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, len = qconf->tx_mbufs[port_out].len;/* if this is an IPv4 packet */ +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif struct ipv4_hdr *ip_hdr;uint32_t ip_dst;/* Read the lookup key (i.e. ip_dst) from the input packet */
@@ -317,9 +321,14 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,if (unlikely (len2 <0 ))return ; } +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if this is an IPv6 packet */ +#else }/* if this is an IPv6 packet */ else if (m->ol_flags &PKT_RX_IPV6_HDR ) { +#endif struct ipv6_hdr *ip_hdr; ipv6 =1 ;
Signature · 1 line
1.9.3
PATCH v7 14/18 examples/ip_reassembly: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/ip_reassembly/main.c | 9 +++++++++ 1 file changed, 9 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/ip_reassembly/main.c +9 -0
@@ -356,7 +356,11 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, dst_port = portid;/* if packet is IPv4 */ +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags & (PKT_RX_IPV4_HDR )) { +#endif struct ipv4_hdr *ip_hdr;uint32_t ip_dst;
@@ -396,9 +400,14 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, } eth_hdr->ether_type =rte_be_to_cpu_16 (ETHER_TYPE_IPv4); +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if packet is IPv6 */ +#else }/* if packet is IPv6 */ else if (m->ol_flags & (PKT_RX_IPV6_HDR |PKT_RX_IPV6_HDR_EXT )) { +#endif struct ipv6_extension_fragment *frag_hdr;struct ipv6_hdr *ip_hdr;
Signature · 1 line
1.9.3
PATCH v7 15/18 examples/l3fwd-acl: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/l3fwd-acl/main.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/l3fwd-acl/main.c +23 -6
@@ -645,10 +645,13 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,struct ipv4_hdr *ipv4_hdr;struct rte_mbuf *pkt = pkts_in[index]; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR );if (type ==PKT_RX_IPV4_HDR ) { - +#endif ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, unsigned char *) + sizeof(struct ether_hdr));
@@ -667,9 +670,11 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,/* Not a valid IPv4 packet */ rte_pktmbuf_free (pkt); } - +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (type ==PKT_RX_IPV6_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -687,17 +692,22 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl, {struct rte_mbuf *pkt = pkts_in[index]; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR );if (type ==PKT_RX_IPV4_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv4[acl->num_ipv4] =MBUF_IPV4_2PROTO (pkt); acl->m_ipv4[(acl->num_ipv4)++] = pkt; - +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (type ==PKT_RX_IPV6_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -745,10 +755,17 @@ send_one_packet(struct rte_mbuf *m, uint32_t res)/* in the ACL list, drop it */ #ifdef L3FWDACL_DEBUG if ((res &ACL_DENY_SIGNATURE ) !=0 ) { +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) +dump_acl4_rule (m, res); +else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) +dump_acl6_rule (m, res); +#else if (m->ol_flags &PKT_RX_IPV4_HDR )dump_acl4_rule (m, res);else dump_acl6_rule (m, res); +#endif /* RTE_NEXT_ABI */ }#endif rte_pktmbuf_free (m);
Signature · 1 line
1.9.3
PATCH v7 16/18 examples/l3fwd-power: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/l3fwd-power/main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/l3fwd-power/main.c +8 -0
@@ -635,7 +635,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif /* Handle IPv4 headers.*/ ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char*)
@@ -670,8 +674,12 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid,ether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif /* Handle IPv6 headers.*/ #if (APP_LOOKUP_METHOD ==APP_LOOKUP_EXACT_MATCH )struct ipv6_hdr *ipv6_hdr;
Signature · 1 line
1.9.3
PATCH v7 17/18 examples/l3fwd: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/l3fwd/main.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 3 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v3 changes:
* Minor bug fixes and enhancements.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/l3fwd/main.c +120 -3
@@ -948,7 +948,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif /* Handle IPv4 headers.*/ ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char *) +sizeof (struct ether_hdr ));
@@ -979,8 +983,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); - +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif /* Handle IPv6 headers.*/ struct ipv6_hdr *ipv6_hdr;
@@ -999,8 +1006,13 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); +#ifdef RTE_NEXT_ABI + }else +/* Free the mbuf that contains non-IPV4/IPV6 packet */ +rte_pktmbuf_free (m); +#else } - +#endif }#ifdef DO_RFC_1812_CHECKS
@@ -1024,12 +1036,19 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon* to BAD_PORT value. */ static inline __attribute__((always_inline)) void +#ifdef RTE_NEXT_ABI +rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t ptype) +#else rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t flags) +#endif {uint8_t ihl; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (ptype)) { +#else if ((flags &PKT_RX_IPV4_HDR ) !=0 ) { - +#endif ihl = ipv4_hdr->version_ihl -IPV4_MIN_VER_IHL ; ipv4_hdr->time_to_live--;
@@ -1059,11 +1078,19 @@ get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,struct ipv6_hdr *ipv6_hdr;struct ether_hdr *eth_hdr; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else if (pkt->ol_flags &PKT_RX_IPV4_HDR ) { +#endif if (rte_lpm_lookup (qconf->ipv4_lookup_struct, dst_ipv4, &next_hop) !=0 ) next_hop = portid; +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (pkt->ol_flags &PKT_RX_IPV6_HDR ) { +#endif eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *); ipv6_hdr = (struct ipv6_hdr *)(eth_hdr +1 ); if (rte_lpm6_lookup(qconf->ipv6_lookup_struct,
@@ -1097,12 +1124,52 @@ process_packet(struct lcore_conf *qconf, struct rte_mbuf *pkt, ve = val_eth[dp]; dst_port[0 ] = dp; +#ifdef RTE_NEXT_ABI +rfc1812_process (ipv4_hdr, dst_port, pkt->packet_type); +#else rfc1812_process (ipv4_hdr, dst_port, pkt->ol_flags); +#endif te =_mm_blend_epi16 (te, ve,MASK_ETH );_mm_store_si128 ((__m128i *)eth_hdr, te); } +#ifdef RTE_NEXT_ABI +/* +* Read packet_type and destination IPV4 addresses from 4 mbufs. +*/ +static inline void +processx4_step1 (struct rte_mbuf *pkt[FWDSTEP ], +__m128i *dip, +uint32_t *ipv4_flag) +{ +struct ipv4_hdr *ipv4_hdr; +struct ether_hdr *eth_hdr; +uint32_t x0, x1, x2, x3; + + eth_hdr = rte_pktmbuf_mtod(pkt[0], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x0 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] = pkt[0 ]->packet_type &RTE_PTYPE_L3_IPV4 ; + + eth_hdr = rte_pktmbuf_mtod(pkt[1], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x1 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[1 ]->packet_type; + + eth_hdr = rte_pktmbuf_mtod(pkt[2], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x2 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[2 ]->packet_type; + + eth_hdr = rte_pktmbuf_mtod(pkt[3], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x3 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[3 ]->packet_type; + + dip[0 ] =_mm_set_epi32 (x3, x2, x1, x0); +} +#else /* RTE_NEXT_ABI */ /* * Read ol_flags and destination IPV4 addresses from 4 mbufs. */
@@ -1135,14 +1202,24 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag) dip[0 ] =_mm_set_epi32 (x3, x2, x1, x0); } +#endif /* RTE_NEXT_ABI */ /* * Lookup into LPM for destination port. * If lookup fails, use incoming port (portid) as destination port. */ static inline void +#ifdef RTE_NEXT_ABI +processx4_step2(const struct lcore_conf *qconf, + __m128i dip, + uint32_t ipv4_flag, + uint8_t portid, + struct rte_mbuf *pkt[FWDSTEP], + uint16_t dprt[FWDSTEP]) +#elseprocessx4_step2 (const struct lcore_conf *qconf, __m128i dip,uint32_t flag, uint8_t portid, struct rte_mbuf *pkt[FWDSTEP], uint16_t dprt[FWDSTEP]) +#endif /* RTE_NEXT_ABI */ {rte_xmm_t dst; const __m128i bswap_mask = _mm_set_epi8(12, 13, 14, 15, 8, 9, 10, 11,
@@ -1152,7 +1229,11 @@ processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t flag, dip =_mm_shuffle_epi8 (dip, bswap_mask);/* if all 4 packets are IPV4. */ +#ifdef RTE_NEXT_ABI +if (likely (ipv4_flag)) { +#else if (likely (flag !=0 )) { +#endif rte_lpm_lookupx4 (qconf->ipv4_lookup_struct, dip, dprt, portid); }else { dst.x = dip;
@@ -1202,6 +1283,16 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])_mm_store_si128 (p[2 ], te[2 ]);_mm_store_si128 (p[3 ], te[3 ]); +#ifdef RTE_NEXT_ABI +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[0 ] +1 ), + &dst_port[0 ], pkt[0 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[1 ] +1 ), + &dst_port[1 ], pkt[1 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[2 ] +1 ), + &dst_port[2 ], pkt[2 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[3 ] +1 ), + &dst_port[3 ], pkt[3 ]->packet_type); +#else /* RTE_NEXT_ABI */ rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[0 ] +1 ), &dst_port[0 ], pkt[0 ]->ol_flags); rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[1] + 1),
@@ -1210,6 +1301,7 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP]) &dst_port[2], pkt[2]->ol_flags);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[3 ] +1 ), &dst_port[3 ], pkt[3 ]->ol_flags); +#endif /* RTE_NEXT_ABI */ }/*
@@ -1396,7 +1488,11 @@ main_loop(__attribute__((unused)) void *dummy)uint16_t *lp;uint16_t dst_port[MAX_PKT_BURST ];__m128i dip[MAX_PKT_BURST /FWDSTEP ]; +#ifdef RTE_NEXT_ABI +uint32_t ipv4_flag[MAX_PKT_BURST /FWDSTEP ]; +#else uint32_t flag[MAX_PKT_BURST /FWDSTEP ]; +#endif uint16_t pnum[MAX_PKT_BURST +1 ];#endif
@@ -1466,6 +1562,18 @@ main_loop(__attribute__((unused)) void *dummy)*/ int32_t n =RTE_ALIGN_FLOOR (nb_rx,4 );for (j =0 ; j < n ; j+=4 ) { +#ifdef RTE_NEXT_ABI +uint32_t pkt_type = + pkts_burst[j]->packet_type & + pkts_burst[j+1 ]->packet_type & + pkts_burst[j+2 ]->packet_type & + pkts_burst[j+3 ]->packet_type; +if (pkt_type &RTE_PTYPE_L3_IPV4 ) { +simple_ipv4_fwd_4pkts ( + &pkts_burst[j], portid, qconf); + }else if (pkt_type & +RTE_PTYPE_L3_IPV6 ) { +#else /* RTE_NEXT_ABI */ uint32_t ol_flag = pkts_burst[j]->ol_flags & pkts_burst[j+1 ]->ol_flags & pkts_burst[j+2 ]->ol_flags
@@ -1474,6 +1582,7 @@ main_loop(__attribute__((unused)) void *dummy)simple_ipv4_fwd_4pkts (&pkts_burst[j], portid, qconf); }else if (ol_flag &PKT_RX_IPV6_HDR ) { +#endif /* RTE_NEXT_ABI */ simple_ipv6_fwd_4pkts (&pkts_burst[j], portid, qconf); }else {
@@ -1498,13 +1607,21 @@ main_loop(__attribute__((unused)) void *dummy)for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step1 (&pkts_burst[j], &dip[j /FWDSTEP ], +#ifdef RTE_NEXT_ABI + &ipv4_flag[j /FWDSTEP ]); +#else &flag[j / FWDSTEP]); +#endif } k =RTE_ALIGN_FLOOR (nb_rx,FWDSTEP );for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step2 (qconf, dip[j /FWDSTEP ], +#ifdef RTE_NEXT_ABI + ipv4_flag[j /FWDSTEP ], portid, +#else flag[j /FWDSTEP ], portid, +#endif &pkts_burst[j], &dst_port[j]); }
Signature · 1 line
1.9.3
PATCH v7 18/18 mbuf: remove old packet type bit masks
In reply to Helin ZhangAs unified packet types are used instead, those old bit masks and the relevant macros for packet type indication need to be removed. To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- lib/librte_mbuf/rte_mbuf.c | 4 ++++ lib/librte_mbuf/rte_mbuf.h | 4 ++++ 2 files changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
* Redefined the bit masks for packet RX offload flags.
v5 changes:
* Rolled back the bit masks of RX flags, for ABI compatibility.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
lib/librte_mbuf/rte_mbuf.c +4 -0
@@ -251,14 +251,18 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask)/* case PKT_RX_HBUF_OVERFLOW: return "PKT_RX_HBUF_OVERFLOW"; */ /* case PKT_RX_RECIP_ERR: return "PKT_RX_RECIP_ERR"; */ /* case PKT_RX_MAC_ERR: return "PKT_RX_MAC_ERR"; */ +#ifndef RTE_NEXT_ABI case PKT_RX_IPV4_HDR :return "PKT_RX_IPV4_HDR" ;case PKT_RX_IPV4_HDR_EXT :return "PKT_RX_IPV4_HDR_EXT" ;case PKT_RX_IPV6_HDR :return "PKT_RX_IPV6_HDR" ;case PKT_RX_IPV6_HDR_EXT :return "PKT_RX_IPV6_HDR_EXT" ; +#endif /* RTE_NEXT_ABI */ case PKT_RX_IEEE1588_PTP :return "PKT_RX_IEEE1588_PTP" ;case PKT_RX_IEEE1588_TMST :return "PKT_RX_IEEE1588_TMST" ; +#ifndef RTE_NEXT_ABI case PKT_RX_TUNNEL_IPV4_HDR :return "PKT_RX_TUNNEL_IPV4_HDR" ;case PKT_RX_TUNNEL_IPV6_HDR :return "PKT_RX_TUNNEL_IPV6_HDR" ; +#endif /* RTE_NEXT_ABI */ default :return NULL ; } }
lib/librte_mbuf/rte_mbuf.h +4 -0
@@ -91,14 +91,18 @@ extern "C" {#define PKT_RX_HBUF_OVERFLOW (0ULL << 0)/**< Header buffer overflow. */ #define PKT_RX_RECIP_ERR (0ULL << 0)/**< Hardware processing error. */ #define PKT_RX_MAC_ERR (0ULL << 0)/**< MAC error. */ +#ifndef RTE_NEXT_ABI #define PKT_RX_IPV4_HDR (1ULL << 5)/**< RX packet with IPv4 header. */ #define PKT_RX_IPV4_HDR_EXT (1ULL << 6)/**< RX packet with extended IPv4 header. */ #define PKT_RX_IPV6_HDR (1ULL << 7)/**< RX packet with IPv6 header. */ #define PKT_RX_IPV6_HDR_EXT (1ULL << 8)/**< RX packet with extended IPv6 header. */ +#endif /* RTE_NEXT_ABI */ #define PKT_RX_IEEE1588_PTP (1ULL << 9)/**< RX IEEE1588 L2 Ethernet PT Packet. */ #define PKT_RX_IEEE1588_TMST (1ULL << 10)/**< RX IEEE1588 L2/L4 timestamped packet.*/ +#ifndef RTE_NEXT_ABI #define PKT_RX_TUNNEL_IPV4_HDR (1ULL << 11)/**< RX tunnel packet with IPv4 header.*/ #define PKT_RX_TUNNEL_IPV6_HDR (1ULL << 12)/**< RX tunnel packet with IPv6 header. */ +#endif /* RTE_NEXT_ABI */ #define PKT_RX_FDIR_ID (1ULL << 13)/**< FD id reported if FDIR match. */ #define PKT_RX_FDIR_FLX (1ULL << 14)/**< Flexible bytes reported if FDIR match. */ #define PKT_RX_QINQ_PKT (1ULL << 15)/**< RX packet with double VLAN stripped. */
Signature · 1 line
1.9.3
v8 cover unified packet type
In reply to Helin ZhangCurrently only 6 bits which are stored in ol_flags are used to indicate the packet types. This is not enough, as some NIC hardware can recognize quite a lot of packet types, e.g i40e hardware can recognize more than 150 packet types. Hiding those packet types hides hardware offload capabilities which could be quite useful for improving performance and for end users. So an unified packet types are needed to support all possible PMDs. A 16 bits packet_type in mbuf structure can be changed to 32 bits and used for this purpose. In addition, all packet types stored in ol_flag field should be deleted at all, and 6 bits of ol_flags can be save as the benifit.
Initially, 32 bits of packet_type can be divided into several sub fields to indicate different packet type information of a packet. The initial design is to divide those bits into fields for L2 types, L3 types, L4 types, tunnel types, inner L2 types, inner L3 types and inner L4 types. All PMDs should translate the offloaded packet types into these 7 fields of information, for user applications.
To avoid breaking ABI compatibility, currently all the code changes for unified packet type are disabled at compile time by default. Users can enable it manually by defining the macro of RTE_NEXT_ABI. The code changes will be valid by default in a future release, and the old version will be deleted accordingly, after the ABI change process is done.
Note that this patch set should be integrated after another patch set for '[PATCH v3 0/7] support i40e QinQ stripping and insertion', to clearly solve the conflict during integration. As both patch sets modified 'struct rte_mbuf', and the final layout of the 'struct rte_mbuf' is key to vectorized ixgbe PMD.
v2 changes:
* Enlarged the packet_type field from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes.
* Used redefined packet types and enlarged packet_type field for all PMDs and corresponding applications.
* Removed changes in bond and its relevant application, as there is no need at all according to the recent bond changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Put vector ixgbe changes right after mbuf changes.
* Disabled vector ixgbe PMD by default, as mbuf layout changed, and then re-enabled it after vector ixgbe PMD updated.
* Put the definitions of unified packet type into a single patch.
* Minor bug fixes and enhancements in l3fwd example.
v4 changes:
* Added detailed description of each packet types.
* Supported unified packet type of fm10k.
* Added printing logs of packet types of each received packet for rxonly mode in testpmd.
* Removed several useless code lines which block packet type unification from app/test/packet_burst_generator.c.
v5 changes:
* Added more detailed description for each packet types, together with examples.
* Rolled back the macro definitions of RX packet flags, for ABI compitability.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
* Integrated with patch set for '[PATCH v3 0/7] support i40e QinQ stripping and insertion', to clearly solve the conflicts during merging.
v8 changes:
* Moved the field of 'vlan_tci_outer' in 'struct rte_mbuf' to the end of the 1st cache line, to avoid breaking any vectorized PMD storing, as fields of 'packet_type, pkt_len, data_len, vlan_tci, rss' should be in an contiguous 128 bits.
Helin Zhang (18):
mbuf: redefine packet_type in rte_mbuf
ixgbe: support unified packet type in vectorized PMD
mbuf: add definitions of unified packet types
e1000: replace bit mask based packet type with unified packet type
ixgbe: replace bit mask based packet type with unified packet type
i40e: replace bit mask based packet type with unified packet type
enic: replace bit mask based packet type with unified packet type
vmxnet3: replace bit mask based packet type with unified packet type
fm10k: replace bit mask based packet type with unified packet type app/test-pipeline: replace bit mask based packet type with unified
packet type
app/testpmd: replace bit mask based packet type with unified packet
type
app/test: Remove useless code
examples/ip_fragmentation: replace bit mask based packet type with
unified packet type
examples/ip_reassembly: replace bit mask based packet type with
unified packet type
examples/l3fwd-acl: replace bit mask based packet type with unified
packet type
examples/l3fwd-power: replace bit mask based packet type with unified
packet type
examples/l3fwd: replace bit mask based packet type with unified packet
type
mbuf: remove old packet type bit masks
app/test-pipeline/pipeline_hash.c | 13 + app/test-pmd/csumonly.c | 14 + app/test-pmd/rxonly.c | 183 +++++++ app/test/packet_burst_generator.c | 6 +- drivers/net/e1000/igb_rxtx.c | 102 ++++ drivers/net/enic/enic_main.c | 26 + drivers/net/fm10k/fm10k_rxtx.c | 27 ++ drivers/net/i40e/i40e_rxtx.c | 528 +++++++++++++++++++++ drivers/net/ixgbe/ixgbe_rxtx.c | 163 +++++++ drivers/net/ixgbe/ixgbe_rxtx_vec.c | 75 ++- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 + examples/ip_fragmentation/main.c | 9 + examples/ip_reassembly/main.c | 9 + examples/l3fwd-acl/main.c | 29 +- examples/l3fwd-power/main.c | 8 + examples/l3fwd/main.c | 123 ++++- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 + lib/librte_mbuf/rte_mbuf.c | 4 + lib/librte_mbuf/rte_mbuf.h | 517 ++++++++++++++++++++ 19 files changed, 1837 insertions(+), 13 deletions(-)
Signature · 1 line
1.9.3
PATCH v8 1/18 mbuf: redefine packet_type in rte_mbuf
In order to unify the packet type, the field of 'packet_type' in 'struct rte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'struct rte_mbuf' are re-organized to support this change for Vector PMD. As 'struct rte_kni_mbuf' for KNI should be right mapped to 'struct rte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'struct rte_mbuf' changed.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- config/common_linuxapp | 2 +- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 +++++ lib/librte_mbuf/rte_mbuf.h | 26 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-)
v2 changes:
* Enlarged the packet_type field from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Disabled vector ixgbe PMD by default, as mbuf layout changed.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
* Integrated with changes of QinQ stripping/insertion.
v8 changes:
* Moved the field of 'vlan_tci_outer' in 'struct rte_mbuf' to the end of the 1st cache line, to avoid breaking any vectorized PMD storing.
config/common_linuxapp +1 -1
@@ -167,7 +167,7 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_IXGBE_INC_VECTOR=y +CONFIG_RTE_IXGBE_INC_VECTOR=n CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y #
lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +6 -0
@@ -117,9 +117,15 @@ struct rte_kni_mbuf {uint16_t data_off;/**< Start address of data in segment buffer. */ char pad1[4 ];uint64_t ol_flags;/**< Offload features. */ +#ifdef RTE_NEXT_ABI +char pad2[4 ]; +uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ +#else char pad2[2 ];uint16_t data_len;/**< Amount of data in segment buffer. */ uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +#endif /* fields on second cache line */ char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_SIZE)));
lib/librte_mbuf/rte_mbuf.h +26 -0
@@ -275,6 +275,28 @@ struct rte_mbuf {/* remaining bytes are set on RX when pulling packet from descriptor */ MARKER rx_descriptor_fields1; +#ifdef RTE_NEXT_ABI +/* +* The packet type, which is the combination of outer/inner L2, L3, L4 +* and tunnel types. +*/ +union { +uint32_t packet_type;/**< L2/L3/L4 and tunnel information. */ +struct { +uint32_t l2_type:4 ;/**< (Outer) L2 type. */ +uint32_t l3_type:4 ;/**< (Outer) L3 type. */ +uint32_t l4_type:4 ;/**< (Outer) L4 type. */ +uint32_t tun_type:4 ;/**< Tunnel type. */ +uint32_t inner_l2_type:4 ;/**< Inner L2 type. */ +uint32_t inner_l3_type:4 ;/**< Inner L3 type. */ +uint32_t inner_l4_type:4 ;/**< Inner L4 type. */ + }; + }; + +uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ +uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ +#else /* RTE_NEXT_ABI */ /** * The packet type, which is used to indicate ordinary packet and also * tunneled packet format, i.e. each number is represented a type of
@@ -286,6 +308,7 @@ struct rte_mbuf {uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ uint16_t vlan_tci_outer;/**< Outer VLAN Tag Control Identifier (CPU order) */ +#endif /* RTE_NEXT_ABI */ union {uint32_t rss;/**< RSS hash result if RSS enabled */ struct {
@@ -306,6 +329,9 @@ struct rte_mbuf { } hash;/**< hash information */ uint32_t seqn;/**< Sequence number. See also rte_reorder_insert() */ +#ifdef RTE_NEXT_ABI +uint16_t vlan_tci_outer;/**< Outer VLAN Tag Control Identifier (CPU order) */ +#endif /* RTE_NEXT_ABI */ /* second cache line - fields only used in slow path or on TX */ MARKER cacheline1 __rte_cache_aligned;
Signature · 1 line
1.9.3
Re: [PATCH v8 01/18] mbuf: redefine packet_type in rte_mbuf
2015-06-23 09:50, Helin Zhang:
Quoted 7 lines
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
[...]
config/common_linuxapp CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n · line 170
Quoted 2 lines
config/common_linuxapp +1
-1-CONFIG_RTE_IXGBE_INC_VECTOR=y +CONFIG_RTE_IXGBE_INC_VECTOR=n
It is the default configuration. Disabling it do not prevent from build break during a "git bisect".
Please merge the changes for vector ixgbe in this patch.
Re: [PATCH v8 01/18] mbuf: redefine packet_type in rte_mbuf
Hi Thomas
Quoted 16 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Thursday, July 2, 2015 5:03 PM
To: Zhang, Helin
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v8 01/18] mbuf: redefinepacket_typeinrte_mbuf2015-06-23 09:50, Helin Zhang:
Quoted 7 lines
In order to unify the packet type, the field of '
packet_type' in 'structrte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'structrte_mbuf' are re-organized to support this change for Vector PMD. As 'structrte_kni_mbuf' for KNI should be right mapped to 'structrte_mbuf', it should be modified accordingly. In addition, Vector PMD of ixgbe is disabled by default, as 'structrte_mbuf' changed.
Quoted 7 lines
[...]
config/common_linuxapp CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n · line 170
Quoted 2 lines
config/common_linuxapp +1
-1-CONFIG_RTE_IXGBE_INC_VECTOR=y +CONFIG_RTE_IXGBE_INC_VECTOR=nIt is the default configuration. Disabling it do not prevent from build break during a "git bisect".
Please merge the changes for vector ixgbe in this patch.
Sure, no problem!
V9 will be sent soon. Thanks!
- Helin
PATCH v8 2/18 ixgbe: support unified packet type in vectorized PMD
In reply to Helin ZhangTo unify the packet type, bit masks of packet type for ol_flags are replaced. In addition, more packet types (UDP, TCP and SCTP) are supported in vectorized ixgbe PMD.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default. Note that around 2% performance drop (64B) was observed of doing 4 ports (1 port per 82599 card) IO forwarding on the same SNB core.
--- config/common_linuxapp | 2 +- drivers/net/ixgbe/ixgbe_rxtx_vec.c | 75 +++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 3 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v3 changes:
* Put vector ixgbe changes right after mbuf changes.
* Enabled vector ixgbe PMD by default together with changes for updated vector PMD.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
config/common_linuxapp +1 -1
@@ -167,7 +167,7 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y -CONFIG_RTE_IXGBE_INC_VECTOR=n +CONFIG_RTE_IXGBE_INC_VECTOR=y CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y #
drivers/net/ixgbe/ixgbe_rxtx_vec.c +73 -2
145 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v8 3/18 mbuf: add definitions of unified packet types
In reply to Helin ZhangAs there are only 6 bit flags in ol_flags for indicating packet types, which is not enough to describe all the possible packet types hardware can recognize. For example, i40e hardware can recognize more than 150 packet types. Unified packet type is composed of L2 type, L3 type, L4 type, tunnel type, inner L2 type, inner L3 type and inner L4 type fields, and can be stored in 'struct rte_mbuf' of 32 bits field 'packet_type'.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- lib/librte_mbuf/rte_mbuf.h | 487 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 487 insertions(+)
v3 changes:
* Put the definitions of unified packet type into a single patch.
v4 changes:
* Added detailed description of each packet types.
v5 changes:
* Re-worded the commit logs.
* Added more detailed description for all packet types, together with examples.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
lib/librte_mbuf/rte_mbuf.h +487 -0
@@ -201,6 +201,493 @@ extern "C" {/* Use final bit of flags to indicate a control mbuf */ #define CTRL_MBUF_FLAG (1ULL << 63)/**< Mbuf contains control data */ +#ifdef RTE_NEXT_ABI +/* +* 32 bits are divided into several fields to mark packet types. Note that +* each field is indexical. +* - Bit 3:0 is for L2 types. +* - Bit 7:4 is for L3 or outer L3 (for tunneling case) types. +* - Bit 11:8 is for L4 or outer L4 (for tunneling case) types. +* - Bit 15:12 is for tunnel types. +* - Bit 19:16 is for inner L2 types. +* - Bit 23:20 is for inner L3 types. +* - Bit 27:24 is for inner L4 types. +* - Bit 31:28 is reserved. +* +* To be compatible with Vector PMD, RTE_PTYPE_L3_IPV4, RTE_PTYPE_L3_IPV4_EXT, +* RTE_PTYPE_L3_IPV6, RTE_PTYPE_L3_IPV6_EXT, RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP +* and RTE_PTYPE_L4_SCTP should be kept as below in a contiguous 7 bits. +* +* Note that L3 types values are selected for checking IPV4/IPV6 header from +* performance point of view. Reading annotations of RTE_ETH_IS_IPV4_HDR and +* RTE_ETH_IS_IPV6_HDR is needed for any future changes of L3 type values. +* +* Note that the packet types of the same packet recognized by different +* hardware may be different, as different hardware may have different +* capability of packet type recognition. +* +* examples: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=0x29 +* | 'version'=6, 'next header'=0x3A +* | 'ICMPv6 header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_IP | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_ICMP. +* +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x2F +* | 'GRE header' +* | 'version'=6, 'next header'=0x11 +* | 'UDP header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_GRENAT | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_UDP. +*/ +#define RTE_PTYPE_UNKNOWN 0x00000000 +/** +* MAC (Media Access Control) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=[0x0800|0x86DD|others]> +*/ +#define RTE_PTYPE_L2_MAC 0x00000001 +/** +* MAC (Media Access Control) packet type for time sync. +* +* Packet format: +* <'ether type'=0x88F7> +*/ +#define RTE_PTYPE_L2_MAC_TIMESYNC 0x00000002 +/** +* ARP (Address Resolution Protocol) packet type. +* +* Packet format: +* <'ether type'=0x0806> +*/ +#define RTE_PTYPE_L2_ARP 0x00000003 +/** +* LLDP (Link Layer Discovery Protocol) packet type. +* +* Packet format: +* <'ether type'=0x88CC> +*/ +#define RTE_PTYPE_L2_LLDP 0x00000004 +/** +* Mask of layer 2 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L2_MASK 0x0000000f +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* header option. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_L3_IPV4 0x00000010 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and contains header +* options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_L3_IPV4_EXT 0x00000030 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* extension header. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_L3_IPV6 0x00000040 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* header options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_L3_IPV4_EXT_UNKNOWN 0x00000090 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and contains extension +* headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_L3_IPV6_EXT 0x000000c0 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* extension headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_L3_IPV6_EXT_UNKNOWN 0x000000e0 +/** +* Mask of layer 3 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L3_MASK 0x000000f0 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_L4_TCP 0x00000100 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_L4_UDP 0x00000200 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, which can be recognized as +* fragmented. A fragmented packet cannot be recognized as any other L4 types +* (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP, +* RTE_PTYPE_L4_NONFRAG). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_L4_FRAG 0x00000300 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_L4_SCTP 0x00000400 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_L4_ICMP 0x00000500 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, while cannot be recognized as +* any of above L4 types (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, +* RTE_PTYPE_L4_FRAG, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_L4_NONFRAG 0x00000600 +/** +* Mask of layer 4 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L4_MASK 0x00000f00 +/** +* IP (Internet Protocol) in IP (Internet Protocol) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=[4|41]> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[4|41]> +*/ +#define RTE_PTYPE_TUNNEL_IP 0x00001000 +/** +* GRE (Generic Routing Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47> +*/ +#define RTE_PTYPE_TUNNEL_GRE 0x00002000 +/** +* VXLAN (Virtual eXtensible Local Area Network) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=4798> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=4798> +*/ +#define RTE_PTYPE_TUNNEL_VXLAN 0x00003000 +/** +* NVGRE (Network Virtualization using Generic Routing Encapsulation) tunneling +* packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47 +* | 'protocol type'=0x6558> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47 +* | 'protocol type'=0x6558'> +*/ +#define RTE_PTYPE_TUNNEL_NVGRE 0x00004000 +/** +* GENEVE (Generic Network Virtualization Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=6081> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=6081> +*/ +#define RTE_PTYPE_TUNNEL_GENEVE 0x00005000 +/** +* Tunneling packet type of Teredo, VXLAN (Virtual eXtensible Local Area +* Network) or GRE (Generic Routing Encapsulation) could be recognized as this +* packet type, if they can not be recognized independently as of hardware +* capability. +*/ +#define RTE_PTYPE_TUNNEL_GRENAT 0x00006000 +/** +* Mask of tunneling packet types. +*/ +#define RTE_PTYPE_TUNNEL_MASK 0x0000f000 +/** +* MAC (Media Access Control) packet type. +* It is used for inner packet type only. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD]> +*/ +#define RTE_PTYPE_INNER_L2_MAC 0x00010000 +/** +* MAC (Media Access Control) packet type with VLAN (Virtual Local Area +* Network) tag. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD], vlan=[1-4095]> +*/ +#define RTE_PTYPE_INNER_L2_MAC_VLAN 0x00020000 +/** +* Mask of inner layer 2 packet types. +*/ +#define RTE_PTYPE_INNER_L2_MASK 0x000f0000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and does not contain any header option. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_INNER_L3_IPV4 0x00100000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and contains header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT 0x00200000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and does not contain any extension header. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_INNER_L3_IPV6 0x00300000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and may or maynot contain header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN 0x00400000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and contains extension headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT 0x00500000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and may or maynot contain extension +* headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN 0x00600000 +/** +* Mask of inner layer 3 packet types. +*/ +#define RTE_PTYPE_INNER_INNER_L3_MASK 0x00f00000 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_INNER_L4_TCP 0x01000000 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_INNER_L4_UDP 0x02000000 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have layer 4 packet. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_INNER_L4_FRAG 0x03000000 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_INNER_L4_SCTP 0x04000000 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_INNER_L4_ICMP 0x05000000 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have other unknown layer +* 4 packet types. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_INNER_L4_NONFRAG 0x06000000 +/** +* Mask of inner layer 4 packet types. +*/ +#define RTE_PTYPE_INNER_L4_MASK 0x0f000000 + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 4 is selected to be used for IPv4 only. Then checking bit 4 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV4_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV4) + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 6 is selected to be used for IPv4 only. Then checking bit 6 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV6_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV6) + +/* Check if it is a tunneling packet */ +#define RTE_ETH_IS_TUNNEL_PKT (ptype) ((ptype) & RTE_PTYPE_TUNNEL_MASK) +#endif /* RTE_NEXT_ABI */ +/** * Get the name of a RX offload flag *
Signature · 1 line
1.9.3
Re: [PATCH v8 03/18] mbuf: add definitions of unified packet types
Hi Helin,
This is greatly documented, thanks!
Please find a small comment below.
Quoted 67 lines · Helin Zhang
As there are only 6 bit flags in
ol_flagsfor indicating packet types, which is not enough to describe all the possible packet types hardware can recognize. For example, i40e hardware can recognize more than 150 packet types. Unified packet type is composed of L2 type, L3 type, L4 type, tunnel type, inner L2 type, inner L3 type and inner L4 type fields, and can be stored in 'structrte_mbuf' of 32 bits field 'packet_type'.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_NEXT_ABI, which is disabled by default.[...]
lib/librte_mbuf/rte_mbuf.h +48
-0@@ -201,6 +201,493 @@ extern "C" {/* Use final bit of flags to indicate a control mbuf */ #define CTRL_MBUF_FLAG (1ULL << 63)/**< Mbuf contains control data */ +#ifdef RTE_NEXT_ABI +/* +* 32 bits are divided into several fields to mark packet types. Note that +* each field is indexical. +* - Bit 3:0 is for L2 types. +* - Bit 7:4 is for L3 or outer L3 (for tunneling case) types. +* - Bit 11:8 is for L4 or outer L4 (for tunneling case) types. +* - Bit 15:12 is for tunnel types. +* - Bit 19:16 is for inner L2 types. +* - Bit 23:20 is for inner L3 types. +* - Bit 27:24 is for inner L4 types. +* - Bit 31:28 is reserved. +* +* To be compatible with Vector PMD, RTE_PTYPE_L3_IPV4, RTE_PTYPE_L3_IPV4_EXT, +* RTE_PTYPE_L3_IPV6, RTE_PTYPE_L3_IPV6_EXT, RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP +* and RTE_PTYPE_L4_SCTP should be kept as below in a contiguous 7 bits. +* +* Note that L3 types values are selected for checking IPV4/IPV6 header from +* performance point of view. Reading annotations of RTE_ETH_IS_IPV4_HDR and +* RTE_ETH_IS_IPV6_HDR is needed for any future changes of L3 type values. +* +* Note that the packet types of the same packet recognized by different +* hardware may be different, as different hardware may have different +* capability of packet type recognition. +* +* examples: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=0x29 +* | 'version'=6, 'next header'=0x3A +* | 'ICMPv6 header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_IP | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_ICMP. +* +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x2F +* | 'GRE header' +* | 'version'=6, 'next header'=0x11 +* | 'UDP header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_GRENAT | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_UDP.
lib/librte_mbuf/rte_mbuf.h extern "C" { · line 261
Quoted 10 lines
lib/librte_mbuf/rte_mbuf.h +10
-0+*/ +#define RTE_PTYPE_UNKNOWN 0x00000000 +/** +* MAC (Media Access Control) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=[0x0800|0x86DD|others]> +*/ +#define RTE_PTYPE_L2_MAC 0x00000001
I'm wondering if RTE_PTYPE_L2_ETHER is not a better name?
Quoted 11 lines
lib/librte_mbuf/rte_mbuf.h +11
-0+/** +* MAC (Media Access Control) packet type for time sync. +* +* Packet format: +* <'ether type'=0x88F7> +*/ +#define RTE_PTYPE_L2_MAC_TIMESYNC 0x00000002 +/** +* ARP (Address Resolution Protocol) packet type. +* +* Packet format:
lib/librte_mbuf/rte_mbuf.h extern "C" { · line 282
Quoted 10 lines
lib/librte_mbuf/rte_mbuf.h +10
-0+* <'ether type'=0x0806> +*/ +#define RTE_PTYPE_L2_ARP 0x00000003 +/** +* LLDP (Link Layer Discovery Protocol) packet type. +* +* Packet format: +* <'ether type'=0x88CC> +*/ +#define RTE_PTYPE_L2_LLDP 0x00000004
Maybe ETHER should appear in these names too, what do you think?
Quoted 412 lines
lib/librte_mbuf/rte_mbuf.h +408
-0+/** +* Mask of layer 2 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L2_MASK 0x0000000f +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* header option. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_L3_IPV4 0x00000010 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and contains header +* options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_L3_IPV4_EXT 0x00000030 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* extension header. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_L3_IPV6 0x00000040 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* header options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_L3_IPV4_EXT_UNKNOWN 0x00000090 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and contains extension +* headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_L3_IPV6_EXT 0x000000c0 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* extension headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_L3_IPV6_EXT_UNKNOWN 0x000000e0 +/** +* Mask of layer 3 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L3_MASK 0x000000f0 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_L4_TCP 0x00000100 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_L4_UDP 0x00000200 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, which can be recognized as +* fragmented. A fragmented packet cannot be recognized as any other L4 types +* (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP, +* RTE_PTYPE_L4_NONFRAG). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_L4_FRAG 0x00000300 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_L4_SCTP 0x00000400 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_L4_ICMP 0x00000500 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, while cannot be recognized as +* any of above L4 types (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, +* RTE_PTYPE_L4_FRAG, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_L4_NONFRAG 0x00000600 +/** +* Mask of layer 4 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L4_MASK 0x00000f00 +/** +* IP (Internet Protocol) in IP (Internet Protocol) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=[4|41]> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[4|41]> +*/ +#define RTE_PTYPE_TUNNEL_IP 0x00001000 +/** +* GRE (Generic Routing Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47> +*/ +#define RTE_PTYPE_TUNNEL_GRE 0x00002000 +/** +* VXLAN (Virtual eXtensible Local Area Network) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=4798> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=4798> +*/ +#define RTE_PTYPE_TUNNEL_VXLAN 0x00003000 +/** +* NVGRE (Network Virtualization using Generic Routing Encapsulation) tunneling +* packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47 +* | 'protocol type'=0x6558> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47 +* | 'protocol type'=0x6558'> +*/ +#define RTE_PTYPE_TUNNEL_NVGRE 0x00004000 +/** +* GENEVE (Generic Network Virtualization Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=6081> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=6081> +*/ +#define RTE_PTYPE_TUNNEL_GENEVE 0x00005000 +/** +* Tunneling packet type of Teredo, VXLAN (Virtual eXtensible Local Area +* Network) or GRE (Generic Routing Encapsulation) could be recognized as this +* packet type, if they can not be recognized independently as of hardware +* capability. +*/ +#define RTE_PTYPE_TUNNEL_GRENAT 0x00006000 +/** +* Mask of tunneling packet types. +*/ +#define RTE_PTYPE_TUNNEL_MASK 0x0000f000 +/** +* MAC (Media Access Control) packet type. +* It is used for inner packet type only. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD]> +*/ +#define RTE_PTYPE_INNER_L2_MAC 0x00010000 +/** +* MAC (Media Access Control) packet type with VLAN (Virtual Local Area +* Network) tag. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD], vlan=[1-4095]> +*/ +#define RTE_PTYPE_INNER_L2_MAC_VLAN 0x00020000 +/** +* Mask of inner layer 2 packet types. +*/ +#define RTE_PTYPE_INNER_L2_MASK 0x000f0000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and does not contain any header option. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_INNER_L3_IPV4 0x00100000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and contains header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT 0x00200000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and does not contain any extension header. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_INNER_L3_IPV6 0x00300000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and may or maynot contain header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN 0x00400000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and contains extension headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT 0x00500000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and may or maynot contain extension +* headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN 0x00600000 +/** +* Mask of inner layer 3 packet types. +*/ +#define RTE_PTYPE_INNER_INNER_L3_MASK 0x00f00000 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_INNER_L4_TCP 0x01000000 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_INNER_L4_UDP 0x02000000 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have layer 4 packet. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_INNER_L4_FRAG 0x03000000 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_INNER_L4_SCTP 0x04000000 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_INNER_L4_ICMP 0x05000000 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have other unknown layer +* 4 packet types. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_INNER_L4_NONFRAG 0x06000000 +/** +* Mask of inner layer 4 packet types. +*/ +#define RTE_PTYPE_INNER_L4_MASK 0x0f000000 + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 4 is selected to be used for IPv4 only. Then checking bit 4 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV4_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV4) + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 6 is selected to be used for IPv4 only. Then checking bit 6 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV6_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV6) + +/* Check if it is a tunneling packet */ +#define RTE_ETH_IS_TUNNEL_PKT (ptype) ((ptype) & RTE_PTYPE_TUNNEL_MASK) +#endif /* RTE_NEXT_ABI */ +/** * Get the name of a RX offload flag *
Re: [PATCH v8 03/18] mbuf: add definitions of unified packet types
Hi Oliver
Thanks for your helps!
Quoted 92 lines
-----Original Message-----
From: Olivier MATZ [mailto:[email protected]]
Sent: Tuesday, June 30, 2015 4:44 PM
To: Zhang, Helin; [email protected]
Cc: Cao, Waterman; Liang, Cunming; Liu, Jijiang; Ananyev, Konstantin; Richardson, Bruce; [email protected]; Wu, Jingjing
Subject: Re: [PATCH v8 03/18] mbuf: add definitions of unified packet typesHi Helin,
This is greatly documented, thanks!
Please find a small comment below.Quoted 16 lines · Helin Zhang
As there are only 6 bit flags in
ol_flagsfor indicating packet types, which is not enough to describe all the possible packet types hardware can recognize. For example, i40e hardware can recognize more than 150 packet types. Unified packet type is composed of L2 type, L3 type, L4 type, tunnel type, inner L2 type, inner L3 type and inner L4 type fields, and can be stored in 'structrte_mbuf' of 32 bits field 'packet_type'.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_NEXT_ABI, which is disabled by default.[...]
lib/librte_mbuf/rte_mbuf.h +0
-0lib/librte_mbuf/rte_mbuf.h extern "C" { · line 202
Quoted 2 lines
lib/librte_mbuf/rte_mbuf.h +0
-0@@ -201,6 +201,493 @@ extern "C" {/* Use final bit of flags to indicate a control mbuf */ #define CTRL_MBUF_FLAG (1ULL << 63)/**< Mbuf contains control data */
Quoted 59 lines
lib/librte_mbuf/rte_mbuf.h +58
-0+#ifdef RTE_NEXT_ABI +/* +* 32 bits are divided into several fields to mark packet types. Note +that +* each field is indexical. +* - Bit 3:0 is for L2 types. +* - Bit 7:4 is for L3 or outer L3 (for tunneling case) types. +* - Bit 11:8 is for L4 or outer L4 (for tunneling case) types. +* - Bit 15:12 is for tunnel types. +* - Bit 19:16 is for inner L2 types. +* - Bit 23:20 is for inner L3 types. +* - Bit 27:24 is for inner L4 types. +* - Bit 31:28 is reserved. +* +* To be compatible with Vector PMD, RTE_PTYPE_L3_IPV4, +RTE_PTYPE_L3_IPV4_EXT, +* RTE_PTYPE_L3_IPV6, RTE_PTYPE_L3_IPV6_EXT, RTE_PTYPE_L4_TCP, +RTE_PTYPE_L4_UDP +* and RTE_PTYPE_L4_SCTP should be kept as below in a contiguous 7 bits. +* +* Note that L3 types values are selected for checking IPV4/IPV6 +header from +* performance point of view. Reading annotations of +RTE_ETH_IS_IPV4_HDR and +* RTE_ETH_IS_IPV6_HDR is needed for any future changes of L3 type values. +* +* Note that the packet types of the same packet recognized by +different +* hardware may be different, as different hardware may have +different +* capability of packet type recognition. +* +* examples: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=0x29 +* | 'version'=6, 'next header'=0x3A +* | 'ICMPv6 header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_IP | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_ICMP. +* +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x2F +* | 'GRE header' +* | 'version'=6, 'next header'=0x11 +* | 'UDP header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_GRENAT | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_UDP. +*/ +#define RTE_PTYPE_UNKNOWN 0x00000000 +/**
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h extern "C" { · line 261
Quoted 6 lines
lib/librte_mbuf/rte_mbuf.h +6
-0+* MAC (Media Access Control) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=[0x0800|0x86DD|others]> */ +#define RTE_PTYPE_L2_MAC 0x00000001I'm wondering if
RTE_PTYPE_L2_ETHERis not a better name?
Ethernet includes both Data Link Layer and Physical Layer, while MAC is for Data Link Layer only. I would prefer to keep 'MAC' in the names, rather than 'ether'. Any opinions from others?
Regards,
Helin
Quoted 17 lines
Quoted 17 lines
lib/librte_mbuf/rte_mbuf.h +15
-0+/** +* MAC (Media Access Control) packet type for time sync. +* +* Packet format: +* <'ether type'=0x88F7> +*/ +#define RTE_PTYPE_L2_MAC_TIMESYNC 0x00000002 +/** +* ARP (Address Resolution Protocol) packet type. +* +* Packet format: +* <'ether type'=0x0806> +*/ +#define RTE_PTYPE_L2_ARP 0x00000003 +/**
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h extern "C" { · line 282
Quoted 6 lines
lib/librte_mbuf/rte_mbuf.h +6
-0+* LLDP (Link Layer Discovery Protocol) packet type. +* +* Packet format: +* <'ether type'=0x88CC> +*/ +#define RTE_PTYPE_L2_LLDP 0x00000004Maybe ETHER should appear in these names too, what do you think?
Same as above.
Quoted 429 lines
Quoted 209 lines
lib/librte_mbuf/rte_mbuf.h +205
-0+/** +* Mask of layer 2 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L2_MASK 0x0000000f +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and does not +contain any +* header option. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_L3_IPV4 0x00000010 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and contains +header +* options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> */ +#define RTE_PTYPE_L3_IPV4_EXT 0x00000030 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and does not +contain any +* extension header. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> */ +#define RTE_PTYPE_L3_IPV6 0x00000040 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and may or maynot +contain +* header options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> */ +#define RTE_PTYPE_L3_IPV4_EXT_UNKNOWN 0x00000090 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and contains +extension +* headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_L3_IPV6_EXT 0x000000c0 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and may or maynot +contain +* extension headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_L3_IPV6_EXT_UNKNOWN 0x000000e0 +/** +* Mask of layer 3 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L3_MASK 0x000000f0 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_L4_TCP 0x00000100 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_L4_UDP 0x00000200 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, which can be +recognized as +* fragmented. A fragmented packet cannot be recognized as any other +L4 types +* (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, RTE_PTYPE_L4_SCTP, +RTE_PTYPE_L4_ICMP, +* RTE_PTYPE_L4_NONFRAG). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_L4_FRAG 0x00000300 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_L4_SCTP 0x00000400 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_L4_ICMP 0x00000500 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, while cannot be +recognized as +* any of above L4 types (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, +* RTE_PTYPE_L4_FRAG, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> */ +#define RTE_PTYPE_L4_NONFRAG 0x00000600 +/** +* Mask of layer 4 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L4_MASK 0x00000f00 +/** +* IP (Internet Protocol) in IP (Internet Protocol) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=[4|41]> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[4|41]> */ +#define RTE_PTYPE_TUNNEL_IP 0x00001000 +/** +* GRE (Generic Routing Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47> +*/ +#define RTE_PTYPE_TUNNEL_GRE 0x00002000 +/** +* VXLAN (Virtual eXtensible Local Area Network) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=4798> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=4798> +*/ +#define RTE_PTYPE_TUNNEL_VXLAN 0x00003000 +/** +* NVGRE (Network Virtualization using Generic Routing Encapsulation) +tunneling +* packet type. +* +* Packet format: +* <'ether type'=0x0800 lib/librte_mbuf/rte_mbuf.h extern "C" {
Quoted 10 lines
lib/librte_mbuf/rte_mbuf.h +10
-0+* | 'version'=4, 'protocol'=47 +* | 'protocol type'=0x6558> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47 +* | 'protocol type'=0x6558'> +*/ +#define RTE_PTYPE_TUNNEL_NVGRE 0x00004000 +/** +* GENEVE (Generic Network Virtualization Encapsulation) tunneling packet type.
Quoted 192 lines
lib/librte_mbuf/rte_mbuf.h +192
-0+* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=6081> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=6081> +*/ +#define RTE_PTYPE_TUNNEL_GENEVE 0x00005000 +/** +* Tunneling packet type of Teredo, VXLAN (Virtual eXtensible Local +Area +* Network) or GRE (Generic Routing Encapsulation) could be +recognized as this +* packet type, if they can not be recognized independently as of +hardware +* capability. +*/ +#define RTE_PTYPE_TUNNEL_GRENAT 0x00006000 +/** +* Mask of tunneling packet types. +*/ +#define RTE_PTYPE_TUNNEL_MASK 0x0000f000 +/** +* MAC (Media Access Control) packet type. +* It is used for inner packet type only. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD]> +*/ +#define RTE_PTYPE_INNER_L2_MAC 0x00010000 +/** +* MAC (Media Access Control) packet type with VLAN (Virtual Local +Area +* Network) tag. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD], vlan=[1-4095]> */ +#define RTE_PTYPE_INNER_L2_MAC_VLAN 0x00020000 +/** +* Mask of inner layer 2 packet types. +*/ +#define RTE_PTYPE_INNER_L2_MASK 0x000f0000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and does not contain any header option. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_INNER_L3_IPV4 0x00100000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and contains header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> */ +#define RTE_PTYPE_INNER_L3_IPV4_EXT 0x00200000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and does not contain any extension header. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> */ +#define RTE_PTYPE_INNER_L3_IPV6 0x00300000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and may or maynot contain header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> */ #define +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN 0x00400000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and contains extension headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT 0x00500000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and may or maynot contain +extension +* headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN 0x00600000 +/** +* Mask of inner layer 3 packet types. +*/ +#define RTE_PTYPE_INNER_INNER_L3_MASK 0x00f00000 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_INNER_L4_TCP 0x01000000 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_INNER_L4_UDP 0x02000000 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have layer 4 packet. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_INNER_L4_FRAG 0x03000000 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_INNER_L4_SCTP 0x04000000 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_INNER_L4_ICMP 0x05000000 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have other +unknown layer +* 4 packet types. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> */ +#define RTE_PTYPE_INNER_L4_NONFRAG 0x06000000 +/** +* Mask of inner layer 4 packet types. +*/ +#define RTE_PTYPE_INNER_L4_MASK 0x0f000000 + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 +types one by +* one, bit 4 is selected to be used for IPv4 only. Then checking bit +4 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV4_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV4) + +/** lib/librte_mbuf/rte_mbuf.h extern "C" {
Quoted 10 lines
lib/librte_mbuf/rte_mbuf.h +10
-0+* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 +types one by +* one, bit 6 is selected to be used for IPv4 only. Then checking bit +6 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV6_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV6) + +/* Check if it is a tunneling packet */ #define +RTE_ETH_IS_TUNNEL_PKT (ptype) ((ptype) & RTE_PTYPE_TUNNEL_MASK)#endif
Quoted 6 lines
lib/librte_mbuf/rte_mbuf.h +2
-0+/* RTE_NEXT_ABI */ +/** * Get the name of a RX offload flag *