net/mlx4: fix Rx packet type offloads
[dpdk.git] / drivers / net / mlx4 / mlx4_rxtx.c
index abd125f..06f57cc 100644 (file)
 #include "mlx4_rxtx.h"
 #include "mlx4_utils.h"
 
+#define WQE_ONE_DATA_SEG_SIZE \
+       (sizeof(struct mlx4_wqe_ctrl_seg) + sizeof(struct mlx4_wqe_data_seg))
+
 /**
  * Pointer-value pair structure used in tx_post_send for saving the first
  * DWORD (32 byte) of a TXBB.
  */
 struct pv {
-       struct mlx4_wqe_data_seg *dseg;
+       volatile struct mlx4_wqe_data_seg *dseg;
        uint32_t val;
 };
 
+/** A table to translate Rx completion flags to packet type. */
+uint32_t mlx4_ptype_table[0x100] __rte_cache_aligned = {
+       /*
+        * The index to the array should have:
+        *  bit[7] - MLX4_CQE_L2_TUNNEL
+        *  bit[6] - MLX4_CQE_L2_TUNNEL_IPV4
+        *  bit[5] - MLX4_CQE_STATUS_UDP
+        *  bit[4] - MLX4_CQE_STATUS_TCP
+        *  bit[3] - MLX4_CQE_STATUS_IPV4OPT
+        *  bit[2] - MLX4_CQE_STATUS_IPV6
+        *  bit[1] - MLX4_CQE_STATUS_IPV4F
+        *  bit[0] - MLX4_CQE_STATUS_IPV4
+        * giving a total of up to 256 entries.
+        */
+       [0x00] = RTE_PTYPE_L2_ETHER,
+       [0x01] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN,
+       [0x02] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_L4_FRAG,
+       [0x03] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_L4_FRAG,
+       [0x04] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN,
+       [0x09] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT,
+       [0x0a] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT |
+                    RTE_PTYPE_L4_FRAG,
+       [0x11] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_L4_TCP,
+       [0x12] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_L4_TCP,
+       [0x14] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_L4_TCP,
+       [0x18] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT |
+                    RTE_PTYPE_L4_TCP,
+       [0x19] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT |
+                    RTE_PTYPE_L4_TCP,
+       [0x1a] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT |
+                    RTE_PTYPE_L4_TCP,
+       [0x21] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_L4_UDP,
+       [0x22] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_L4_UDP,
+       [0x24] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_L4_UDP,
+       [0x28] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT |
+                    RTE_PTYPE_L4_UDP,
+       [0x29] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT |
+                    RTE_PTYPE_L4_UDP,
+       [0x2a] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT |
+                    RTE_PTYPE_L4_UDP,
+       /* Tunneled - L3 IPV6 */
+       [0x80] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN,
+       [0x81] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN,
+       [0x82] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_FRAG,
+       [0x83] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_FRAG,
+       [0x84] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN,
+       [0x88] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT,
+       [0x89] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT,
+       [0x8a] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT | RTE_PTYPE_INNER_L4_FRAG,
+       /* Tunneled - L3 IPV6, TCP */
+       [0x91] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0x92] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_FRAG |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0x93] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_FRAG |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0x94] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0x98] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0x99] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0x9a] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT | RTE_PTYPE_INNER_L4_FRAG |
+                    RTE_PTYPE_INNER_L4_TCP,
+       /* Tunneled - L3 IPV6, UDP */
+       [0xa1] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_UDP,
+       [0xa2] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_FRAG |
+                    RTE_PTYPE_INNER_L4_UDP,
+       [0xa3] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_FRAG |
+                    RTE_PTYPE_INNER_L4_UDP,
+       [0xa4] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_UDP,
+       [0xa8] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT |
+                    RTE_PTYPE_INNER_L4_UDP,
+       [0xa9] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT |
+                    RTE_PTYPE_INNER_L4_UDP,
+       [0xaa] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT | RTE_PTYPE_INNER_L4_FRAG |
+                    RTE_PTYPE_INNER_L4_UDP,
+       /* Tunneled - L3 IPV4 */
+       [0xc0] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN,
+       [0xc1] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN,
+       [0xc2] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_FRAG,
+       [0xc3] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_FRAG,
+       [0xc4] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN,
+       [0xc8] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT,
+       [0xc9] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT,
+       [0xca] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT |
+                    RTE_PTYPE_INNER_L4_FRAG,
+       /* Tunneled - L3 IPV4, TCP */
+       [0xd0] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0xd1] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0xd2] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_FRAG |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0xd3] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_FRAG |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0xd4] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0xd8] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0xd9] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT |
+                    RTE_PTYPE_INNER_L4_TCP,
+       [0xda] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT | RTE_PTYPE_INNER_L4_FRAG |
+                    RTE_PTYPE_INNER_L4_TCP,
+       /* Tunneled - L3 IPV4, UDP */
+       [0xe0] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_UDP,
+       [0xe1] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_UDP,
+       [0xe2] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_FRAG |
+                    RTE_PTYPE_INNER_L4_UDP,
+       [0xe3] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_FRAG |
+                    RTE_PTYPE_INNER_L4_UDP,
+       [0xe4] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L4_UDP,
+       [0xe8] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT | RTE_PTYPE_INNER_L4_UDP,
+       [0xe9] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT | RTE_PTYPE_INNER_L4_UDP,
+       [0xea] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
+                    RTE_PTYPE_INNER_L3_IPV4_EXT | RTE_PTYPE_INNER_L4_FRAG |
+                    RTE_PTYPE_INNER_L4_UDP,
+};
+
 /**
  * Stamp a WQE so it won't be reused by the HW.
  *
@@ -94,14 +284,15 @@ mlx4_txq_stamp_freed_wqe(struct mlx4_sq *sq, uint16_t index, uint8_t owner)
 {
        uint32_t stamp = rte_cpu_to_be_32(MLX4_SQ_STAMP_VAL |
                                          (!!owner << MLX4_SQ_STAMP_SHIFT));
-       uint8_t *wqe = mlx4_get_send_wqe(sq, (index & sq->txbb_cnt_mask));
-       uint32_t *ptr = (uint32_t *)wqe;
+       volatile uint8_t *wqe = mlx4_get_send_wqe(sq,
+                                               (index & sq->txbb_cnt_mask));
+       volatile uint32_t *ptr = (volatile uint32_t *)wqe;
        int i;
        int txbbs_size;
        int num_txbbs;
 
        /* Extract the size from the control segment of the WQE. */
-       num_txbbs = MLX4_SIZE_TO_TXBBS((((struct mlx4_wqe_ctrl_seg *)
+       num_txbbs = MLX4_SIZE_TO_TXBBS((((volatile struct mlx4_wqe_ctrl_seg *)
                                         wqe)->fence_size & 0x3f) << 4);
        txbbs_size = num_txbbs * MLX4_TXBB_SIZE;
        /* Optimize the common case when there is no wrap-around. */
@@ -116,8 +307,8 @@ mlx4_txq_stamp_freed_wqe(struct mlx4_sq *sq, uint16_t index, uint8_t owner)
                for (i = 0; i < txbbs_size; i += MLX4_SQ_STAMP_STRIDE) {
                        *ptr = stamp;
                        ptr += MLX4_SQ_STAMP_DWORDS;
-                       if ((uint8_t *)ptr >= sq->eob) {
-                               ptr = (uint32_t *)sq->buf;
+                       if ((volatile uint8_t *)ptr >= sq->eob) {
+                               ptr = (volatile uint32_t *)sq->buf;
                                stamp ^= RTE_BE32(0x80000000);
                        }
                }
@@ -140,39 +331,36 @@ mlx4_txq_stamp_freed_wqe(struct mlx4_sq *sq, uint16_t index, uint8_t owner)
  *   0 on success, -1 on failure.
  */
 static int
-mlx4_txq_complete(struct txq *txq)
+mlx4_txq_complete(struct txq *txq, const unsigned int elts_n,
+                                 struct mlx4_sq *sq)
 {
        unsigned int elts_comp = txq->elts_comp;
        unsigned int elts_tail = txq->elts_tail;
-       const unsigned int elts_n = txq->elts_n;
        struct mlx4_cq *cq = &txq->mcq;
-       struct mlx4_sq *sq = &txq->msq;
-       struct mlx4_cqe *cqe;
+       volatile struct mlx4_cqe *cqe;
        uint32_t cons_index = cq->cons_index;
        uint16_t new_index;
        uint16_t nr_txbbs = 0;
        int pkts = 0;
 
-       if (unlikely(elts_comp == 0))
-               return 0;
        /*
         * Traverse over all CQ entries reported and handle each WQ entry
         * reported by them.
         */
        do {
-               cqe = (struct mlx4_cqe *)mlx4_get_cqe(cq, cons_index);
+               cqe = (volatile struct mlx4_cqe *)mlx4_get_cqe(cq, cons_index);
                if (unlikely(!!(cqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^
                    !!(cons_index & cq->cqe_cnt)))
                        break;
                /*
                 * Make sure we read the CQE after we read the ownership bit.
                 */
-               rte_rmb();
+               rte_io_rmb();
 #ifndef NDEBUG
                if (unlikely((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) ==
                             MLX4_CQE_OPCODE_ERROR)) {
-                       struct mlx4_err_cqe *cqe_err =
-                               (struct mlx4_err_cqe *)cqe;
+                       volatile struct mlx4_err_cqe *cqe_err =
+                               (volatile struct mlx4_err_cqe *)cqe;
                        ERROR("%p CQE error - vendor syndrome: 0x%x"
                              " syndrome: 0x%x\n",
                              (void *)txq, cqe_err->vendor_err,
@@ -195,14 +383,9 @@ mlx4_txq_complete(struct txq *txq)
        } while (1);
        if (unlikely(pkts == 0))
                return 0;
-       /*
-        * Update CQ.
-        * To prevent CQ overflow we first update CQ consumer and only then
-        * the ring consumer.
-        */
+       /* Update CQ. */
        cq->cons_index = cons_index;
        *cq->set_ci_db = rte_cpu_to_be_32(cq->cons_index & MLX4_CQ_DB_CI_MASK);
-       rte_wmb();
        sq->tail = sq->tail + nr_txbbs;
        /* Update the list of packets posted for transmission. */
        elts_comp -= pkts;
@@ -237,6 +420,123 @@ mlx4_txq_mb2mp(struct rte_mbuf *buf)
        return buf->pool;
 }
 
+static int
+mlx4_tx_burst_segs(struct rte_mbuf *buf, struct txq *txq,
+                  volatile struct mlx4_wqe_ctrl_seg **pctrl)
+{
+       int wqe_real_size;
+       int nr_txbbs;
+       struct pv *pv = (struct pv *)txq->bounce_buf;
+       struct mlx4_sq *sq = &txq->msq;
+       uint32_t head_idx = sq->head & sq->txbb_cnt_mask;
+       volatile struct mlx4_wqe_ctrl_seg *ctrl;
+       volatile struct mlx4_wqe_data_seg *dseg;
+       struct rte_mbuf *sbuf;
+       uint32_t lkey;
+       uintptr_t addr;
+       uint32_t byte_count;
+       int pv_counter = 0;
+
+       /* Calculate the needed work queue entry size for this packet. */
+       wqe_real_size = sizeof(volatile struct mlx4_wqe_ctrl_seg) +
+               buf->nb_segs * sizeof(volatile struct mlx4_wqe_data_seg);
+       nr_txbbs = MLX4_SIZE_TO_TXBBS(wqe_real_size);
+       /*
+        * Check that there is room for this WQE in the send queue and that
+        * the WQE size is legal.
+        */
+       if (((sq->head - sq->tail) + nr_txbbs +
+                               sq->headroom_txbbs) >= sq->txbb_cnt ||
+                       nr_txbbs > MLX4_MAX_WQE_TXBBS) {
+               return -1;
+       }
+       /* Get the control and data entries of the WQE. */
+       ctrl = (volatile struct mlx4_wqe_ctrl_seg *)
+                       mlx4_get_send_wqe(sq, head_idx);
+       dseg = (volatile struct mlx4_wqe_data_seg *)
+                       ((uintptr_t)ctrl + sizeof(struct mlx4_wqe_ctrl_seg));
+       *pctrl = ctrl;
+       /* Fill the data segments with buffer information. */
+       for (sbuf = buf; sbuf != NULL; sbuf = sbuf->next, dseg++) {
+               addr = rte_pktmbuf_mtod(sbuf, uintptr_t);
+               rte_prefetch0((volatile void *)addr);
+               /* Handle WQE wraparound. */
+               if (dseg >= (volatile struct mlx4_wqe_data_seg *)sq->eob)
+                       dseg = (volatile struct mlx4_wqe_data_seg *)sq->buf;
+               dseg->addr = rte_cpu_to_be_64(addr);
+               /* Memory region key (big endian) for this memory pool. */
+               lkey = mlx4_txq_mp2mr(txq, mlx4_txq_mb2mp(sbuf));
+               dseg->lkey = rte_cpu_to_be_32(lkey);
+#ifndef NDEBUG
+               /* Calculate the needed work queue entry size for this packet */
+               if (unlikely(dseg->lkey == rte_cpu_to_be_32((uint32_t)-1))) {
+                       /* MR does not exist. */
+                       DEBUG("%p: unable to get MP <-> MR association",
+                                       (void *)txq);
+                       /*
+                        * Restamp entry in case of failure.
+                        * Make sure that size is written correctly
+                        * Note that we give ownership to the SW, not the HW.
+                        */
+                       wqe_real_size = sizeof(struct mlx4_wqe_ctrl_seg) +
+                               buf->nb_segs * sizeof(struct mlx4_wqe_data_seg);
+                       ctrl->fence_size = (wqe_real_size >> 4) & 0x3f;
+                       mlx4_txq_stamp_freed_wqe(sq, head_idx,
+                                       (sq->head & sq->txbb_cnt) ? 0 : 1);
+                       return -1;
+               }
+#endif /* NDEBUG */
+               if (likely(sbuf->data_len)) {
+                       byte_count = rte_cpu_to_be_32(sbuf->data_len);
+               } else {
+                       /*
+                        * Zero length segment is treated as inline segment
+                        * with zero data.
+                        */
+                       byte_count = RTE_BE32(0x80000000);
+               }
+               /*
+                * If the data segment is not at the beginning of a
+                * Tx basic block (TXBB) then write the byte count,
+                * else postpone the writing to just before updating the
+                * control segment.
+                */
+               if ((uintptr_t)dseg & (uintptr_t)(MLX4_TXBB_SIZE - 1)) {
+#if RTE_CACHE_LINE_SIZE < 64
+                       /*
+                        * Need a barrier here before writing the byte_count
+                        * fields to make sure that all the data is visible
+                        * before the byte_count field is set.
+                        * Otherwise, if the segment begins a new cacheline,
+                        * the HCA prefetcher could grab the 64-byte chunk and
+                        * get a valid (!= 0xffffffff) byte count but stale
+                        * data, and end up sending the wrong data.
+                        */
+                       rte_io_wmb();
+#endif /* RTE_CACHE_LINE_SIZE */
+                       dseg->byte_count = byte_count;
+               } else {
+                       /*
+                        * This data segment starts at the beginning of a new
+                        * TXBB, so we need to postpone its byte_count writing
+                        * for later.
+                        */
+                       pv[pv_counter].dseg = dseg;
+                       pv[pv_counter++].val = byte_count;
+               }
+       }
+       /* Write the first DWORD of each TXBB save earlier. */
+       if (pv_counter) {
+               /* Need a barrier here before writing the byte_count. */
+               rte_io_wmb();
+               for (--pv_counter; pv_counter  >= 0; pv_counter--)
+                       pv[pv_counter].dseg->byte_count = pv[pv_counter].val;
+       }
+       /* Fill the control parameters for this packet. */
+       ctrl->fence_size = (wqe_real_size >> 4) & 0x3f;
+       return nr_txbbs;
+}
+
 /**
  * DPDK callback for Tx.
  *
@@ -260,10 +560,11 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
        unsigned int i;
        unsigned int max;
        struct mlx4_sq *sq = &txq->msq;
-       struct pv *pv = (struct pv *)txq->bounce_buf;
+       int nr_txbbs;
 
        assert(txq->elts_comp_cd != 0);
-       mlx4_txq_complete(txq);
+       if (likely(txq->elts_comp != 0))
+               mlx4_txq_complete(txq, elts_n, sq);
        max = (elts_n - (elts_head - txq->elts_tail));
        if (max > elts_n)
                max -= elts_n;
@@ -280,9 +581,8 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
                struct txq_elt *elt_next = &(*txq->elts)[elts_head_next];
                struct txq_elt *elt = &(*txq->elts)[elts_head];
                uint32_t owner_opcode = MLX4_OPCODE_SEND;
-               struct mlx4_wqe_ctrl_seg *ctrl;
-               struct mlx4_wqe_data_seg *dseg;
-               struct rte_mbuf *sbuf;
+               volatile struct mlx4_wqe_ctrl_seg *ctrl;
+               volatile struct mlx4_wqe_data_seg *dseg;
                union {
                        uint32_t flags;
                        uint16_t flags16[2];
@@ -290,10 +590,6 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
                uint32_t head_idx = sq->head & sq->txbb_cnt_mask;
                uint32_t lkey;
                uintptr_t addr;
-               uint32_t byte_count;
-               int wqe_real_size;
-               int nr_txbbs;
-               int pv_counter = 0;
 
                /* Clean up old buffer. */
                if (likely(elt->buf != NULL)) {
@@ -312,38 +608,32 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
                        } while (tmp != NULL);
                }
                RTE_MBUF_PREFETCH_TO_FREE(elt_next->buf);
-               /*
-                * Calculate the needed work queue entry size
-                * for this packet.
-                */
-               wqe_real_size = sizeof(struct mlx4_wqe_ctrl_seg) +
-                               buf->nb_segs * sizeof(struct mlx4_wqe_data_seg);
-               nr_txbbs = MLX4_SIZE_TO_TXBBS(wqe_real_size);
-               /*
-                * Check that there is room for this WQE in the send
-                * queue and that the WQE size is legal.
-                */
-               if (((sq->head - sq->tail) + nr_txbbs +
-                    sq->headroom_txbbs) >= sq->txbb_cnt ||
-                   nr_txbbs > MLX4_MAX_WQE_TXBBS) {
-                       elt->buf = NULL;
-                       break;
-               }
-               /* Get the control and data entries of the WQE. */
-               ctrl = (struct mlx4_wqe_ctrl_seg *)
-                               mlx4_get_send_wqe(sq, head_idx);
-               dseg = (struct mlx4_wqe_data_seg *)((uintptr_t)ctrl +
-                               sizeof(struct mlx4_wqe_ctrl_seg));
-               /* Fill the data segments with buffer information. */
-               for (sbuf = buf; sbuf != NULL; sbuf = sbuf->next, dseg++) {
-                       addr = rte_pktmbuf_mtod(sbuf, uintptr_t);
+               if (buf->nb_segs == 1) {
+                       /*
+                        * Check that there is room for this WQE in the send
+                        * queue and that the WQE size is legal
+                        */
+                       if (((sq->head - sq->tail) + 1 + sq->headroom_txbbs) >=
+                            sq->txbb_cnt || 1 > MLX4_MAX_WQE_TXBBS) {
+                               elt->buf = NULL;
+                               break;
+                       }
+                       /* Get the control and data entries of the WQE. */
+                       ctrl = (volatile struct mlx4_wqe_ctrl_seg *)
+                                       mlx4_get_send_wqe(sq, head_idx);
+                       dseg = (volatile struct mlx4_wqe_data_seg *)
+                                       ((uintptr_t)ctrl +
+                                       sizeof(struct mlx4_wqe_ctrl_seg));
+                       addr = rte_pktmbuf_mtod(buf, uintptr_t);
                        rte_prefetch0((volatile void *)addr);
                        /* Handle WQE wraparound. */
-                       if (dseg >= (struct mlx4_wqe_data_seg *)sq->eob)
-                               dseg = (struct mlx4_wqe_data_seg *)sq->buf;
+                       if (dseg >=
+                               (volatile struct mlx4_wqe_data_seg *)sq->eob)
+                               dseg = (volatile struct mlx4_wqe_data_seg *)
+                                               sq->buf;
                        dseg->addr = rte_cpu_to_be_64(addr);
                        /* Memory region key (big endian). */
-                       lkey = mlx4_txq_mp2mr(txq, mlx4_txq_mb2mp(sbuf));
+                       lkey = mlx4_txq_mp2mr(txq, mlx4_txq_mb2mp(buf));
                        dseg->lkey = rte_cpu_to_be_32(lkey);
 #ifndef NDEBUG
                        if (unlikely(dseg->lkey ==
@@ -357,61 +647,26 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
                                 * Note that we give ownership to the SW,
                                 * not the HW.
                                 */
-                               ctrl->fence_size = (wqe_real_size >> 4) & 0x3f;
+                               ctrl->fence_size =
+                                       (WQE_ONE_DATA_SEG_SIZE >> 4) & 0x3f;
                                mlx4_txq_stamp_freed_wqe(sq, head_idx,
                                             (sq->head & sq->txbb_cnt) ? 0 : 1);
                                elt->buf = NULL;
                                break;
                        }
 #endif /* NDEBUG */
-                       if (likely(sbuf->data_len)) {
-                               byte_count = rte_cpu_to_be_32(sbuf->data_len);
-                       } else {
-                               /*
-                                * Zero length segment is treated as inline
-                                * segment with zero data.
-                                */
-                               byte_count = RTE_BE32(0x80000000);
-                       }
-                       /*
-                        * If the data segment is not at the beginning
-                        * of a Tx basic block (TXBB) then write the
-                        * byte count, else postpone the writing to
-                        * just before updating the control segment.
-                        */
-                       if ((uintptr_t)dseg & (uintptr_t)(MLX4_TXBB_SIZE - 1)) {
-                               /*
-                                * Need a barrier here before writing the
-                                * byte_count fields to make sure that all the
-                                * data is visible before the byte_count field
-                                * is set. otherwise, if the segment begins a
-                                * new cacheline, the HCA prefetcher could grab
-                                * the 64-byte chunk and get a valid
-                                * (!= 0xffffffff) byte count but stale data,
-                                * and end up sending the wrong data.
-                                */
-                               rte_io_wmb();
-                               dseg->byte_count = byte_count;
-                       } else {
-                               /*
-                                * This data segment starts at the beginning of
-                                * a new TXBB, so we need to postpone its
-                                * byte_count writing for later.
-                                */
-                               pv[pv_counter].dseg = dseg;
-                               pv[pv_counter++].val = byte_count;
+                       /* Never be TXBB aligned, no need compiler barrier. */
+                       dseg->byte_count = rte_cpu_to_be_32(buf->data_len);
+                       /* Fill the control parameters for this packet. */
+                       ctrl->fence_size = (WQE_ONE_DATA_SEG_SIZE >> 4) & 0x3f;
+                       nr_txbbs = 1;
+               } else {
+                       nr_txbbs = mlx4_tx_burst_segs(buf, txq, &ctrl);
+                       if (nr_txbbs < 0) {
+                               elt->buf = NULL;
+                               break;
                        }
                }
-               /* Write the first DWORD of each TXBB save earlier. */
-               if (pv_counter) {
-                       /* Need a barrier before writing the byte_count. */
-                       rte_io_wmb();
-                       for (--pv_counter; pv_counter  >= 0; pv_counter--)
-                               pv[pv_counter].dseg->byte_count =
-                                               pv[pv_counter].val;
-               }
-               /* Fill the control parameters for this packet. */
-               ctrl->fence_size = (wqe_real_size >> 4) & 0x3f;
                /*
                 * For raw Ethernet, the SOLICIT flag is used to indicate
                 * that no ICRC should be calculated.
@@ -462,7 +717,7 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
                 * setting ownership bit (because HW can start
                 * executing as soon as we do).
                 */
-               rte_wmb();
+               rte_io_wmb();
                ctrl->owner_opcode = rte_cpu_to_be_32(owner_opcode |
                                              ((sq->head & sq->txbb_cnt) ?
                                                       MLX4_BIT_WQE_OWN : 0));
@@ -489,30 +744,40 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
 /**
  * Translate Rx completion flags to packet type.
  *
- * @param flags
- *   Rx completion flags returned by mlx4_cqe_flags().
+ * @param[in] cqe
+ *   Pointer to CQE.
  *
  * @return
- *   Packet type in mbuf format.
+ *   Packet type for struct rte_mbuf.
  */
 static inline uint32_t
-rxq_cq_to_pkt_type(uint32_t flags)
+rxq_cq_to_pkt_type(volatile struct mlx4_cqe *cqe,
+                  uint32_t l2tun_offload)
 {
-       uint32_t pkt_type;
+       uint8_t idx = 0;
+       uint32_t pinfo = rte_be_to_cpu_32(cqe->vlan_my_qpn);
+       uint32_t status = rte_be_to_cpu_32(cqe->status);
 
-       if (flags & MLX4_CQE_L2_TUNNEL)
-               pkt_type =
-                       mlx4_transpose(flags,
-                                      MLX4_CQE_L2_TUNNEL_IPV4,
-                                      RTE_PTYPE_L3_IPV4_EXT_UNKNOWN) |
-                       mlx4_transpose(flags,
-                                      MLX4_CQE_STATUS_IPV4_PKT,
-                                      RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN);
-       else
-               pkt_type = mlx4_transpose(flags,
-                                         MLX4_CQE_STATUS_IPV4_PKT,
-                                         RTE_PTYPE_L3_IPV4_EXT_UNKNOWN);
-       return pkt_type;
+       /*
+        * The index to the array should have:
+        *  bit[7] - MLX4_CQE_L2_TUNNEL
+        *  bit[6] - MLX4_CQE_L2_TUNNEL_IPV4
+        */
+       if (l2tun_offload && (pinfo & MLX4_CQE_L2_TUNNEL))
+               idx |= ((pinfo & MLX4_CQE_L2_TUNNEL) >> 20) |
+                      ((pinfo & MLX4_CQE_L2_TUNNEL_IPV4) >> 19);
+       /*
+        * The index to the array should have:
+        *  bit[5] - MLX4_CQE_STATUS_UDP
+        *  bit[4] - MLX4_CQE_STATUS_TCP
+        *  bit[3] - MLX4_CQE_STATUS_IPV4OPT
+        *  bit[2] - MLX4_CQE_STATUS_IPV6
+        *  bit[1] - MLX4_CQE_STATUS_IPV4F
+        *  bit[0] - MLX4_CQE_STATUS_IPV4
+        * giving a total of up to 256 entries.
+        */
+       idx |= ((status & MLX4_CQE_STATUS_PTYPE_MASK) >> 22);
+       return mlx4_ptype_table[idx];
 }
 
 /**
@@ -566,7 +831,7 @@ rxq_cq_to_ol_flags(uint32_t flags, int csum, int csum_l2tun)
  *   CQE checksum information.
  */
 static inline uint32_t
-mlx4_cqe_flags(struct mlx4_cqe *cqe, int csum, int csum_l2tun)
+mlx4_cqe_flags(volatile struct mlx4_cqe *cqe, int csum, int csum_l2tun)
 {
        uint32_t flags = 0;
 
@@ -599,13 +864,13 @@ mlx4_cqe_flags(struct mlx4_cqe *cqe, int csum, int csum_l2tun)
  *   Number of bytes of the CQE, 0 in case there is no completion.
  */
 static unsigned int
-mlx4_cq_poll_one(struct rxq *rxq, struct mlx4_cqe **out)
+mlx4_cq_poll_one(struct rxq *rxq, volatile struct mlx4_cqe **out)
 {
        int ret = 0;
-       struct mlx4_cqe *cqe = NULL;
+       volatile struct mlx4_cqe *cqe = NULL;
        struct mlx4_cq *cq = &rxq->mcq;
 
-       cqe = (struct mlx4_cqe *)mlx4_get_cqe(cq, cq->cons_index);
+       cqe = (volatile struct mlx4_cqe *)mlx4_get_cqe(cq, cq->cons_index);
        if (!!(cqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^
            !!(cq->cons_index & cq->cqe_cnt))
                goto out;
@@ -650,7 +915,7 @@ mlx4_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
        int len = 0;
 
        while (pkts_n) {
-               struct mlx4_cqe *cqe;
+               volatile struct mlx4_cqe *cqe;
                uint32_t idx = rq_ci & wr_cnt;
                struct rte_mbuf *rep = (*rxq->elts)[idx];
                volatile struct mlx4_wqe_data_seg *scat = &(*rxq->wqes)[idx];
@@ -695,6 +960,11 @@ mlx4_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
                                goto skip;
                        }
                        pkt = seg;
+                       /* Update packet information. */
+                       pkt->packet_type =
+                               rxq_cq_to_pkt_type(cqe, rxq->l2tun_offload);
+                       pkt->ol_flags = 0;
+                       pkt->pkt_len = len;
                        if (rxq->csum | rxq->csum_l2tun) {
                                uint32_t flags =
                                        mlx4_cqe_flags(cqe,
@@ -705,12 +975,7 @@ mlx4_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
                                        rxq_cq_to_ol_flags(flags,
                                                           rxq->csum,
                                                           rxq->csum_l2tun);
-                               pkt->packet_type = rxq_cq_to_pkt_type(flags);
-                       } else {
-                               pkt->packet_type = 0;
-                               pkt->ol_flags = 0;
                        }
-                       pkt->pkt_len = len;
                }
                rep->nb_segs = 1;
                rep->port = rxq->port_id;