@@ -110,7 +110,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev);
static void gfar_reset_task(struct work_struct *work);
static void gfar_timeout(struct net_device *dev);
static int gfar_close(struct net_device *dev);
-static struct sk_buff *gfar_alloc_skb(struct net_device *dev);
+static struct sk_buff *gfar_alloc_skb(struct net_device *dev, gfp_t gfp_mask);
static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
struct sk_buff *skb);
static int gfar_set_mac_address(struct net_device *dev);
@@ -207,7 +207,7 @@ static int gfar_init_bds(struct net_device *ndev)
gfar_init_rxbdp(rx_queue, rxbdp,
rxbdp->bufPtr);
} else {
- skb = gfar_alloc_skb(ndev);
+ skb = gfar_alloc_skb(ndev, GFP_KERNEL);
if (!skb) {
netdev_err(ndev, "Can't allocate RX buffers\n");
return -ENOMEM;
@@ -2598,12 +2598,13 @@ static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
gfar_init_rxbdp(rx_queue, bdp, buf);
}
-static struct sk_buff *gfar_alloc_skb(struct net_device *dev)
+static struct sk_buff *gfar_alloc_skb(struct net_device *dev, gfp_t gfp_mask)
{
struct gfar_private *priv = netdev_priv(dev);
struct sk_buff *skb;
- skb = netdev_alloc_skb(dev, priv->rx_buffer_size + RXBUF_ALIGNMENT);
+ skb = __netdev_alloc_skb(dev, priv->rx_buffer_size + RXBUF_ALIGNMENT,
+ gfp_mask);
if (!skb)
return NULL;
@@ -2749,7 +2750,7 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
rmb();
/* Add another skb for the future */
- newskb = gfar_alloc_skb(dev);
+ newskb = gfar_alloc_skb(dev, GFP_ATOMIC);
skb = rx_queue->rx_skbuff[rx_queue->skb_currx];
While allocation skb in IRQ/SOFTIRQ, such as processing each frame in the rx ring, alloc skb should be ATOMIC based, should not sleep. When allocation skb is not in IRQ/SOFTIRQ, such as allocation skb when initializing a net driver, starting up the NIC from stopped status. In this case, it is not necessary to alloc memory base on GFP_ATOMIC, should use GFP_KERNEL. The second method also avoid kernel crash and reporting -ENOMEM when free low memory is near vm.min_free_kbytes as below: Signed-off-by: Jianhua Xie <jianhua.xie@freescale.com> --- drivers/net/ethernet/freescale/gianfar.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)