Messages in this thread Patch in this message | | | From | Michal Hocko <> | Subject | [PATCH 2/3] lib/rhashtable.c: use kvzalloc in bucket_table_alloc when possible | Date | Wed, 31 May 2017 17:51:44 +0200 |
| |
From: Michal Hocko <mhocko@suse.com>
bucket_table_alloc can be currently called with GFP_KERNEL or GFP_ATOMIC. For the former we basically have an open coded kvzalloc while the later only uses kzalloc. Let's simplify the code a bit by the dropping the open coded path and replace it with kvzalloc
Cc: Thomas Graf <tgraf@suug.ch> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: netdev@vger.kernel.org Signed-off-by: Michal Hocko <mhocko@suse.com> --- lib/rhashtable.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/rhashtable.c b/lib/rhashtable.c index d9e7274a04cd..42466c167257 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -211,11 +211,10 @@ static struct bucket_table *bucket_table_alloc(struct rhashtable *ht, int i; size = sizeof(*tbl) + nbuckets * sizeof(tbl->buckets[0]); - if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER) || - gfp != GFP_KERNEL) + if (gfp != GFP_KERNEL) tbl = kzalloc(size, gfp | __GFP_NOWARN | __GFP_NORETRY); - if (tbl == NULL && gfp == GFP_KERNEL) - tbl = vzalloc(size); + else + tbl = kvzalloc(size, gfp); size = nbuckets; -- 2.11.0
| |