diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2022-02-16 21:38:11 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-02-18 05:03:39 +0100 |
| commit | 6b48bece871e27ad18ae6df6090a71408d5c1b17 (patch) | |
| tree | 414291ad0fc198ae92f6536cbef8b4b7dbd6e52e /drivers/net/ethernet/ni/nixge.c | |
| parent | Merge branch 'mptcp-selftest-fine-tuning-and-cleanup' (diff) | |
| download | linux-6b48bece871e27ad18ae6df6090a71408d5c1b17.tar.xz linux-6b48bece871e27ad18ae6df6090a71408d5c1b17.zip | |
net: nixge: Use GFP_KERNEL instead of GFP_ATOMIC when possible
NIXGE_MAX_JUMBO_FRAME_SIZE is over 9000 bytes and RX_BD_NUM 128.
So this loop allocates more than 1 Mo of memory.
Previous memory allocations in this function already use GFP_KERNEL, so
use __netdev_alloc_skb_ip_align() and an explicit GFP_KERNEL instead of a
implicit GFP_ATOMIC.
This gives more opportunities of successful allocation.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/28d2c8e05951ad02a57eb48333672947c8bb4f81.1645043881.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/ni/nixge.c')
| -rw-r--r-- | drivers/net/ethernet/ni/nixge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c index 07a00dd9cfe0..4b3482ce90a1 100644 --- a/drivers/net/ethernet/ni/nixge.c +++ b/drivers/net/ethernet/ni/nixge.c @@ -324,8 +324,9 @@ static int nixge_hw_dma_bd_init(struct net_device *ndev) + sizeof(*priv->rx_bd_v) * ((i + 1) % RX_BD_NUM)); - skb = netdev_alloc_skb_ip_align(ndev, - NIXGE_MAX_JUMBO_FRAME_SIZE); + skb = __netdev_alloc_skb_ip_align(ndev, + NIXGE_MAX_JUMBO_FRAME_SIZE, + GFP_KERNEL); if (!skb) goto out; |