New upstream version 16.11.3
[deb_dpdk.git] / drivers / net / i40e / i40e_rxtx.c
index d3cfb98..ba33b2a 100644 (file)
@@ -138,12 +138,21 @@ i40e_rxd_error_to_pkt_flags(uint64_t qword)
        uint64_t error_bits = (qword >> I40E_RXD_QW1_ERROR_SHIFT);
 
 #define I40E_RX_ERR_BITS 0x3f
-       if (likely((error_bits & I40E_RX_ERR_BITS) == 0))
+       if (likely((error_bits & I40E_RX_ERR_BITS) == 0)) {
+               flags |= (PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD);
                return flags;
+       }
+
        if (unlikely(error_bits & (1 << I40E_RX_DESC_ERROR_IPE_SHIFT)))
                flags |= PKT_RX_IP_CKSUM_BAD;
+       else
+               flags |= PKT_RX_IP_CKSUM_GOOD;
+
        if (unlikely(error_bits & (1 << I40E_RX_DESC_ERROR_L4E_SHIFT)))
                flags |= PKT_RX_L4_CKSUM_BAD;
+       else
+               flags |= PKT_RX_L4_CKSUM_GOOD;
+
        if (unlikely(error_bits & (1 << I40E_RX_DESC_ERROR_EIPE_SHIFT)))
                flags |= PKT_RX_EIP_CKSUM_BAD;
 
@@ -174,569 +183,6 @@ i40e_get_iee15888_flags(struct rte_mbuf *mb, uint64_t qword)
 }
 #endif
 
-/* For each value it means, datasheet of hardware can tell more details
- *
- * @note: fix i40e_dev_supported_ptypes_get() if any change here.
- */
-static inline uint32_t
-i40e_rxd_pkt_type_mapping(uint8_t ptype)
-{
-       static const uint32_t type_table[UINT8_MAX + 1] __rte_cache_aligned = {
-               /* L2 types */
-               /* [0] reserved */
-               [1] = RTE_PTYPE_L2_ETHER,
-               [2] = RTE_PTYPE_L2_ETHER_TIMESYNC,
-               /* [3] - [5] reserved */
-               [6] = RTE_PTYPE_L2_ETHER_LLDP,
-               /* [7] - [10] reserved */
-               [11] = RTE_PTYPE_L2_ETHER_ARP,
-               /* [12] - [21] reserved */
-
-               /* Non tunneled IPv4 */
-               [22] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_FRAG,
-               [23] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_NONFRAG,
-               [24] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_UDP,
-               /* [25] reserved */
-               [26] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_TCP,
-               [27] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_SCTP,
-               [28] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_ICMP,
-
-               /* IPv4 --> IPv4 */
-               [29] = RTE_PTYPE_L2_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT,
-
-               /* IPv4 --> GRE/Teredo/VXLAN --> IPv4 */
-               [44] = RTE_PTYPE_L2_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER,
-
-               /* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */
-               [59] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_FRAG,
-               [60] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_NONFRAG,
-               [61] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_UDP,
-               /* [62] reserved */
-               [63] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_TCP,
-               [64] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_SCTP,
-               [65] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_ICMP,
-
-               /* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */
-               [66] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_FRAG,
-               [67] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_NONFRAG,
-               [68] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_UDP,
-               /* [69] reserved */
-               [70] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_TCP,
-               [71] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_SCTP,
-               [72] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_ICMP,
-
-               /* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN */
-               [73] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN,
-
-               /* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */
-               [74] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_FRAG,
-               [75] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_NONFRAG,
-               [76] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_UDP,
-               /* [77] reserved */
-               [78] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_TCP,
-               [79] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_SCTP,
-               [80] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_ICMP,
-
-               /* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */
-               [81] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_FRAG,
-               [82] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_NONFRAG,
-               [83] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_UDP,
-               /* [84] reserved */
-               [85] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_TCP,
-               [86] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_SCTP,
-               [87] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_ICMP,
-
-               /* Non tunneled IPv6 */
-               [88] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_FRAG,
-               [89] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_NONFRAG,
-               [90] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_UDP,
-               /* [91] reserved */
-               [92] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_TCP,
-               [93] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_SCTP,
-               [94] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_ICMP,
-
-               /* IPv6 --> IPv4 */
-               [95] = RTE_PTYPE_L2_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT,
-
-               /* IPv6 --> GRE/Teredo/VXLAN --> IPv4 */
-               [110] = RTE_PTYPE_L2_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | 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_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER,
-
-               /* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */
-               [125] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_FRAG,
-               [126] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_NONFRAG,
-               [127] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_UDP,
-               /* [128] reserved */
-               [129] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_TCP,
-               [130] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_SCTP,
-               [131] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_ICMP,
-
-               /* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */
-               [132] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_FRAG,
-               [133] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_NONFRAG,
-               [134] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_UDP,
-               /* [135] reserved */
-               [136] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_TCP,
-               [137] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_SCTP,
-               [138] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_ICMP,
-
-               /* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN */
-               [139] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN,
-
-               /* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */
-               [140] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_FRAG,
-               [141] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_NONFRAG,
-               [142] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_UDP,
-               /* [143] reserved */
-               [144] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_TCP,
-               [145] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_SCTP,
-               [146] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_ICMP,
-
-               /* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */
-               [147] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_FRAG,
-               [148] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_NONFRAG,
-               [149] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_UDP,
-               /* [150] reserved */
-               [151] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_TCP,
-               [152] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_SCTP,
-               [153] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_TUNNEL_GRENAT |
-                       RTE_PTYPE_INNER_L2_ETHER_VLAN |
-                       RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_INNER_L4_ICMP,
-
-               /* L2 NSH packet type */
-               [154] = RTE_PTYPE_L2_ETHER_NSH,
-               [155] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_FRAG,
-               [156] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_NONFRAG,
-               [157] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_UDP,
-               [158] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_TCP,
-               [159] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_SCTP,
-               [160] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_ICMP,
-               [161] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_FRAG,
-               [162] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_NONFRAG,
-               [163] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_UDP,
-               [164] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_TCP,
-               [165] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_SCTP,
-               [166] = RTE_PTYPE_L2_ETHER_NSH | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
-                       RTE_PTYPE_L4_ICMP,
-
-               /* All others reserved */
-       };
-
-       return type_table[ptype];
-}
-
 #define I40E_RX_DESC_EXT_STATUS_FLEXBH_MASK   0x03
 #define I40E_RX_DESC_EXT_STATUS_FLEXBH_FD_ID  0x01
 #define I40E_RX_DESC_EXT_STATUS_FLEXBH_FLEX   0x02
@@ -779,33 +225,65 @@ i40e_rxd_build_fdir(volatile union i40e_rx_desc *rxdp, struct rte_mbuf *mb)
 #endif
        return flags;
 }
+
+static inline void
+i40e_parse_tunneling_params(uint64_t ol_flags,
+                           union i40e_tx_offload tx_offload,
+                           uint32_t *cd_tunneling)
+{
+       /* EIPT: External (outer) IP header type */
+       if (ol_flags & PKT_TX_OUTER_IP_CKSUM)
+               *cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4;
+       else if (ol_flags & PKT_TX_OUTER_IPV4)
+               *cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4_NO_CSUM;
+       else if (ol_flags & PKT_TX_OUTER_IPV6)
+               *cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV6;
+
+       /* EIPLEN: External (outer) IP header length, in DWords */
+       *cd_tunneling |= (tx_offload.outer_l3_len >> 2) <<
+               I40E_TXD_CTX_QW0_EXT_IPLEN_SHIFT;
+
+       /* L4TUNT: L4 Tunneling Type */
+       switch (ol_flags & PKT_TX_TUNNEL_MASK) {
+       case PKT_TX_TUNNEL_IPIP:
+               /* for non UDP / GRE tunneling, set to 00b */
+               break;
+       case PKT_TX_TUNNEL_VXLAN:
+       case PKT_TX_TUNNEL_GENEVE:
+               *cd_tunneling |= I40E_TXD_CTX_UDP_TUNNELING;
+               break;
+       case PKT_TX_TUNNEL_GRE:
+               *cd_tunneling |= I40E_TXD_CTX_GRE_TUNNELING;
+               break;
+       default:
+               PMD_TX_LOG(ERR, "Tunnel type not supported\n");
+               return;
+       }
+
+       /* L4TUNLEN: L4 Tunneling Length, in Words
+        *
+        * We depend on app to set rte_mbuf.l2_len correctly.
+        * For IP in GRE it should be set to the length of the GRE
+        * header;
+        * for MAC in GRE or MAC in UDP it should be set to the length
+        * of the GRE or UDP headers plus the inner MAC up to including
+        * its last Ethertype.
+        */
+       *cd_tunneling |= (tx_offload.l2_len >> 1) <<
+               I40E_TXD_CTX_QW0_NATLEN_SHIFT;
+}
+
 static inline void
 i40e_txd_enable_checksum(uint64_t ol_flags,
                        uint32_t *td_cmd,
                        uint32_t *td_offset,
-                       union i40e_tx_offload tx_offload,
-                       uint32_t *cd_tunneling)
+                       union i40e_tx_offload tx_offload)
 {
-       /* UDP tunneling packet TX checksum offload */
-       if (ol_flags & PKT_TX_OUTER_IP_CKSUM) {
-
+       /* Set MACLEN */
+       if (ol_flags & PKT_TX_TUNNEL_MASK)
                *td_offset |= (tx_offload.outer_l2_len >> 1)
                                << I40E_TX_DESC_LENGTH_MACLEN_SHIFT;
-
-               if (ol_flags & PKT_TX_OUTER_IP_CKSUM)
-                       *cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4;
-               else if (ol_flags & PKT_TX_OUTER_IPV4)
-                       *cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4_NO_CSUM;
-               else if (ol_flags & PKT_TX_OUTER_IPV6)
-                       *cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV6;
-
-               /* Now set the ctx descriptor fields */
-               *cd_tunneling |= (tx_offload.outer_l3_len >> 2) <<
-                               I40E_TXD_CTX_QW0_EXT_IPLEN_SHIFT |
-                               (tx_offload.l2_len >> 1) <<
-                               I40E_TXD_CTX_QW0_NATLEN_SHIFT;
-
-       } else
+       else
                *td_offset |= (tx_offload.l2_len >> 1)
                        << I40E_TX_DESC_LENGTH_MACLEN_SHIFT;
 
@@ -994,6 +472,8 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)
                                        I40E_RXD_QW1_STATUS_SHIFT;
                }
 
+               rte_smp_rmb();
+
                /* Compute how many status bits were set */
                for (j = 0, nb_dd = 0; j < I40E_LOOK_AHEAD; j++)
                        nb_dd += s[j] & (1 << I40E_RX_DESC_STATUS_DD_SHIFT);
@@ -1118,6 +598,7 @@ static inline uint16_t
 rx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 {
        struct i40e_rx_queue *rxq = (struct i40e_rx_queue *)rx_queue;
+       struct rte_eth_dev *dev;
        uint16_t nb_rx = 0;
 
        if (!nb_pkts)
@@ -1135,9 +616,10 @@ rx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                if (i40e_rx_alloc_bufs(rxq) != 0) {
                        uint16_t i, j;
 
-                       PMD_RX_LOG(DEBUG, "Rx mbuf alloc failed for "
-                                  "port_id=%u, queue_id=%u",
-                                  rxq->port_id, rxq->queue_id);
+                       dev = I40E_VSI_TO_ETH_DEV(rxq->vsi);
+                       dev->data->rx_mbuf_alloc_failed +=
+                               rxq->rx_free_thresh;
+
                        rxq->rx_nb_avail = 0;
                        rxq->rx_tail = (uint16_t)(rxq->rx_tail - nb_rx);
                        for (i = 0, j = rxq->rx_tail; i < nb_rx; i++, j++)
@@ -1199,6 +681,7 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        union i40e_rx_desc rxd;
        struct i40e_rx_entry *sw_ring;
        struct i40e_rx_entry *rxe;
+       struct rte_eth_dev *dev;
        struct rte_mbuf *rxm;
        struct rte_mbuf *nmb;
        uint16_t nb_rx;
@@ -1227,10 +710,13 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                        break;
 
                nmb = rte_mbuf_raw_alloc(rxq->mp);
-               if (unlikely(!nmb))
+               if (unlikely(!nmb)) {
+                       dev = I40E_VSI_TO_ETH_DEV(rxq->vsi);
+                       dev->data->rx_mbuf_alloc_failed++;
                        break;
-               rxd = *rxdp;
+               }
 
+               rxd = *rxdp;
                nb_hold++;
                rxe = &sw_ring[rx_id];
                rx_id++;
@@ -1322,6 +808,7 @@ i40e_recv_scattered_pkts(void *rx_queue,
        struct rte_mbuf *nmb, *rxm;
        uint16_t rx_id = rxq->rx_tail;
        uint16_t nb_rx = 0, nb_hold = 0, rx_packet_len;
+       struct rte_eth_dev *dev;
        uint32_t rx_status;
        uint64_t qword1;
        uint64_t dma_addr;
@@ -1338,8 +825,12 @@ i40e_recv_scattered_pkts(void *rx_queue,
                        break;
 
                nmb = rte_mbuf_raw_alloc(rxq->mp);
-               if (unlikely(!nmb))
+               if (unlikely(!nmb)) {
+                       dev = I40E_VSI_TO_ETH_DEV(rxq->vsi);
+                       dev->data->rx_mbuf_alloc_failed++;
                        break;
+               }
+
                rxd = *rxdp;
                nb_hold++;
                rxe = &sw_ring[rx_id];
@@ -1436,10 +927,10 @@ i40e_recv_scattered_pkts(void *rx_queue,
                        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 =
+                       first_seg->hash.rss =
                                rte_le_to_cpu_32(rxd.wb.qword0.hi_dword.rss);
                if (pkt_flags & PKT_RX_FDIR)
-                       pkt_flags |= i40e_rxd_build_fdir(&rxd, rxm);
+                       pkt_flags |= i40e_rxd_build_fdir(&rxd, first_seg);
 
 #ifdef RTE_LIBRTE_IEEE1588
                pkt_flags |= i40e_get_iee15888_flags(first_seg, qword1);
@@ -1484,7 +975,8 @@ i40e_calc_context_desc(uint64_t flags)
 {
        static uint64_t mask = PKT_TX_OUTER_IP_CKSUM |
                PKT_TX_TCP_SEG |
-               PKT_TX_QINQ_PKT;
+               PKT_TX_QINQ_PKT |
+               PKT_TX_TUNNEL_MASK;
 
 #ifdef RTE_LIBRTE_IEEE1588
        mask |= PKT_TX_IEEE1588_TMST;
@@ -1506,7 +998,7 @@ i40e_set_tso_ctx(struct rte_mbuf *mbuf, union i40e_tx_offload tx_offload)
        }
 
        /**
-        * in case of tunneling packet, the outer_l2_len and
+        * in case of non tunneling packet, the outer_l2_len and
         * outer_l3_len must be 0.
         */
        hdr_len = tx_offload.outer_l2_len +
@@ -1623,12 +1115,15 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
                /* Always enable CRC offload insertion */
                td_cmd |= I40E_TX_DESC_CMD_ICRC;
 
-               /* Enable checksum offloading */
+               /* Fill in tunneling parameters if necessary */
                cd_tunneling_params = 0;
-               if (ol_flags & I40E_TX_CKSUM_OFFLOAD_MASK) {
-                       i40e_txd_enable_checksum(ol_flags, &td_cmd, &td_offset,
-                               tx_offload, &cd_tunneling_params);
-               }
+               if (ol_flags & PKT_TX_TUNNEL_MASK)
+                       i40e_parse_tunneling_params(ol_flags, tx_offload,
+                                                   &cd_tunneling_params);
+               /* Enable checksum offloading */
+               if (ol_flags & I40E_TX_CKSUM_OFFLOAD_MASK)
+                       i40e_txd_enable_checksum(ol_flags, &td_cmd,
+                                                &td_offset, tx_offload);
 
                if (nb_ctx) {
                        /* Setup TX context descriptor if required */
@@ -2136,7 +1631,9 @@ i40e_dev_supported_ptypes_get(struct rte_eth_dev *dev)
 #ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC
            dev->rx_pkt_burst == i40e_recv_pkts_bulk_alloc ||
 #endif
-           dev->rx_pkt_burst == i40e_recv_scattered_pkts)
+           dev->rx_pkt_burst == i40e_recv_scattered_pkts ||
+           dev->rx_pkt_burst == i40e_recv_scattered_pkts_vec ||
+           dev->rx_pkt_burst == i40e_recv_pkts_vec)
                return ptypes;
        return NULL;
 }
@@ -2231,11 +1728,7 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,
        rxq->rx_ring_phys_addr = rte_mem_phy2mch(rz->memseg_id, rz->phys_addr);
        rxq->rx_ring = (union i40e_rx_desc *)rz->addr;
 
-#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC
        len = (uint16_t)(nb_desc + RTE_PMD_I40E_RX_MAX_BURST);
-#else
-       len = nb_desc;
-#endif
 
        /* Allocate the software ring. */
        rxq->sw_ring =
@@ -2433,8 +1926,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,
                return I40E_ERR_PARAM;
        }
        if (tx_free_thresh >= (nb_desc - 3)) {
-               PMD_INIT_LOG(ERR, "tx_rs_thresh must be less than the "
-                            "tx_free_thresh must be less than the "
+               PMD_INIT_LOG(ERR, "tx_free_thresh must be less than the "
                             "number of TX descriptors minus 3. "
                             "(tx_free_thresh=%u port=%d queue=%d)",
                             (unsigned int)tx_free_thresh,
@@ -2644,11 +2136,11 @@ i40e_reset_rx_queue(struct i40e_rx_queue *rxq)
        for (i = 0; i < len * sizeof(union i40e_rx_desc); i++)
                ((volatile char *)rxq->rx_ring)[i] = 0;
 
-#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC
        memset(&rxq->fake_mbuf, 0x0, sizeof(rxq->fake_mbuf));
        for (i = 0; i < RTE_PMD_I40E_RX_MAX_BURST; ++i)
                rxq->sw_ring[rxq->nb_rx_desc + i].mbuf = &rxq->fake_mbuf;
 
+#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC
        rxq->rx_nb_avail = 0;
        rxq->rx_next_avail = 0;
        rxq->rx_free_trigger = (uint16_t)(rxq->rx_free_thresh - 1);
@@ -2832,7 +2324,7 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq)
        case I40E_FLAG_HEADER_SPLIT_DISABLED:
        default:
                rxq->rx_hdr_len = 0;
-               rxq->rx_buf_len = RTE_ALIGN(buf_size,
+               rxq->rx_buf_len = RTE_ALIGN_FLOOR(buf_size,
                        (1 << I40E_RXQ_CTX_DBUFF_SHIFT));
                rxq->hs_mode = i40e_header_split_none;
                break;
@@ -2948,11 +2440,15 @@ i40e_dev_clear_queues(struct rte_eth_dev *dev)
        PMD_INIT_FUNC_TRACE();
 
        for (i = 0; i < dev->data->nb_tx_queues; i++) {
+               if (!dev->data->tx_queues[i])
+                       continue;
                i40e_tx_queue_release_mbufs(dev->data->tx_queues[i]);
                i40e_reset_tx_queue(dev->data->tx_queues[i]);
        }
 
        for (i = 0; i < dev->data->nb_rx_queues; i++) {
+               if (!dev->data->rx_queues[i])
+                       continue;
                i40e_rx_queue_release_mbufs(dev->data->rx_queues[i]);
                i40e_reset_rx_queue(dev->data->rx_queues[i]);
        }
@@ -2966,12 +2462,16 @@ i40e_dev_free_queues(struct rte_eth_dev *dev)
        PMD_INIT_FUNC_TRACE();
 
        for (i = 0; i < dev->data->nb_rx_queues; i++) {
+               if (!dev->data->rx_queues[i])
+                       continue;
                i40e_dev_rx_queue_release(dev->data->rx_queues[i]);
                dev->data->rx_queues[i] = NULL;
        }
        dev->data->nb_rx_queues = 0;
 
        for (i = 0; i < dev->data->nb_tx_queues; i++) {
+               if (!dev->data->tx_queues[i])
+                       continue;
                i40e_dev_tx_queue_release(dev->data->tx_queues[i]);
                dev->data->tx_queues[i] = NULL;
        }
@@ -3154,7 +2654,7 @@ i40e_set_rx_function(struct rte_eth_dev *dev)
                                struct i40e_rx_queue *rxq =
                                        dev->data->rx_queues[i];
 
-                               if (i40e_rxq_vec_setup(rxq)) {
+                               if (rxq && i40e_rxq_vec_setup(rxq)) {
                                        ad->rx_vec_allowed = false;
                                        break;
                                }
@@ -3216,7 +2716,8 @@ i40e_set_rx_function(struct rte_eth_dev *dev)
                for (i = 0; i < dev->data->nb_rx_queues; i++) {
                        struct i40e_rx_queue *rxq = dev->data->rx_queues[i];
 
-                       rxq->rx_using_sse = rx_using_sse;
+                       if (rxq)
+                               rxq->rx_using_sse = rx_using_sse;
                }
        }
 }
@@ -3255,7 +2756,7 @@ i40e_set_tx_function(struct rte_eth_dev *dev)
                                struct i40e_tx_queue *txq =
                                        dev->data->tx_queues[i];
 
-                               if (i40e_txq_vec_setup(txq)) {
+                               if (txq && i40e_txq_vec_setup(txq)) {
                                        ad->tx_vec_allowed = false;
                                        break;
                                }