From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751274AbdEaPwE (ORCPT ); Wed, 31 May 2017 11:52:04 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33146 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751009AbdEaPwB (ORCPT ); Wed, 31 May 2017 11:52:01 -0400 From: Michal Hocko To: LKML Cc: , Andrew Morton , Michal Hocko , Herbert Xu , Thomas Graf Subject: [PATCH 2/3] lib/rhashtable.c: use kvzalloc in bucket_table_alloc when possible Date: Wed, 31 May 2017 17:51:44 +0200 Message-Id: <20170531155145.17111-3-mhocko@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170531155145.17111-1-mhocko@kernel.org> References: <20170531155145.17111-1-mhocko@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michal Hocko 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 Cc: Herbert Xu Cc: netdev@vger.kernel.org Signed-off-by: Michal Hocko --- 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