121 lines
4.9 KiB
Diff
121 lines
4.9 KiB
Diff
From sgruszka@redhat.com Mon Oct 18 05:10:00 2010
|
|
Return-Path: sgruszka@redhat.com
|
|
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
|
|
zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
|
|
mail03.corp.redhat.com with LMTP; Mon, 18 Oct 2010 05:10:00 -0400 (EDT)
|
|
Received: from localhost (localhost.localdomain [127.0.0.1])
|
|
by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 5E48E928A4;
|
|
Mon, 18 Oct 2010 05:10:00 -0400 (EDT)
|
|
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
|
|
by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
|
|
with ESMTP id q3QJQ+TOP+bt; Mon, 18 Oct 2010 05:10:00 -0400 (EDT)
|
|
Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
|
|
by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 423CC91A7C;
|
|
Mon, 18 Oct 2010 05:10:00 -0400 (EDT)
|
|
Received: from localhost (dhcp-1-246.brq.redhat.com [10.34.1.246])
|
|
by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id o9I99x6b006228;
|
|
Mon, 18 Oct 2010 05:09:59 -0400
|
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
To: stable@kernel.org
|
|
Cc: Kyle McMartin <kmcmartin@redhat.com>,
|
|
Stanislaw Gruszka <sgruszka@redhat.com>,
|
|
"David S. Miller" <davem@davemloft.net>
|
|
Subject: [PATCH -stable 2.6.34+] r8169: allocate with GFP_KERNEL flag when able to sleep
|
|
Date: Mon, 18 Oct 2010 11:12:22 +0200
|
|
Message-Id: <1287393142-2566-1-git-send-email-sgruszka@redhat.com>
|
|
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
|
|
|
|
Upstream aeb19f6052b5e5c8a24aa444fbff73b84341beac commit.
|
|
|
|
We have fedora bug report where driver fail to initialize after
|
|
suspend/resume because of memory allocation errors:
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=629158
|
|
|
|
To fix use GFP_KERNEL allocation where possible.
|
|
|
|
Patch should fix any allocation errors with calltrace like that:
|
|
|
|
NetworkManager: page allocation failure. order:3, mode:0x4020
|
|
Pid: 1427, comm: NetworkManager Not tainted 2.6.31.12-rhapsody.fc12-121 #1
|
|
Call Trace:
|
|
[<ffffffff810c876f>] __alloc_pages_nodemask+0x57a/0x5bb
|
|
[<ffffffff810f415d>] alloc_pages_node+0x48/0x4a
|
|
[<ffffffff810f4189>] kmalloc_large_node+0x2a/0x67
|
|
[<ffffffff810f5f1c>] __kmalloc_node_track_caller+0x31/0x11b
|
|
[<ffffffff8136f4fe>] ? __netdev_alloc_skb+0x34/0x50
|
|
[<ffffffff8136e8b8>] __alloc_skb+0x80/0x170
|
|
[<ffffffff8136f4fe>] __netdev_alloc_skb+0x34/0x50
|
|
[<ffffffffa011c5e0>] rtl8169_rx_fill+0xa8/0x154 [r8169]
|
|
[<ffffffffa011e5c5>] rtl8169_init_ring+0x71/0x9f [r8169]
|
|
[<ffffffffa011edbe>] rtl8169_open+0x7f/0x199 [r8169]
|
|
|
|
Tested-by: Neal Becker <ndbecker2@gmail.com>
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/r8169.c | 12 ++++++------
|
|
1 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
|
|
index a0da4a1..a68ec8f 100644
|
|
--- a/drivers/net/r8169.c
|
|
+++ b/drivers/net/r8169.c
|
|
@@ -4000,7 +4000,7 @@ static inline void rtl8169_map_to_asic(struct RxDesc *desc, dma_addr_t mapping,
|
|
static struct sk_buff *rtl8169_alloc_rx_skb(struct pci_dev *pdev,
|
|
struct net_device *dev,
|
|
struct RxDesc *desc, int rx_buf_sz,
|
|
- unsigned int align)
|
|
+ unsigned int align, gfp_t gfp)
|
|
{
|
|
struct sk_buff *skb;
|
|
dma_addr_t mapping;
|
|
@@ -4008,7 +4008,7 @@ static struct sk_buff *rtl8169_alloc_rx_skb(struct pci_dev *pdev,
|
|
|
|
pad = align ? align : NET_IP_ALIGN;
|
|
|
|
- skb = netdev_alloc_skb(dev, rx_buf_sz + pad);
|
|
+ skb = __netdev_alloc_skb(dev, rx_buf_sz + pad, gfp);
|
|
if (!skb)
|
|
goto err_out;
|
|
|
|
@@ -4039,7 +4039,7 @@ static void rtl8169_rx_clear(struct rtl8169_private *tp)
|
|
}
|
|
|
|
static u32 rtl8169_rx_fill(struct rtl8169_private *tp, struct net_device *dev,
|
|
- u32 start, u32 end)
|
|
+ u32 start, u32 end, gfp_t gfp)
|
|
{
|
|
u32 cur;
|
|
|
|
@@ -4054,7 +4054,7 @@ static u32 rtl8169_rx_fill(struct rtl8169_private *tp, struct net_device *dev,
|
|
|
|
skb = rtl8169_alloc_rx_skb(tp->pci_dev, dev,
|
|
tp->RxDescArray + i,
|
|
- tp->rx_buf_sz, tp->align);
|
|
+ tp->rx_buf_sz, tp->align, gfp);
|
|
if (!skb)
|
|
break;
|
|
|
|
@@ -4082,7 +4082,7 @@ static int rtl8169_init_ring(struct net_device *dev)
|
|
memset(tp->tx_skb, 0x0, NUM_TX_DESC * sizeof(struct ring_info));
|
|
memset(tp->Rx_skbuff, 0x0, NUM_RX_DESC * sizeof(struct sk_buff *));
|
|
|
|
- if (rtl8169_rx_fill(tp, dev, 0, NUM_RX_DESC) != NUM_RX_DESC)
|
|
+ if (rtl8169_rx_fill(tp, dev, 0, NUM_RX_DESC, GFP_KERNEL) != NUM_RX_DESC)
|
|
goto err_out;
|
|
|
|
rtl8169_mark_as_last_descriptor(tp->RxDescArray + NUM_RX_DESC - 1);
|
|
@@ -4583,7 +4583,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
|
|
count = cur_rx - tp->cur_rx;
|
|
tp->cur_rx = cur_rx;
|
|
|
|
- delta = rtl8169_rx_fill(tp, dev, tp->dirty_rx, tp->cur_rx);
|
|
+ delta = rtl8169_rx_fill(tp, dev, tp->dirty_rx, tp->cur_rx, GFP_ATOMIC);
|
|
if (!delta && count)
|
|
netif_info(tp, intr, dev, "no Rx buffer allocated\n");
|
|
tp->dirty_rx += delta;
|
|
--
|
|
1.7.1
|
|
|