From: Eric Dumazet <eric.dumazet@gmail.com>
To: mbizon@freebox.fr
Cc: David Madore <david+ml@madore.org>,
Francois Romieu <romieu@fr.zoreil.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Hugh Dickins <hughd@google.com>
Subject: Re: kernel 3.2.27 on arm: WARNING: at mm/page_alloc.c:2109 __alloc_pages_nodemask+0x1d4/0x68c()
Date: Fri, 05 Oct 2012 14:39:50 +0200 [thread overview]
Message-ID: <1349440790.21172.56.camel@edumazet-glaptop> (raw)
In-Reply-To: <1349440667.21172.54.camel@edumazet-glaptop>
On Fri, 2012-10-05 at 14:37 +0200, Eric Dumazet wrote:
> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> index cdc2859..f6c1f52 100644
> --- a/net/core/skbuff.c
> +++ b/net/core/skbuff.c
> @@ -1053,11 +1053,22 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
> {
> int i;
> u8 *data;
> - int size = nhead + skb_end_offset(skb) + ntail;
> + unsigned int tail_offset = skb_tail_pointer(skb) - skb->head;
> + int size = nhead + ntail;
> long off;
>
> BUG_ON(nhead < 0);
>
> + /* callers using nhead == 0 and ntail == 0 wants to get a fresh copy,
> + * so allocate same amount of memory (skb_end_offset)
> + * For others, they want extra head or tail against the currently
> + * used portion of header (skb->head -> skb_tail_pointer).
> + * But we dont shrink the head.
> + */
> + if (size)
> + size += tail_offset;
> + size = max_t(int, size, skb_end_offset(skb));
> +
>
This can be factorized to :
size = tail_offset + nhead + ntail;
size = max_t(int, size, skb_end_offset(skb));
next prev parent reply other threads:[~2012-10-05 12:39 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120829002548.GA7063@aldebaran.gro-tsen.net>
2012-09-01 2:21 ` kernel 3.2.27 on arm: WARNING: at mm/page_alloc.c:2109 __alloc_pages_nodemask+0x1d4/0x68c() Hugh Dickins
2012-09-01 8:20 ` Francois Romieu
2012-09-02 22:51 ` David Madore
2012-10-04 16:02 ` Maxime Bizon
2012-10-04 16:29 ` Eric Dumazet
2012-10-05 7:41 ` Eric Dumazet
2012-10-05 10:49 ` Maxime Bizon
2012-10-05 12:22 ` Eric Dumazet
2012-10-05 12:37 ` Eric Dumazet
2012-10-05 12:39 ` Eric Dumazet [this message]
2012-10-05 12:51 ` Maxime Bizon
2012-10-05 13:02 ` Eric Dumazet
2012-10-05 14:50 ` Maxime Bizon
2012-10-05 15:04 ` Eric Dumazet
2012-10-05 15:15 ` Maxime Bizon
2012-10-05 15:37 ` Eric Dumazet
2012-10-05 16:23 ` [PATCH] net: remove skb recycling Eric Dumazet
2012-10-07 4:41 ` David Miller
2012-10-04 16:50 ` kernel 3.2.27 on arm: WARNING: at mm/page_alloc.c:2109 __alloc_pages_nodemask+0x1d4/0x68c() Eric Dumazet
2012-10-04 17:09 ` Maxime Bizon
2012-10-04 17:17 ` Eric Dumazet
2012-10-04 17:34 ` Maxime Bizon
2012-10-04 21:27 ` Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349440790.21172.56.camel@edumazet-glaptop \
--to=eric.dumazet@gmail.com \
--cc=david+ml@madore.org \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbizon@freebox.fr \
--cc=netdev@vger.kernel.org \
--cc=romieu@fr.zoreil.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox