net/enic: improve packet type identification

[dpdk.git] / drivers / net / enic / enic_rxtx.c

diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c
index 243efe6..470d32c 100644 (file)
--- a/drivers/net/enic/enic_rxtx.c
+++ b/drivers/net/enic/enic_rxtx.c
@@ -37,7 +37,6 @@
 #include "enic_compat.h"
 #include "rq_enet_desc.h"
 #include "enic.h"
-#include "enic_vnic_wq.h"
 
 #define RTE_PMD_USE_PREFETCH
 
@@ -149,20 +148,31 @@ enic_cq_rx_flags_to_pkt_type(struct cq_desc *cqd)
        struct cq_enet_rq_desc *cqrd = (struct cq_enet_rq_desc *)cqd;
        uint8_t cqrd_flags = cqrd->flags;
        static const uint32_t cq_type_table[128] __rte_cache_aligned = {
-               [32] =  RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4,
-               [34] =  RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4
-                       | RTE_PTYPE_L4_UDP,
-               [36] =  RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4
-                       | RTE_PTYPE_L4_TCP,
-               [96] =  RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4
-                       | RTE_PTYPE_L4_FRAG,
-               [16] =  RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6,
-               [18] =  RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6
-                       | RTE_PTYPE_L4_UDP,
-               [20] =  RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6
-                       | RTE_PTYPE_L4_TCP,
-               [80] =  RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6
-                       | RTE_PTYPE_L4_FRAG,
+               [0x00] = RTE_PTYPE_UNKNOWN,
+               [0x20] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN
+                         | RTE_PTYPE_L4_NONFRAG,
+               [0x22] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN
+                         | RTE_PTYPE_L4_UDP,
+               [0x24] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN
+                         | RTE_PTYPE_L4_TCP,
+               [0x60] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN
+                         | RTE_PTYPE_L4_FRAG,
+               [0x62] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN
+                         | RTE_PTYPE_L4_UDP,
+               [0x64] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN
+                         | RTE_PTYPE_L4_TCP,
+               [0x10] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN
+                         | RTE_PTYPE_L4_NONFRAG,
+               [0x12] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN
+                         | RTE_PTYPE_L4_UDP,
+               [0x14] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN
+                         | RTE_PTYPE_L4_TCP,
+               [0x50] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN
+                         | RTE_PTYPE_L4_FRAG,
+               [0x52] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN
+                         | RTE_PTYPE_L4_UDP,
+               [0x54] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN
+                         | RTE_PTYPE_L4_TCP,
                /* All others reserved */
        };
        cqrd_flags &= CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT
@@ -344,6 +354,7 @@ static inline void enic_free_wq_bufs(struct vnic_wq *wq, u16 completed_index)
                buf = &wq->bufs[tail_idx];
                m = (struct rte_mbuf *)(buf->mb);
                if (likely(m->pool == pool)) {
+                       ENIC_ASSERT(nb_free < ENIC_MAX_WQ_DESCS);
                        free[nb_free++] = m;
                } else {
                        rte_mempool_put_bulk(pool, (void *)free, nb_free);
@@ -384,11 +395,11 @@ uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        struct vnic_wq *wq = (struct vnic_wq *)tx_queue;
        struct enic *enic = vnic_dev_priv(wq->vdev);
        unsigned short vlan_id;
-       unsigned short ol_flags;
+       uint64_t ol_flags;
+       uint64_t ol_flags_mask;
        unsigned int wq_desc_avail;
        int head_idx;
        struct vnic_wq_buf *buf;
-       unsigned int hw_ip_cksum_enabled;
        unsigned int desc_count;
        struct wq_enet_desc *descs, *desc_p, desc_tmp;
        uint16_t mss;
@@ -400,10 +411,10 @@ uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        wq_desc_avail = vnic_wq_desc_avail(wq);
        head_idx = wq->head_idx;
        desc_count = wq->ring.desc_count;
+       ol_flags_mask = PKT_TX_VLAN_PKT | PKT_TX_IP_CKSUM | PKT_TX_L4_MASK;
 
        nb_pkts = RTE_MIN(nb_pkts, ENIC_TX_XMIT_MAX);
 
-       hw_ip_cksum_enabled = enic->hw_ip_checksum;
        for (index = 0; index < nb_pkts; index++) {
                tx_pkt = *tx_pkts++;
                nb_segs = tx_pkt->nb_segs;
@@ -415,10 +426,9 @@ uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
 
                pkt_len = tx_pkt->pkt_len;
                data_len = tx_pkt->data_len;
-               vlan_id = tx_pkt->vlan_tci;
                ol_flags = tx_pkt->ol_flags;
-
                mss = 0;
+               vlan_id = 0;
                vlan_tag_insert = 0;
                bus_addr = (dma_addr_t)
                           (tx_pkt->buf_physaddr + tx_pkt->data_off);
@@ -428,14 +438,23 @@ uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
 
                eop = (data_len == pkt_len);
 
-               if (ol_flags & PKT_TX_VLAN_PKT)
-                       vlan_tag_insert = 1;
+               if (ol_flags & ol_flags_mask) {
+                       if (ol_flags & PKT_TX_VLAN_PKT) {
+                               vlan_tag_insert = 1;
+                               vlan_id = tx_pkt->vlan_tci;
+                       }
 
-               if (hw_ip_cksum_enabled && (ol_flags & PKT_TX_IP_CKSUM))
-                       mss |= ENIC_CALC_IP_CKSUM;
+                       if (ol_flags & PKT_TX_IP_CKSUM)
+                               mss |= ENIC_CALC_IP_CKSUM;
 
-               if (hw_ip_cksum_enabled && (ol_flags & PKT_TX_TCP_UDP_CKSUM))
-                       mss |= ENIC_CALC_TCP_UDP_CKSUM;
+                       /* Nic uses just 1 bit for UDP and TCP */
+                       switch (ol_flags & PKT_TX_L4_MASK) {
+                       case PKT_TX_TCP_CKSUM:
+                       case PKT_TX_UDP_CKSUM:
+                               mss |= ENIC_CALC_TCP_UDP_CKSUM;
+                               break;
+                       }
+               }
 
                wq_enet_desc_enc(&desc_tmp, bus_addr, data_len, mss, 0, 0, eop,
                                 eop, 0, vlan_tag_insert, vlan_id, 0);