[PATCH v2 04/10] net/txgbe: fix packet type to parse from offload flags

[Jiawen Wu]

Context descriptors which contains the length of each packet layer and
the packet type are needed when Tx checksum offload or TSO is on. If the
packet type and length do not strictly match, it will cause Tx ring hang.

In some external applications, developers may fill in wrong packet_type
in rte_mbuf for Tx path. For example, they encap/decap the packets but
did not refill the packet_type. To prevent this, change it to parse from
ol_flags.

Fixes: ca46fcd753b1 ("net/txgbe: support Tx with hardware offload")
Cc: sta...@dpdk.org

Signed-off-by: Jiawen Wu <jiawe...@trustnetic.com>
---
 drivers/net/txgbe/txgbe_rxtx.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c
index 328406908d..f7e3159dc9 100644
--- a/drivers/net/txgbe/txgbe_rxtx.c
+++ b/drivers/net/txgbe/txgbe_rxtx.c
@@ -516,20 +516,21 @@ tx_desc_ol_flags_to_cmdtype(uint64_t ol_flags)
        return cmdtype;
 }
 
-static inline uint8_t
-tx_desc_ol_flags_to_ptid(uint64_t oflags, uint32_t ptype)
+static inline uint32_t
+tx_desc_ol_flags_to_ptype(uint64_t oflags)
 {
+       uint32_t ptype;
        bool tun;
 
-       if (ptype)
-               return txgbe_encode_ptype(ptype);
-
        /* Only support flags in TXGBE_TX_OFFLOAD_MASK */
        tun = !!(oflags & RTE_MBUF_F_TX_TUNNEL_MASK);
 
        /* L2 level */
        ptype = RTE_PTYPE_L2_ETHER;
        if (oflags & RTE_MBUF_F_TX_VLAN)
+               ptype |= (tun ? RTE_PTYPE_INNER_L2_ETHER_VLAN : 
RTE_PTYPE_L2_ETHER_VLAN);
+
+       if (oflags & RTE_MBUF_F_TX_QINQ) /* tunnel + QINQ is not supported */
                ptype |= RTE_PTYPE_L2_ETHER_VLAN;
 
        /* L3 level */
@@ -587,6 +588,16 @@ tx_desc_ol_flags_to_ptid(uint64_t oflags, uint32_t ptype)
                break;
        }
 
+       return ptype;
+}
+
+static inline uint8_t
+tx_desc_ol_flags_to_ptid(uint64_t oflags)
+{
+       uint32_t ptype;
+
+       ptype = tx_desc_ol_flags_to_ptype(oflags);
+
        return txgbe_encode_ptype(ptype);
 }
 
@@ -776,8 +787,7 @@ txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                /* If hardware offload required */
                tx_ol_req = ol_flags & TXGBE_TX_OFFLOAD_MASK;
                if (tx_ol_req) {
-                       tx_offload.ptid = tx_desc_ol_flags_to_ptid(tx_ol_req,
-                                       tx_pkt->packet_type);
+                       tx_offload.ptid = tx_desc_ol_flags_to_ptid(tx_ol_req);
                        if (tx_offload.ptid & TXGBE_PTID_PKT_TUN)
                                tx_offload.ptid |= txgbe_parse_tun_ptid(tx_pkt);
                        tx_offload.l2_len = tx_pkt->l2_len;
-- 
2.27.0