net/i40e: fix descriptor scan on Arm

[dpdk.git] / drivers / net / i40e / i40e_rxtx.c

diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 808ed95..e518409 100644 (file)
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -452,7 +452,7 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)
        uint16_t pkt_len;
        uint64_t qword1;
        uint32_t rx_status;
-       int32_t s[I40E_LOOK_AHEAD], nb_dd;
+       int32_t s[I40E_LOOK_AHEAD], var, nb_dd;
        int32_t i, j, nb_rx = 0;
        uint64_t pkt_flags;
        uint32_t *ptype_tbl = rxq->vsi->adapter->ptype_tbl;
@@ -485,8 +485,18 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)
                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);
+               for (j = 0, nb_dd = 0; j < I40E_LOOK_AHEAD; j++) {
+                       var = s[j] & (1 << I40E_RX_DESC_STATUS_DD_SHIFT);
+#ifdef RTE_ARCH_ARM
+                       /* For Arm platforms, only compute continuous status bits */
+                       if (var)
+                               nb_dd += 1;
+                       else
+                               break;
+#else
+                       nb_dd += var;
+#endif
+               }
 
                nb_rx += nb_dd;
 
@@ -1294,22 +1304,40 @@ static __rte_always_inline int
 i40e_tx_free_bufs(struct i40e_tx_queue *txq)
 {
        struct i40e_tx_entry *txep;
-       uint16_t i;
+       uint16_t tx_rs_thresh = txq->tx_rs_thresh;
+       uint16_t i = 0, j = 0;
+       struct rte_mbuf *free[RTE_I40E_TX_MAX_FREE_BUF_SZ];
+       const uint16_t k = RTE_ALIGN_FLOOR(tx_rs_thresh, RTE_I40E_TX_MAX_FREE_BUF_SZ);
+       const uint16_t m = tx_rs_thresh % RTE_I40E_TX_MAX_FREE_BUF_SZ;
 
        if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz &
                        rte_cpu_to_le_64(I40E_TXD_QW1_DTYPE_MASK)) !=
                        rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE))
                return 0;
 
-       txep = &(txq->sw_ring[txq->tx_next_dd - (txq->tx_rs_thresh - 1)]);
+       txep = &txq->sw_ring[txq->tx_next_dd - (tx_rs_thresh - 1)];
 
-       for (i = 0; i < txq->tx_rs_thresh; i++)
+       for (i = 0; i < tx_rs_thresh; i++)
                rte_prefetch0((txep + i)->mbuf);
 
        if (txq->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE) {
-               for (i = 0; i < txq->tx_rs_thresh; ++i, ++txep) {
-                       rte_mempool_put(txep->mbuf->pool, txep->mbuf);
-                       txep->mbuf = NULL;
+               if (k) {
+                       for (j = 0; j != k; j += RTE_I40E_TX_MAX_FREE_BUF_SZ) {
+                               for (i = 0; i < RTE_I40E_TX_MAX_FREE_BUF_SZ; ++i, ++txep) {
+                                       free[i] = txep->mbuf;
+                                       txep->mbuf = NULL;
+                               }
+                               rte_mempool_put_bulk(free[0]->pool, (void **)free,
+                                               RTE_I40E_TX_MAX_FREE_BUF_SZ);
+                       }
+               }
+
+               if (m) {
+                       for (i = 0; i < m; ++i, ++txep) {
+                               free[i] = txep->mbuf;
+                               txep->mbuf = NULL;
+                       }
+                       rte_mempool_put_bulk(free[0]->pool, (void **)free, m);
                }
        } else {
                for (i = 0; i < txq->tx_rs_thresh; ++i, ++txep) {
@@ -3046,7 +3074,7 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf)
                return I40E_ERR_BAD_PTR;
        }
 
-       dev = pf->adapter->eth_dev;
+       dev = &rte_eth_devices[pf->dev_data->port_id];
 
        /* Allocate the TX queue data structure. */
        txq = rte_zmalloc_socket("i40e fdir tx queue",
@@ -3104,7 +3132,7 @@ i40e_fdir_setup_rx_resources(struct i40e_pf *pf)
                return I40E_ERR_BAD_PTR;
        }
 
-       dev = pf->adapter->eth_dev;
+       dev = &rte_eth_devices[pf->dev_data->port_id];
 
        /* Allocate the RX queue data structure. */
        rxq = rte_zmalloc_socket("i40e fdir rx queue",