Commit e8684db1 authored by Yuiko Oshino's avatar Yuiko Oshino Committed by David S. Miller
Browse files

net: ethernet: microchip: lan743x: Fix skb allocation failure 



The driver allocates skb during ndo_open with GFP_ATOMIC which has high chance of failure when there are multiple instances.
GFP_KERNEL is enough while open and use GFP_ATOMIC only from interrupt context.

Fixes: 23f0703c ("lan743x: Add main source files for new lan743x driver")
Signed-off-by: default avatarYuiko Oshino <yuiko.oshino@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d9d6fd2

drivers/net/ethernet/microchip/lan743x_main.c

+9 −4
Original line number Original line Diff line number Diff line
@@ -1944,7 +1944,8 @@ static void lan743x_rx_update_tail(struct lan743x_rx *rx, int index) 
				  index);

				  index);

}

}





static int lan743x_rx_init_ring_element(struct lan743x_rx *rx, int index)

static int lan743x_rx_init_ring_element(struct lan743x_rx *rx, int index,

					gfp_t gfp)

{

{

	struct net_device *netdev = rx->adapter->netdev;

	struct net_device *netdev = rx->adapter->netdev;

	struct device *dev = &rx->adapter->pdev->dev;

	struct device *dev = &rx->adapter->pdev->dev;
@@ -1958,7 +1959,7 @@ static int lan743x_rx_init_ring_element(struct lan743x_rx *rx, int index) 




	descriptor = &rx->ring_cpu_ptr[index];

	descriptor = &rx->ring_cpu_ptr[index];

	buffer_info = &rx->buffer_info[index];

	buffer_info = &rx->buffer_info[index];

	skb = __netdev_alloc_skb(netdev, buffer_length, GFP_ATOMIC | GFP_DMA);

	skb = __netdev_alloc_skb(netdev, buffer_length, gfp);

	if (!skb)

	if (!skb)

		return -ENOMEM;

		return -ENOMEM;

	dma_ptr = dma_map_single(dev, skb->data, buffer_length, DMA_FROM_DEVICE);

	dma_ptr = dma_map_single(dev, skb->data, buffer_length, DMA_FROM_DEVICE);
@@ -2120,7 +2121,8 @@ static int lan743x_rx_process_buffer(struct lan743x_rx *rx) 




	/* save existing skb, allocate new skb and map to dma */

	/* save existing skb, allocate new skb and map to dma */

	skb = buffer_info->skb;

	skb = buffer_info->skb;

	if (lan743x_rx_init_ring_element(rx, rx->last_head)) {

	if (lan743x_rx_init_ring_element(rx, rx->last_head,

					 GFP_ATOMIC | GFP_DMA)) {

		/* failed to allocate next skb.

		/* failed to allocate next skb.

		 * Memory is very low.

		 * Memory is very low.

		 * Drop this packet and reuse buffer.

		 * Drop this packet and reuse buffer.
@@ -2335,13 +2337,16 @@ static int lan743x_rx_ring_init(struct lan743x_rx *rx) 




	rx->last_head = 0;

	rx->last_head = 0;

	for (index = 0; index < rx->ring_size; index++) {

	for (index = 0; index < rx->ring_size; index++) {

		ret = lan743x_rx_init_ring_element(rx, index);

		ret = lan743x_rx_init_ring_element(rx, index, GFP_KERNEL);

		if (ret)

		if (ret)

			goto cleanup;

			goto cleanup;

	}

	}

	return 0;

	return 0;





cleanup:

cleanup:

	netif_warn(rx->adapter, ifup, rx->adapter->netdev,

		   "Error allocating memory for LAN743x\n");



	lan743x_rx_ring_cleanup(rx);

	lan743x_rx_ring_cleanup(rx);

	return ret;

	return ret;

}

}