netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] dev_alloc_skb: avoid using GFP_ATOMIC
@ 2009-09-29 16:43 swalter
  2009-09-29 16:58 ` Stephen Hemminger
  0 siblings, 1 reply; 2+ messages in thread
From: swalter @ 2009-09-29 16:43 UTC (permalink / raw)
  To: davem, netdev; +Cc: swalter, Steven Walter

From: swalter <swalter@swalter-d630.(none)>


Signed-off-by: Steven Walter <swalter@lpdev.prtdev.lexmark.com>
---
 net/core/skbuff.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 9e0597d..58ec625 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -306,7 +306,11 @@ struct sk_buff *dev_alloc_skb(unsigned int length)
 	 * There is more code here than it seems:
 	 * __dev_alloc_skb is an inline
 	 */
-	return __dev_alloc_skb(length, GFP_ATOMIC);
+	if (in_interrupt()  ||  in_atomic()  ||  irqs_disabled()) {
+		return __dev_alloc_skb(length, GFP_ATOMIC);
+	} else {
+		return __dev_alloc_skb(length, GFP_KERNEL);
+	}
 }
 EXPORT_SYMBOL(dev_alloc_skb);
 
-- 
1.6.2.3.g5bbe6


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] dev_alloc_skb: avoid using GFP_ATOMIC
  2009-09-29 16:43 [PATCH] dev_alloc_skb: avoid using GFP_ATOMIC swalter
@ 2009-09-29 16:58 ` Stephen Hemminger
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2009-09-29 16:58 UTC (permalink / raw)
  To: swalter; +Cc: davem, netdev, swalter, Steven Walter

On Tue, 29 Sep 2009 12:43:13 -0400
swalter@lexmark.com wrote:

> From: swalter <swalter@swalter-d630.(none)>
> 
> 
> Signed-off-by: Steven Walter <swalter@lpdev.prtdev.lexmark.com>
> ---
>  net/core/skbuff.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> index 9e0597d..58ec625 100644
> --- a/net/core/skbuff.c
> +++ b/net/core/skbuff.c
> @@ -306,7 +306,11 @@ struct sk_buff *dev_alloc_skb(unsigned int length)
>  	 * There is more code here than it seems:
>  	 * __dev_alloc_skb is an inline
>  	 */
> -	return __dev_alloc_skb(length, GFP_ATOMIC);
> +	if (in_interrupt()  ||  in_atomic()  ||  irqs_disabled()) {
> +		return __dev_alloc_skb(length, GFP_ATOMIC);
> +	} else {
> +		return __dev_alloc_skb(length, GFP_KERNEL);
> +	}
>  }
>  EXPORT_SYMBOL(dev_alloc_skb);
>  

No, this should be fixed by caller (using netdev_alloc_skb)
also, it may break cases like swap over NFS that want to get memory
when memory pool is low


-- 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-09-29 16:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-29 16:43 [PATCH] dev_alloc_skb: avoid using GFP_ATOMIC swalter
2009-09-29 16:58 ` Stephen Hemminger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).