diff mbox

[1/2] net: calxedaxgmac: fix rx ring handling when OOM

Message ID 1364506365-13689-1-git-send-email-robherring2@gmail.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Rob Herring March 28, 2013, 9:32 p.m. UTC 
From: Rob Herring <rob.herring@calxeda.com>

If skb allocation for the rx ring fails repeatedly, we can reach a point
were the ring is empty. In this condition, the driver is out of sync with
the h/w. While this has always been possible, the removal of the skb
recycling seems to have made triggering this problem easier.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
 drivers/net/ethernet/calxeda/xgmac.c |    3 +++
 1 file changed, 3 insertions(+)

Comments

David Miller March 29, 2013, 7:29 p.m. UTC | #1 
From: Rob Herring <robherring2@gmail.com>
Date: Thu, 28 Mar 2013 16:32:44 -0500

> From: Rob Herring <rob.herring@calxeda.com>
> 
> If skb allocation for the rx ring fails repeatedly, we can reach a point
> were the ring is empty. In this condition, the driver is out of sync with
> the h/w. While this has always been possible, the removal of the skb
> recycling seems to have made triggering this problem easier.
> 
> Signed-off-by: Rob Herring <rob.herring@calxeda.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
index a170065..bb1e80b 100644
--- a/drivers/net/ethernet/calxeda/xgmac.c
+++ b/drivers/net/ethernet/calxeda/xgmac.c
@@ -1141,6 +1141,9 @@  static int xgmac_rx(struct xgmac_priv *priv, int limit)
 		struct sk_buff *skb;
 		int frame_len;
 
+		if (!dma_ring_cnt(priv->rx_head, priv->rx_tail, DMA_RX_RING_SZ))
+			break;
+
 		entry = priv->rx_tail;
 		p = priv->dma_rx + entry;
 		if (desc_get_owner(p))