From: Herbert Xu <herbert@gondor.apana.org.au>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Phil Sutter <phil@nwl.cc>,
davem@davemloft.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, tgraf@suug.ch,
fengguang.wu@intel.com, wfg@linux.intel.com, lkp@01.org
Subject: rhashtable: Use __vmalloc with GFP_ATOMIC for table allocation
Date: Fri, 4 Dec 2015 22:39:56 +0800 [thread overview]
Message-ID: <20151204143956.GA17471@gondor.apana.org.au> (raw)
In-Reply-To: <1449158919.6379.27.camel@edumazet-glaptop2.roam.corp.google.com>
On Thu, Dec 03, 2015 at 08:08:39AM -0800, Eric Dumazet wrote:
>
> Anyway, __vmalloc() can be used with GFP_ATOMIC, have you tried this ?
OK I've tried it and I no longer get any ENOMEM errors!
---8<---
When an rhashtable user pounds rhashtable hard with back-to-back
insertions we may end up growing the table in GFP_ATOMIC context.
Unfortunately when the table reaches a certain size this often
fails because we don't have enough physically contiguous pages
to hold the new table.
Eric Dumazet suggested (and in fact wrote this patch) using
__vmalloc instead which can be used in GFP_ATOMIC context.
Reported-by: Phil Sutter <phil@nwl.cc>
Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index a54ff89..1c624db 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -120,8 +120,9 @@ static struct bucket_table *bucket_table_alloc(struct rhashtable *ht,
if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER) ||
gfp != GFP_KERNEL)
tbl = kzalloc(size, gfp | __GFP_NOWARN | __GFP_NORETRY);
- if (tbl == NULL && gfp == GFP_KERNEL)
- tbl = vzalloc(size);
+ if (tbl == NULL)
+ tbl = __vmalloc(size, gfp | __GFP_HIGHMEM | __GFP_ZERO,
+ PAGE_KERNEL);
if (tbl == NULL)
return NULL;
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
next prev parent reply other threads:[~2015-12-04 14:40 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-20 17:17 [PATCH v2 0/4] improve fault-tolerance of rhashtable runtime-test Phil Sutter
2015-11-20 17:17 ` [PATCH v2 1/4] rhashtable-test: add cond_resched() to thread test Phil Sutter
2015-11-20 17:17 ` [PATCH v2 2/4] rhashtable-test: retry insert operations Phil Sutter
2015-11-20 17:17 ` [PATCH v2 3/4] rhashtable-test: calculate max_entries value by default Phil Sutter
2015-11-20 17:17 ` [PATCH v2 4/4] rhashtable-test: allow to retry even if -ENOMEM was returned Phil Sutter
2015-11-20 17:28 ` Phil Sutter
2015-11-23 17:38 ` [PATCH v2 0/4] improve fault-tolerance of rhashtable runtime-test David Miller
2015-11-30 9:37 ` Herbert Xu
2015-11-30 10:14 ` Phil Sutter
2015-11-30 10:18 ` Herbert Xu
2015-12-03 12:41 ` rhashtable: Prevent spurious EBUSY errors on insertion Herbert Xu
2015-12-03 15:38 ` Phil Sutter
2015-12-04 19:38 ` David Miller
2015-12-17 8:46 ` Xin Long
2015-12-17 8:48 ` Herbert Xu
2015-12-17 9:00 ` Xin Long
2015-12-17 16:07 ` Xin Long
2015-12-18 2:26 ` Herbert Xu
2015-12-18 8:18 ` Xin Long
2015-12-17 17:00 ` David Miller
2015-12-03 12:51 ` rhashtable: ENOMEM errors when hit with a flood of insertions Herbert Xu
2015-12-03 15:08 ` David Laight
2015-12-03 16:08 ` Eric Dumazet
2015-12-04 0:07 ` Herbert Xu
2015-12-04 14:39 ` Herbert Xu [this message]
2015-12-04 17:01 ` rhashtable: Use __vmalloc with GFP_ATOMIC for table allocation Phil Sutter
2015-12-04 17:45 ` Eric Dumazet
2015-12-04 18:15 ` Phil Sutter
2015-12-05 7:06 ` Herbert Xu
2015-12-07 15:35 ` Thomas Graf
2015-12-07 19:29 ` David Miller
2015-12-09 2:18 ` Thomas Graf
2015-12-09 2:24 ` Herbert Xu
2015-12-09 2:36 ` Thomas Graf
2015-12-09 2:38 ` Herbert Xu
2015-12-09 2:42 ` Thomas Graf
2015-12-04 21:53 ` David Miller
2015-12-05 7:03 ` Herbert Xu
2015-12-06 3:48 ` David Miller
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=20151204143956.GA17471@gondor.apana.org.au \
--to=herbert@gondor.apana.org.au \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=fengguang.wu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@01.org \
--cc=netdev@vger.kernel.org \
--cc=phil@nwl.cc \
--cc=tgraf@suug.ch \
--cc=wfg@linux.intel.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;
as well as URLs for NNTP newsgroup(s).