mbuf: add rte prefix to offload flags

[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 ae97dfe..2570a6b 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_rxtx.c
+++ b/drivers/net/bnx2x/bnx2x_rxtx.c
@@ -321,14 +321,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)
 {
-       struct ustorm_eth_rx_producers rx_prods = { 0 };
-       uint32_t *val = NULL;
+       union {
+               struct ustorm_eth_rx_producers rx_prods;
+               uint32_t val;
+       } val = { {0} };
 
-       rx_prods.bd_prod  = rx_bd_prod;
-       rx_prods.cqe_prod = rx_cq_prod;
+       val.rx_prods.bd_prod  = rx_bd_prod;
+       val.rx_prods.cqe_prod = rx_cq_prod;
 
-       val = (uint32_t *)&rx_prods;
-       REG_WR(sc, fp->ustorm_rx_prods_offset, val[0]);
+       REG_WR(sc, fp->ustorm_rx_prods_offset, val.val);
 }
 
 static uint16_t
@@ -343,8 +344,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) ==
@@ -357,8 +361,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) {
 
@@ -380,6 +386,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)) {
@@ -404,7 +424,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 *));
 
@@ -414,7 +435,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;
@@ -439,6 +460,8 @@ next_rx:
 
        bnx2x_upd_rx_prod_fast(sc, fp, bd_prod, sw_cq_prod);
 
+       rte_spinlock_unlock(&(fp)->rx_mtx);
+
        return nb_rx;
 }