From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael Chan" Subject: Re: [PATCH v2 1/2] bnx2: allocate with GFP_KERNEL flag on RX path init Date: Fri, 16 Jul 2010 14:24:38 -0700 Message-ID: <1279315478.18129.41.camel@nseg_linux_HP1.broadcom.com> References: <20100715142537.12504.60051.send-patch@dhcp-lab-109.englab.brq.redhat.com> <20100716105540.613d40cc@dhcp-lab-109.englab.brq.redhat.com> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: "netdev@vger.kernel.org" To: "Stanislaw Gruszka" Return-path: Received: from mms2.broadcom.com ([216.31.210.18]:1842 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759270Ab0GPVZ5 (ORCPT ); Fri, 16 Jul 2010 17:25:57 -0400 In-Reply-To: <20100716105540.613d40cc@dhcp-lab-109.englab.brq.redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: On Fri, 2010-07-16 at 01:55 -0700, Stanislaw Gruszka wrote: > Signed-off-by: Stanislaw Gruszka Acked-by: Michael Chan > --- > v1->v2: use GFP_ATOMIC in bnx2_rx_skb > > drivers/net/bnx2.c | 17 +++++++++-------- > 1 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c > index a203f39..a7df539 100644 > --- a/drivers/net/bnx2.c > +++ b/drivers/net/bnx2.c > @@ -2664,13 +2664,13 @@ bnx2_set_mac_addr(struct bnx2 *bp, u8 *mac_addr, u32 pos) > } > > static inline int > -bnx2_alloc_rx_page(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index) > +bnx2_alloc_rx_page(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index, gfp_t gfp) > { > dma_addr_t mapping; > struct sw_pg *rx_pg = &rxr->rx_pg_ring[index]; > struct rx_bd *rxbd = > &rxr->rx_pg_desc_ring[RX_RING(index)][RX_IDX(index)]; > - struct page *page = alloc_page(GFP_ATOMIC); > + struct page *page = alloc_page(gfp); > > if (!page) > return -ENOMEM; > @@ -2705,7 +2705,7 @@ bnx2_free_rx_page(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index) > } > > static inline int > -bnx2_alloc_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index) > +bnx2_alloc_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index, gfp_t gfp) > { > struct sk_buff *skb; > struct sw_bd *rx_buf = &rxr->rx_buf_ring[index]; > @@ -2713,7 +2713,7 @@ bnx2_alloc_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index) > struct rx_bd *rxbd = &rxr->rx_desc_ring[RX_RING(index)][RX_IDX(index)]; > unsigned long align; > > - skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size); > + skb = __netdev_alloc_skb(bp->dev, bp->rx_buf_size, gfp); > if (skb == NULL) { > return -ENOMEM; > } > @@ -2974,7 +2974,7 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb, > int err; > u16 prod = ring_idx & 0xffff; > > - err = bnx2_alloc_rx_skb(bp, rxr, prod); > + err = bnx2_alloc_rx_skb(bp, rxr, prod, GFP_ATOMIC); > if (unlikely(err)) { > bnx2_reuse_rx_skb(bp, rxr, skb, (u16) (ring_idx >> 16), prod); > if (hdr_len) { > @@ -3039,7 +3039,8 @@ bnx2_rx_skb(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, struct sk_buff *skb, > rx_pg->page = NULL; > > err = bnx2_alloc_rx_page(bp, rxr, > - RX_PG_RING_IDX(pg_prod)); > + RX_PG_RING_IDX(pg_prod), > + GFP_ATOMIC); > if (unlikely(err)) { > rxr->rx_pg_cons = pg_cons; > rxr->rx_pg_prod = pg_prod; > @@ -5179,7 +5180,7 @@ bnx2_init_rx_ring(struct bnx2 *bp, int ring_num) > > ring_prod = prod = rxr->rx_pg_prod; > for (i = 0; i < bp->rx_pg_ring_size; i++) { > - if (bnx2_alloc_rx_page(bp, rxr, ring_prod) < 0) { > + if (bnx2_alloc_rx_page(bp, rxr, ring_prod, GFP_KERNEL) < 0) { > netdev_warn(bp->dev, "init'ed rx page ring %d with %d/%d pages only\n", > ring_num, i, bp->rx_pg_ring_size); > break; > @@ -5191,7 +5192,7 @@ bnx2_init_rx_ring(struct bnx2 *bp, int ring_num) > > ring_prod = prod = rxr->rx_prod; > for (i = 0; i < bp->rx_ring_size; i++) { > - if (bnx2_alloc_rx_skb(bp, rxr, ring_prod) < 0) { > + if (bnx2_alloc_rx_skb(bp, rxr, ring_prod, GFP_KERNEL) < 0) { > netdev_warn(bp->dev, "init'ed rx ring %d with %d/%d skbs only\n", > ring_num, i, bp->rx_ring_size); > break;