X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnx2x%2Fbnx2x_rxtx.c;h=57e2ce50458756deb1c8a586337f33cf4eb4056d;hb=972a1bf8120d971c04c065221c46c37c266b1f62;hp=ae97dfee36b3b3e27e31c953e3730ed880113a6a;hpb=38dff79ba7360f7171303300fadc4f00592d8630;p=dpdk.git

diff --git a/drivers/net/bnx2x/bnx2x_rxtx.c b/drivers/net/bnx2x/bnx2x_rxtx.c
index ae97dfee36..57e2ce5045 100644
--- a/drivers/net/bnx2x/bnx2x_rxtx.c
+++ b/drivers/net/bnx2x/bnx2x_rxtx.c
@@ -343,8 +343,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 +360,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 +385,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 +423,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 +434,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 |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
 		}
 
 		rx_pkts[nb_rx] = rx_mb;
@@ -439,6 +459,8 @@ next_rx:
 
 	bnx2x_upd_rx_prod_fast(sc, fp, bd_prod, sw_cq_prod);
 
+	rte_spinlock_unlock(&(fp)->rx_mtx);
+
 	return nb_rx;
 }