net/mlx5: fix E-Switch DV flow disabling

[dpdk.git] / drivers / net / bnx2x / bnx2x_rxtx.c

diff --git a/drivers/net/bnx2x/bnx2x_rxtx.c b/drivers/net/bnx2x/bnx2x_rxtx.c
index e5a2b25..fbc0bb7 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_rxtx.c
+++ b/drivers/net/bnx2x/bnx2x_rxtx.c
@@ -27,8 +27,7 @@ bnx2x_rx_queue_release(struct bnx2x_rx_queue *rx_queue)
                sw_ring = rx_queue->sw_ring;
                if (NULL != sw_ring) {
                        for (i = 0; i < rx_queue->nb_rx_desc; i++) {
-                               if (NULL != sw_ring[i])
-                                       rte_pktmbuf_free(sw_ring[i]);
+                               rte_pktmbuf_free(sw_ring[i]);
                        }
                        rte_free(sw_ring);
                }
@@ -37,9 +36,9 @@ bnx2x_rx_queue_release(struct bnx2x_rx_queue *rx_queue)
 }
 
 void
-bnx2x_dev_rx_queue_release(void *rxq)
+bnx2x_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx)
 {
-       bnx2x_rx_queue_release(rxq);
+       bnx2x_rx_queue_release(dev->data->rx_queues[queue_idx]);
 }
 
 int
@@ -172,8 +171,7 @@ bnx2x_tx_queue_release(struct bnx2x_tx_queue *tx_queue)
                sw_ring = tx_queue->sw_ring;
                if (NULL != sw_ring) {
                        for (i = 0; i < tx_queue->nb_tx_desc; i++) {
-                               if (NULL != sw_ring[i])
-                                       rte_pktmbuf_free(sw_ring[i]);
+                               rte_pktmbuf_free(sw_ring[i]);
                        }
                        rte_free(sw_ring);
                }
@@ -182,9 +180,9 @@ bnx2x_tx_queue_release(struct bnx2x_tx_queue *tx_queue)
 }
 
 void
-bnx2x_dev_tx_queue_release(void *txq)
+bnx2x_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx)
 {
-       bnx2x_tx_queue_release(txq);
+       bnx2x_tx_queue_release(dev->data->tx_queues[queue_idx]);
 }
 
 static uint16_t
@@ -321,12 +319,15 @@ static inline void
 bnx2x_upd_rx_prod_fast(struct bnx2x_softc *sc, struct bnx2x_fastpath *fp,
                uint16_t rx_bd_prod, uint16_t rx_cq_prod)
 {
-       union ustorm_eth_rx_producers rx_prods;
+       union {
+               struct ustorm_eth_rx_producers rx_prods;
+               uint32_t val;
+       } val = { {0} };
 
-       rx_prods.prod.bd_prod  = rx_bd_prod;
-       rx_prods.prod.cqe_prod = rx_cq_prod;
+       val.rx_prods.bd_prod  = rx_bd_prod;
+       val.rx_prods.cqe_prod = rx_cq_prod;
 
-       REG_WR(sc, fp->ustorm_rx_prods_offset, rx_prods.raw_data[0]);
+       REG_WR(sc, fp->ustorm_rx_prods_offset, val.val);
 }
 
 static uint16_t
@@ -341,8 +342,11 @@ bnx2x_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        struct rte_mbuf *new_mb;
        uint16_t rx_pref;
        struct eth_fast_path_rx_cqe *cqe_fp;
-       uint16_t len, pad;
+       uint16_t len, pad, bd_len, buf_len;
        struct rte_mbuf *rx_mb = NULL;
+       static bool log_once = true;
+
+       rte_spinlock_lock(&(fp)->rx_mtx);
 
        hw_cq_cons = le16toh(*fp->rx_cq_cons_sb);
        if ((hw_cq_cons & USABLE_RCQ_ENTRIES_PER_PAGE) ==
@@ -355,8 +359,10 @@ bnx2x_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        sw_cq_cons = rxq->rx_cq_head;
        sw_cq_prod = rxq->rx_cq_tail;
 
-       if (sw_cq_cons == hw_cq_cons)
+       if (sw_cq_cons == hw_cq_cons) {
+               rte_spinlock_unlock(&(fp)->rx_mtx);
                return 0;
+       }
 
        while (nb_rx < nb_pkts && sw_cq_cons != hw_cq_cons) {
 
@@ -378,6 +384,20 @@ bnx2x_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 
                len = cqe_fp->pkt_len_or_gro_seg_len;
                pad = cqe_fp->placement_offset;
+               bd_len = cqe_fp->len_on_bd;
+               buf_len = rxq->sw_ring[bd_cons]->buf_len;
+
+               /* Check for sufficient buffer length */
+               if (unlikely(buf_len < len + (pad + RTE_PKTMBUF_HEADROOM))) {
+                       if (unlikely(log_once)) {
+                               PMD_DRV_LOG(ERR, sc, "mbuf size %d is not enough to hold Rx packet length more than %d",
+                                           buf_len - RTE_PKTMBUF_HEADROOM,
+                                           buf_len -
+                                           (pad + RTE_PKTMBUF_HEADROOM));
+                               log_once = false;
+                       }
+                       goto next_rx;
+               }
 
                new_mb = rte_mbuf_raw_alloc(rxq->mb_pool);
                if (unlikely(!new_mb)) {
@@ -402,7 +422,8 @@ bnx2x_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                rx_mb->data_off = pad + RTE_PKTMBUF_HEADROOM;
                rx_mb->nb_segs = 1;
                rx_mb->next = NULL;
-               rx_mb->pkt_len = rx_mb->data_len = len;
+               rx_mb->pkt_len = len;
+               rx_mb->data_len = bd_len;
                rx_mb->port = rxq->port_id;
                rte_prefetch1(rte_pktmbuf_mtod(rx_mb, void *));
 
@@ -412,7 +433,7 @@ bnx2x_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                 */
                if (cqe_fp->pars_flags.flags & PARSING_FLAGS_VLAN) {
                        rx_mb->vlan_tci = cqe_fp->vlan_tag;
-                       rx_mb->ol_flags |= PKT_RX_VLAN;
+                       rx_mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;
                }
 
                rx_pkts[nb_rx] = rx_mb;
@@ -437,21 +458,15 @@ next_rx:
 
        bnx2x_upd_rx_prod_fast(sc, fp, bd_prod, sw_cq_prod);
 
-       return nb_rx;
-}
+       rte_spinlock_unlock(&(fp)->rx_mtx);
 
-static uint16_t
-bnx2x_rxtx_pkts_dummy(__rte_unused void *p_rxq,
-                     __rte_unused struct rte_mbuf **rx_pkts,
-                     __rte_unused uint16_t nb_pkts)
-{
-       return 0;
+       return nb_rx;
 }
 
 void bnx2x_dev_rxtx_init_dummy(struct rte_eth_dev *dev)
 {
-       dev->rx_pkt_burst = bnx2x_rxtx_pkts_dummy;
-       dev->tx_pkt_burst = bnx2x_rxtx_pkts_dummy;
+       dev->rx_pkt_burst = rte_eth_pkt_burst_dummy;
+       dev->tx_pkt_burst = rte_eth_pkt_burst_dummy;
 }
 
 void bnx2x_dev_rxtx_init(struct rte_eth_dev *dev)