lkml.org 
[lkml]   [2011]   [Jan]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 204/260] r8169: allocate with GFP_KERNEL flag when able to sleep
    Date
    From: Stanislaw Gruszka <sgruszka@redhat.com>

    commit aeb19f6052b5e5c8a24aa444fbff73b84341beac upstream.

    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.

    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>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    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 17382c3..0fa0598 100644
    --- a/drivers/net/r8169.c
    +++ b/drivers/net/r8169.c
    @@ -3970,7 +3970,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;
    @@ -3978,7 +3978,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;

    @@ -4009,7 +4009,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;

    @@ -4024,7 +4024,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;

    @@ -4052,7 +4052,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);
    @@ -4553,7 +4553,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.3.3


    \
     
     \ /
      Last update: 2011-01-02 08:39    [W:4.042 / U:0.848 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site